From a37bb38e689f71582b2b74531571ca4de2dadf66 Mon Sep 17 00:00:00 2001
From: following <following>
Date: Fri, 10 Aug 2012 00:09:28 +0200
Subject: [PATCH] adjustment for developer system installation

---
 htdocs/config2/settings-dev.inc.php | 6 +++---
 htdocs/lib/settings-dev.inc.php     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/config2/settings-dev.inc.php b/htdocs/config2/settings-dev.inc.php
index c445b9fa..7c6c6f6f 100644
--- a/htdocs/config2/settings-dev.inc.php
+++ b/htdocs/config2/settings-dev.inc.php
@@ -105,13 +105,13 @@
 	/* other template options
 	 *
 	 */
-	$opt['page']['absolute_url'] = 'http://local.opencaching.de/oc-server/server-3.0/htdocs';
+	$opt['page']['absolute_url'] = 'http://' . $dev_domain . '/' . $dev_codepath . 'htdocs';
 	$opt['mail']['from'] = '<admin email>';
 
 	/* location of uploaded images
 	 */
-	$opt['logic']['pictures']['dir'] = '/var/www/html/oc-server/server-3.0/htdocs/images/uploads';
-	$opt['logic']['pictures']['url'] = 'http://local.opencaching.de/oc-server/server-3.0/htdocs/images/uploads';
+	$opt['logic']['pictures']['dir'] = $dev_basepath . $dev_codepath . 'htdocs/images/uploads';
+	$opt['logic']['pictures']['url'] = 'http://' .  $dev_domain . '/' . $dev_codepath . 'htdocs/images/uploads';
 	$opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
 
 	/* cachemaps
diff --git a/htdocs/lib/settings-dev.inc.php b/htdocs/lib/settings-dev.inc.php
index 075f50fc..94362ebd 100644
--- a/htdocs/lib/settings-dev.inc.php
+++ b/htdocs/lib/settings-dev.inc.php
@@ -57,14 +57,14 @@
 	
 	//if you are running this site on a other domain than staging.opencaching.de, you can set
 	//this in private_db.inc.php, but don't forget the ending /
-	$absolute_server_URI = 'http://local.opencaching.de/oc-server/server-3.0/htdocs/';
+	$absolute_server_URI = 'http://' . $dev_domain . '/' . $dev_codepath . 'htdocs/';
 	
 	// EMail address of the sender
 	if (!isset($emailaddr)) $emailaddr = 'contact@mail.opencaching.de';
 	
 	// location of cache images
 	if (!isset($picdir)) $picdir = $rootpath . 'images/uploads';
-	if (!isset($picurl)) $picurl = 'http://local.opencaching.de/oc-server/server-3.0/htdocs/images/uploads';
+	if (!isset($picurl)) $picurl = 'http://' . $dev_domain . '/' . $dev_codepath . 'htdocs/images/uploads';
 
 	// Thumbsize
 	$thumb_max_width = 175;
@@ -110,8 +110,8 @@
 
 	// safemode_zip-binary
 	$safemode_zip = '/var/www/bin/phpzip.php';
-	$zip_basedir = '/var/www/html/oc-server/server-3.0/htdocs/download/zip/';
-	$zip_wwwdir = 'oc-server/server-3.0/htdocs/download/zip/';
+	$zip_basedir = $dev_basepath . $dev_codepath . 'htdocs/download/zip/';
+	$zip_wwwdir = $dev_codepath . 'htdocs/download/zip/';
 
 	$googlemap_key = "<key>";
 	$googlemap_type = "G_MAP_TYPE"; // alternativ: _HYBRID_TYPE