@@ -5,6 +5,6 @@ |
||
5 | 5 | */ |
6 | 6 | |
7 | 7 | ?> |
8 | -<?php $value = get_option( $args['name'], $args['default'] ); ?> |
|
9 | -<input name="<?php echo esc_attr( $args['name'] ); ?>" id="<?php echo esc_attr( $args['name'] ); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr( $value ); ?>" /> |
|
8 | +<?php $value = get_option($args['name'], $args['default']); ?> |
|
9 | +<input name="<?php echo esc_attr($args['name']); ?>" id="<?php echo esc_attr($args['name']); ?>" type="<?php echo 'wogh_secret' === $args['name'] ? 'password' : 'text'; ?>" value="<?php echo esc_attr($value); ?>" /> |
|
10 | 10 | <p class="description"><?php echo $args['help_text']; ?></p> |
@@ -16,13 +16,13 @@ discard block |
||
16 | 16 | * |
17 | 17 | * @return array[Writing_On_GitHub_File_Info]|WP_Error |
18 | 18 | */ |
19 | - public function compare( $sha ) { |
|
19 | + public function compare($sha) { |
|
20 | 20 | // https://api.github.com/repos/litefeel/testwpsync/compare/861f87e8851b8debb78db548269d29f8da4d94ac...master |
21 | 21 | $endpoint = $this->compare_endpoint(); |
22 | 22 | $branch = $this->branch(); |
23 | - $data = $this->call( 'GET', "$endpoint/$sha...$branch" ); |
|
23 | + $data = $this->call('GET', "$endpoint/$sha...$branch"); |
|
24 | 24 | |
25 | - if ( is_wp_error( $data ) ) { |
|
25 | + if (is_wp_error($data)) { |
|
26 | 26 | return $data; |
27 | 27 | } |
28 | 28 | |
@@ -44,13 +44,13 @@ discard block |
||
44 | 44 | * |
45 | 45 | * @return mixed |
46 | 46 | */ |
47 | - public function remote_contents( $post ) { |
|
48 | - return $this->call( 'GET', $this->content_endpoint( $post->github_path() ) ); |
|
47 | + public function remote_contents($post) { |
|
48 | + return $this->call('GET', $this->content_endpoint($post->github_path())); |
|
49 | 49 | } |
50 | 50 | |
51 | - public function exists( $path ) { |
|
52 | - $result = $this->call( 'GET', $this->content_endpoint( $path ) ); |
|
53 | - if ( is_wp_error( $result ) ) { |
|
51 | + public function exists($path) { |
|
52 | + $result = $this->call('GET', $this->content_endpoint($path)); |
|
53 | + if (is_wp_error($result)) { |
|
54 | 54 | return false; |
55 | 55 | } |
56 | 56 | return true; |
@@ -63,27 +63,27 @@ discard block |
||
63 | 63 | * |
64 | 64 | * @return Writing_On_GitHub_Tree|WP_Error |
65 | 65 | */ |
66 | - public function tree_recursive( $sha = '_default' ) { |
|
66 | + public function tree_recursive($sha = '_default') { |
|
67 | 67 | |
68 | - if ( '_default' === $sha ) { |
|
68 | + if ('_default' === $sha) { |
|
69 | 69 | $sha = $this->branch(); |
70 | 70 | } |
71 | 71 | |
72 | - $data = $this->call( 'GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1' ); |
|
72 | + $data = $this->call('GET', $this->tree_endpoint() . '/' . $sha . '?recursive=1'); |
|
73 | 73 | |
74 | - if ( is_wp_error( $data ) ) { |
|
74 | + if (is_wp_error($data)) { |
|
75 | 75 | return $data; |
76 | 76 | } |
77 | 77 | |
78 | 78 | $files = array(); |
79 | 79 | |
80 | - foreach ( $data->tree as $index => $thing ) { |
|
80 | + foreach ($data->tree as $index => $thing) { |
|
81 | 81 | // We need to remove the trees because |
82 | 82 | // the recursive tree includes both |
83 | 83 | // the subtrees as well the subtrees' blobs. |
84 | - if ( 'blob' === $thing->type ) { |
|
84 | + if ('blob' === $thing->type) { |
|
85 | 85 | $thing->status = ''; |
86 | - $files[] = new Writing_On_GitHub_File_Info( $thing ); |
|
86 | + $files[] = new Writing_On_GitHub_File_Info($thing); |
|
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
@@ -97,15 +97,15 @@ discard block |
||
97 | 97 | * |
98 | 98 | * @return Writing_On_GitHub_Blob|WP_Error |
99 | 99 | */ |
100 | - public function blob( $blob ) { |
|
101 | - $data = $this->call( 'GET', $this->blob_endpoint() . '/' . $blob->sha ); |
|
100 | + public function blob($blob) { |
|
101 | + $data = $this->call('GET', $this->blob_endpoint() . '/' . $blob->sha); |
|
102 | 102 | |
103 | - if ( is_wp_error( $data ) ) { |
|
103 | + if (is_wp_error($data)) { |
|
104 | 104 | return $data; |
105 | 105 | } |
106 | 106 | |
107 | 107 | $data->path = $blob->path; |
108 | - $obj = new Writing_On_GitHub_Blob( $data ); |
|
108 | + $obj = new Writing_On_GitHub_Blob($data); |
|
109 | 109 | |
110 | 110 | return $obj; |
111 | 111 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | // This fixes function duplication during unit testing. |
15 | 15 | $path = dirname( __FILE__ ) . '/vendor/autoload.php'; |
16 | 16 | if ( file_exists( $path ) ) { |
17 | - require_once( $path ); |
|
17 | + require_once( $path ); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) ); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | add_action( 'save_post', array( $this->controller, 'export_post' ) ); |
132 | 132 | add_action( 'delete_post', array( $this->controller, 'delete_post' ) ); |
133 | 133 | add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) ); |
134 | - add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 ); |
|
134 | + add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 ); |
|
135 | 135 | add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 ); |
136 | 136 | add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 ); |
137 | 137 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | } |
151 | 151 | } |
152 | 152 | |
153 | - return $link; |
|
153 | + return $link; |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | public function ignore_post_meta($meta) { |
@@ -392,9 +392,9 @@ discard block |
||
392 | 392 | /** |
393 | 393 | * Kicks of an import or export cronjob. |
394 | 394 | * |
395 | - * @param bool $force |
|
396 | - * @param string $type |
|
397 | - */ |
|
395 | + * @param bool $force |
|
396 | + * @param string $type |
|
397 | + */ |
|
398 | 398 | protected function start_cron( $type, $force = false ) { |
399 | 399 | update_option( '_wogh_' . $type . '_started', 'yes' ); |
400 | 400 | $user_id = get_current_user_id(); |
@@ -12,12 +12,12 @@ discard block |
||
12 | 12 | |
13 | 13 | // If the functions have already been autoloaded, don't reload. |
14 | 14 | // This fixes function duplication during unit testing. |
15 | -$path = dirname( __FILE__ ) . '/vendor/autoload.php'; |
|
16 | -if ( file_exists( $path ) ) { |
|
17 | - require_once( $path ); |
|
15 | +$path = dirname(__FILE__) . '/vendor/autoload.php'; |
|
16 | +if (file_exists($path)) { |
|
17 | + require_once($path); |
|
18 | 18 | } |
19 | 19 | |
20 | -add_action( 'plugins_loaded', array( new Writing_On_GitHub, 'boot' ) ); |
|
20 | +add_action('plugins_loaded', array(new Writing_On_GitHub, 'boot')); |
|
21 | 21 | |
22 | 22 | class Writing_On_GitHub { |
23 | 23 | |
@@ -107,14 +107,14 @@ discard block |
||
107 | 107 | public function __construct() { |
108 | 108 | self::$instance = $this; |
109 | 109 | |
110 | - if ( is_admin() ) { |
|
110 | + if (is_admin()) { |
|
111 | 111 | $this->admin = new Writing_On_GitHub_Admin; |
112 | 112 | } |
113 | 113 | |
114 | - $this->controller = new Writing_On_GitHub_Controller( $this ); |
|
114 | + $this->controller = new Writing_On_GitHub_Controller($this); |
|
115 | 115 | |
116 | - if ( defined( 'WP_CLI' ) && WP_CLI ) { |
|
117 | - WP_CLI::add_command( 'wogh', $this->cli() ); |
|
116 | + if (defined('WP_CLI') && WP_CLI) { |
|
117 | + WP_CLI::add_command('wogh', $this->cli()); |
|
118 | 118 | } |
119 | 119 | } |
120 | 120 | |
@@ -122,30 +122,30 @@ discard block |
||
122 | 122 | * Attaches the plugin's hooks into WordPress. |
123 | 123 | */ |
124 | 124 | public function boot() { |
125 | - register_activation_hook( __FILE__, array( $this, 'activate' ) ); |
|
126 | - add_action( 'admin_notices', array( $this, 'activation_notice' ) ); |
|
125 | + register_activation_hook(__FILE__, array($this, 'activate')); |
|
126 | + add_action('admin_notices', array($this, 'activation_notice')); |
|
127 | 127 | |
128 | - add_action( 'init', array( $this, 'l10n' ) ); |
|
128 | + add_action('init', array($this, 'l10n')); |
|
129 | 129 | |
130 | 130 | // Controller actions. |
131 | - add_action( 'save_post', array( $this->controller, 'export_post' ) ); |
|
132 | - add_action( 'delete_post', array( $this->controller, 'delete_post' ) ); |
|
133 | - add_action( 'wp_ajax_nopriv_wogh_push_request', array( $this->controller, 'pull_posts' ) ); |
|
134 | - add_action( 'wogh_export', array( $this->controller, 'export_all' ), 10, 2 ); |
|
135 | - add_action( 'wogh_import', array( $this->controller, 'import_master' ), 10, 1 ); |
|
136 | - add_filter( 'get_edit_post_link', array( $this, 'edit_post_link' ), 10, 3 ); |
|
131 | + add_action('save_post', array($this->controller, 'export_post')); |
|
132 | + add_action('delete_post', array($this->controller, 'delete_post')); |
|
133 | + add_action('wp_ajax_nopriv_wogh_push_request', array($this->controller, 'pull_posts')); |
|
134 | + add_action('wogh_export', array($this->controller, 'export_all'), 10, 2); |
|
135 | + add_action('wogh_import', array($this->controller, 'import_master'), 10, 1); |
|
136 | + add_filter('get_edit_post_link', array($this, 'edit_post_link'), 10, 3); |
|
137 | 137 | |
138 | 138 | // add_filter( 'wogh_post_meta', array( $this, 'ignore_post_meta' ), 10, 1 ); |
139 | 139 | // add_filter( 'wogh_pre_import_meta', array( $this, 'ignore_post_meta' ), 10, 1 ); |
140 | - add_filter( 'the_content', array( $this, 'the_content' ) ); |
|
140 | + add_filter('the_content', array($this, 'the_content')); |
|
141 | 141 | |
142 | - do_action( 'wogh_boot', $this ); |
|
142 | + do_action('wogh_boot', $this); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | public function edit_post_link($link, $postID, $context) { |
146 | - if ( ! wp_is_post_revision( $postID ) ) { |
|
147 | - $post = new Writing_On_GitHub_Post( $postID, Writing_On_GitHub::$instance->api() ); |
|
148 | - if ( $post->is_on_github() ) { |
|
146 | + if ( ! wp_is_post_revision($postID)) { |
|
147 | + $post = new Writing_On_GitHub_Post($postID, Writing_On_GitHub::$instance->api()); |
|
148 | + if ($post->is_on_github()) { |
|
149 | 149 | return $post->github_edit_url(); |
150 | 150 | } |
151 | 151 | } |
@@ -204,29 +204,29 @@ discard block |
||
204 | 204 | * Init i18n files |
205 | 205 | */ |
206 | 206 | public function l10n() { |
207 | - load_plugin_textdomain( self::$text_domain ); |
|
207 | + load_plugin_textdomain(self::$text_domain); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | /** |
211 | 211 | * Sets and kicks off the export cronjob |
212 | 212 | */ |
213 | - public function start_export( $force = false ) { |
|
214 | - $this->start_cron( 'export', $force ); |
|
213 | + public function start_export($force = false) { |
|
214 | + $this->start_cron('export', $force); |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /** |
218 | 218 | * Sets and kicks off the import cronjob |
219 | 219 | */ |
220 | 220 | public function start_import() { |
221 | - $this->start_cron( 'import' ); |
|
221 | + $this->start_cron('import'); |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | /** |
225 | 225 | * Enables the admin notice on initial activation |
226 | 226 | */ |
227 | 227 | public function activate() { |
228 | - if ( 'yes' !== get_option( '_wogh_fully_exported' ) ) { |
|
229 | - set_transient( '_wogh_activated', 'yes' ); |
|
228 | + if ('yes' !== get_option('_wogh_fully_exported')) { |
|
229 | + set_transient('_wogh_activated', 'yes'); |
|
230 | 230 | } |
231 | 231 | } |
232 | 232 | |
@@ -234,18 +234,18 @@ discard block |
||
234 | 234 | * Displays the activation admin notice |
235 | 235 | */ |
236 | 236 | public function activation_notice() { |
237 | - if ( ! get_transient( '_wogh_activated' ) ) { |
|
237 | + if ( ! get_transient('_wogh_activated')) { |
|
238 | 238 | return; |
239 | 239 | } |
240 | 240 | |
241 | - delete_transient( '_wogh_activated' ); |
|
241 | + delete_transient('_wogh_activated'); |
|
242 | 242 | |
243 | 243 | ?><div class="updated"> |
244 | 244 | <p> |
245 | 245 | <?php |
246 | 246 | printf( |
247 | - __( 'To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github' ), |
|
248 | - admin_url( 'options-general.php?page=' . static::$text_domain) |
|
247 | + __('To set up your site to sync with GitHub, update your <a href="%s">settings</a> and click "Export to GitHub."', 'writing-on-github'), |
|
248 | + admin_url('options-general.php?page=' . static::$text_domain) |
|
249 | 249 | ); |
250 | 250 | ?> |
251 | 251 | </p> |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | * @return Writing_On_GitHub_CLI |
268 | 268 | */ |
269 | 269 | public function cli() { |
270 | - if ( ! $this->cli ) { |
|
270 | + if ( ! $this->cli) { |
|
271 | 271 | $this->cli = new Writing_On_GitHub_CLI; |
272 | 272 | } |
273 | 273 | |
@@ -280,8 +280,8 @@ discard block |
||
280 | 280 | * @return Writing_On_GitHub_Request |
281 | 281 | */ |
282 | 282 | public function request() { |
283 | - if ( ! $this->request ) { |
|
284 | - $this->request = new Writing_On_GitHub_Request( $this ); |
|
283 | + if ( ! $this->request) { |
|
284 | + $this->request = new Writing_On_GitHub_Request($this); |
|
285 | 285 | } |
286 | 286 | |
287 | 287 | return $this->request; |
@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | * @return Writing_On_GitHub_Response |
294 | 294 | */ |
295 | 295 | public function response() { |
296 | - if ( ! $this->response ) { |
|
297 | - $this->response = new Writing_On_GitHub_Response( $this ); |
|
296 | + if ( ! $this->response) { |
|
297 | + $this->response = new Writing_On_GitHub_Response($this); |
|
298 | 298 | } |
299 | 299 | |
300 | 300 | return $this->response; |
@@ -306,8 +306,8 @@ discard block |
||
306 | 306 | * @return Writing_On_GitHub_Api |
307 | 307 | */ |
308 | 308 | public function api() { |
309 | - if ( ! $this->api ) { |
|
310 | - $this->api = new Writing_On_GitHub_Api( $this ); |
|
309 | + if ( ! $this->api) { |
|
310 | + $this->api = new Writing_On_GitHub_Api($this); |
|
311 | 311 | } |
312 | 312 | |
313 | 313 | return $this->api; |
@@ -319,8 +319,8 @@ discard block |
||
319 | 319 | * @return Writing_On_GitHub_Import |
320 | 320 | */ |
321 | 321 | public function import() { |
322 | - if ( ! $this->import ) { |
|
323 | - $this->import = new Writing_On_GitHub_Import( $this ); |
|
322 | + if ( ! $this->import) { |
|
323 | + $this->import = new Writing_On_GitHub_Import($this); |
|
324 | 324 | } |
325 | 325 | |
326 | 326 | return $this->import; |
@@ -332,8 +332,8 @@ discard block |
||
332 | 332 | * @return Writing_On_GitHub_Export |
333 | 333 | */ |
334 | 334 | public function export() { |
335 | - if ( ! $this->export ) { |
|
336 | - $this->export = new Writing_On_GitHub_Export( $this ); |
|
335 | + if ( ! $this->export) { |
|
336 | + $this->export = new Writing_On_GitHub_Export($this); |
|
337 | 337 | } |
338 | 338 | |
339 | 339 | return $this->export; |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | * @return Writing_On_GitHub_Semaphore |
346 | 346 | */ |
347 | 347 | public function semaphore() { |
348 | - if ( ! $this->semaphore ) { |
|
348 | + if ( ! $this->semaphore) { |
|
349 | 349 | $this->semaphore = new Writing_On_GitHub_Semaphore; |
350 | 350 | } |
351 | 351 | |
@@ -358,8 +358,8 @@ discard block |
||
358 | 358 | * @return Writing_On_GitHub_Database |
359 | 359 | */ |
360 | 360 | public function database() { |
361 | - if ( ! $this->database ) { |
|
362 | - $this->database = new Writing_On_GitHub_Database( $this ); |
|
361 | + if ( ! $this->database) { |
|
362 | + $this->database = new Writing_On_GitHub_Database($this); |
|
363 | 363 | } |
364 | 364 | |
365 | 365 | return $this->database; |
@@ -373,18 +373,18 @@ discard block |
||
373 | 373 | * @param mixed $msg |
374 | 374 | * @param string $write |
375 | 375 | */ |
376 | - public static function write_log( $msg, $write = 'line' ) { |
|
377 | - if ( defined( 'WP_CLI' ) && WP_CLI ) { |
|
378 | - if ( is_array( $msg ) || is_object( $msg ) ) { |
|
379 | - WP_CLI::print_value( $msg ); |
|
376 | + public static function write_log($msg, $write = 'line') { |
|
377 | + if (defined('WP_CLI') && WP_CLI) { |
|
378 | + if (is_array($msg) || is_object($msg)) { |
|
379 | + WP_CLI::print_value($msg); |
|
380 | 380 | } else { |
381 | - WP_CLI::$write( $msg ); |
|
381 | + WP_CLI::$write($msg); |
|
382 | 382 | } |
383 | - } elseif ( true === WP_DEBUG ) { |
|
384 | - if ( is_array( $msg ) || is_object( $msg ) ) { |
|
385 | - error_log( print_r( $msg, true ) ); |
|
383 | + } elseif (true === WP_DEBUG) { |
|
384 | + if (is_array($msg) || is_object($msg)) { |
|
385 | + error_log(print_r($msg, true)); |
|
386 | 386 | } else { |
387 | - error_log( $msg ); |
|
387 | + error_log($msg); |
|
388 | 388 | } |
389 | 389 | } |
390 | 390 | } |
@@ -395,10 +395,10 @@ discard block |
||
395 | 395 | * @param bool $force |
396 | 396 | * @param string $type |
397 | 397 | */ |
398 | - protected function start_cron( $type, $force = false ) { |
|
399 | - update_option( '_wogh_' . $type . '_started', 'yes' ); |
|
398 | + protected function start_cron($type, $force = false) { |
|
399 | + update_option('_wogh_' . $type . '_started', 'yes'); |
|
400 | 400 | $user_id = get_current_user_id(); |
401 | - wp_schedule_single_event( time(), 'wogh_' . $type . '', array( $user_id, $force ) ); |
|
401 | + wp_schedule_single_event(time(), 'wogh_' . $type . '', array($user_id, $force)); |
|
402 | 402 | spawn_cron(); |
403 | 403 | } |
404 | 404 | } |