Bug#341417: bamboo: staticcopy script does not work

[Paul Wise]

Package: bamboo
Version: 1.3-1
Severity: normal
Tags: patch

I recently noticed that the cron script that syncs my website to it's
host wasn't working. I determined the cause to be bamboo's staticcopy
script being broken. It gave this error:

"page type Txt is unknown"

The problem as far as I can tell was that two files were including other
php files using incorrect paths. The attached patch fixes the problem
for me.

-- System Information:
Debian Release: unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.14-2-k7
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)

Versions of packages bamboo depends on:
ii  apache [httpd]                1.3.34-1   versatile, high-performance HTTP s
ii  php4                          4:4.4.0-4  server-side, HTML-embedded scripti
ii  php4-sqlite                   1.0.2-9    PHP4 bindings to SQLite, a file-ba

-- 
bye,
pabs

http://wiki.debian.org/PaulWise

diff -u bamboo-1.3/debian/changelog bamboo-1.3/debian/changelog
--- bamboo-1.3/debian/changelog
+++ bamboo-1.3/debian/changelog
@@ -1,3 +1,9 @@
+bamboo (1.3-2) unstable; urgency=low
+
+  * Fix some issues preventing use of the staticcopy script.
+
+ -- Micah Anderson <[EMAIL PROTECTED]>  Wed, 30 Nov 2005 21:43:06 +0800
+
 bamboo (1.3-1) unstable; urgency=low
 
   * Upgraded to new upstream 1.3 release (Closes: #312939)
only in patch2:
unchanged:
--- bamboo-1.3.orig/pages/PageFilter.php
+++ bamboo-1.3/pages/PageFilter.php
@@ -15,7 +15,7 @@
 	parent::init();
 	foreach($this->filters as $filter) {
 		if (!class_exists($filter))
-			require_once("filters/$filter.php");
+			require_once(dirname(dirname(__FILE__))."/filters/$filter.php");
 		$this->filterobjs[$filter] = new $filter();
 	}		
 }
only in patch2:
unchanged:
--- bamboo-1.3.orig/PageStore.php
+++ bamboo-1.3/PageStore.php
@@ -63,11 +63,12 @@
 	$type = preg_replace('/[^a-z]/', '', strtolower($type)); // safety check
 	$type = ucfirst($type);
 	if (!class_exists("Page$type")) {
-		if (!is_file("pages/Page$type.php")) {
-			die("page type $type is unknown");
+		$file = dirname(__FILE__)."/pages/Page$type.php";
+		if (!is_file($file)) {
+			die("page type $type is unknown for $path\n");
 			return;
 		}
-		require_once("pages/Page$type.php");
+		require_once($file);
 	}
 	$pageclass = "Page$type";
 	$page = new $pageclass();

signature.asc
Description: This is a digitally signed message part