Completed
Push — update_code ( 8d132a...a09958 )
by Armando
02:55
created
lib/class-api.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -315,9 +315,9 @@
 block discarded – undo
315 315
 
316 316
 		// If we are already logged in and not forcing a relogin, return.
317 317
 		if ( ! $force &&
318
-		     $username === $this->_username &&
319
-		     $password === $this->_password &&
320
-		     $this->is_logged_in()
318
+				 $username === $this->_username &&
319
+				 $password === $this->_password &&
320
+				 $this->is_logged_in()
321 321
 		) {
322 322
 			return true;
323 323
 		}
Please login to merge, or discard this patch.
lib/class-contextual-help.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -123,12 +123,12 @@  discard block
 block discarded – undo
123 123
 			'content' => '<p><strong>' . esc_html__( 'Enter your diaspora* login details to connect your account.', 'wp-to-diaspora' ) . '</strong></p>
124 124
 				<ul>
125 125
 					<li><strong>' . esc_html__( 'diaspora* Pod', 'wp-to-diaspora' ) . '</strong>: ' .
126
-			             esc_html__( 'This is the domain name of the pod you are on (e.g. joindiaspora.com)', 'wp-to-diaspora' ) . '<br>
126
+									 esc_html__( 'This is the domain name of the pod you are on (e.g. joindiaspora.com)', 'wp-to-diaspora' ) . '<br>
127 127
 						<em>' . sprintf( esc_html__( 'Use the "%s" button to prepopulate the input field to help choose your pod.', 'wp-to-diaspora' ), esc_html__( 'Refresh pod list', 'wp-to-diaspora' ) ) . '</em>
128 128
 					<li><strong>' . esc_html__( 'Username', 'wp-to-diaspora' ) . '</strong>: ' .
129
-			             esc_html__( 'Your diaspora* username (without the pod domain).', 'wp-to-diaspora' ) . '
129
+									 esc_html__( 'Your diaspora* username (without the pod domain).', 'wp-to-diaspora' ) . '
130 130
 					<li><strong>' . esc_html__( 'Password', 'wp-to-diaspora' ) . '</strong>: ' .
131
-			             esc_html__( 'Your diaspora* password.', 'wp-to-diaspora' ) . '
131
+									 esc_html__( 'Your diaspora* password.', 'wp-to-diaspora' ) . '
132 132
 				</ul>',
133 133
 		] );
134 134
 
@@ -139,27 +139,27 @@  discard block
 block discarded – undo
139 139
 			'content' => '<p><strong>' . esc_html__( 'Define the default posting behaviour.', 'wp-to-diaspora' ) . '</strong></p>
140 140
 				<ul>
141 141
 					<li><strong>' . esc_html__( 'Post types', 'wp-to-diaspora' ) . '</strong>: ' .
142
-			             esc_html__( 'Choose the post types that are allowed to be shared to diaspora*.', 'wp-to-diaspora' ) . '
142
+									 esc_html__( 'Choose the post types that are allowed to be shared to diaspora*.', 'wp-to-diaspora' ) . '
143 143
 					<li><strong>' . esc_html__( 'Post to diaspora*', 'wp-to-diaspora' ) . '</strong>: ' .
144
-			             esc_html__( 'Automatically share new posts to diaspora* when publishing them.', 'wp-to-diaspora' ) . '
144
+									 esc_html__( 'Automatically share new posts to diaspora* when publishing them.', 'wp-to-diaspora' ) . '
145 145
 					<li><strong>' . esc_html__( 'Show "Posted at" link?', 'wp-to-diaspora' ) . '</strong>: ' .
146
-			             esc_html__( 'Add a link back to your original post, at the bottom of the diaspora* post.', 'wp-to-diaspora' ) . '
146
+									 esc_html__( 'Add a link back to your original post, at the bottom of the diaspora* post.', 'wp-to-diaspora' ) . '
147 147
 					<li><strong>' . esc_html__( 'Display', 'wp-to-diaspora' ) . '</strong>: ' .
148
-			             esc_html__( 'Choose whether you would like to post the whole post or just the excerpt.', 'wp-to-diaspora' ) . '
148
+									 esc_html__( 'Choose whether you would like to post the whole post or just the excerpt.', 'wp-to-diaspora' ) . '
149 149
 					<li><strong>' . esc_html__( 'Tags to post', 'wp-to-diaspora' ) . '</strong>: ' .
150
-			             esc_html__( 'You can add tags to your post to make it easier to find on diaspora*.' ) . '<br>
150
+									 esc_html__( 'You can add tags to your post to make it easier to find on diaspora*.' ) . '<br>
151 151
 						<ul>
152 152
 							<li><strong>' . esc_html__( 'Global tags', 'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Tags that apply to all posts.', 'wp-to-diaspora' ) . '
153 153
 							<li><strong>' . esc_html__( 'Custom tags', 'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Tags that apply to individual posts (can be set on each post).', 'wp-to-diaspora' ) . '
154 154
 							<li><strong>' . esc_html__( 'Post tags', 'wp-to-diaspora' ) . '</strong>: ' . esc_html__( 'Default WordPress Tags of individual posts.', 'wp-to-diaspora' ) . '
155 155
 						</ul>
156 156
 					<li><strong>' . esc_html__( 'Global tags', 'wp-to-diaspora' ) . '</strong>: ' .
157
-			             esc_html__( 'A list of tags that gets added to every post.', 'wp-to-diaspora' ) . '
157
+									 esc_html__( 'A list of tags that gets added to every post.', 'wp-to-diaspora' ) . '
158 158
 					<li><strong>' . esc_html__( 'Aspects', 'wp-to-diaspora' ) . '</strong>: ' .
159
-			             esc_html__( 'Decide which of your diaspora* aspects can see your posts.', 'wp-to-diaspora' ) . '<br>
159
+									 esc_html__( 'Decide which of your diaspora* aspects can see your posts.', 'wp-to-diaspora' ) . '<br>
160 160
 							<em>' . sprintf( esc_html__( 'Use the "%s" button to load your aspects from diaspora*.', 'wp-to-diaspora' ), esc_html__( 'Refresh Aspects', 'wp-to-diaspora' ) ) . '</em>
161 161
 					<li><strong>' . esc_html__( 'Services', 'wp-to-diaspora' ) . '</strong>: ' .
162
-			             esc_html__( 'Choose the services your new diaspora* post gets shared to.', 'wp-to-diaspora' ) . '<br>
162
+									 esc_html__( 'Choose the services your new diaspora* post gets shared to.', 'wp-to-diaspora' ) . '<br>
163 163
 							<em>' . sprintf( esc_html__( 'Use the "%s" button to fetch the list of your connected services from diaspora*.', 'wp-to-diaspora' ), esc_html__( 'Refresh Services', 'wp-to-diaspora' ) ) . '</em>
164 164
 				</ul>',
165 165
 		] );
@@ -196,30 +196,30 @@  discard block
 block discarded – undo
196 196
 				<p>' . esc_html__( 'Lucky for you though, we have you covered if this is the case for you!', 'wp-to-diaspora' ) . '</p>
197 197
 				<ol>
198 198
 					<li><strong>' . esc_html__( 'Check the WordPress certificate bundle', 'wp-to-diaspora' ) . '</strong>: ' .
199
-			             esc_html__( 'The best option is to make sure that the WordPress internal certificate bundle is available and accessible. You should be able to find it here: "wp-includes/certificates/ca-bundle.crt".', 'wp-to-diaspora' ) . '
199
+									 esc_html__( 'The best option is to make sure that the WordPress internal certificate bundle is available and accessible. You should be able to find it here: "wp-includes/certificates/ca-bundle.crt".', 'wp-to-diaspora' ) . '
200 200
 					<li><strong>' . esc_html__( 'Get in touch with your hosting provider', 'wp-to-diaspora' ) . '</strong>: ' .
201
-			             esc_html__( 'Get in touch with your hosting provider and ask them to update the bundle on the server for you. They should know what you\'re talking about.', 'wp-to-diaspora' ) . '
201
+									 esc_html__( 'Get in touch with your hosting provider and ask them to update the bundle on the server for you. They should know what you\'re talking about.', 'wp-to-diaspora' ) . '
202 202
 					<li><strong>' . esc_html__( 'Install the CA bundle yourself', 'wp-to-diaspora' ) . '</strong>: ' .
203
-			             sprintf(
204
-				             esc_html_x(
205
-					             'If you maintain your own server, it\'s your job to keep the bundle up to date. You can find a short and simple way on how to do this %shere%s.',
206
-					             'Placeholders are HTML for a link.',
207
-					             'wp-to-diaspora'
208
-				             ),
209
-				             '<a href="http://serverfault.com/a/394835" target="_blank">', '</a>'
210
-			             ) . '
203
+									 sprintf(
204
+										 esc_html_x(
205
+											 'If you maintain your own server, it\'s your job to keep the bundle up to date. You can find a short and simple way on how to do this %shere%s.',
206
+											 'Placeholders are HTML for a link.',
207
+											 'wp-to-diaspora'
208
+										 ),
209
+										 '<a href="http://serverfault.com/a/394835" target="_blank">', '</a>'
210
+									 ) . '
211 211
 					<li><strong>' . esc_html__( 'Quick "temporary" fix', 'wp-to-diaspora' ) . '</strong>: ' .
212
-			             sprintf(
213
-				             esc_html_x(
214
-					             'As a temporary solution, you can download the up to date %sCA certificate bundle%s (Right-click &#8594; Save As...) and place the cacert.pem file at the top level of the WP to diaspora* plugin folder. This is a "last resort" option.',
215
-					             'Placeholders are HTML for links.',
216
-					             'wp-to-diaspora'
217
-				             ),
218
-				             '<a href="http://curl.haxx.se/ca/cacert.pem" download>', '</a>'
219
-			             )
220
-			             . '<br><p>' .
221
-			             $ssl_install_output
222
-			             . '</p>
212
+									 sprintf(
213
+										 esc_html_x(
214
+											 'As a temporary solution, you can download the up to date %sCA certificate bundle%s (Right-click &#8594; Save As...) and place the cacert.pem file at the top level of the WP to diaspora* plugin folder. This is a "last resort" option.',
215
+											 'Placeholders are HTML for links.',
216
+											 'wp-to-diaspora'
217
+										 ),
218
+										 '<a href="http://curl.haxx.se/ca/cacert.pem" download>', '</a>'
219
+									 )
220
+									 . '<br><p>' .
221
+									 $ssl_install_output
222
+									 . '</p>
223 223
 				</ul>
224 224
 				<p class="dashicons-before dashicons-info">' . esc_html__( 'NOTE: If you choose the temporary option, the copy procedure needs to be done every time the plugin is updated because all files get replaced!', 'wp-to-diaspora' ) . '</p>',
225 225
 		] );
@@ -233,9 +233,9 @@  discard block
 block discarded – undo
233 233
 				<p>' . esc_html__( 'There are a few important differences to the settings page:', 'wp-to-diaspora' ) . '</p>
234 234
 				<ul>
235 235
 					<li><strong>' . esc_html__( 'Already posted to diaspora*', 'wp-to-diaspora' ) . '</strong>: ' .
236
-			             esc_html__( 'If the post has already been posted to diaspora* a link to the diaspora* post will appear at the top.', 'wp-to-diaspora' ) . '
236
+									 esc_html__( 'If the post has already been posted to diaspora* a link to the diaspora* post will appear at the top.', 'wp-to-diaspora' ) . '
237 237
 					<li><strong>' . esc_html__( 'Custom tags', 'wp-to-diaspora' ) . '</strong>: ' .
238
-			             esc_html__( 'A list of tags that gets added to this post. Note that they are seperate from the WordPress post tags!', 'wp-to-diaspora' ) . '
238
+									 esc_html__( 'A list of tags that gets added to this post. Note that they are seperate from the WordPress post tags!', 'wp-to-diaspora' ) . '
239 239
 				</ul>
240 240
 				<p class="dashicons-before dashicons-info">' . esc_html__( 'If you don\'t see the meta box, make sure the post type you\'re on has been added to the "Post types" list on the settings page. Also make sure it has been selected from the "Screen Options" at the top of the screen.', 'wp-to-diaspora' ) . '</p>',
241 241
 		] );
@@ -248,17 +248,17 @@  discard block
 block discarded – undo
248 248
 				<p>' . esc_html__( 'Here are a few common errors and their possible solutions:', 'wp-to-diaspora' ) . '</p>
249 249
 				<ul>
250 250
 					<li><strong>' . esc_html( sprintf( __( 'Failed to initialise connection to pod "%s"', 'wp-to-diaspora' ), 'xyz' ) ) . '</strong>: ' .
251
-			             esc_html__( 'This could have multiple reasons.' ) . '
251
+									 esc_html__( 'This could have multiple reasons.' ) . '
252 252
 						<ul>
253 253
 							<li>' . esc_html__( 'Make sure that your pod domain is entered correctly.', 'wp-to-diaspora' ) . '
254 254
 							<li>' .
255
-			             esc_html__( 'It might be an SSL problem.', 'wp-to-diaspora' ) .
256
-			             sprintf( ' <a href="#" class="open-help-tab" data-help-tab="ssl">%s</a>',
257
-				             esc_html__( 'Learn More', 'wp-to-diaspora' ) ) . '
255
+									 esc_html__( 'It might be an SSL problem.', 'wp-to-diaspora' ) .
256
+									 sprintf( ' <a href="#" class="open-help-tab" data-help-tab="ssl">%s</a>',
257
+										 esc_html__( 'Learn More', 'wp-to-diaspora' ) ) . '
258 258
 							<li>' . esc_html__( 'The pod might be offline at the moment.', 'wp-to-diaspora' ) . '
259 259
 						</ul>
260 260
 					<li><strong>' . esc_html__( 'Login failed. Check your login details.', 'wp-to-diaspora' ) . '</strong>: ' .
261
-			             esc_html__( 'Make sure that your username and password are entered correctly.', 'wp-to-diaspora' ) . '
261
+									 esc_html__( 'Make sure that your username and password are entered correctly.', 'wp-to-diaspora' ) . '
262 262
 				</ul>',
263 263
 		] );
264 264
 
Please login to merge, or discard this patch.