Skip to content

Commit 0f8b379

Browse files
john-shafferjohn-shaffer
committed
Change hardcoded nonce and action names to calls
1 parent 719f574 commit 0f8b379

6 files changed

Lines changed: 56 additions & 56 deletions

File tree

‎src/Controller.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,14 @@ public static function UISaveOptions(): void {
298298
self::getHookName( 'addon_ui_save_options' )
299299
);
300300

301-
check_admin_referer( 'wp2static-ui-options' );
301+
check_admin_referer( self::getHookName( 'ui_options' ) );
302302

303303
wp_safe_redirect( admin_url( 'admin.php?page=wp2static-options' ) );
304304
exit;
305305
}
306306

307307
public static function adminDetectedFilesDelete(): void {
308-
check_admin_referer( 'wp2static-caches-page' );
308+
check_admin_referer( self::getHookName( 'caches_page' ) );
309309

310310
DetectedFiles::truncate();
311311

@@ -314,14 +314,14 @@ public static function adminDetectedFilesDelete(): void {
314314
}
315315

316316
public static function adminDetectedFilesShow(): void {
317-
check_admin_referer( 'wp2static-caches-page' );
317+
check_admin_referer( self::getHookName( 'caches_page' ) );
318318

319319
wp_safe_redirect( admin_url( 'admin.php?page=wp2static-detected-files' ) );
320320
exit;
321321
}
322322

323323
public static function adminDeleteJobsQueue(): void {
324-
check_admin_referer( 'wp2static-ui-job-options' );
324+
check_admin_referer( self::getHookName( 'ui_job_options' ) );
325325

326326
JobQueue::truncate();
327327

@@ -330,7 +330,7 @@ public static function adminDeleteJobsQueue(): void {
330330
}
331331

332332
public static function adminDeleteAllCaches(): void {
333-
check_admin_referer( 'wp2static-caches-page' );
333+
check_admin_referer( self::getHookName( 'caches_page' ) );
334334

335335
self::deleteAllCaches();
336336

@@ -347,7 +347,7 @@ public static function deleteAllCaches(): void {
347347
}
348348

349349
public static function adminProcessJobsQueue(): void {
350-
check_admin_referer( 'wp2static-ui-job-options' );
350+
check_admin_referer( self::getHookName( 'ui_job_options' ) );
351351

352352
WsLog::l( 'Manually processing JobQueue' );
353353

@@ -358,7 +358,7 @@ public static function adminProcessJobsQueue(): void {
358358
}
359359

360360
public static function adminDeployCacheDelete(): void {
361-
check_admin_referer( 'wp2static-caches-page' );
361+
check_admin_referer( self::getHookName( 'caches_page' ) );
362362

363363
$deploy_namespace = strval( filter_input( INPUT_POST, 'deploy_namespace' ) );
364364
if ( $deploy_namespace !== '' ) {
@@ -372,7 +372,7 @@ public static function adminDeployCacheDelete(): void {
372372
}
373373

374374
public static function adminDeployCacheShow(): void {
375-
check_admin_referer( 'wp2static-caches-page' );
375+
check_admin_referer( self::getHookName( 'caches_page' ) );
376376

377377
$deploy_namespace = strval( filter_input( INPUT_POST, 'deploy_namespace' ) );
378378
if ( $deploy_namespace !== '' ) {
@@ -390,7 +390,7 @@ public static function adminDeployCacheShow(): void {
390390
}
391391

392392
public static function adminCrawledFilesDelete(): void {
393-
check_admin_referer( 'wp2static-caches-page' );
393+
check_admin_referer( self::getHookName( 'caches_page' ) );
394394

395395
CrawledFiles::truncate();
396396

@@ -399,14 +399,14 @@ public static function adminCrawledFilesDelete(): void {
399399
}
400400

401401
public static function adminCrawledFilesShow(): void {
402-
check_admin_referer( 'wp2static-caches-page' );
402+
check_admin_referer( self::getHookName( 'caches_page' ) );
403403

404404
wp_safe_redirect( admin_url( 'admin.php?page=wp2static-crawled-files' ) );
405405
exit;
406406
}
407407

408408
public static function adminPostProcessedSiteDelete(): void {
409-
check_admin_referer( 'wp2static-caches-page' );
409+
check_admin_referer( self::getHookName( 'caches_page' ) );
410410

411411
ProcessedSite::delete();
412412

@@ -415,14 +415,14 @@ public static function adminPostProcessedSiteDelete(): void {
415415
}
416416

417417
public static function adminPostProcessedSiteShow(): void {
418-
check_admin_referer( 'wp2static-caches-page' );
418+
check_admin_referer( self::getHookName( 'caches_page' ) );
419419

420420
wp_safe_redirect( admin_url( 'admin.php?page=wp2static-post-processed-site' ) );
421421
exit;
422422
}
423423

424424
public static function adminLogDelete(): void {
425-
check_admin_referer( 'wp2static-log-page' );
425+
check_admin_referer( self::getHookName( 'log_page' ) );
426426

427427
WsLog::truncate();
428428

@@ -431,7 +431,7 @@ public static function adminLogDelete(): void {
431431
}
432432

433433
public static function adminStaticSiteDelete(): void {
434-
check_admin_referer( 'wp2static-caches-page' );
434+
check_admin_referer( self::getHookName( 'caches_page' ) );
435435

436436
StaticSite::delete();
437437

@@ -440,7 +440,7 @@ public static function adminStaticSiteDelete(): void {
440440
}
441441

442442
public static function adminStaticSiteShow(): void {
443-
check_admin_referer( 'wp2static-caches-page' );
443+
check_admin_referer( self::getHookName( 'caches_page' ) );
444444

445445
wp_safe_redirect( admin_url( 'admin.php?page=wp2static-static-site' ) );
446446
exit;
@@ -453,7 +453,7 @@ public static function adminUISaveJobsOptions(): void {
453453
self::getHookName( 'addon_ui_save_job_options' )
454454
);
455455

456-
check_admin_referer( 'wp2static-ui-job-options' );
456+
check_admin_referer( self::getHookName( 'ui_job_options' ) );
457457

458458
wp_safe_redirect( admin_url( 'admin.php?page=wp2static-jobs' ) );
459459
exit;
@@ -479,7 +479,7 @@ public static function adminUISaveAdvancedOptions(): void {
479479
self::getHookName( 'addon_ui_save_advanced_options' )
480480
);
481481

482-
check_admin_referer( 'wp2static-ui-advanced-options' );
482+
check_admin_referer( self::getHookName( 'ui_advanced_options' ) );
483483

484484
wp_safe_redirect( admin_url( 'admin.php?page=wp2static-advanced' ) );
485485
exit;
@@ -521,7 +521,7 @@ public static function adminToggleAddon( string $addon_slug = null ): void {
521521

522522
$addon_slug = sanitize_text_field( $addon_slug );
523523
} else {
524-
check_admin_referer( 'wp2static-addons-page' );
524+
check_admin_referer( self::getHookName( 'addons_page' ) );
525525

526526
$addon_slug = sanitize_text_field( strval( filter_input( INPUT_POST, 'addon_slug' ) ) );
527527
}
@@ -561,7 +561,7 @@ public static function adminToggleAddon( string $addon_slug = null ): void {
561561
}
562562

563563
public static function adminManuallyEnqueueJobs(): void {
564-
check_admin_referer( 'wp2static-manually-enqueue-jobs' );
564+
check_admin_referer( self::getHookName( 'manually_enqueue_jobs' ) );
565565

566566
// TODO: consider using a transient based notifications system to
567567
// persist through wp_safe_redirect calls

‎src/ViewRenderer.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static function renderOptionsPage(): void {
99

1010
$view = [
1111
'options' => Options::getAll(),
12-
'nonce_action' => 'wp2static-ui-options',
12+
'nonce_action' => Controller::getHookName( 'ui_options' ),
1313
];
1414

1515
require_once WP2STATIC_PATH . 'views/options-page.php';
@@ -20,7 +20,7 @@ public static function renderAdvancedOptionsPage(): void {
2020

2121
$view = [
2222
'options' => Options::getAll(),
23-
'nonce_action' => 'wp2static-ui-advanced-options',
23+
'nonce_action' => Controller::getHookName( 'ui_advanced_options' ),
2424
];
2525

2626
require_once WP2STATIC_PATH . 'views/advanced-options-page.php';
@@ -44,15 +44,15 @@ public static function renderDiagnosticsPage(): void {
4444

4545
public static function renderLogsPage(): void {
4646
$view = [];
47-
$view['nonce_action'] = 'wp2static-log-page';
47+
$view['nonce_action'] = Controller::getHookName( 'log_page' );
4848
$view['logs'] = WsLog::getAll();
4949

5050
require_once WP2STATIC_PATH . 'views/logs-page.php';
5151
}
5252

5353
public static function renderAddonsPage(): void {
5454
$view = [];
55-
$view['nonce_action'] = 'wp2static-addons-page';
55+
$view['nonce_action'] = Controller::getHookName( 'addons_page' );
5656
$view['addons'] = Addons::getAll();
5757

5858
require_once WP2STATIC_PATH . 'views/addons-page.php';
@@ -250,7 +250,7 @@ public static function renderJobsPage(): void {
250250
JobQueue::squashQueue();
251251

252252
$view = [];
253-
$view['nonce_action'] = 'wp2static-ui-job-options';
253+
$view['nonce_action'] = Controller::getHookName( 'ui_job_options' );
254254
$view['jobs'] = JobQueue::getJobs();
255255
$view['jobOptions'] = Options::getAll();
256256

@@ -346,7 +346,7 @@ public static function renderCachesPage(): void {
346346
$view['crawledFilesTotal'] = CrawledFiles::getTotal();
347347
$view['deployCacheTotalPaths'] = DeployCache::getTotal();
348348
$view['uploads_path'] = SiteInfo::getPath( 'uploads' );
349-
$view['nonce_action'] = 'wp2static-caches-page';
349+
$view['nonce_action'] = Controller::getHookName( 'caches_page' );
350350

351351
require_once WP2STATIC_PATH . 'views/caches-page.php';
352352
}

‎views/addons-page.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
<tr>
3838
<td>
3939
<form
40-
name="wp2static-detected-files-delete"
40+
name="<?php echo Controller::getHookName( 'toggle_addon' ); ?>"
4141
method="POST"
4242
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
4343

4444
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
45-
<input name="action" type="hidden" value="wp2static_toggle_addon" />
45+
<input name="action" type="hidden" value="<?php echo Controller::getHookName( 'toggle_addon' ); ?>" />
4646
<input name="addon_slug" type="hidden" value="<?php echo $addon->slug; ?>" />
4747

4848
<button><?php echo $addon->enabled ? 'Enabled' : 'Disabled'; ?></button>

‎views/advanced-options-page.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<div class="wrap">
2424
<form
25-
name="wp2static-ui-advanced-options"
25+
name="<?php echo Controller::getHookName( 'ui_advanced_options' ); ?>"
2626
method="POST"
2727
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
2828

@@ -73,7 +73,7 @@
7373
<p/>
7474

7575
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
76-
<input name="action" type="hidden" value="wp2static_ui_save_advanced_options" />
76+
<input name="action" type="hidden" value="<?php echo Controller::getHookName( 'ui_save_advanced_options' ); ?>" />
7777

7878
<button class="button btn-primary" type="submit">Save options</button>
7979

‎views/caches-page.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@
7373
<!-- TODO: allow downloading zipped CSV of all lists <a href="#"><button class="button btn-danger">Download List</button></a> -->
7474

7575
<form
76-
name="wp2static-detected-files-delete"
76+
name="<?php echo Controller::getHookName( 'detected_files_delete' ); ?>"
7777
method="POST"
7878
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
7979

8080
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
8181

8282
<select name="action" class="wp2static-select">
83-
<option value="wp2static_detected_files_show">Show URLs</option>
84-
<option value="wp2static_detected_files_delete">Delete Detected Files</option>
83+
<option value="<?php echo Controller::getHookName( 'detected_files_show' ); ?>">Show URLs</option>
84+
<option value="<?php echo Controller::getHookName( 'detected_files_delete' ); ?>">Delete Detected Files</option>
8585
</select>
8686

8787
<button class="button btn-danger">Go</button>
@@ -94,15 +94,15 @@
9494
<td><?php echo $crawled_files_total; ?> URLs in database</td>
9595
<td>
9696
<form
97-
name="wp2static-crawled-files-delete"
97+
name="<?php echo Controller::getHookName( 'crawled_files_delete' ); ?>"
9898
method="POST"
9999
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
100100

101101
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
102102

103103
<select name="action" class="wp2static-select">
104-
<option value="wp2static_crawled_files_show">Show URLs</option>
105-
<option value="wp2static_crawled_files_delete">Delete Crawled Files</option>
104+
<option value="<?php echo Controller::getHookName( 'crawled_files_show' ); ?>">Show URLs</option>
105+
<option value="<?php echo Controller::getHookName( 'crawled_files_delete' ); ?>">Delete Crawled Files</option>
106106
</select>
107107

108108
<button class="button btn-danger">Go</button>
@@ -120,15 +120,15 @@
120120
</td>
121121
<td>
122122
<form
123-
name="wp2static-static-site-delete"
123+
name="<?php echo Controller::getHookName( 'static_site_delete' ); ?>"
124124
method="POST"
125125
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
126126

127127
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
128128

129129
<select name="action" class="wp2static-select">
130-
<option value="wp2static_static_site_show">Show Paths</option>
131-
<option value="wp2static_static_site_delete">Delete Files</option>
130+
<option value="<?php echo Controller::getHookName( 'static_site_show' ); ?>">Show Paths</option>
131+
<option value="<?php echo Controller::getHookName( 'static_site_delete' ); ?>">Delete Files</option>
132132
</select>
133133

134134
<button class="button btn-danger">Go</button>
@@ -145,15 +145,15 @@
145145
</td>
146146
<td>
147147
<form
148-
name="wp2static-post-processed-site-delete"
148+
name="<?php echo Controller::getHookName( 'post_processed_site_delete' ); ?>"
149149
method="POST"
150150
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
151151

152152
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
153153

154154
<select name="action" class="wp2static-select">
155-
<option value="wp2static_post_processed_site_show">Show Paths</option>
156-
<option value="wp2static_post_processed_site_delete">Delete Files</option>
155+
<option value="<?php echo Controller::getHookName( 'post_processed_site_show' ); ?>">Show Paths</option>
156+
<option value="<?php echo Controller::getHookName( 'post_processed_site_delete' ); ?>">Delete Files</option>
157157
</select>
158158

159159
<button class="button btn-danger">Go</button>
@@ -173,15 +173,15 @@
173173
<?php } ?>
174174
<td>
175175
<form
176-
name="wp2static-post-processed-site-delete"
176+
name="<?php echo Controller::getHookName( 'deploy_cache_delete' ); ?>"
177177
method="POST"
178178
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
179179

180180
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
181181

182182
<select name="action" class="wp2static-select">
183-
<option value="wp2static_deploy_cache_show">Show Paths</option>
184-
<option value="wp2static_deploy_cache_delete">Delete Deploy Cache</option>
183+
<option value="<?php echo Controller::getHookName( 'deploy_cache_show' ); ?>">Show Paths</option>
184+
<option value="<?php echo Controller::getHookName( 'deploy_cache_delete' ); ?>">Delete Deploy Cache</option>
185185
</select>
186186

187187
<input name="deploy_namespace" type="hidden" value="<?php echo $namespaces[0]; ?>" />
@@ -196,15 +196,15 @@
196196
<td><?php echo strval( $deploy_cache_total_paths[ $namespaces[ $i ] ] ); ?> Paths in database for <code><?php echo strval( $namespaces[ $i ] ); ?></code></td>
197197
<td>
198198
<form
199-
name="wp2static-deploy-cache-delete"
199+
name="<?php echo Controller::getHookName( 'deploy_cache_delete' ); ?>"
200200
method="POST"
201201
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
202202

203203
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
204204

205205
<select name="action" class="wp2static-select">
206-
<option value="wp2static_deploy_cache_show">Show Paths</option>
207-
<option value="wp2static_deploy_cache_delete">Delete Deploy Cache</option>
206+
<option value="<?php echo Controller::getHookName( 'deploy_cache_show' ); ?>">Show Paths</option>
207+
<option value="<?php echo Controller::getHookName( 'deploy_cache_delete' ); ?>">Delete Deploy Cache</option>
208208
</select>
209209

210210
<input name="deploy_namespace" type="hidden" value="<?php echo $namespaces[ $i ]; ?>" />
@@ -221,13 +221,13 @@
221221
<br>
222222

223223
<form
224-
name="wp2static-delete-all-caches"
224+
name="<?php echo Controller::getHookName( 'delete_all_caches' ); ?>"
225225
method="POST"
226226
action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
227227

228228
<?php wp_nonce_field( strval( $view['nonce_action'] ) ); ?>
229229

230-
<input name="action" type="hidden" value="wp2static_delete_all_caches" />
230+
<input name="action" type="hidden" value="<?php echo Controller::getHookName( 'delete_all_caches' ); ?>" />
231231

232232
<button class="button btn-danger">Delete all caches</button>
233233

0 commit comments

Comments
 (0)