Changeset 512

Timestamp:

07/21/07 14:46:15 (16 months ago)

Author:

michiel

Message:

Merge changes from remove_multi_blog branch.

remove everything that referenced to:
'one codebase multiple weblogs'
Also stop supporting common/hosts.php as configfile.

Location:

trunk

Files:

• .htaccess (modified) (1 diff)
• INSTALL (modified) (2 diffs)
• README (modified) (11 diffs)
• common/hosts.php.sample (deleted)
• common/js/liveRequest.js (modified) (3 diffs)
• common/livesearch.php (modified) (2 diffs)
• common/mvblog_common.php (modified) (2 diffs)
• tags (deleted)

trunk/.htaccess

@@ -6 +6 @@
 </IfModule>
 ErrorDocument 404 "/index.php?action=view&id=httperror&error=404"
+<Files *mvblog.ini>
+        Order deny,allow
+        deny from all
+</Files>

trunk/INSTALL

@@ -2 +2 @@
 
 * PHP5 (tested with apache2 cgi and apache2 module)
-* PHP5 PostgreSQL module
-* PEAR::DB
-* PEAR::HTTP_Request (for trackbacks)
+* PHP5 PostgreSQL module or PHP5 MySQL module or PHP5 sqlite module
+* PEAR::MDB2 with apropiate backend driver
+* PEAR::HTTP_Request (for trackbacks) -- optional
 * PostgreSQL server (tested with 7.4 and 8.0) OR
-* MySQL 5.0 (tested with 5.0.22 and newer)
+* MySQL 5.0 (tested with 5.0.22 and newer) OR
+* Sqlite
 
 Installation
-
-MvBlog can be used in 2 ways:
-1. Just one weblog
-2. Service for multiple weblogs on a server
-
-Below you will find the installation guide for both uses.
-
-1. Just one weblog
 
 - Unpack the .tar.gz in your DocumentRoot.
 - Create a database for the blog. You can also create an optional database-user for the blog-database
 - Import sql/<database_system>/mvblog.sql into the blog-database.
-- Edit the common/hosts.php file and fill in the correct user, password and database name.
+- Copy the conf/mvblog.ini.sample to conf/mvblog.ini
+- Edit the conf/mvblog.ini file and fill in the correct user, password and database name.
+- Make sure php can write in the site_images folder (chown www-data:www-data site_images)
 
 The actual commands to create a database and import the sql file are not shown here.
@@ -35 +30 @@
 
 You are now ready to enjoy MvBlog.
-
-
-2. Service for multiple weblogs on a server
-
-This feature will require more installation steps. Use this method when you think more weblogs will be needed on your webserver, for instance for customers, friends, etc.
-
-As an example, the www.mvblog.org weblog is used, as it is installed and running on a webserver which hosts multiple customers and their blogs.
-If you want a different filesystem location, use those paths instead of the ones shown here.
-
-- Unpack the .tar.gz into /var/www/mvblog
-- Create a database user (e.g. mvblog)
-- Create database with a name that reflects the domain/website the blog is running on (e.g. mvblog_mvblog_org)
-- Create a directory that will serve as the DocumentRoot for your blog (e.g. /var/www/domains/mvblog.org/www)
-- Copy the /var/www/mvblog/style directory into the new style directory (e.g. /var/www/domains/mvblog.org/www/style)
-- Copy the /var/www/mvblog/index.php into the new directory
-- Copy the /var/www/mvblog/favicon.ico into the new directory
-- Change to the new directory (cd)
-- Now you will need to create some symlinks. Below are the commands used:
-
-For mvblog version 1.0 and before:
-
-$ cd /var/www/domains/mvblog.org/www
-$ ln -s /var/www/mvblog/UserFiles
-$ ln -s /var/www/mvblog/admin
-$ ln -s /var/www/mvblog/common
-$ ln -s /var/www/mvblog/fckeditor
-
-For mvblog version after 1.0:
-
-$ cd /var/www/domains/mvblog.org/www
-$ ln -s /var/www/mvblog/admin
-$ ln -s /var/www/mvblog/common
-$ ln -s /var/www/mvblog/xinha
-
-- Edit the common/hosts.php file to list your hostname, etc.
-- Edit your webservers config to enable the domain
-
-Your blog can now be reached at the url associated with the DocumentRoot.
-
-The Admin Interface can be accessed through the admin/ folder in your url.
-
-The default admin user/password is mvblog/mvblog
-I suggest you create a new user and disable the mvblog admin user as
-soon as possible.
-
-You are now ready to enjoy MvBlog.

trunk/README

@@ -1 @@
-MvBlog v 2.1
+MvBlog v %%VERSION%%
 
 Copyright (c) 2005-2007, Michiel van Baak <mvanbaak (AT) users (DOT) sourceforge (DOT) net>
 Logo design (c) 2005-2006, Sofie van Tendeloo <eldridge (AT) users (DOT) sourceforge (DOT) net>
 Significant work done by Ferry Boender <f.boender (AT) electricmonk (DOT) nl>
-Licensed under the General Public License (GPL), see LICENSE file 
+Licensed under the General Public License (GPL), see LICENSE file
 provided with this program.
 
@@ -28 +28 @@
 -------------------------------------------------------------------------------
 
-MvBlog is a webbased tool written in PHP to manage a 
+MvBlog is a webbased tool written in PHP to manage a
 PHP::PEAR compatible written blog.
 
@@ -35 +35 @@
 
 List of current features (new features marked with *) :
- 
+
 Managing posts
 Managing authors
@@ -63 +63 @@
 -------------------------------------------------------------------------------
 
-  This section is intended for system administrators who would like to 
-  offer MvBlog to the users on their systems. 
+  This section is intended for system administrators who would like to
+  offer MvBlog to the users on their systems.
   See the INSTALL file
 
@@ -81 +81 @@
 
 * Do not run your webserver as user root!
-  
+
 Also read the beautiful NO WARRANTY disclaimer in the GPL. ;)
 
-  
+
 9. Contributing.
 -------------------------------------------------------------------------------
 
-If you wish to contribute to MvBlog, 
+If you wish to contribute to MvBlog,
 you can do so with the following things:
-  
+
     * patches.
     * suggestions.
     * feature requests.
-  
+
   When contributing code, please keep the following in mind:
-  
+
     * Write your code according to the rest of programs code style.
     * Send in patches created with the 'diff' command and the -u flag set.
     * Patch purpose must follow the project goals. (or fix bugs, etc)
-    * Patches sent to me are public domain or under a GPL (compatible) 
-      license, or they can't be added to the code. 
-  
+    * Patches sent to me are public domain or under a GPL (compatible)
+      license, or they can't be added to the code.
+
 
 10. Copyright stuff.
@@ -109 +109 @@
   MvBlog is Copyright by Michiel van Baak,
   licensed under the General Public License (GPL)
-  
+
   Copyright (C), 2005-2007 by Michiel van Baak <mvanbaak (AT) users (DOT) sourceforge (DOT) net>
-  
+
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
-  as published by the Free Software Foundation; either version 2
-  of the License, or (at your option) any later version.
-      
+  as published by the Free Software Foundation version 2
+  of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU General Public License for more details.
-      
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-              
+
   For more information, see the COPYING file supplied with this
   program.
@@ -134 +134 @@
 
 Author:
-  
+
     Michiel van Baak
     Email: mvanbaak (AT) users (DOT) sourceforge (DOT) net
@@ -141 +141 @@
   Please report any bugs, requests and general comments by using the project
   page at dev.mvblog.org
-  
+
   You may also mail them to me. Before reporting bugs or sending contributions
   please read the Contributing section in this README.
@@ -147 +147 @@
   Project HomePage: http://dev.mvblog.org
 
-  
+
 
 12. Thanks
@@ -165 +165 @@
   --------------
         Leonieke Aalders (Nieke)
-  
+
   Testing:
   --------
@@ -171 +171 @@
         Kermit    (http://xulon.info)
         f.boender (http://www.electricmonk.nl)
-  
+
   Various suggestions and patches:
   --------------------------------

trunk/common/js/liveRequest.js

@@ -1 @@
-var inputId = 'search'; 
+var inputId = 'search';
                                         // This is the id on the input/textarea that you want to use as the query.
-                                                                        
+
 var outputId = 'searchresults';
                                         // use this to have the results populate your own ID'd tag.
                                         // leave it blank and a div tag will automatically be added
                                         // with an id="liveSearchResults"
-                                                                        
+
 var processURI    = 'common/livesearch.php';
                                         // this is the file that you request data from.
-                                                                        
+
 var emptyString   = '';
                                         // What to display in the results field when there's nothing
@@ -47 +47 @@
 
 function liveReqInit() {
-        
+
         inputElement  = document.getElementById(inputId);
         outputElement = document.getElementById(outputId);
-        
-        if( inputElement == null || outputElement == null ) 
+
+        if( inputElement == null || outputElement == null )
                 return;
-        
-        
+
+
         if (navigator.userAgent.indexOf("Safari") > 0) {
                 inputElement.addEventListener("keydown",liveReqStart,false);
-                
+
         } else if (navigator.product == "Gecko") {
                 inputElement.addEventListener("keypress",liveReqStart,false);
-                
+
         } else {
                 inputElement.attachEvent('onkeydown',liveReqStart);
                 isIE = true;
         }
-        
+
         if(emptyString == '') {
                 // set the result field to hidden, or to default string
@@ -93 +93 @@
                         liveReq = new ActiveXObject("Microsoft.XMLHTTP");
                 }
-                
+
                 liveReq.onreadystatechange = liveReqProcessReqChange;
+                var uri = processURI + "?s=" + encodeURI(inputElement.value);
                 liveReq.open("GET", processURI + "?s=" + encodeURI(inputElement.value));
                 liveReqLast = inputElement.value;

trunk/common/livesearch.php

@@ -18 +18 @@
  * @copyright 2005-2007 Michiel van Baak
  */
-function db_init() {
-        session_start();
-        require("MDB2.php");
-        require("hosts.php");
+require("mvblog.php");
+$mvblog = new MvBlog();
+//get all the authors in an array
+$res =& $mvblog->db->query("SELECT * FROM authors");
 
-        $options = array(
-                "debug"       => 2,
-                "portability" => MDB2_PORTABILITY_ALL,
-        );
+if (PEAR::isError($res)) {
+        die($res->getMessage());
+}
 
-        $db =& MDB2::connect($dsn, $options);
-        if (PEAR::isError($db)) {
-                die($db->getMessage());
-        }
-        $_SESSION["filepath"] = $filepath;
-        return $db;
+while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
+        $authors[$row["id"]]["fullname"] = $row["fullname"];
+        $authors[$row["id"]]["email"]    = $row["email"];
 }
-ob_start();
-$db = db_init();
-
-
 
 $searchstring = urldecode($_REQUEST["s"]);
@@ -49 +41 @@
 $query .= " ORDER BY date DESC";
 
-$db->setLimit(5);
-$res =& $db->query($query);
+$mvblog->db->setLimit(5);
+$res =& $mvblog->db->query($query);
 $ret = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 $ret .= "<channel>\n";

trunk/common/mvblog_common.php

@@ -258 +258 @@
         protected function _init_db($settings = "") {
                 require_once("MDB2.php");
-                if (!is_array($settings)) {
-                        require_once("hosts.php");
+                //sqlite has a different scheme, because it's filebased
+                if ($settings["type"] == "sqlite") {
+                        if (is_dir("db"))
+                                $dsn = sprintf("%s:///db/%s.db?mode=0666", $settings["type"], $settings["database"]);
+                        elseif (is_dir("../db"))
+                                $dsn = sprintf("%s:///../db/%s.db?mode=0666", $settings["type"], $settings["database"]);
                 } else {
-                        //sqlite has a different scheme, because it's filebased
-                        if ($settings["type"] == "sqlite") {
-                                if (is_dir("db"))
-                                        $dsn = sprintf("%s:///db/%s.db?mode=0666", $settings["type"], $settings["database"]);
-                                elseif (is_dir("../db"))
-                                        $dsn = sprintf("%s:///../db/%s.db?mode=0666", $settings["type"], $settings["database"]);
-                        } else {
-                                $dsn = $settings["type"]."://".$settings["username"].":".$settings["password"]."@tcp(".$settings["hostname"].")/".$settings["database"];
-                                $dsn = sprintf("%s://%s:%s@tcp(%s)/%s",
-                                        $settings["type"], $settings["username"], $settings["password"],
-                                        $settings["hostname"], $settings["database"]);
-                        }
+                        $dsn = $settings["type"]."://".$settings["username"].":".$settings["password"]."@tcp(".$settings["hostname"].")/".$settings["database"];
+                        $dsn = sprintf("%s://%s:%s@tcp(%s)/%s",
+                                $settings["type"], $settings["username"], $settings["password"],
+                                $settings["hostname"], $settings["database"]);
                 }
 
@@ -498 +494 @@
                 if (array_key_exists("style", $_REQUEST)) {
                         /* Overwrite the style set in the session from the request */
-                        $_SESSION["style"] = $this->_sanitize($_REQUEST["style"]); 
+                        $_SESSION["style"] = $this->_sanitize($_REQUEST["style"]);
                 }
                 if (!array_key_exists("style", $_SESSION)) {