Changeset 1638

Timestamp:

09/11/04 16:12:40 (4 years ago)

Author:

rboren

Message:

Themes.

Files:

• trunk/wp-admin/admin-functions.php (modified) (1 diff)
• trunk/wp-admin/menu.php (modified) (2 diffs)
• trunk/wp-admin/theme-editor.php (added)
• trunk/wp-admin/themes.php (added)
• trunk/wp-admin/upgrade-schema.php (modified) (1 diff)
• trunk/wp-blog-header.php (modified) (4 diffs)
• trunk/wp-includes/template-functions-general.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -489 +489 @@
-}
-
+function get_theme_data($theme_file) {
+    $theme_data = implode('', file($theme_file));
+    preg_match("|Theme Name:(.*)|i", $theme_data, $theme_name);
+    preg_match("|Theme URI:(.*)|i", $theme_data, $theme_uri);
+    preg_match("|Description:(.*)|i", $theme_data, $description);
+    preg_match("|Author:(.*)|i", $theme_data, $author_name);
+    preg_match("|Author URI:(.*)|i", $theme_data, $author_uri);
+    preg_match("|Template:(.*)|i", $theme_data, $template);
+    if ( preg_match("|Version:(.*)|i", $theme_data, $version) )
+        $version = $version[1];
+    else
+        $version ='';
+
+    $description = wptexturize($description[1]);
+
+    $name = $theme_name[1];
+    $name = trim($name);
+    $theme = $name;
+    if ('' != $theme_uri && '' != $name) {
+        $theme = __("<a href='{$theme_uri[1]}' title='Visit theme homepage'>{$theme}</a>");
+    }
+
+    if ('' == $author_uri) {
+        $author = $author_name[1];
+    } else {
+        $author = __("<a href='{$author_uri[1]}' title='Visit author homepage'>{$author_name[1]}</a>");
+    }
+
+    return array('Name' => $name, 'Title' => $theme, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1]);
+}
+
+function get_themes() {
+    $themes = array();
+    $theme_loc = 'wp-content/themes';
+    $theme_root = ABSPATH . $theme_loc;
+
+    // Files in wp-content/themes directory
+    $themes_dir = @ dir($theme_root);
+    if ($themes_dir) {
+        while(($theme_dir = $themes_dir->read()) !== false) {
+            if (is_dir($theme_root . '/' . $theme_dir)) {
+                $stylish_dir = @ dir($theme_root . '/' . $theme_dir);
+                while(($theme_file = $stylish_dir->read()) !== false) {
+                    if ( $theme_file == 'style.css' ) {
+                        $theme_files[] = $theme_dir . '/' . $theme_file;
+                    }
+                }
+            }
+        }
+    }
+
+    $default_files = array(get_settings('blogfilename'), 'wp-comments.php', 'wp-comments-popup.php', 'wp-comments-post.php', 'wp-footer.php', 'wp-header.php', 'wp-sidebar.php', 'footer.php', 'header.php', 'sidebar.php');
+
+    // Get the files for the default template.
+    $default_template_files = array();
+    {
+        $dirs = array('', 'wp-content');
+        foreach ($dirs as $dir) {
+            $template_dir = @ dir(ABSPATH . $dir);
+            while(($file = $template_dir->read()) !== false) {
+                if ( !preg_match('|^\.+$|', $file) && in_array($file, $default_files)) 
+                    $default_template_files[] = trim("$dir/$file", '/');
+            }
+        }
+    }
+
+    // Get the files for the default stylesheet.
+    $default_stylesheet_files = array();
+    {
+        $stylesheet_dir = @ dir(ABSPATH);
+        while(($file = $stylesheet_dir->read()) !== false) {
+            if ( !preg_match('|^\.+$|', $file) && preg_match('|\.css$|', $file)) 
+                $default_stylesheet_files[] = "$file";
+        }
+    }
+    
+    // The default theme always exists.
+    $themes['Default'] = array('Name' => 'Default', 'Title' => 'Default', 'Description' => 'The default theme', 'Author' => '', 'Version' => '1.3', 'Template' => 'default', 'Stylesheet' => 'default', 'Template Files' => $default_template_files, 'Stylesheet Files' => $default_stylesheet_files);
+
+    if (!$themes_dir || !$theme_files) {
+        return $themes;
+    }
+
+    sort($theme_files);
+
+    foreach($theme_files as $theme_file) {
+        $theme_data = get_theme_data("$theme_root/$theme_file");
+      
+        $name = $theme_data['Name']; 
+        $title = $theme_data['Title'];
+        $description = wptexturize($theme_data['Description']);
+        $version = $theme_data['Version'];
+        $author = $theme_data['Author'];
+        $template = $theme_data['Template'];
+        $stylesheet = dirname($theme_file);
+
+        if (empty($template)) {
+            if (file_exists(dirname("$theme_root/$theme_file/index.php"))) {
+                $template = dirname($theme_file);
+            } else {
+                continue;
+            }
+        }
+
+        $template = trim($template);
+
+        if (($template != 'default') && (! file_exists("$theme_root/$template/index.php"))) {
+            continue;
+        }
+
+        if (empty($name)) {
+            $name = dirname($theme_file);
+            $title = $name;
+        }
+        
+        $stylesheet_files = array();
+        if ($stylesheet != 'default') {
+            $stylesheet_dir = @ dir("$theme_root/$stylesheet");
+            if ($stylesheet_dir) {
+                while(($file = $stylesheet_dir->read()) !== false) {
+                    if ( !preg_match('|^\.+$|', $file) && preg_match('|\.css$|', $file) ) 
+                        $stylesheet_files[] = "$theme_loc/$stylesheet/$file";
+                }
+            }
+        } else {
+            $stylesheet_files = $default_stylesheet_files;
+        }
+
+        $template_files = array();      
+        if ($template != 'default') {
+            $template_dir = @ dir("$theme_root/$template");
+            if ($template_dir) {
+                while(($file = $template_dir->read()) !== false) {
+                    if ( !preg_match('|^\.+$|', $file) && preg_match('|\.php$|', $file) ) 
+                        $template_files[] = "$theme_loc/$template/$file";
+                }
+            }
+        } else {
+            $template_files = $default_template_files;
+        }
+
+        $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files);
+    }
+
+    return $themes;
+}
+
-?>

trunk/wp-admin/menu.php

@@ -14 +14 @@
-$menu[30] = array(__('Options'), 6, 'options-general.php');
-$menu[35] = array(__('Plugins'), 8, 'plugins.php');
-
-
+
+
+
-ksort($menu); // So other files can plugin
-
@@ -39 +40 @@
-$submenu['options-general.php'][25] = array(__('Permalinks'), 5, 'options-permalink.php');
-$submenu['options-general.php'][30] = array(__('Miscellaneous'), 5, 'options-misc.php');
+
+$submenu['themes.php'][5] = array(__('Themes'), 5, 'themes.php');
+$submenu['themes.php'][10] = array(__('Theme Editor'), 5, 'theme-editor.php');
-
-$self = preg_replace('|.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);

trunk/wp-admin/upgrade-schema.php

@@ -216 +216 @@
-    add_option('recently_edited');
-    add_option('use_linksupdate', 0);
+    add_option('template', 'default');
+    add_option('stylesheet', 'default');
-
-    // Delete unused options

trunk/wp-blog-header.php

@@ -65 +65 @@
-        if (isset($_GET['error'])) {
-            unset($_GET['error']);
+        }
+
+        if (isset($error)) {
+            unset($error);
-        }
-
@@ -102 +106 @@
-// Sending HTTP headers
-
-
+
+
+
-    @header ('X-Pingback: '. get_settings('siteurl') . '/xmlrpc.php');
-} else {
@@ -184 +190 @@
-endif;
-
+$wp_template = get_settings('template');
+
+if ($wp_template == 'default') {
+  $wp_template = '';
+}
+
+if (! empty($wp_template)) {
+  $wp_template = "themes/$wp_template/";
+}
+
-// Template redirection
-
-
+
+
+
+
+
+
+
+
+
-  $wp_did_single = true;
-'wp-content/single.php'
+"wp-content/${wp_template}single.php"
-  exit;
-} else if (is_page() && (! isset($wp_did_page)) &&
-'wp-content/page.php'
+"wp-content/${wp_template}page.php"
-  $wp_did_page = true;
-'wp-content/page.php'
+"wp-content/${wp_template}page.php"
-  exit;
-} else if (is_category() && (! isset($wp_did_category)) &&
-'wp-content/category.php'
+"wp-content/${wp_template}category.php"
-  $wp_did_category = true;
-'wp-content/category.php'
+"wp-content/${wp_template}category.php"
-  exit;
-} else if (is_author() && (! isset($wp_did_author)) &&
-'wp-content/author.php'
+"wp-content/${wp_template}author.php"
-  $wp_did_author = true;
-'wp-content/author.php'
+"wp-content/${wp_template}author.php"
-  exit;
-} else if (is_date() && (! isset($wp_did_date)) &&
-'wp-content/date.php'
+"wp-content/${wp_template}date.php"
-  $wp_did_date = true;
-'wp-content/date.php'
+"wp-content/${wp_template}date.php"
-  exit;
-} else if (is_archive() && (! isset($wp_did_archive)) &&
-'wp-content/archive.php'
+"wp-content/${wp_template}archive.php"
-  $wp_did_archive = true;
-'wp-content/archive.php'
+"wp-content/${wp_template}archive.php"
-  exit;
-} else if (is_search() && (! isset($wp_did_search)) &&
-'wp-content/search.php'
+"wp-content/${wp_template}search.php"
-  $wp_did_search = true;
-'wp-content/search.php'
+"wp-content/${wp_template}search.php"
-  exit;
-} else if (is_404() && (! isset($wp_did_404)) &&
-'wp-content/404.php'
+"wp-content/${wp_template}404.php"
-  $wp_did_404 = true;
-'wp-content/404.php'
+"wp-content/${wp_template}404.php"
-  exit;
-} else if (is_feed() && $pagenow != 'wp-feed.php') {
@@ -231 +254 @@
-  include(dirname(__FILE__) . '/wp-trackback.php');
-  exit;
+} else if ((! isset($wp_did_home)) && file_exists(ABSPATH . "wp-content/${wp_template}index.php"))
+{
+    $wp_did_home = true;
+    include(ABSPATH . "wp-content/${wp_template}index.php");
+    exit;
-}
-

trunk/wp-includes/template-functions-general.php

@@ -78 +78 @@
-            $output = get_settings('siteurl') .'/xmlrpc.php';
-            break;
+        case 'stylesheet_url':
+            $output = get_settings('stylesheet');;
+            if (empty($output) || $output == 'default') {
+                $output = get_settings('home') . "/wp-layout.css";
+            } else {
+                $output = get_settings('home') . "/wp-content/themes/$output/style.css";
+            }
+            break;
+        case 'template_url':
+            $output = get_settings('template');;
+            if (empty($output) || $output == 'default') {
+                $output = get_settings('home');
+            } else {
+                $output = get_settings('home') . "/wp-content/themes/$output";
+            }
+            break;
-        case 'admin_email':
-            $output = get_settings('admin_email');