version 2.2

2 files changed, 238 insertions, 189 deletions

diff --git a/blog.php b/blog.php
index 23c22fb..367773b 100644
--- a/blog.php
+++ b/blog.php
@@ -1,43 +1,47 @@
 <?php
 
-//  blogRight! version 2.1 (2006-03-24)
-//  Copyright (C) 2004, 2005, 2006 Wojciech Polak.
+//  blogRight! version 2.2 (2008-03-16)
+//  Copyright (C) 2004, 2005, 2006, 2007, 2008 Wojciech Polak.
 //
-//  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, or (at your option)
-//  any later version.
+//  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 3 of the License, or (at your
+//  option) any later version.
 //
 //  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+//  You should have received a copy of the GNU General Public License along
+//  with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if (!ereg ("^apache2", @php_sapi_name ()))
+  ob_start ('ob_gzhandler');
 
 require 'config.php';
 
-if (!isset ($header_file))
-  $header_file = 'inc/header.html';
+if (!isset ($CONF)) exit;
+
+if (!isset ($CONF['path.header_file']))
+  $CONF['path.header_file'] = 'inc/header.html';
 
-if (!isset ($footer_file))
-  $footer_file = 'inc/footer.html';
+if (!isset ($CONF['path.footer_file']))
+  $CONF['path.footer_file'] = 'inc/footer.html';
 
-if (!isset ($charsetEncoding))
-  $charsetEncoding = 'UTF-8';
+if (!isset ($CONF['charsetEncoding']))
+  $CONF['charsetEncoding'] = 'UTF-8';
 
 /////////////////////////////
 
 $start_time = microtime ();
 
-if (isset ($_REQUEST['q']))
+if (isset ($_GET['q']))
 {
-  $q = $_REQUEST['q'];
+  $q = $_GET['q'];
   $result = array ();
   ereg ('([0-9]{4})?[-/]?([0-1][0-9])?[-/]?([0-3][0-9])?', $q, $result);
 
   if (isset ($result[1]) && $result[1] != '')
   {
     $search_y = $result[1];
@@ -48,31 +52,32 @@ if (isset ($_REQUEST['q']))
     if (isset ($result[3]) && $result[3] != '')
       $search_d = $result[3] <= 31 ? $result[3] > 0 ? $result[3] : 1 : 31;
   }
   else
   {
     if (eregi ('^all$', $q))
-      unset ($recent);
+      unset ($CONF['recent']);
   }
 }
 
 /////////////////////////////
 
-if (isset ($datadir) && $datadir != '')
+if (isset ($CONF['path.data']) && $CONF['path.data'] != '')
 {
-  $cwd = $datadir;
+  $cwd = $CONF['path.data'];
 }
 else
 {
-  $datadir = '';
+  $CONF['path.data'] = '';
   $cwd = getcwd ();
 }
 
-if (file_exists ($datadir.$orderfile))
+if (isset ($CONF['orderfile']) &&
+    file_exists ($CONF['path.data'].$CONF['orderfile']))
 {
-  $lines = file ($datadir.$orderfile);
+  $lines = file ($CONF['path.data'].$CONF['orderfile']);
   foreach ($lines as $line)
     $searchdirs[] = chop ($line);
   $searchdirs = array_unique ($searchdirs);
 }
 else if (isset ($search_y))
 {
@@ -88,31 +93,32 @@ else // scan the directory
     if (is_numeric ($name))
       $searchdirs[] = $name;
   }
   closedir ($dp);
   sort ($searchdirs);
 
-  if ($sortorder == 'desc')
+  if (isset ($CONF['sortorder']) &&
+      $CONF['sortorder'] == 'desc')
     $searchdirs = array_reverse ($searchdirs);
 }
 
 /////////////////////////////
 
 $include_files = array ();
 
 foreach ($searchdirs as $dir)
 {
-  $path = $datadir.$dir;
+  $path = $CONF['path.data'].$dir;
   $dirlist = array ();
 
   // ignore hidden files/dirs.
   if ($dir[0] != '.' && $dir[0] != '' && is_dir ($path))
   {
-    if (file_exists ($path.'/'.$orderfile))
+    if (file_exists ($path.'/'.$CONF['orderfile']))
     {
-      $lines = file ($path.'/'.$orderfile);
+      $lines = file ($path.'/'.$CONF['orderfile']);
       foreach ($lines as $line)
         $dirlist[] = $path.'/'.chop ($line);
     }
     else // scan the directory
     {
       if (!($dp = opendir ($path)))
@@ -127,20 +133,20 @@ foreach ($searchdirs as $dir)
             $dirlist[filemtime ($path.'/'.$name) . $i] = $path.'/'.$name;
             $i++;
           }
         }
         closedir ($dp);
 
-        if ($sortby == 'timestamp')
+        if ($CONF['sortby'] == 'timestamp')
           ksort ($dirlist);
         else // sort by name
           sort ($dirlist);
       }
     }
 
-    if ($sortorder == 'desc' && !isset ($search_y))
+    if ($CONF['sortorder'] == 'desc' && !isset ($search_y))
       $dirlist = array_reverse ($dirlist);
 
     $include_files = array_merge ($include_files, $dirlist);
   }
 }
 
@@ -148,43 +154,49 @@ foreach ($searchdirs as $dir)
 
 $cur_y = date ('Y');
 $cur_m = date ('m');
 
 function cmonth ($var)
 {
-  global $cur_y, $cur_m, $suffix;
-  if (ereg ("$cur_y/$cur_m-.*$suffix\$", $var))
+  global $cur_y, $cur_m;
+  if (ereg ("$cur_y/$cur_m-.*\.html\$", $var))
     return true;
   else
     return false;
 }
 
-if (isset ($ATOM) || isset ($_REQUEST['atom']) ||
-    isset ($RSS) || isset ($_REQUEST['rss'])) {
-  $recent = $feedRecent;
+if (isset ($_GET['format'])) {
+  if ($_GET['format'] == 'atom')
+    $ATOM = true;
+  else if ($_GET['format'] == 'rss')
+    $RSS  = true;
+}
+
+if (isset ($ATOM) || isset ($RSS)) {
+  $CONF['recent'] = $CONF['feed.recent'];
 }
 
 // show only N recent entries or current month
-if (!isset ($search_y) && isset ($recent))
+if (!isset ($search_y) && isset ($CONF['recent']))
 {
-  if (is_numeric ($recent))
+  if (is_numeric ($CONF['recent']))
   {
-    $include_files = array_slice ($include_files, 0, $recent);
+    $include_files = array_slice ($include_files, 0, $CONF['recent']);
   }