diff options
28 files changed, 1353 insertions, 94 deletions
diff --git a/htaccess.dist b/htaccess.dist index 10927e6..37491e5 100644 --- a/htaccess.dist +++ b/htaccess.dist @@ -1,67 +1,6 @@ RewriteEngine On RewriteBase BASE/ -### -#### main blog -### - -RewriteRule ^templates/(.*) BASE/wp-inst/wp-content/blogs/main/templates/$1 [L] -RewriteRule ^files/(.*) BASE/wp-inst/wp-content/blogs/files/$1 [L] -RewriteRule ^wp-content/themes/(.*) BASE/wp-inst/wp-content/themes/$1 [L] - -# rewrite these -RewriteRule ^category/(.*)/page/(.*)/ BASE/wp-inst/index.php?wpblog=main&category_name=$1&paged=$2 [L] -RewriteRule ^category/(.*)/(feed|rdf|rss|rss2|atom)/?$ BASE/wp-inst/wp-feed.php?wpblog=main&category_name=$1&feed=$2 [L] -RewriteRule ^category/?(.*) BASE/wp-inst/index.php?wpblog=main&category_name=$1 [L] -RewriteRule ^author/(.*)/(feed|rdf|rss|rss2|atom)/?$ BASE/wp-inst/wp-feed.php?wpblog=main&author_name=$1&feed=$2 [L] -RewriteRule ^author/?(.*) BASE/wp-inst/index.php?wpblog=main&author_name=$1 [L] -RewriteRule ^([0-9]{4})/?([0-9]{1,2})?/?([0-9]{1,2})?/?([_0-9a-zA-Z-]+)?/?([0-9]+)?/?$ BASE/wp-inst/index.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4&page=$5 [L] -RewriteRule ^([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-zA-Z-]+)/(feed|rdf|rss|rss2|atom)/?$ BASE/wp-inst/wp-feed.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4&feed=$5 [L] -RewriteRule ^([0-9]{4})/?([0-9]{1,2})/([0-9]{1,2})/([_0-9a-zA-Z-]+)/trackback/?$ BASE/wp-inst/wp-trackback.php?wpblog=main&year=$1&monthnum=$2&day=$3&name=$4 [L] -RewriteRule ^page/?([0-9]+)?/?$ BASE/wp-inst/index.php?paged=$1 [L] -RewriteRule ^feed/?([_0-9a-zA-Z-]+)?/?$ BASE/wp-inst/wp-feed.php?wpblog=main&feed=$1 [L] -RewriteRule ^comments/feed/?([_0-9a-zA-Z-]+)?/?$ BASE/wp-inst/wp-feed.php?wpblog=main&feed=$1&withcomments=1 [L] -RewriteRule ^archives/p/([0-9]+)/?(.*)? BASE/wp-inst/index.php?wpblog=main&redirect=yes&p=$1 [L] -RewriteRule ^archives/cat/([0-9]+)/?(.*)? BASE/wp-inst/index.php?wpblog=main&redirect=yes&cat=$1 [L] -RewriteRule ^archives/m/([0-9]+)\#?(.*)? BASE/wp-inst/index.php?wpblog=main&redirect=yes&m=$1 [L] -RewriteRule ^b2rss2.php(.*)? BASE/wp-inst/wp-feed.php?wpblog=main&feed=rss2 [L] -RewriteRule ^b2rdf.php(.*)? BASE/wp-inst/wp-feed.php?wpblog=main&feed=rdf [L] - -# We want to pass these files straight through -RewriteRule ^wp-comments-post.php(.*) BASE/wp-inst/wp-comments-post.php [L] -RewriteRule ^go.php(.*) BASE/wp-inst/go.php$1 [L] -RewriteRule ^pages/(.*) BASE/wp-inst/pages/$1 [L] -RewriteRule ^wp-admin/(.*) BASE/wp-inst/wp-admin/$1 [L] -RewriteRule ^wp-atom.php(.*) BASE/wp-inst/wp-atom.php [L] -RewriteRule ^wp-comments-popup.php(.*) BASE/wp-inst/wp-comments-popup.php [L] -RewriteRule ^wp-comments-post.php(.*) BASE/wp-inst/wp-comments-post.php [L] -RewriteRule ^wp-commentsrss2.php(.*) BASE/wp-inst/wp-commentsrss2.php [L] -RewriteRule ^wp-counter.php(.+)? BASE/wp-inst/wp-counter.php [L] -RewriteRule ^wp-feed.php(.*) BASE/wp-inst/wp-feed.php [L] -RewriteRule ^wp-images/(.*) BASE/wp-inst/wp-images/$1 [L] -RewriteRule ^wp-includes/images/(.*) BASE/wp-inst/wp-includes/images/$1 [L] -RewriteRule ^wp-includes/js/(.*) BASE/wp-inst/wp-includes/js/$1 [L] -RewriteRule ^wp-links-opml.php(.*) BASE/wp-inst/wp-links-opml.php [L] -RewriteRule ^wp-login.php(.*) BASE/wp-inst/wp-login.php [L] -RewriteRule ^wp-mail.php(.*) BASE/wp-inst/wp-mail.php [L] -RewriteRule ^wp-pass.php(.*) BASE/wp-inst/wp-pass.php [L] -RewriteRule ^wp-rdf.php(.*) BASE/wp-inst/wp-rdf.php [L] -RewriteRule ^wp-register.php(.*) BASE/wp-inst/wp-register.php [L] -RewriteRule ^wp-rss.php(.*) BASE/wp-inst/wp-rss.php [L] -RewriteRule ^wp-rss2.php(.*) BASE/wp-inst/wp-rss2.php [L] -RewriteRule ^wp-sidebar.php(.*) BASE/wp-inst/wp-sidebar.php [L] -RewriteRule ^wp-trackback.php(.*) BASE/wp-inst/wp-trackback.php [L] -RewriteRule ^xmlrpc.php(.*) BASE/wp-inst/xmlrpc.php [L] -RewriteRule ^maintenance.php BASE/wp-inst/maintenance.php [L] -RewriteRule ^favicon.ico /wp-inst/favicon.ico [L] -RewriteRule ^robots.txt /wp-inst/robots.txt [L] - -RewriteRule ^wp-newblog.php BASE/wp-inst/wp-newblog.php [L] -RewriteRule ^signup/ BASE/wp-inst/wp-newblog.php [L] -RewriteRule ^invite/(.*)/? BASE/wp-inst/wp-newblog.php?u=$1 [L] -RewriteRule ^index.php BASE/wp-inst/index.php [L] - -RewriteRule ^$ BASE/wp-inst/index.php [L] ### #### blogs @@ -70,6 +9,7 @@ RewriteRule ^([_0-9a-zA-Z-]+)/templates/(.*) BASE/wp-inst/wp-content/blogs/$1/ RewriteRule ^([_0-9a-zA-Z-]+)/files/(.*) BASE/wp-inst/wp-content/blogs/$1/files/$2 [L] RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/blogs/(.*)/files/(.*) BASE/wp-inst/wp-content/blogs/$1/files/$3 [L] RewriteRule ^([_0-9a-zA-Z-]+)/wp-content/themes/(.*) BASE/wp-inst/wp-content/themes/$2 [L] +RewriteRule ^wp-content/themes/(.*) BASE/wp-inst/wp-content/themes/$1 [L] # rewrite these RewriteRule ^([_0-9a-zA-Z-]+)/category/(.*)/page/(.*)/ BASE/wp-inst/index.php?wpblog=$1&category_name=$2&paged=$3 [L] @@ -113,23 +53,23 @@ RewriteRule ^([_0-9a-zA-Z-]+)/wp-sidebar.php(.*) BASE/wp-inst/wp-sidebar.php [ RewriteRule ^([_0-9a-zA-Z-]+)/wp-trackback.php(.*) BASE/wp-inst/wp-trackback.php [L] RewriteRule ^([_0-9a-zA-Z-]+)/xmlrpc.php(.*) BASE/wp-inst/xmlrpc.php [L] RewriteRule ^([_0-9a-zA-Z-]+)/maintenance.php BASE/wp-inst/maintenance.php [L] -RewriteRule ^([_0-9a-zA-Z-]+)/favicon.ico /wp-inst/favicon.ico [L] +RewriteRule ^([_0-9a-zA-Z-]+)/favicon.ico BASE/wp-inst/favicon.ico [L] +RewriteRule ^([_0-9a-zA-Z-]+)/wp-includes/images/(.*) BASE/wp-inst/wp-includes/images/$2 [L] +RewriteRule ^([_0-9a-zA-Z-]+)/wp-includes/js/(.*) BASE/wp-inst/wp-includes/js/$2 [L] -# pages -RewriteCond REALPATH/wp-inst/wp-content/blogs/%{1} -d -RewriteRule ^([_0-9a-zA-Z-]+)/(.*)/$ BASE/wp-inst/index.php?pagename=$2 [L] +RewriteRule ^wp-newblog.php$ BASE/wp-inst/wp-newblog.php [L] +RewriteRule ^wp-login.php BASE/wp-inst/wp-login.php [L] +RewriteRule ^wp-admin/(.*) BASE/wp-inst/wp-admin/$1 [L] +RewriteRule ^wp-includes/images/(.*) BASE/wp-inst/wp-includes/images/$1 [L] +RewriteRule ^wp-includes/js/(.*) BASE/wp-inst/wp-includes/js/$1 [L] +RewriteRule ^signup/ BASE/wp-inst/wp-newblog.php [L] +RewriteRule ^invite/(.*)/? BASE/wp-inst/wp-newblog.php?u=$1 [L] +RewriteRule ^index.php BASE/wp-inst/index.php [L] -RewriteRule ^(.*)/$ BASE/wp-inst/index.php?pagename=$1 [L] +RewriteRule ^$ BASE/wp-inst/index.php [L] # catch all rules -RewriteCond REALPATH/wp-inst/wp-content/blogs/%{1} -d RewriteRule ^([_0-9a-zA-Z-]+)/ BASE/wp-inst/index.php [L] - -RewriteRule ^([_0-9a-zA-Z-]+)/(.+)$ BASE/wp-inst/$2 [L] - -RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^(.+[^/])$ BASE/ [R,L] -RewriteCond REALPATH/wp-inst/wp-content/blogs/%{1} -d -RewriteRule ^(.*[^/])$ BASE/$1/ [R,L] +RewriteRule ^([_0-9a-zA-Z-]+) $1/ [R,L] AddType text/css .css @@ -61,7 +61,7 @@ text-align: center; border-top: 1px solid #ccc; padding-top: 1em; font-style: it </head> <body> -<div align="center"><img src="wp-inst/wp-images/wordpress-mu.png"></div><br> +<div align="center"><img src="wp-inst/wp-includes/images/wordpress-mu.png"></div><br> Welcome to WordPress MU, the Multi User Weblog System built on WordPress.<br><br> '; } @@ -262,6 +262,7 @@ function printstep1form( $dbname = 'wordpress', $uname = 'username', $pwd = 'pas <h1>Virtual Server Support</h1> <p>Each blog on your site will have their own hostname or 'sub domain'. Your blog addresses will appear like <span class='fakelink'>http://joesblog.example.com/</span> instead of <span class='fakelink'>http://www.example.com/joesblog/</span> but you need to do a few more things to Apache and your DNS settings before it'll work.</p> <p>Apache will have to have a <q>wildcard</q> alias configured in the virtual server definition of your server. You'll have to add a wildcard DNS record for your domain too. That's usually as easy as adding a <q>*</q> hostname in your online dns software.</p> + <p>Virtual Server Support: <input type='radio' name='vhost' value='yes'> Yes <input type='radio' name='vhost' value='no' checked>No</p> <p>More: <ul><li> <a href='http://codewalkers.com/archives/general_admin/234.html'>Sub-domain catch-all with Apache</a> via <a href='http://www.google.com/search?q=apache+wildcard+alias'>Google Search: apache wildcard alias</a></li><li> <a href='http://photomatt.net/2003/10/10/wildcard-dns-and-sub-domains/'>Wildcard dns and sub domains</a> via <a href='http://www.google.com/search?q=dns+wildcard+sub+domain'>Google Search: dns wildcard sub domain</a></li><li><a href='http://mu.wordpress.org/forums/topic/126#post-677'>mu forums: how to setup vhosts</a></li></ul></p> <br /> <h1>Database</h1> @@ -349,7 +350,7 @@ function step2() { fwrite($handle, str_replace("localhost", $dbhost, $line)); break; case "define('VHOST', ": - fwrite($handle, str_replace("VHOSTSETTING", 'yes', $line)); + fwrite($handle, str_replace("VHOSTSETTING", $vhost, $line)); break; case '$table_prefix =': fwrite($handle, str_replace('wp_', $prefix, $line)); @@ -428,15 +429,18 @@ SITE_NAME')" ); $res = createBlog( $domain, $base, 'admin', $weblog_title, $email ); if( $res == 'ok' ) { $url = "http://".$_SERVER["HTTP_HOST"] . $base; - $realpath = dirname(__FILE__); - do_htaccess( "htaccess.dist", ".htaccess", $realpath, $base, $url ); - do_htaccess( "wp-inst/htaccess.dist", "wp-inst/.htaccess", $realpath, $base, $url ); - - $illegal_names = array( "www", "web", "root", "admin", "main", "invite", "administrator", "blog" ); - add_site_settings( "illegal_names", $illegal_names ); - - print "<p>Well Done! Your blog has been set up and you have been sent details of your login and password in an email.</p>"; - print "<p>You may view your new blog by visiting <a href='".$url."'>".$url."</a>!</p>"; + update_option( "template", "home" ); + update_option( "stylesheet", "home" ); + add_site_option( "allowed_themes", 'a:2:{s:17:"WordPress Classic";b:1;s:17:"WordPress Default";b:1;}' ); + $realpath = dirname(__FILE__); + do_htaccess( "htaccess.dist", ".htaccess", $realpath, $base, $url ); + do_htaccess( "wp-inst/htaccess.dist", "wp-inst/.htaccess", $realpath, $base, $url ); + + $illegal_names = array( "www", "web", "root", "admin", "main", "invite", "administrator", "blog" ); + add_site_settings( "illegal_names", $illegal_names ); + + print "<p>Well Done! Your blog has been set up and you have been sent details of your login and password in an email.</p>"; + print "<p>You may view your new blog by visiting <a href='".$url."'>".$url."</a>!</p>"; } else { if( $res == 'error: problem creating blog entry' ) { print "The <q>main</q> blog has already been created. Edit your blogs table and delete the entry for this domain!"; diff --git a/wp-inst/wp-content/themes/home/404.php b/wp-inst/wp-content/themes/home/404.php new file mode 100644 index 0000000..01a8e8a --- /dev/null +++ b/wp-inst/wp-content/themes/home/404.php @@ -0,0 +1,11 @@ +<?php get_header(); ?> + + <div id="content" class="narrowcolumn"> + + <h2 class="center">Error 404 - Not Found</h2> + + </div> + +<?php get_sidebar(); ?> + +<?php get_footer(); ?>
\ No newline at end of file diff --git a/wp-inst/wp-content/themes/home/archive.php b/wp-inst/wp-content/themes/home/archive.php new file mode 100644 index 0000000..b6f42d2 --- /dev/null +++ b/wp-inst/wp-content/themes/home/archive.php @@ -0,0 +1,68 @@ +<?php get_header(); ?> + + <div id="content" class="narrowcolumn"> + + <?php if (have_posts()) : ?> + + <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?> +<?php /* If this is a category archive */ if (is_category()) { ?> + <h2 class="pagetitle">Archive for the '<?php echo single_cat_title(); ?>' Category</h2> + + <?php /* If this is a daily archive */ } elseif (is_day()) { ?> + <h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2> + + <?php /* If this is a monthly archive */ } elseif (is_month()) { ?> + <h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2> + + <?php /* If this is a yearly archive */ } elseif (is_year()) { ?> + <h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2> + + <?php /* If this is a search */ } elseif (is_search()) { ?> + <h2 class="pagetitle">Search Results</h2> + + <?php /* If this is an author archive */ } elseif (is_author()) { ?> + <h2 class="pagetitle">Author Archive</h2> + + <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> + <h2 class="pagetitle">Blog Archives</h2> + + <?php } ?> + + + <div class="navigation"> + <div class="alignleft"><?php previous_posts_link('« Previous Entries') ?></div> + <div class="alignright"><?php next_posts_link('Next Entries »') ?></div> + </div> + + <?php while (have_posts()) : the_post(); ?> + <div class="post"> + <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3> + <small><?php the_time('l, F jS, Y') ?></small> + + <div class="entry"> + <?php the_excerpt() ?> + </div> + + <p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?> <?php comments_popup_link('No Comments »', '1 Comment »', '% Comments »'); ?></p> + + </div> + + <?php endwhile; ?> + + <div class="navigation"> + <div class="alignleft"><?php previous_posts_link('« Previous Entries') ?></div> + <div class="alignright"><?php next_posts_link('Next Entries »') ?></div> + </div> + + <?php else : ?> + + <h2 class="center">Not Found</h2> + <?php include (TEMPLATEPATH . '/searchform.php'); ?> + + <?php endif; ?> + + </div> + +<?php get_sidebar(); ?> + +<?php get_footer(); ?> diff --git a/wp-inst/wp-content/themes/home/archives.php b/wp-inst/wp-content/themes/home/archives.php new file mode 100644 index 0000000..ae9d8dd --- /dev/null +++ b/wp-inst/wp-content/themes/home/archives.php @@ -0,0 +1,25 @@ +<?php +/* +Template Name: Archives +*/ +?> + +<?php get_header(); ?> + +<div id="content" class="widecolumn"> + +<?php include (TEMPLATEPATH . '/searchform.php'); ?> + +<h2>Archives by Month:</h2> + <ul> + <?php wp_get_archives('type=monthly'); ?> + </ul> + +<h2>Archives by Subject:</h2> + <ul> + <?php wp_list_cats(); ?> + </ul> + +</div> + +<?php get_footer(); ?> diff --git a/wp-inst/wp-content/themes/home/comments-popup.php b/wp-inst/wp-content/themes/home/comments-popup.php new file mode 100644 index 0000000..f01e3eb --- /dev/null +++ b/wp-inst/wp-content/themes/home/comments-popup.php @@ -0,0 +1,113 @@ +<?php +/* Don't remove these lines. */ +add_filter('comment_text', 'popuplinks'); +foreach ($posts as $post) { start_wp(); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <title><?php echo get_settings('blogname'); ?> - Comments on <?php the_title(); ?></title> + + <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" /> + <style type="text/css" media="screen"> + @import url( <?php bloginfo('stylesheet_url'); ?> ); + body { margin: 3px; } + </style> + +</head> +<body id="commentspopup"> + +<h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1> + +<h2 id="comments">Comments</h2> + +<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p> + +<?php if ('open' == $post->ping_status) { ?> +<p>The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em><?php trackback_url() ?></em></p> +<?php } ?> + +<?php +// this line is WordPress' motor, do not delete it. +$comment_author = (isset($_COOKIE['comment_author_' . COOKIEHASH])) ? trim($_COOKIE['comment_author_'. COOKIEHASH]) : ''; +$comment_author_email = (isset($_COOKIE['comment_author_email_'. COOKIEHASH])) ? trim($_COOKIE['comment_author_email_'. COOKIEHASH]) : ''; +$comment_author_url = (isset($_COOKIE['comment_author_url_'. COOKIEHASH])) ? trim($_COOKIE['comment_author_url_'. COOKIEHASH]) : ''; +$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1' ORDER BY comment_date"); +$commentstatus = $wpdb->get_row("SELECT comment_status, post_password FROM $wpdb->posts WHERE ID = $id"); +if (!empty($commentstatus->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH] != $commentstatus->post_password) { // and it doesn't match the cookie + echo(get_the_password_form()); +} else { ?> + +<?php if ($comments) { ?> +<ol id="commentlist"> +<?php foreach ($comments as $comment) { ?> + <li id="comment-<?php comment_ID() ?>"> + <?php comment_text() ?> + <p><cite><?php comment_type('Comment', 'Trackback', 'Pingback'); ?> by <?php comment_author_link() ?> — <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p> + </li> + +<?php } // end for each comment ?> +</ol> +<?php } else { // this is displayed if there are no comments so far ?> + <p>No comments yet.</p> +<?php } ?> + +<?php if ('open' == $commentstatus->comment_status) { ?> +<h2>Leave a comment</h2> +<p>Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p> + +<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform"> + <p> + <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" /> + <label for="author">Name</label> + <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /> + <input type="hidden" name="redirect_to" value="<?php echo wp_specialchars($_SERVER["REQUEST_URI"]); ?>" /> + </p> + + <p> + <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" /> + <label for="email">E-mail</label> + </p> + + <p> + <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" /> + <label for="url"><acronym title="Uniform Resource Identifier">URI</acronym></label> + </p> + + <p> + <label for="comment">Your Comment</label> + <br /> + <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea> + </p> + + <p> + <input name="submit" type="submit" tabindex="5" value="Say It!" /> + </p> + <?php do_action('comment_form', $post->ID); ?> +</form> +<?php } else { // comments are closed ?> +<p>Sorry, the comment form is closed at this time.</p> +<?php } +} // end password check +?> + +<div><strong><a href="javascript:window.close()">Close this window.</a></strong></div> + +<?php // if you delete this the sky will fall on your head +} +?> + +<!-- // this is just the end of the motor - don't touch that line either :) --> +<?php //} ?> +<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>Wordpress</strong></a></cite></p> +<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?> +<script type="text/javascript"> +<!-- +document.onkeypress = function esc(e) { + if(typeof(e) == "undefined") { e=event; } + if (e.keyCode == 27) { self.close(); } +} +// --> +</script> +</body> +</html> diff --git a/wp-inst/wp-content/themes/home/comments.php b/wp-inst/wp-content/themes/home/comments.php new file mode 100644 index 0000000..dff40d8 --- /dev/null +++ b/wp-inst/wp-content/themes/home/comments.php @@ -0,0 +1,104 @@ +<?php // Do not delete these lines + if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) + die ('Please do not load this page directly. Thanks!'); + + if (!empty($post->post_password)) { // if there's a password + if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) { // and it doesn't match the cookie + ?> + + <p class="nocomments">This post is password protected. Enter the password to view comments.<p> + + <?php + return; + } + } + + /* This variable is for alternating comment background */ + $oddcomment = 'alt'; +?> + +<!-- You can start editing here. --> + +<?php if ($comments) : ?> + <h3 id="comments"><?php comments_number('No Responses', 'One Response', '% Responses' );?> to “<?php the_title(); ?>”</h3> + + <ol class="commentlist"> + + <?php foreach ($comments as $comment) : ?> + + <li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>"> + <cite><?php comment_author_link() ?></cite> Says: + <?php if ($comment->comment_approved == '0') : ?> + <em>Your comment is awaiting moderation.</em> + <?php endif; ?> + <br /> + + <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('e','',''); ?></small> + + <?php comment_text() ?> + + </li> + + <?php /* Changes every other comment to a different class */ + if ('alt' == $oddcomment) $oddcomment = ''; + else $oddcomment = 'alt'; + ?> + + <?php endforeach; /* end for each comment */ ?> + + </ol> + + <?php else : // this is displayed if there are no comments so far ?> + + <?php if ('open' == $post->comment_status) : ?> + <!-- If comments are open, but there are no comments. --> + + <?php else : // comments are closed ?> + <!-- If comments are closed. --> + <p class="nocomments">Comments are closed.</p> + + <?php endif; ?> +<?php endif; ?> + + +<?php if ('open' == $post->comment_status) : ?> + +<h3 id="respond">Leave a Reply</h3> + +<?php if ( get_option('comment_registration') && !$user_ID ) : ?> +<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>">logged in</a> to post a comment.</p> +<?php else : ?> + +<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform"> + +<?php if ( $user_ID ) : ?> + +<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Logout »</a></p> + +<?php else : ?> + +<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" /> +<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p> + +<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" /> +<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p> + +<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" /> +<label for="url"><small>Website</small></label></p> + +<?php endif; ?> + +<!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>--> + +<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p> + +<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" /> +<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /> +</p> +<?php do_action('comment_form', $post->ID); ?> + +</form> + +<?php endif; // If registration required and not logged in ?> + +<?php endif; // if you delete this the sky will fall on your head ?> diff --git a/wp-inst/wp-content/themes/home/footer.php b/wp-inst/wp-content/themes/home/footer.php new file mode 100644 index 0000000..9ee08e2 --- /dev/null +++ b/wp-inst/wp-content/themes/home/footer.php @@ -0,0 +1,20 @@ + +<hr /> +<div id="footer"> + <p> + <?php bloginfo('name'); ?> is proudly powered by + <a href="http://wordpress.org">WordPress</a> + <br /><a href="feed:<?php bloginfo('rss2_url'); ?>">Entries (RSS)</a> + and <a href="feed:<?php bloginfo('comments_rss2_url'); ?>">Comments (RSS)</a>. + <!-- <?php echo $wpdb->num_queries; ?> queries. <?php timer_stop(1); ?> seconds. --> + </p> +</div> +</div> + +<!-- Gorgeous design by Michael Heilemann - http://binarybonsai.com/kubrick/ --> +<?php /* "Just what do you think you're doing Dave?" */ ?> + + <?php wp_footer(); ?> + +</body> +</html>
\ No newline at end of file diff --git a/wp-inst/wp-content/themes/home/header.php b/wp-inst/wp-content/themes/home/header.php new file mode 100644 index 0000000..99ff334 --- /dev/null +++ b/wp-inst/wp-content/themes/home/header.php @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + +<head profile="http://gmpg.org/xfn/11"> +<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> + +<title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> » Blog Archive <?php } ?> <?php wp_title(); ?></title> + +<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats --> + +<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" /> +<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" /> +<link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" /> +<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" /> +<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" /> + +<style type="text/css" media="screen"> +/* To accomodate differing install paths of WordPress, images are referred only here, + and not in the wp-layout.css file. If you prefer to use only CSS for colors and what + not, then go right ahead and delete the following lines, and the image files. */ + + body { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbgcolor.jpg"); } +<?php /* Checks to see whether it needs a sidebar or not */ if ((! $withcomments) && (! is_single())) { ?> + #page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg.jpg") repeat-y top; border: none; } +<?php } else { // No sidebar ?> + #page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbgwide.jpg") repeat-y top; border: none; } +<?php } ?> + #header { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickheader.jpg") no-repeat bottom center; } + #footer { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickfooter.jpg") no-repeat bottom; border: none;} + +/* Because the template is slightly different, size-wise, with images, this needs to be set here + If you don't want to use the template's images, you can also delete the following two lines. */ + + #header { margin: 0 !important; margin: 0 0 0 1px; padding: 1px; height: 198px; width: 758px; } + #headerimg { margin: 7px 9px 0; height: 192px; width: 740px; } + +/* To ease the insertion of a personal header image, I have done it in such a way, + that you simply drop in an image called 'personalheader.jpg' into your /images/ + directory. Dimensions should be at least 760px x 200px. Anything above that will + get cropped off of the image. */ + /* + #headerimg { background: url('<?php bloginfo('stylesheet_directory'); ?>/images/personalheader.jpg') no-repeat top;} + */ +</style> + +<?php wp_get_archives('type=monthly&format=link'); ?> + +<?php wp_head(); ?> +</head> +<body> + +<div id="page"> + + +<div id="header"> + <div id="headerimg"> + <h1><a href="<?php echo get_settings('home'); ?>"><?php bloginfo('name'); ?></a></h1> + <div class="description"><?php bloginfo('description'); ?></div> + </div> +</div> +<hr /> diff --git a/wp-inst/wp-content/themes/home/home.php b/wp-inst/wp-content/themes/home/home.php new file mode 100644 index 0000000..e2e4c49 --- /dev/null +++ b/wp-inst/wp-content/themes/home/home.php @@ -0,0 +1,15 @@ +<?php get_header(); ?> + + <div id="content" class="widecolumn"> + + <h2><?php echo $current_site->site_name ?></h2> + <p>This is a <a href="http://mu.wordpress.org/">WordPress Mu</a> powered site.</p> + <p>You can: <ul><li> <a href="wp-login.php">Login</a> </li><li> <a href="wp-newblog.php">Create a new blog</a></li><li> Edit thie file at <code>wp-content/themes/home/home.php</code> with your favourite text editor and customize this screen.</li></ul></p> + <?php if( constant( "VHOST" ) == 'no' ) :?> + <h3>Virtual Hosts</h3> + <p>As you are not using virtual hosts, it is not possible to post anything to this primary blog because the URLs of your posts could potentially conflict with weblogs living at this site. Please consider using virtual hosts as <a href="http://mu.wordpress.org/forums/topic/99">described here</a> instead so that your website will have http://blogname.<?php echo $_SERVER[ 'HTTP_HOST' ] ?>/ format addresses instead of http://<?php echo $_SERVER[ 'HTTP_HOST' ] ?>/blogname/ format.</p> + <?php endif; ?> + + </div> + +<?php get_footer(); ?> diff --git a/wp-inst/wp-content/themes/home/images/kubrickbg.jpg b/wp-inst/wp-content/themes/home/images/kubrickbg.jpg Binary files differnew file mode 100644 index 0000000..dc74fb8 --- /dev/null +++ b/wp-inst/wp-content/themes/home/images/kubrickbg.jpg diff --git a/wp-inst/wp-content/themes/home/images/kubrickbgcolor.jpg b/wp-inst/wp-content/themes/home/images/kubrickbgcolor.jpg Binary files differnew file mode 100644 index 0000000..4653b68 --- /dev/null +++ b/wp-inst/wp-content/themes/home/images/kubrickbgcolor.jpg diff --git a/wp-inst/wp-content/themes/home/images/kubrickbgwide.jpg b/wp-inst/wp-content/themes/home/images/kubrickbgwide.jpg Binary files differnew file mode 100644 index 0000000..77096f2 --- /dev/null +++ b/wp-inst/wp-content/themes/home/images/kubrickbgwide.jpg diff --git a/wp-inst/wp-content/themes/home/images/kubrickfooter.jpg b/wp-inst/wp-content/themes/home/images/kubrickfooter.jpg Binary files differnew file mode 100644 index 0000000..d7a4c65 --- /dev/null +++ b/wp-inst/wp-content/themes/home/images/kubrickfooter.jpg diff --git a/wp-inst/wp-content/themes/home/images/kubrickheader.jpg b/wp-inst/wp-content/themes/home/images/kubrickheader.jpg Binary files differnew file mode 100644 index 0000000..69441ee --- /dev/null +++ b/wp-inst/wp-content/themes/home/images/kubrickheader.jpg diff --git a/wp-inst/wp-content/themes/home/index.php b/wp-inst/wp-content/themes/home/index.php new file mode 100644 index 0000000..0e76687 --- /dev/null +++ b/wp-inst/wp-content/themes/home/index.php @@ -0,0 +1,39 @@ +<?php get_header(); ?> + + <div id="content" class="narrowcolumn"> + + <?php if (have_posts()) : ?> + + <?php while (have_posts()) : the_post(); ?> + + <div class="post" id="post-<?php the_ID(); ?>"> + <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2> + <small><?php the_time('F jS, Y') ?> <!-- by <?php the_author() ?> --></small> + + <div class="entry"> + <?php the_content('Read the rest of this entry »'); ?> + </div> + + <p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?> <?php comments_popup_link('No Comments »', '1 Comment »', '% Comments »'); ?></p> + </div> + + <?php endwhile; ?> + + <div class="navigation"> + <div class="alignleft"><?php next_posts_link('« Previous Entries') ?></div> + <div class="alignright"><?php previous_posts_link('Next Entries »') ?></div> + </div> + + <?php else : ?> + + <h2 class="center">Not Found</h2> + <p class="center">Sorry, but you are looking for something that isn't here.</p> + <?php include (TEMPLATEPATH . "/searchform.php"); ?> + + <?php endif; ?> + + </div> + +<?php get_sidebar(); ?> + +<?php get_footer(); ?> diff --git a/wp-inst/wp-content/themes/home/links.php b/wp-inst/wp-content/themes/home/links.php new file mode 100644 index 0000000..2970897 --- /dev/null +++ b/wp-inst/wp-content/themes/home/links.php @@ -0,0 +1,18 @@ +<?php +/* +Template Name: Links +*/ +?> + +<?php get_header(); ?> + +<div id="content" class="widecolumn"> + +<h2>Links:</h2> +<ul> +<?php get_links_list(); ?> +</ul> + +</div> + +<?php get_footer(); ?> diff --git a/wp-inst/wp-content/themes/home/page.php b/wp-inst/wp-content/themes/home/page.php new file mode 100644 index 0000000..5f914c1 --- /dev/null +++ b/wp-inst/wp-content/themes/home/page.php @@ -0,0 +1,21 @@ +<?php get_header(); ?> + + <div id="content" class="narrowcolumn"> + + <?php if (have_posts()) : while (have_posts()) : the_post(); ?> + <div class="post" id="post-<?php the_ID(); ?>"> + <h2><?php the_title(); ?></h2> + <div class="entrytext"> + <?php the_content('<p class="serif">Read the rest of this page »</p>'); ?> + + <?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?> + + </div> + </div> + <?php endwhile; endif; ?> + <?php edit_post_link('Edit this entry.', '<p>', '</p>'); ?> + </div> + +<?php get_sidebar(); ?> + +<?php get_footer(); ?>
\ No newline at end of file diff --git a/wp-inst/wp-content/themes/home/screenshot.png b/wp-inst/wp-content/themes/home/screenshot.png Binary files differnew file mode 100644 index 0000000..e0b1d48 --- /dev/null +++ b/wp-inst/wp-content/themes/home/screenshot.png diff --git a/wp-inst/wp-content/themes/home/search.php b/wp-inst/wp-content/themes/home/search.php new file mode 100644 index 0000000..602a19d --- /dev/null +++ b/wp-inst/wp-content/themes/home/search.php @@ -0,0 +1,46 @@ +<?php get_header(); ?> + + <div id="content" class="narrowcolumn"> + + <?php if (have_posts()) : ?> + + <h2 class="pagetitle">Search Results</h2> + + <div class="navigation"> + <div class="alignleft"><?php next_posts_link('« Previous Entries') ?></div> + <div class="alignright"><?php previous_posts_link('Next Entries »') ?></div> + </div> + + + <?php while (have_posts()) : the_post(); ?> + + <div class="post"> + <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h3> + <small><?php the_time('l, F jS, Y') ?></small> + + <div class="entry"> + <?php the_excerpt() ?> + </div> + + <p class="postmetadata">Posted in <?php the_category(', ') ?> <strong>|</strong> <?php edit_post_link('Edit','','<strong>|</strong>'); ?> <?php comments_popup_link('No Comments »', '1 Comment »', '% Comments »'); ?></p> + </div> + + <?php endwhile; ?> + + <div class="navigation"> + <div class="alignleft"><?php next_posts_link('« Previous Entries') ?></div> + <div class="alignright"><?php previous_posts_link('Next Entries »') ?></div> + </div> + + <?php else : ?> + + <h2 class="center">Not Found</h2> + <?php include (TEMPLATEPATH . '/searchform.php'); ?> + + <?php endif; ?> + + </div> + +<?php get_sidebar(); ?> + +<?php get_footer(); ?>
\ No newline at end of file diff --git a/wp-inst/wp-content/themes/home/searchform.php b/wp-inst/wp-content/themes/home/searchform.php new file mode 100644 index 0000000..340a34b --- /dev/null +++ b/wp-inst/wp-content/themes/home/searchform.php @@ -0,0 +1,5 @@ +<form method="get" id="searchform" action="<?php echo $_SERVER['PHP_SELF']; ?>"> +<div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" /> +<input type="submit" id="searchsubmit" value="Search" /> +</div> +</form>
\ No newline at end of file diff --git a/wp-inst/wp-content/themes/home/sidebar.php b/wp-inst/wp-content/themes/home/sidebar.php new file mode 100644 index 0000000..e74ecf7 --- /dev/null +++ b/wp-inst/wp-content/themes/home/sidebar.php @@ -0,0 +1,72 @@ + <div id="sidebar"> + <ul> + + <li> + <?php include (TEMPLATEPATH . '/searchform.php'); ?> + </li> + + <!-- Author information is disabled per default. Uncomment and fill in your details if you want to use it. + <li><h2>Author</h2> + <p>A little something about you, the author. Nothing lengthy, just an overview.</p> + </li> + --> + + <li> + <?php /* If this is a 404 page */ if (is_404()) { ?> + <?php /* If this is a category archive */ } elseif (is_category()) { ?> + <p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p> + + <?php /* If this is a yearly archive */ } elseif (is_day()) { ?> + <p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives + for the day <?php the_time('l, F jS, Y'); ?>.</p> + + <?php /* If this is a monthly archive */ } elseif (is_month()) { ?> + <p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives + for <?php the_time('F, Y'); ?>.</p> + + <?php /* If this is a yearly archive */ } elseif (is_year()) { ?> + <p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives + for the year <?php the_time('Y'); ?>.</p> + + <?php /* If this is a monthly archive */ } elseif (is_search()) { ?> + <p>You have searched the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives + for <strong>'<?php echo wp_specialchars($s); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p> + + <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> + <p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives.</p> + + <?php } ?> + </li> + + <?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?> + + <li><h2>Archives</h2> + <ul> + <?php wp_get_archives('type=monthly'); ?> + </ul> + </li> + + <li><h2>Categories</h2> + <ul> + <?php wp_list_cats('sort_column=name&optioncount=1&hierarchical=0'); ?> + </ul> + </li> + + <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?> + <?php get_links_list(); ?> + + <li><h2>Meta</h2> + <ul> + <?php wp_register(); ?> + <li><?php wp_loginout(); ?></li> + <li><a href="http://validator.w3.org/check/referer" title="This page validates as XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li> + <li><a href="http://gmpg.org/xfn/"><abbr title="XHTML Friends Network">XFN</abbr></a></li> + <li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li> + <?php wp_meta(); ?> + </ul> + </li> + <?php } ?> + + </ul> + </div> + diff --git a/wp-inst/wp-content/themes/home/single.php b/wp-inst/wp-content/themes/home/single.php new file mode 100644 index 0000000..1130d2f --- /dev/null +++ b/wp-inst/wp-content/themes/home/single.php @@ -0,0 +1,65 @@ +<?php get_header(); ?> + + <div id="content" class="widecolumn"> + + <?php if (have_posts()) : while (have_posts()) : the_post(); ?> + + <div class="navigation"> + <div class="alignleft"><?php previous_post_link('« %link') ?></div> + <div class="alignright"><?php next_post_link('%link »') ?></div> + </div> + + <div class="post" id="post-<?php the_ID(); ?>"> + <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h2> + + <div class="entrytext"> + <?php the_content('<p class="serif">Read the rest of this entry »</p>'); ?> + + <?php link_pages('<p><strong>Pages:</strong> ', '</p>', 'number'); ?> + + <p class="postmetadata alt"> + <small> + This entry was posted + <?php /* This is commented, because it requires a little adjusting sometimes. + You'll need to download this plugin, and follow the instructions: + http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */ + /* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?> + on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?> + and is filed under <?php the_category(', ') ?>. + You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed. + + <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) { + // Both Comments and Pings are open ?> + You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site. + + <?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) { + // Only Pings are Open ?> + Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site. + + <?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) { + // Comments are open, Pings are not ?> + You can skip to the end and leave a response. Pinging is currently not allowed. + + <?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) { + // Neither Comments, nor Pings are open ?> + Both comments and pings are currently closed. + + <?php } edit_post_link('Edit this entry.','',''); ?> + + </small> + </p> + + </div> + </div> + + <?php comments_template(); ?> + + <?php endwhile; else: ?> + + <p>Sorry, no posts matched your criteria.</p> + +<?php endif; ?> + + </div> + +<?php get_footer(); ?> diff --git a/wp-inst/wp-content/themes/home/style.css b/wp-inst/wp-content/themes/home/style.css new file mode 100644 index 0000000..7da50b4 --- /dev/null +++ b/wp-inst/wp-content/themes/home/style.css @@ -0,0 +1,610 @@ +/* +Theme Name: WordPress MU Home Default +Theme URI: http://wordpress.org/ +Description: The default WordPress theme based on the famous <a href="http://binarybonsai.com/kubrick/">Kubrick</a>. +Version: 1.5 +Author: Michael Heilemann +Author URI: http://binarybonsai.com/ + + Kubrick v1.5 + http://binarybonsai.com/kubrick/ + + This theme was designed and built by Michael Heilemann, + whose blog you will find at http://binarybonsai.com/ + + The CSS, XHTML and design is released under GPL: + http://www.opensource.org/licenses/gpl-license.php + + + *** REGARDING IMAGES *** + All CSS that involves the use of images, can be found in the 'index.php' file. + This is to ease installation inside subdirectories of a server. + + Have fun, and don't be afraid to contact me if you have questions. +*/ + + + +/* Begin Typography & Colors */ +body { + font-size: 62.5%; /* Resets 1em to 10px */ + font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif; + background-color: #d5d6d7; + color: #333; + text-align: center; + } + +#page { + background-color: white; + border: 1px solid #959596; + text-align: left; + } + +#header { + background-color: #73a0c5; + } + +#content { + font-size: 1.2em + } + +.widecolumn .entry p { + font-size: 1.05em; + } + +.narrowcolumn .entry, .widecolumn .entry { + line-height: 1.4em; + } + +.widecolumn { + line-height: 1.6em; + } + +.narrowcolumn .postmetadata { + text-align: center; + } + +.alt { + background-color: #f8f8f8; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + } + +#footer { + background-color: #eee; + } + +small { + font-family: Arial, Helvetica, Sans-Serif; + font-size: 0.9em; + line-height: 1.5em; + } + +h1, h2, h3 { + font-family: 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; + font-weight: bold; + } + +h1 { + font-size: 4em; + text-align: center; + } + +.description { + font-size: 1.2em; + text-align: center; + } + +h2 { + font-size: 1.6em; + } + +h2.pagetitle { + font-size: 1.6em; + } + +#sidebar h2 { + font-family: 'Lucida Grande', Verdana, Sans-Serif; + font-size: 1.2em; + } + +h3 { + font-size: 1.3em; + } + +h1, h1 a, h1 a:hover, h1 a:visited, .description { + text-decoration: none; + color: white; + } + +h2, h2 a, h2 a:visited, h3, h3 a, h3 a:visited { + color: #333; + } + +h2, h2 a, h2 a:hover, h2 a:visited, h3, h3 a, h3 a:hover, h3 a:visited, #sidebar h2, #wp-calendar caption, cite { + text-decoration: none; + } + +.entry p a:visited { + color: #b85b5a; + } + +.commentlist li, #commentform input, #commentform textarea { + font: 0.9em 'Lucida Grande', Verdana, Arial, Sans-Serif; + } + +.commentlist li { + font-weight: bold; + } + +.commentlist cite, .commentlist cite a { + font-weight: bold; + font-style: normal; + font-size: 1.1em; + } + +.commentlist p { + font-weight: normal; + line-height: 1.5em; + text-transform: none; + } + +#commentform p { + font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif; + } + +.commentmetadata { + font-weight: normal; + } + +#sidebar { + font: 1em 'Lucida Grande', Verdana, Arial, Sans-Serif; + } + +small, #sidebar ul ul li, #sidebar ul ol li, .nocomments, .postmetadata, blockquote, strike { + color: #777; + } + +code { + font: 1.1em 'Courier New', Courier, Fixed; + } + +acronym, abbr, span.caps +{ + font-size: 0.9em; + letter-spacing: .07em; + } + +a, h2 a:hover, h3 a:hover { + color: #06c; + text-decoration: none; + } + +a:hover { + color: #147; + text-decoration: underline; + } + +#wp-calendar #prev a { + font-size: 9pt; + } + +#wp-calendar a { + text-decoration: none; + } + +#wp-calendar caption { + font: bold 1.3em 'Lucida Grande', Verdana, Arial, Sans-Serif; + text-align: center; + } + +#wp-calendar th { + font-style: normal; + text-transform: capitalize; + } +/* End Typography & Colors */ + + + +/* Begin Structure */ +body { + margin: 0; + padding: 0; + } + +#page { + background-color: white; + margin: 20px auto; + padding: 0; + width: 760px; + border: 1px solid #959596; + } + +#header { + padding: 0; + margin: 0 auto; + height: 200px; + width: 100%; + background-color: #73a0c5; + } + +#headerimg { + margin: 0; + height: 200px; + width: 100%; + } + +.narrowcolumn { + float: left; + padding: 0 0 20px 45px; + margin: 0px 0 0; + width: 450px; + } + +.widecolumn { + padding: 10px 0 20px 0; + margin: 5px 0 0 150px; + width: 450px; + } + +.post { + margin: 0 0 40px; + text-align: justify; + } + +.widecolumn .post { + margin: 0; + } + +.narrowcolumn .postmetadata { + padding-top: 5px; + } + +.widecolumn .postmetadata { + margin: 30px 0; + } + +#footer { + padding: 0 0 0 1px; + margin: 0 auto; + width: 760px; + clear: both; + } + +#footer p { + margin: 0; + padding: 20px 0; + text-align: center; + } +/* End Structure */ + + + +/* Begin Headers */ +h1 { + padding-top: 70px; + margin: 0; + } + +.description { + text-align: center; + } + +h2 { + margin: 30px 0 0; + } + +h2.pagetitle { + margin-top: 30px; + text-align: center; +} + +#sidebar h2 { + margin: 5px 0 0; + padding: 0; + } + +h3 { + padding: 0; + margin: 30px 0 0; + } + +h3.comments { + padding: 0; + margin: 40px auto 20px ; + } +/* End Headers */ + + + +/* Begin Images */ +p img { + padding: 0; + max-width: 100%; + } + +/* Using 'class="alignright"' on an image will (who would've + thought?!) align the image to the right. And using 'class="centered', + will of course center the image. This is much better than using + align="center", being much more futureproof (and valid) */ + +img.centered { + display: block; + margin-left: auto; + margin-right: auto; + } + +img.alignright { + padding: 4px; + margin: 0 0 2px 7px; + display: inline; + } + +img.alignleft { + padding: 4px; + margin: 0 7px 2px 0; + display: inline; + } + +.alignright { + float: right; + } + +.alignleft { + float: left + } +/* End Images */ + + + +/* Begin Lists + + Special stylized non-IE bullets + Do not work in Internet Explorer, which merely default to normal bullets. */ + +html>body .entry ul { + margin-left: 0px; + padding: 0 0 0 30px; + list-style: none; + padding-left: 10px; + text-indent: -10px; + } + +html>body .entry li { + margin: 7px 0 8px 10px; + } + +.entry ul li:before, #sidebar ul ul li:before { + content: "\00BB \0020"; + } + +.entry ol { + padding: 0 0 0 35px; + margin: 0; + } + +.entry ol li { + margin: 0; + padding: 0; + } + +.postmetadata ul, .postmetadata li { + display: inline; + list-style-type: none; + list-style-image: none; + } + +#sidebar ul, #sidebar ul ol { + margin: 0; + padding: 0; + } + +#sidebar ul li { + list-style-type: none; + list-style-image: none; + margin-bottom: 15px; + } + +#sidebar ul p, #sidebar ul select { + margin: 5px 0 8px; + } + +#sidebar ul ul, #sidebar ul ol { + margin: 5px 0 0 10px; + } + +#sidebar ul ul ul, #sidebar ul ol { + margin: 0 0 0 10px; + } + +ol li, #sidebar ul ol li { + list-style: decimal outside; + } + +#sidebar ul ul li, #sidebar ul ol li { + margin: 3px 0 0; + padding: 0; + } +/* End Entry Lists */ + + + +/* Begin Form Elements */ +#searchform { + margin: 10px auto; + padding: 5px 3px; + text-align: center; + } + +#sidebar #searchform #s { + width: 115px; + padding: 2px; + } + +#sidebar #searchsubmit { + padding: 1px; + } + +.entry form { /* This is mainly for password protected posts, makes them look better. */ + text-align:center; + } + +select { + width: 130px; + } + +#commentform input { + width: 170px; + padding: 2px; + margin: 5px 5px 1px 0; + } + +#commentform textarea { + width: 100%; + padding: 2px; + } + +#commentform #submit { + margin: 0; + float: right; + } +/* End Form Elements */ + + + +/* Begin Comments*/ +.alt { + margin: 0; + padding: 10px; + } + +.commentlist { + padding: 0; + text-align: justify; + } + +.commentlist li { + margin: 15px 0 3px; + padding: 5px 10px 3px; + list-style: none; + } + +.commentlist p { + margin: 10px 5px 10px 0; + } + +#commentform p { + margin: 5px 0; + } + +.nocomments { + text-align: center; + margin: 0; + padding: 0; + } + +.commentmetadata { + margin: 0; + display: block; + } +/* End Comments */ + + + +/* Begin Sidebar */ +#sidebar +{ + padding: 20px 0 10px 0; + margin-left: 545px; + width: 190px; + } + +#sidebar form { + margin: 0; + } +/* End Sidebar */ + + + +/* Begin Calendar */ +#wp-calendar { + empty-cells: show; + margin: 10px auto 0; + width: 155px; + } + +#wp-calendar #next a { + padding-right: 10px; + text-align: right; + } + +#wp-calendar #prev a { + padding-left: 10px; + text-align: left; + } + +#wp-calendar a { + display: block; + } + +#wp-calendar caption { + text-align: center; + width: 100%; + } + +#wp-calendar td { + padding: 3px 0; + text-align: center; + } + +#wp-calendar td.pad:hover { /* Doesn't work in IE */ + background-color: #fff; } +/* End Calendar */ + + + +/* Begin Various Tags & Classes */ +acronym, abbr, span.caps { + cursor: help; + } + +acronym, abbr { + border-bottom: 1px dashed #999; + } + +blockquote { + margin: 15px 30px 0 10px; + padding-left: 20px; + border-left: 5px solid #ddd; + } + +blockquote cite { + margin: 5px 0 0; + display: block; + } + +.center { + text-align: center; + } + +hr { + display: none; + } + +a img { + border: none; + } + +.navigation { + display: block; + text-align: center; + margin-top: 10px; + margin-bottom: 60px; + } +/* End Various Tags & Classes*/ + + + +/* "Daisy, Daisy, give me your answer do. I'm half crazy all for the love of you. + It won't be a stylish marriage, I can't afford a carriage. + But you'll look sweet upon the seat of a bicycle built for two." */ diff --git a/wp-inst/wp-includes/images/wordpress-mu.png b/wp-inst/wp-includes/images/wordpress-mu.png Binary files differnew file mode 100644 index 0000000..8dd6c04 --- /dev/null +++ b/wp-inst/wp-includes/images/wordpress-mu.png diff --git a/wp-inst/wp-includes/wpmu-functions.php b/wp-inst/wp-includes/wpmu-functions.php index ea473ad..9f0b5c8 100644 --- a/wp-inst/wp-includes/wpmu-functions.php +++ b/wp-inst/wp-includes/wpmu-functions.php @@ -162,11 +162,16 @@ function createBlog( $domain, $path, $username, $weblog_title, $admin_email, $si if( defined( "VHOST" ) && constant( "VHOST" ) == 'yes' ) { $url = "http://".$domain.$path; } else { - if( $blogname == 'main' ) { - $url = "http://".$domain.$path; - } else { - $url = "http://".$domain.$path.$blogname; - } + if( $domain != $_SERVER[ 'HTTP_HOST' ] ) { + $blogname = substr( $domain, 0, strpos( $domain, '.' ) ); + if( $blogname != 'www.' ) { + $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path . $blogname . '/'; + } else { // we're installing the main blog + $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path; + } + } else { // we're installing the main blog + $url = 'http://' . $domain . $path; + } } // Set everything up @@ -250,6 +255,8 @@ SITE_NAME" ) ); $message_headers = 'From: ' . stripslashes($weblog_title) . ' <wordpress@' . $_SERVER[ 'SERVER_NAME' ] . '>'; $message = $welcome_email; + if( empty( $current_site->site_name ) ) + $current_site->site_name = "WordPress MU"; @mail($admin_email, __('New ' . $current_site->site_name . ' Blog').": ".stripslashes( $weblog_title ), $message, $message_headers); // remove all perms except for the login user. diff --git a/wp-inst/wp-newblog.php b/wp-inst/wp-newblog.php index fe682e9..20c63b4 100644 --- a/wp-inst/wp-newblog.php +++ b/wp-inst/wp-newblog.php @@ -95,9 +95,11 @@ function determineDirPath() { $result = dirname( $_SERVER["SCRIPT_NAME"] ); $result = str_replace("wp-inst","",$result); + /* if( strlen( $result > 1 ) && substr($result, -1 ) == '/') { $result = substr($result, 0, -1); } + */ return $result; } diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php index 0654802..14cdbb2 100644 --- a/wp-inst/wp-settings.php +++ b/wp-inst/wp-settings.php @@ -93,7 +93,23 @@ function is_installed() { die( "<h1>Fatal Error</h1> " . $msg ); } } -$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$base'"); +if( defined( "VHOST" ) && constant( "VHOST" ) == 'yes' ) { + $current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$base'"); +} else { + if( $base == '/' ) { + $wpblog = substr( $_SERVER[ 'REQUEST_URI' ], 1 ); + } else { + $wpblog = str_replace( $base, '', $_SERVER[ 'REQUEST_URI' ] ); + } + if( strpos( $wpblog, '/' ) ) + $wpblog = substr( $wpblog, 0, strpos( $wpblog, '/' ) ); + if( $wpblog == '' || file_exists( ABSPATH . $wpblog ) || is_dir( ABSPATH . $wpblog ) ) { + $searchdomain = $domain; + } else { + $searchdomain = $wpblog . "." . $domain; + } + $current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '{$searchdomain}' AND path = '$base'"); +} if( $current_blog == false ) { is_installed(); } @@ -113,9 +129,6 @@ if( $current_site->site_name == false ) { include( ABSPATH . "wp-admin/wpmu-upgrade.inc.php" ); } -if( $current_site->domain == $domain && $current_site->path == $base ) { - $wpblog = 'main'; -} if( $blog_id == false ) { // no blog found, are we installing? Check if the table exists. if ( defined('WP_INSTALLING') ) { |
