Changeset 838

Timestamp:

05/29/2007 11:48:11 PM (17 years ago)

Author:

mdawaffe

Message:

deprecate bb_path_to_url(), bb_url_to_path(). BBTHEMEURL and BBPLUGINURL to match the *DIR consts. bb_get_theme_uri(), bb_get_plugin_uri() fixes #589

Location:

trunk

Files:

• bb-admin/themes.php (modified) (1 diff)
• bb-includes/deprecated.php (modified) (1 diff)
• bb-includes/functions.php (modified) (2 diffs)
• bb-includes/template-functions.php (modified) (1 diff)
• bb-settings.php (modified) (3 diffs)

trunk/bb-admin/themes.php

@@ -29 +29 @@
 function bb_admin_theme_row( $theme ) {
     $theme_data = file_exists( $theme . 'style.css' ) ? bb_get_theme_data( $theme . 'style.css' ) : false;
-    $screen_shot = file_exists( $theme . 'screenshot.png' ) ? attribute_escape( bb_path_to_url( $theme . 'screenshot.png' ) ) : false;
+    $screen_shot = file_exists( $theme . 'screenshot.png' ) ? clean_url( bb_get_theme_uri( $theme . 'screenshot.png' ) ) : false;
     $activation_url = clean_url( bb_nonce_url( add_query_arg( 'theme', urlencode($theme), bb_get_option( 'uri' ) . 'bb-admin/themes.php' ), 'switch-theme' ) );
 ?>

trunk/bb-includes/deprecated.php

@@ -297 +297 @@
 endif;
 
+// It's not omnipotent
+function bb_path_to_url( $path ) {
+    return apply_filters( 'bb_path_to_url', bb_convert_path_base( $path, BBPATH, bb_get_option( 'uri' ) ), $path );
+}
+
+// Neither is this one
+function bb_url_to_path( $url ) {
+    return apply_filters( 'bb_url_to_path', bb_convert_path_base( $url, bb_get_option( 'uri' ), BBPATH ), $url );
+}
+
+function bb_convert_path_base( $path, $from_base, $to_base ) {
+    $last_char = $path{strlen($path)-1};
+    if ( '/' != $last_char && '\\' != $last_char )
+        $last_char = '';
+
+    list($from_base, $to_base) = bb_trim_common_path_right($from_base, $to_base);
+
+    if ( 0 === strpos( $path, $from_base ) )
+        $r = $to_base . substr($path, strlen($from_base)) . $last_char;
+    else
+        return false;
+
+    $r = str_replace(array('//', '\\\\'), array('/', '\\'), $r);
+    $r = preg_replace('|:/([^/])|', '://$1', $r);
+
+    return $r;
+}
+
+function bb_trim_common_path_right( $one, $two ) {
+    $root_one = false;
+    $root_two = false;
+
+    while ( false === $root_one ) {
+        $base_one = basename($one);
+        $base_two = basename($two);
+        if ( !$base_one || !$base_two )
+            break;      
+        if ( $base_one == $base_two ) {
+            $one = dirname($one);
+            $two = dirname($two);
+        } else {
+            $root_one = $one;
+            $root_two = $two;
+        }
+    }
+
+    return array($root_one, $root_two);
+}
+
 ?>

trunk/bb-includes/functions.php

@@ -1697 +1697 @@
 }
 
-// It's not omnipotent
-function bb_path_to_url( $path ) {
-    return apply_filters( 'bb_path_to_url', bb_convert_path_base( $path, BBPATH, bb_get_option( 'uri' ) ), $path );
-}
-
-// Neither is this one
-function bb_url_to_path( $url ) {
-    return apply_filters( 'bb_url_to_path', bb_convert_path_base( $url, bb_get_option( 'uri' ), BBPATH ), $url );
-}
-
-function bb_convert_path_base( $path, $from_base, $to_base ) {
-    $last_char = $path{strlen($path)-1};
-    if ( '/' != $last_char && '\\' != $last_char )
-        $last_char = '';
-
-    list($from_base, $to_base) = bb_trim_common_path_right($from_base, $to_base);
-
-    if ( 0 === strpos( $path, $from_base ) )
-        $r = $to_base . substr($path, strlen($from_base)) . $last_char;
-    else
-        return false;
-
-    $r = str_replace(array('//', '\\\\'), array('/', '\\'), $r);
-    $r = preg_replace('|:/([^/])|', '://$1', $r);
-
-    return $r;
-}
-
-function bb_trim_common_path_right( $one, $two ) {
-    $root_one = false;
-    $root_two = false;
-
-    while ( false === $root_one ) {
-        $base_one = basename($one);
-        $base_two = basename($two);
-        if ( !$base_one || !$base_two )
-            break;      
-        if ( $base_one == $base_two ) {
-            $one = dirname($one);
-            $two = dirname($two);
-        } else {
-            $root_one = $one;
-            $root_two = $two;
-        }
-    }
-
-    return array($root_one, $root_two);
-}
-
 /* Profile/Admin */
 
@@ -2029 +1980 @@
 }
 
+function bb_get_plugin_uri( $plugin = false ) {
+    if ( !$plugin )
+        $r = BBPLUGINURL;
+    elseif ( 0 === strpos($plugin, BBPLUGINDIR) )
+        $r = BBPLUGINURL . substr($plugin, strlen(BBPLUGINDIR));
+    else
+        $r = false;
+
+    return apply_filters( 'bb_get_plugin_uri', $r, $plugin );
+}
+
 /* Themes / Templates */
 

trunk/bb-includes/template-functions.php

@@ -70 +70 @@
 
 function bb_get_active_theme_uri() {
-    return apply_filters( 'bb_get_active_theme_uri', bb_path_to_url( bb_get_active_theme_folder() ) );
+    if ( !$active_theme = bb_get_option( 'bb_active_theme' ) )
+        $active_theme = BBPATH . 'bb-templates/kakumei/';
+    return apply_filters( 'bb_get_active_theme_uri', bb_get_theme_uri( $active_theme ) );
+}
+
+function bb_get_theme_uri( $theme = false ) {
+    if ( !$theme )
+        $r = BBTHEMEURL;
+    elseif ( 0 === strpos($theme, BBTHEMEDIR) )
+        $r = BBTHEMEURL . substr($theme, strlen(BBTHEMEDIR));
+    elseif ( 0 === strpos($theme, BBPATH) )
+        $r = bb_get_option( 'uri' ) . substr($theme, strlen(BBPATH));
+    else
+        $r = false;
+
+    return apply_filters( 'bb_get_theme_uri', $r, $theme );
 }
 

trunk/bb-settings.php

@@ -58 +58 @@
 error_reporting(E_ALL ^ E_NOTICE);
 
+if ( isset($bb->uri) ) {
+    $bb->domain = preg_replace('|(?<!/)/(?!/).*$|', '', $bb->uri);
+    $bb->path = substr($bb->uri, strlen($bb->domain));
+} elseif ( isset($bb->path) && isset($bb->domain) ) {
+    $bb->domain = rtrim($bb->domain, '/');
+    $bb->path = '/' . ltrim($bb->path, '/');
+} else {
+    bb_die( '<code>$bb->uri</cade> must be set in your <code>config.php</code> file.' );
+}
+
+foreach ( array('wp_site_url', 'wp_home', 'path') as $p )
+    if ( isset($bb->$p) && $bb->$p )
+        $bb->$p = rtrim($bb->$p, '/');
+unset($p);
+
+$bb->path = "$bb->path/";
+$bb->uri = $bb->domain . $bb->path;
+
 define('BBINC', 'bb-includes/');
 if ( !defined('BBLANGDIR') )
@@ -63 +81 @@
 if ( !defined('BBPLUGINDIR') )
     define('BBPLUGINDIR', BBPATH . 'my-plugins/');
+if ( !defined('BBPLUGINURL') )
+    define('BBPLUGINURL', $bb->uri . 'my-plugins/');
 if ( !defined('BBTHEMEDIR') )
     define('BBTHEMEDIR', BBPATH . 'my-templates/');
+if ( !defined('BBTHEMEURL') )
+    define('BBTHEMEDIR', $bb->uri . 'my-templates/');
 
 if ( extension_loaded('mysqli') ) {
@@ -144 +166 @@
     $bbdb->usermeta = CUSTOM_USER_META_TABLE;
 
-if ( isset($bb->uri) ) {
-    $bb->domain = preg_replace('|(?<!/)/(?!/).*$|', '', $bb->uri);
-    $bb->path = substr($bb->uri, strlen($bb->domain));
-} elseif ( isset($bb->path) && isset($bb->domain) ) {
-    $bb->domain = rtrim($bb->domain, '/');
-    $bb->path = '/' . ltrim($bb->path, '/');
-} else {
-    bb_die( '<code>$bb->uri</cade> must be set in your <code>config.php</code> file.' );
-}
-
-foreach ( array('wp_site_url', 'wp_home', 'path') as $p )
-    if ( isset($bb->$p) && $bb->$p )
-        $bb->$p = rtrim($bb->$p, '/');
-unset($p);
-
-$bb->path = "$bb->path/";
-$bb->uri = $bb->domain . $bb->path;
-
 define('BBHASH', $bb->wp_siteurl ? md5($bb->wp_siteurl) : md5($bb_table_prefix) );