Changeset 1575 for trunk/bb-plugins/akismet.php

Timestamp:

07/02/2008 02:53:07 PM (17 years ago)

Author:

sambauers

Message:

bb_uri() and bb_get_uri() commit bomb.

BB_URI_CONTEXT_* definitions applied to all link creation functions and passed to their filters.

First stages of SSL support for user forms (login, registration, etc.) and admin area.

Links rewritten for SSL at this stage, but pages are not yet forced to SSL if loaded as non-secure.

bb_force_ssl_user_forms() and bb_force_ssl_admin() also included.

Introducing new config constants, BB_FORCE_SSL_USER_FORMS and BB_FORCE_SSL_ADMIN.

New config variable $bb->uri_ssl, a complete URI for the SSL links to go to. If not set it is based on replacing http with https in $bb->uri.

File:

• trunk/bb-plugins/akismet.php (modified) (5 diffs)

trunk/bb-plugins/akismet.php

@@ -81 +81 @@
 function bb_akismet_verify_key( $key ) {
     global $bb_ksd_api_port;
-    $blog = urlencode( bb_get_option('uri') );
+    $blog = urlencode( bb_get_uri(null, null, BB_URI_CONTEXT_TEXT + BB_URI_CONTEXT_AKISMET) );
     $response = bb_ksd_http_post("key=$key&blog=$blog", 'rest.akismet.com', '/1.1/verify-key', $bb_ksd_api_port);
     if ( 'valid' == $response[1] )
@@ -128 +128 @@
 
         $_submit = array(
-            'blog' => bb_get_option('uri'),
+            'blog' => bb_get_uri(null, null, BB_URI_CONTEXT_TEXT + BB_URI_CONTEXT_AKISMET),
             'user_ip' => $bb_post->poster_ip,
             'permalink' => get_topic_link( $bb_post->topic_id ), // First page
@@ -150 +150 @@
 
         $_submit = array(
-            'blog' => bb_get_option('uri'),
+            'blog' => bb_get_uri(null, null, BB_URI_CONTEXT_TEXT + BB_URI_CONTEXT_AKISMET),
             'permalink' => get_user_profile_link( $user->ID ),
             'comment_type' => 'profile',
@@ -167 +167 @@
 
         $_submit = array(
-            'blog' => bb_get_option('uri'),
+            'blog' => bb_get_uri(null, null, BB_URI_CONTEXT_TEXT + BB_URI_CONTEXT_AKISMET),
             'user_ip' => preg_replace( '/[^0-9., ]/', '', $_SERVER['REMOTE_ADDR'] ),
             'user_agent' => $_SERVER['HTTP_USER_AGENT'],
@@ -292 +292 @@
     if ( !bb_current_user_can('moderate') )
         return $link;
-    if ( 2 == $post_status )
-        $link .= " <a href='" . attribute_escape( bb_nonce_url( bb_get_option('uri') . 'bb-admin/delete-post.php?id=' . get_post_id() . '&status=0&view=all', 'delete-post_' . get_post_id() ) ) . "' >" . __('Not Spam') ."</a>";
-    else
-        $link .= " <a href='" . attribute_escape( bb_nonce_url( bb_get_option('uri') . 'bb-admin/delete-post.php?id=' . get_post_id() . '&status=2', 'delete-post_' . get_post_id() ) ) . "' >" . __('Spam') ."</a>";
+    if ( 2 == $post_status ) {
+        $query = array(
+            'id'     => get_post_id(),
+            'status' => 0,
+            'view'   => 'all'
+        );
+        $display = __('Not Spam');
+    } else {
+        $query = array(
+            'id'     => get_post_id(),
+            'status' => 2
+        );
+        $display = __('Spam');
+    }
+    $uri = bb_get_uri('bb-admin/delete-post.php', $query, BB_URI_CONTEXT_A_HREF + BB_URI_CONTEXT_BB_ADMIN);
+    $uri = attribute_escape( bb_nonce_url( $uri, 'delete-post_' . get_post_id() ) );
+    $link .= " <a href='" . $uri . "' >" . $display ."</a>";
     return $link;
 }