Changeset 2138 for trunk/bb-includes/functions.bb-core.php

Timestamp:

06/10/2009 06:57:41 AM (17 years ago)

Author:

sambauers

Message:

Updates brought about by reorganisation of BackPress core functions.

File:

• trunk/bb-includes/functions.bb-core.php (modified) (11 diffs)

trunk/bb-includes/functions.bb-core.php

@@ -157 +157 @@
         return true;
 }
-
-
-
-/* HTTP Helpers */
-
-/**
- * Set the headers for caching for 10 days with JavaScript content type.
- *
- * @since 1.0
- */
-function bb_cache_javascript_headers() {
-        $expiresOffset = 864000; // 10 days
-        header( "Content-Type: text/javascript; charset=utf-8" );
-        header( "Vary: Accept-Encoding" ); // Handle proxies
-        header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . " GMT" );
-}
-
 
 
@@ -414 +397 @@
 
 function bb_current_time( $type = 'timestamp' ) {
-        switch ($type) {
-                case 'mysql':
-                        $d = gmdate('Y-m-d H:i:s');
-                        break;
-                case 'timestamp':
-                        $d = time();
-                        break;
-        }
-        return $d;
+        return current_time( $type, true );
 }
 
@@ -538 +513 @@
         // Use https?
         if (
-                ( ( $context & BB_URI_CONTEXT_BB_USER_FORMS ) && bb_force_ssl_user_forms() ) // Force https when required on user forms
+                ( ( $context & BB_URI_CONTEXT_BB_USER_FORMS ) && force_ssl_login() ) // Force https when required on user forms
         ||
-                ( ( $context & BB_URI_CONTEXT_BB_ADMIN ) && bb_force_ssl_admin() ) // Force https when required in admin
+                ( ( $context & BB_URI_CONTEXT_BB_ADMIN ) && force_ssl_admin() ) // Force https when required in admin
         ) {
                 static $_uri_ssl;
@@ -559 +534 @@
 
 /**
- * Whether SSL should be forced when sensitive user data is being submitted.
- *
- * @since 1.0
- *
- * @param string|bool $force Optional.
- * @return bool True if forced, false if not forced.
- */
-function bb_force_ssl_user_forms( $force = '' )
-{
-        static $forced;
-
-        if ( '' != $force ) {
-                $old_forced = $forced;
-                $forced = $force;
-                return $old_forced;
-        }
-
-        return $forced;
-}
-
-/**
- * Whether SSL should be forced when using the admin area.
- *
- * @since 1.0
- *
- * @param string|bool $force Optional.
- * @return bool True if forced, false if not forced.
- */
-function bb_force_ssl_admin( $force = '' )
-{
-        static $forced;
-
-        if ( '' != $force ) {
-                $old_forced = $forced;
-                $forced = $force;
-                return $old_forced;
-        }
-
-        return $forced;
-}
-
-/**
  * Forces redirection to an SSL page when required
  *
@@ -614 +547 @@
 
         if ( BB_IS_ADMIN ) {
-                if ( !bb_force_ssl_admin() ) {
+                if ( !force_ssl_admin() ) {
                         return;
                 }
@@ -621 +554 @@
                         case 'login-page':
                         case 'register-page':
-                                if ( !bb_force_ssl_user_forms() ) {
+                                if ( !force_ssl_login() ) {
                                         return;
                                 }
@@ -628 +561 @@
                                 global $self;
                                 if ( $self == 'profile-edit.php' ) {
-                                        if ( !bb_force_ssl_user_forms() ) {
+                                        if ( !force_ssl_login() ) {
                                                 return;
                                         }
@@ -641 +574 @@
         }
 
-        if ( bb_is_ssl() ) {
+        if ( is_ssl() ) {
                 return;
         }
@@ -649 +582 @@
         bb_safe_redirect( $uri );
         exit;
-}
-
-/**
- * Determine if SSL is used.
- *
- * @since 1.0
- *
- * @return bool True if SSL, false if not used.
- */
-function bb_is_ssl()
-{
-        static $is_ssl;
-
-        if ( isset( $is_ssl ) ) {
-                return $is_ssl;
-        }
-
-        $is_ssl = false;
-
-        if ( isset($_SERVER['HTTPS']) ) {
-                if ( 'on' == strtolower( $_SERVER['HTTPS'] ) ) {
-                        $is_ssl = true;
-                } elseif ( '1' == $_SERVER['HTTPS'] ) {
-                        $is_ssl = true;
-                }
-        } elseif ( isset( $_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
-                $is_ssl = true;
-        }
-
-        return $is_ssl;
 }
 
@@ -1093 +996 @@
 /* Nonce */
 
-function bb_nonce_url($actionurl, $action = -1) {
-        $actionurl = str_replace( '&', '&', $actionurl );
-        return wp_specialchars( add_query_arg( '_wpnonce', bb_create_nonce( $action ), $actionurl ) );
-}
-
-function bb_nonce_field( $action = -1, $name = "_wpnonce", $referer = true , $echo = true ) {
-        $name = attribute_escape( $name );
-        $nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . bb_create_nonce( $action ) . '" />';
-        if ( $echo )
-                echo $nonce_field;
-
-        if ( $referer )
-                wp_referer_field( $echo, 'previous' );
-
-        return $nonce_field;
-}
-
-function bb_nonce_ays( $action ) {
+function bb_nonce_url( $actionurl, $action = -1 )
+{
+        return wp_nonce_url( $actionurl, $action );
+}
+
+function bb_nonce_field( $action = -1, $name = "_wpnonce", $referer = true, $echo = true )
+{
+        return wp_nonce_field( $action, $name, $referer, $echo );
+}
+
+function bb_nonce_ays( $action )
+{
         $title = __( 'bbPress Failure Notice' );
         $html .= "\t<div id='message' class='updated fade'>\n\t<p>" . wp_specialchars( bb_explain_nonce( $action ) ) . "</p>\n\t<p>";
@@ -1120 +1017 @@
 }
 
-function bb_install_header( $title = '', $header = false, $logo = false ) {
+function bb_install_header( $title = '', $header = false, $logo = false )
+{
         if ( empty($title) )
                 if ( function_exists('__') )