head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2009.10.02.20.39.27;	author rse;	state Exp;
branches;
next	1.2;
commitid	s5Rn1HA91Gbia06u;

1.2
date	2008.11.08.10.56.17;	author rse;	state Exp;
branches;
next	1.1;
commitid	61RKraBdcwRTtNpt;

1.1
date	2007.04.16.20.28.53;	author rse;	state Exp;
branches;
next	;
commitid	mVgscHDGCehh2les;


desc
@@


1.3
log
@fix URL rewriting support
@
text
@Index: .htaccess.dist
--- .htaccess.dist.orig	2008-10-31 10:04:18 +0100
+++ .htaccess.dist	2009-10-02 22:36:29 +0200
@@@@ -1,17 +1,9 @@@@
-# BEGIN PunBB
 
-<IfModule mod_rewrite.c>
-# MultiViews interfers with proper rewriting
 Options -MultiViews
-
 RewriteEngine On
-
-# Uncomment and properly set the RewriteBase if the rewrite rules are not working properly
-#RewriteBase /
+RewriteBase /punbb
 
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule . rewrite.php [L]
-</IfModule>
 
-# END PunBB
\ No newline at end of file
Index: admin/install.php
--- admin/install.php.orig	2009-05-20 11:20:51 +0200
+++ admin/install.php	2009-10-02 22:36:15 +0200
@@@@ -222,25 +222,25 @@@@
 			<div class="sf-set set2">
 				<div class="sf-box text required">
 					<label for="fld3"><span><?php echo $lang_install['Database name'] ?> <em><?php echo $lang_install['Required'] ?></em></span> <small><?php echo $lang_install['Database name help'] ?></small></label><br />
-					<span class="fld-input"><input id="fld3" type="text" name="req_db_name" size="35" maxlength="50" /></span>
+					<span class="fld-input"><input id="fld3" type="text" name="req_db_name" size="35" maxlength="50" value="punbb"/></span>
 				</div>
 			</div>
 			<div class="sf-set set3">
 				<div class="sf-box text">
 					<label for="fld4"><span><?php echo $lang_install['Database username'] ?></span> <small><?php echo $lang_install['Database username help'] ?></small></label><br />
-					<span class="fld-input"><input id="fld4" type="text" name="db_username" size="35" maxlength="50" /></span>
+					<span class="fld-input"><input id="fld4" type="text" name="db_username" size="35" maxlength="50" value="punbb"/></span>
 				</div>
 			</div>
 			<div class="sf-set set4">
 				<div class="sf-box text">
 					<label for="fld5"><span><?php echo $lang_install['Database password'] ?></span> <small><?php echo $lang_install['Database password help'] ?></small></label><br />
-					<span class="fld-input"><input id="fld5" type="password" name="db_password" size="35" /></span>
+					<span class="fld-input"><input id="fld5" type="password" name="db_password" size="35" value="punbb"/></span>
 				</div>
 			</div>
 			<div class="sf-set set5">
 				<div class="sf-box text">
 					<label for="fld6"><span><?php echo $lang_install['Table prefix'] ?></span> <small><?php echo $lang_install['Table prefix help'] ?></small></label><br />
-					<span class="fld-input"><input id="fld6" type="text" name="db_prefix" size="20" maxlength="30" /></span>
+					<span class="fld-input"><input id="fld6" type="text" name="db_prefix" size="20" maxlength="30" value=""/></span>
 				</div>
 			</div>
 		</fieldset>
@


1.2
log
@upgrading package: punbb 1.3snap20071203 -> 1.3rc2
@
text
@d1 23
d25 3
a27 3
--- admin/install.php.orig	2008-10-31 10:36:34 +0100
+++ admin/install.php	2008-11-08 09:42:40 +0100
@@@@ -224,25 +224,25 @@@@
@


1.1
log
@first cut for a PunBB package
@
text
@d1 33
a33 89
Index: upload/include/dblayer/pgsql.php
--- upload/include/dblayer/pgsql.php.orig	2007-04-16 13:57:33 +0200
+++ upload/include/dblayer/pgsql.php	2007-04-16 22:15:23 +0200
@@@@ -146,6 +146,59 @@@@
 	}
 
 
+	function query_build($query, $unbuffered = false)
+	{
+		$sql = '';
+
+		if (isset($query['SELECT']))
+		{
+			$sql = 'SELECT '.$query['SELECT'].' FROM '.$this->prefix.$query['FROM'];
+
+			if (isset($query['JOINS']))
+			{
+				foreach ($query['JOINS'] as $cur_join)
+					$sql .= ' '.key($cur_join).' '.$this->prefix.current($cur_join).' ON '.$cur_join['ON'];
+			}
+
+			if (!empty($query['WHERE']))
+				$sql .= ' WHERE '.$query['WHERE'];
+			if (!empty($query['GROUP BY']))
+				$sql .= ' GROUP BY '.$query['GROUP BY'];
+			if (!empty($query['HAVING']))
+				$sql .= ' HAVING '.$query['HAVING'];
+			if (!empty($query['ORDER BY']))
+				$sql .= ' ORDER BY '.$query['ORDER BY'];
+			if (!empty($query['LIMIT']))
+				$sql .= ' LIMIT '.$query['LIMIT'];
+		}
+		else if (isset($query['INSERT']))
+		{
+			$sql = 'INSERT INTO '.$this->prefix.$query['INTO'];
+
+			if (!empty($query['INSERT']))
+				$sql .= ' ('.$query['INSERT'].')';
+
+			$sql .= ' VALUES('.$query['VALUES'].')';
+		}
+		else if (isset($query['UPDATE']))
+		{
+			$sql = 'UPDATE '.$this->prefix.$query['UPDATE'].' SET '.$query['SET'];
+
+			if (!empty($query['WHERE']))
+				$sql .= ' WHERE '.$query['WHERE'];
+		}
+		else if (isset($query['DELETE']))
+		{
+			$sql = 'DELETE FROM '.$this->prefix.$query['DELETE'];
+
+			if (!empty($query['WHERE']))
+				$sql .= ' WHERE '.$query['WHERE'];
+		}
+
+		return $this->query($sql, $unbuffered);
+	}
+
+
 	function result($query_id = 0, $row = 0)
 	{
 		return ($query_id) ? @@pg_fetch_result($query_id, $row, 0) : false;
Index: upload/install.php
--- upload/install.php.orig	2007-03-17 18:32:58 +0100
+++ upload/install.php	2007-04-16 22:16:16 +0200
@@@@ -175,7 +175,7 @@@@
 					</div>
 					<p class="field required">
 						<label for="req_db_name">Database name<em> * <span class="acchide">(Required)</span></em></label><br />
-						<span class="input"><input id="req_db_name" type="text" name="req_db_name" size="30" maxlength="50" /></span>
+						<span class="input"><input id="req_db_name" type="text" name="req_db_name" size="30" maxlength="50" value="punbb"/></span>
 					</p>
 					<div class="form-info">
 						<h2 class="prefix"><span>Step 4: </span></h2>
@@@@ -183,11 +183,11 @@@@
 					</div>
 					<p class="field">
 						<label for="fld3">Database username</label><br />
-						<span class="input"><input id="fld3" type="text" name="db_username" size="30" maxlength="50" /></span>
+						<span class="input"><input id="fld3" type="text" name="db_username" size="30" maxlength="50" value="punbb"/></span>
 					</p>
 					<p class="field">
 						<label for="fld4">Database password</label><br />
-						<span class="input"><input id="fld4" type="text" name="db_password" size="30" maxlength="50" /></span>
+						<span class="input"><input id="fld4" type="text" name="db_password" size="30" maxlength="50" value="punbb"/></span>
 					</p>
 					<div class="form-info">
 						<h2 class="prefix"><span>Step 5: </span></h2>
@