Completed
Pull Request — stable9 (#4232)
by Lukas
25:41 queued 15:25
created
settings/templates/email.new_user.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
 	<tr><td>
7 7
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
8 8
 				<tr>
9
-					<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
10
-					<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
9
+					<td bgcolor="<?php p($theme->getMailHeaderColor()); ?>" width="20px">&nbsp;</td>
10
+					<td bgcolor="<?php p($theme->getMailHeaderColor()); ?>">
11 11
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
12 12
 					</td>
13 13
 				</tr>
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
29 29
 						<?php p($theme->getName()); ?> -
30 30
 						<?php p($theme->getSlogan()); ?>
31
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
31
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
32 32
 					</td>
33 33
 				</tr>
34 34
 				<tr>
Please login to merge, or discard this patch.
public.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
  */
28 28
 try {
29 29
 
30
-	require_once __DIR__ . '/lib/base.php';
30
+	require_once __DIR__.'/lib/base.php';
31 31
 	if (\OCP\Util::needUpgrade()) {
32 32
 		// since the behavior of apps or remotes are unpredictable during
33 33
 		// an upgrade, return a 503 directly
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 		$pathInfo = trim($pathInfo, '/');
51 51
 		list($service) = explode('/', $pathInfo);
52 52
 	}
53
-	$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($service));
53
+	$file = OCP\CONFIG::getAppValue('core', 'public_'.strip_tags($service));
54 54
 	if (is_null($file)) {
55 55
 		header('HTTP/1.0 404 Not Found');
56 56
 		exit;
@@ -65,14 +65,14 @@  discard block
 block discarded – undo
65 65
 	OC_App::loadApps(array('filesystem', 'logging'));
66 66
 
67 67
 	if (!\OC::$server->getAppManager()->isInstalled($app)) {
68
-		throw new Exception('App not installed: ' . $app);
68
+		throw new Exception('App not installed: '.$app);
69 69
 	}
70 70
 	OC_App::loadApp($app);
71 71
 	OC_User::setIncognitoMode(true);
72 72
 
73
-	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
73
+	$baseuri = OC::$WEBROOT.'/public.php/'.$service.'/';
74 74
 
75
-	require_once OC_App::getAppPath($app) . '/' . $parts[1];
75
+	require_once OC_App::getAppPath($app).'/'.$parts[1];
76 76
 
77 77
 } catch (\OC\ServiceUnavailableException $ex) {
78 78
 	//show the user a detailed error page
Please login to merge, or discard this patch.
remote.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 			// we shall not log on RemoteException
55 55
 			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
56 56
 		}
57
-		$server->on('beforeMethod', function () use ($e) {
57
+		$server->on('beforeMethod', function() use ($e) {
58 58
 			if ($e instanceof RemoteException) {
59 59
 				switch ($e->getCode()) {
60 60
 					case OC_Response::STATUS_SERVICE_UNAVAILABLE:
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		$server->exec();
71 71
 	} else {
72 72
 		$statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
73
-		if ($e instanceof \OC\ServiceUnavailableException ) {
73
+		if ($e instanceof \OC\ServiceUnavailableException) {
74 74
 			$statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
75 75
 		}
76 76
 		if ($e instanceof RemoteException) {
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 }
87 87
 
88 88
 try {
89
-	require_once __DIR__ . '/lib/base.php';
89
+	require_once __DIR__.'/lib/base.php';
90 90
 
91 91
 	if (\OCP\Util::needUpgrade()) {
92 92
 		// since the behavior of apps or remotes are unpredictable during
@@ -102,21 +102,21 @@  discard block
 block discarded – undo
102 102
 	if (!$pos = strpos($pathInfo, '/', 1)) {
103 103
 		$pos = strlen($pathInfo);
104 104
 	}
105
-	$service=substr($pathInfo, 1, $pos-1);
105
+	$service = substr($pathInfo, 1, $pos - 1);
106 106
 
107
-	$file = \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
107
+	$file = \OC::$server->getConfig()->getAppValue('core', 'remote_'.$service);
108 108
 
109
-	if(is_null($file)) {
109
+	if (is_null($file)) {
110 110
 		throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
111 111
 	}
112 112
 
113 113
 	// force language as given in the http request
114 114
 	\OC::$server->getL10NFactory()->setLanguageFromRequest();
115 115
 
116
-	$file=ltrim($file, '/');
116
+	$file = ltrim($file, '/');
117 117
 
118
-	$parts=explode('/', $file, 2);
119
-	$app=$parts[0];
118
+	$parts = explode('/', $file, 2);
119
+	$app = $parts[0];
120 120
 
121 121
 	// Load all required applications
122 122
 	\OC::$REQUESTEDAPP = $app;
@@ -125,17 +125,17 @@  discard block
 block discarded – undo
125 125
 
126 126
 	switch ($app) {
127 127
 		case 'core':
128
-			$file =  OC::$SERVERROOT .'/'. $file;
128
+			$file = OC::$SERVERROOT.'/'.$file;
129 129
 			break;
130 130
 		default:
131 131
 			if (!\OC::$server->getAppManager()->isInstalled($app)) {
132
-				throw new RemoteException('App not installed: ' . $app);
132
+				throw new RemoteException('App not installed: '.$app);
133 133
 			}
134 134
 			OC_App::loadApp($app);
135
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
135
+			$file = OC_App::getAppPath($app).'/'.$parts[1];
136 136
 			break;
137 137
 	}
138
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
138
+	$baseuri = OC::$WEBROOT.'/remote.php/'.$service.'/';
139 139
 	require_once $file;
140 140
 
141 141
 } catch (Exception $ex) {
Please login to merge, or discard this patch.
lib/public/lock/lockedexception.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 	 * @since 8.1.0
49 49
 	 */
50 50
 	public function __construct($path, \Exception $previous = null) {
51
-		parent::__construct('"' . $path . '" is locked', 0, $previous);
51
+		parent::__construct('"'.$path.'" is locked', 0, $previous);
52 52
 		$this->path = $path;
53 53
 	}
54 54
 
Please login to merge, or discard this patch.
lib/public/icachefactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
  * @package OCP
30 30
  * @since 7.0.0
31 31
  */
32
-interface ICacheFactory{
32
+interface ICacheFactory {
33 33
 	/**
34 34
 	 * Get a memory cache instance
35 35
 	 *
Please login to merge, or discard this patch.
lib/public/response.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 	 *  null		cache indefinitly
52 52
 	 * @since 4.0.0
53 53
 	 */
54
-	static public function enableCaching( $cache_time = null ) {
55
-		\OC_Response::enableCaching( $cache_time );
54
+	static public function enableCaching($cache_time = null) {
55
+		\OC_Response::enableCaching($cache_time);
56 56
 	}
57 57
 
58 58
 	/**
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 	 * @param string $lastModified time when the reponse was last modified
62 62
 	 * @since 4.0.0
63 63
 	 */
64
-	static public function setLastModifiedHeader( $lastModified ) {
65
-		\OC_Response::setLastModifiedHeader( $lastModified );
64
+	static public function setLastModifiedHeader($lastModified) {
65
+		\OC_Response::setLastModifiedHeader($lastModified);
66 66
 	}
67 67
 
68 68
 	/**
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
 	 * @param string $type disposition type, either 'attachment' or 'inline'
72 72
 	 * @since 7.0.0
73 73
 	 */
74
-	static public function setContentDispositionHeader( $filename, $type = 'attachment' ) {
75
-		\OC_Response::setContentDispositionHeader( $filename, $type );
74
+	static public function setContentDispositionHeader($filename, $type = 'attachment') {
75
+		\OC_Response::setContentDispositionHeader($filename, $type);
76 76
 	}
77 77
 
78 78
 	/**
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	 * @param string $etag token to use for modification check
100 100
 	 * @since 4.0.0
101 101
 	 */
102
-	static public function setETagHeader( $etag ) {
103
-		\OC_Response::setETagHeader( $etag );
102
+	static public function setETagHeader($etag) {
103
+		\OC_Response::setETagHeader($etag);
104 104
 	}
105 105
 
106 106
 	/**
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
109 109
 	 * @since 4.0.0
110 110
 	 * @deprecated 8.1.0 - Use \OCP\AppFramework\Http\StreamResponse or another AppFramework controller instead
111 111
 	 */
112
-	static public function sendFile( $filepath ) {
113
-		\OC_Response::sendFile( $filepath );
112
+	static public function sendFile($filepath) {
113
+		\OC_Response::sendFile($filepath);
114 114
 	}
115 115
 
116 116
 	/**
@@ -120,8 +120,8 @@  discard block
 block discarded – undo
120 120
 	 *  DateTime object when to expire response
121 121
 	 * @since 4.0.0
122 122
 	 */
123
-	static public function setExpiresHeader( $expires ) {
124
-		\OC_Response::setExpiresHeader( $expires );
123
+	static public function setExpiresHeader($expires) {
124
+		\OC_Response::setExpiresHeader($expires);
125 125
 	}
126 126
 
127 127
 	/**
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	 * @param string $location to redirect to
130 130
 	 * @since 4.0.0
131 131
 	 */
132
-	static public function redirect( $location ) {
133
-		\OC_Response::redirect( $location );
132
+	static public function redirect($location) {
133
+		\OC_Response::redirect($location);
134 134
 	}
135 135
 }
Please login to merge, or discard this patch.
lib/public/json.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 * @param bool $setContentType the optional content type
47 47
 	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
48 48
 	 */
49
-	public static function encodedPrint( $data, $setContentType=true ) {
49
+	public static function encodedPrint($data, $setContentType = true) {
50 50
 		\OC_JSON::encodedPrint($data, $setContentType);
51 51
 	}
52 52
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	 * @return string json formatted string.
102 102
 	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
103 103
 	 */
104
-	public static function success( $data = array() ) {
104
+	public static function success($data = array()) {
105 105
 		\OC_JSON::success($data);
106 106
 	}
107 107
 
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
 	 * @return string json formatted error string.
125 125
 	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
126 126
 	 */
127
-	public static function error( $data = array() ) {
128
-		\OC_JSON::error( $data );
127
+	public static function error($data = array()) {
128
+		\OC_JSON::error($data);
129 129
 	}
130 130
 
131 131
 	/**
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 * @param string $type The content type header
134 134
 	 * @deprecated 8.1.0 Use a AppFramework JSONResponse instead
135 135
 	 */
136
-	public static function setContentTypeHeader( $type='application/json' ) {
136
+	public static function setContentTypeHeader($type = 'application/json') {
137 137
 		\OC_JSON::setContentTypeHeader($type);
138 138
 	}
139 139
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	 * @param string $app The app to check
154 154
 	 * @deprecated 8.1.0 Use the AppFramework instead. It will automatically check if the app is enabled.
155 155
 	 */
156
-	public static function checkAppEnabled( $app ) {
156
+	public static function checkAppEnabled($app) {
157 157
 		\OC_JSON::checkAppEnabled($app);
158 158
 	}
159 159
 
Please login to merge, or discard this patch.
lib/public/iusermanager.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	 * remove all user backends
69 69
 	 * @since 8.0.0
70 70
 	 */
71
-	public function clearBackends() ;
71
+	public function clearBackends();
72 72
 
73 73
 	/**
74 74
 	 * get a user by user id
@@ -142,5 +142,5 @@  discard block
 block discarded – undo
142 142
 	 * @param string $search
143 143
 	 * @since 9.0.0
144 144
 	 */
145
-	public function callForAllUsers (\Closure $callback, $search = '');
145
+	public function callForAllUsers(\Closure $callback, $search = '');
146 146
 }
Please login to merge, or discard this patch.
lib/public/idbconnection.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
60 60
 	 * @since 6.0.0
61 61
 	 */
62
-	public function prepare($sql, $limit=null, $offset=null);
62
+	public function prepare($sql, $limit = null, $offset = null);
63 63
 
64 64
 	/**
65 65
 	 * Executes an, optionally parameterized, SQL query.
Please login to merge, or discard this patch.