Changeset 3934

Timestamp:

06/27/2006 08:06:00 AM (18 years ago)

Author:

ryan

Message:

wp_explain_nonce() and wp_nonce_ays(). Props mdawaffe. #2734

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• pluggable.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1022 +1022 @@
 }
 
+function wp_explain_nonce($action) {
+    if ( $action !== -1 && preg_match('/([a-z]+)-([a-z]+)(_(.+))?/', $action, $matches) ) {
+        $verb = $matches[1];
+        $noun = $matches[2];
+
+        $trans = array();
+        $trans['add']['category'] = array(__('Are you sure you want to add this category?'), false);
+        $trans['delete']['category'] = array(__('Are you sure you want to delete this category: "%s"?'), 'get_catname');
+        $trans['update']['category'] = array(__('Are you sure you want to edit this category: "%s"?'), 'get_catname');
+
+        $trans['delete']['comment'] = array(__('Are you sure you want to delete this comment: "%s"?'), 'use_id');
+        $trans['unapprove']['comment'] = array(__('Are you sure you want to unapprove this comment: "%s"?'), 'use_id');
+        $trans['approve']['comment'] = array(__('Are you sure you want to approve this comment: "%s"?'), 'use_id');
+        $trans['update']['comment'] = array(__('Are you sure you want to edit this comment: "%s"?'), 'use_id');
+        $trans['bulk']['comments'] = array(__('Are you sure you want to bulk modify comments?'), false);
+        $trans['moderate']['comments'] = array(__('Are you sure you want to moderate comments?'), false);
+
+        $trans['add']['bookmark'] = array(__('Are you sure you want to add this bookmark?'), false);
+        $trans['delete']['bookmark'] = array(__('Are you sure you want to delete this bookmark: "%s"?'), 'use_id');
+        $trans['update']['bookmark'] = array(__('Are you sure you want to edit this bookmark: "%s"?'), 'use_id');
+        $trans['bulk']['bookmarks'] = array(__('Are you sure you want to bulk modify bookmarks?'), false);
+
+        $trans['add']['post'] = array(__('Are you sure you want to add this post?'), false);
+        $trans['delete']['post'] = array(__('Are you sure you want to delete this post: "%s"?'), 'get_the_title');
+        $trans['update']['post'] = array(__('Are you sure you want to edit this post: "%s"?'), 'get_the_title');
+
+        $trans['add']['page'] = array(__('Are you sure you want to add this page?'), false);
+        $trans['delete']['page'] = array(__('Are you sure you want to delete this page: "%s"?'), 'get_the_title');
+        $trans['update']['page'] = array(__('Are you sure you want to edit this page: "%s"?'), 'get_the_title');
+
+        $trans['add']['user'] = array(__('Are you sure you want to add this user?'), false);
+        $trans['delete']['users'] = array(__('Are you sure you want to delete users?'), false);
+        $trans['bulk']['users'] = array(__('Are you sure you want to bulk modify users?'), false);
+        $trans['update']['user'] = array(__('Are you sure you want to edit this user: "%s"?'), 'get_author_name');
+
+        if ( isset($trans[$verb][$noun]) ) {
+            if ( !empty($trans[$verb][$noun][1]) ) {
+                $lookup = $trans[$verb][$noun][1];
+                $object = $matches[4];
+                if ( 'use_id' != $lookup )
+                    $object = call_user_func($lookup, $object);
+                return sprintf($trans[$verb][$noun][0], $object);
+            } else {
+                return $trans[$verb][$noun][0];
+            }
+        }
+    }
+
+    return __('Are you sure you want to do this');
+}
+
+function wp_nonce_ays($action) {
+    global $pagenow, $menu, $submenu, $parent_file, $submenu_file;
+
+    $admin_url = get_settings('siteurl') . '/wp-admin';
+    if ( wp_get_referer() )
+        $admin_url = wp_get_referer();
+
+    $title = __('WordPress Confirmation');
+    require_once(ABSPATH . '/wp-admin/admin-header.php');
+    // Remove extra layer of slashes.
+    $_POST   = stripslashes_deep($_POST  );
+    if ( $_POST ) {
+        $q = http_build_query($_POST);
+        $q = explode( ini_get('arg_separator.output'), $q);
+        $html .= "\t<form method='post' action='$pagenow'>\n";
+        foreach ( (array) $q as $a ) {
+            $v = substr(strstr($a, '='), 1);
+            $k = substr($a, 0, -(strlen($v)+1));
+            $html .= "\t\t<input type='hidden' name='" . wp_specialchars( urldecode($k), 1 ) . "' value='" . wp_specialchars( urldecode($v), 1 ) . "' />\n";
+        }
+        $html .= "\t\t<input type='hidden' name='_wpnonce' value='" . wp_create_nonce($action) . "' />\n";
+        $html .= "\t\t<div id='message' class='confirm fade'>\n\t\t<p>" . wp_explain_nonce($action) . "</p>\n\t\t<p><a href='$adminurl'>" . __('No') . "</a> <input type='submit' value='" . __('Yes') . "' /></p>\n\t\t</div>\n\t</form>\n";
+    } else {
+        $html .= "\t<div id='message' class='confirm fade'>\n\t<p>" . wp_explain_nonce($action) . "</p>\n\t<p><a href='$adminurl'>" . __('No') . "</a> <a href='" . add_query_arg( '_wpnonce', wp_create_nonce($action), $_SERVER['REQUEST_URI'] ) . "'>" . __('Yes') . "</a></p>\n\t</div>\n";
+    }
+    $html .= "</body>\n</html>";
+    echo $html;
+    include_once(ABSPATH . '/wp-admin/admin-footer.php');
+}
+
 ?>

trunk/wp-includes/pluggable.php

@@ -230 +230 @@
 if ( !function_exists('check_admin_referer') ) :
 function check_admin_referer($action = -1) {
-    global $pagenow, $menu, $submenu, $parent_file, $submenu_file;;
     $adminurl = strtolower(get_settings('siteurl')).'/wp-admin';
     $referer = strtolower(wp_get_referer());
     if ( !wp_verify_nonce($_REQUEST['_wpnonce'], $action) &&
         !(-1 == $action && strstr($referer, $adminurl)) ) {
-        if ( $referer ) 
-            $adminurl = $referer;
-        $title = __('WordPress Confirmation');
-        require_once(ABSPATH . '/wp-admin/admin-header.php');
-        // Remove extra layer of slashes.
-        $_POST   = stripslashes_deep($_POST  );
-        if ( $_POST ) {
-            $q = http_build_query($_POST);
-            $q = explode( ini_get('arg_separator.output'), $q);
-            $html .= "\t<form method='post' action='$pagenow'>\n";
-            foreach ( (array) $q as $a ) {
-                $v = substr(strstr($a, '='), 1);
-                $k = substr($a, 0, -(strlen($v)+1));
-                $html .= "\t\t<input type='hidden' name='" . wp_specialchars( urldecode($k), 1 ) . "' value='" . wp_specialchars( urldecode($v), 1 ) . "' />\n";
-            }
-            $html .= "\t\t<input type='hidden' name='_wpnonce' value='" . wp_create_nonce($action) . "' />\n";
-            $html .= "\t\t<div id='message' class='confirm fade'>\n\t\t<p>" . __('Are you sure you want to do this?') . "</p>\n\t\t<p><a href='$adminurl'>" . __('No') . "</a> <input type='submit' value='" . __('Yes') . "' /></p>\n\t\t</div>\n\t</form>\n";
-        } else {
-            $html .= "\t<div id='message' class='confirm fade'>\n\t<p>" . __('Are you sure you want to do this?') . "</p>\n\t<p><a href='$adminurl'>" . __('No') . "</a> <a href='" . add_query_arg( '_wpnonce', wp_create_nonce($action), $_SERVER['REQUEST_URI'] ) . "'>" . __('Yes') . "</a></p>\n\t</div>\n";
-        }
-        $html .= "</body>\n</html>";
-        echo $html;
-        include_once(ABSPATH . '/wp-admin/admin-footer.php');
+        wp_nonce_ays($action);
         die();
     }