switched okapi settings from lib/ to config2/settings.inc.php

htdocs/config2/settings-dev.inc.php

@@ -34,6 +34,7 @@
 	 *    mysql.trace_mode = On
 	 */
 	$opt['php']['debug'] = PHP_DEBUG_ON;
+	$opt['php']['semaphores'] = false;
 
 	/* settings for the template engine
 	 *
@@ -75,7 +76,7 @@
 	/* other template options
 	 *
 	 */
-	$opt['page']['absolute_url'] = $dev_baseurl;
+	$opt['page']['absolute_url'] = $dev_baseurl . "/";
 	$opt['page']['develsystem'] = true;
 	$opt['mail']['from'] = 'root';
 	$opt['mail']['subject'] = '[local.opencaching.de] ';
@@ -83,7 +84,7 @@
 	/* location of uploaded images
 	 */
 	$opt['logic']['pictures']['dir'] = $dev_basepath . $dev_codepath . 'htdocs/images/uploads';
-	$opt['logic']['pictures']['url'] = $opt['page']['absolute_url'] . '/images/uploads';
+	$opt['logic']['pictures']['url'] = $opt['page']['absolute_url'] . 'images/uploads';
 	$opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
 
  	/* E-Mail for notification about news (newstopic.php)

htdocs/config2/settings-dist.inc.php

@@ -35,6 +35,7 @@
 	 */
 	$opt['php']['debug'] = PHP_DEBUG_SKIP;
 	$opt['php']['timezone'] = 'Europe/Berlin';
+	$opt['php']['semaphores'] = true;
 
 	// database connection
 	
@@ -364,7 +365,7 @@
 	$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
 	$opt['logic']['license']['admin'] = true;
 	$opt['logic']['license']['disclaimer'] = false;
-	$opt['logic']['license']['terms'] = 'http://www.opencaching.de/articles.php?page=impressum#datalicense';
+	$opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
 	   // 'disclaimer' and 'terms' also in lib/settings.inc.php
 
   /* Database charset

htdocs/lib/settings-dev.inc.php

@@ -174,7 +174,4 @@
 	$opt['template']['locales']['DA']['show'] = false;
 	$opt['template']['locales']['PT']['show'] = false;
 	$opt['template']['locales']['JA']['show'] = false;
-
-	// OKAPI settings
-	$disable_semaphores = true;
 ?>

htdocs/lib/settings-dist.inc.php

@@ -211,10 +211,6 @@
 	// you can use -1 to use the master (not recommended, because replicated to slaves)
 	$opt['db']['slave']['primary'] = -1;
 
-	// OKAPI settings
-	$disable_semaphores = false;
-
-
 /* post_config() is invoked directly before the first HTML line of the main.tpl.php is sent to the client.
  */
 function post_config()

htdocs/okapi_settings.php

@@ -10,7 +10,10 @@ function get_okapi_settings()
 	# [2] http://code.google.com/p/opencaching-api/source/browse/trunk/okapi/settings.php
 	# [3] http://code.google.com/p/opencaching-api/issues/detail?id=132
 	
-	require($GLOBALS['rootpath'].'lib/settings.inc.php');  # (into the *local* scope!)
+	$opt['rootpath'] = $GLOBALS['rootpath'];
+	require($opt['rootpath'].'lib2/const.inc.php');   # (into the *local* scope!)
+	require($opt['rootpath'].'config2/settings-dist.inc.php');
+	require($opt['rootpath'].'config2/settings.inc.php');
 	
 	return array(
 
@@ -18,24 +21,25 @@ function get_okapi_settings()
 
 		'OC_BRANCH' => 'oc.de',  # Tell OKAPI to work in "OCDE mode".
 		'SUPPORTS_LOGTYPE_NEEDS_MAINTENANCE' => false,  # OCDE doesn't support it, see [2] for more info.
-		'DATA_LICENSE_URL' => $opt['logic']['license']['terms'],
 		
 		# Settings which ARE present in settings.inc.php:
 		
-		'ADMINS' => array($sql_errormail,'rygielski@mimuw.edu.pl'),
+		'ADMINS'           => array($opt['db']['warn']['mail'],'rygielski@mimuw.edu.pl'),
-		'FROM_FIELD' => $emailaddr,
+		'FROM_FIELD'       => $opt['mail']['contact'],
-		'DEBUG' => $debug_page,
+		'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'],
-		'DEBUG_PREVENT_SEMAPHORES' => $disable_semaphores,  # not available on current developer system
+		'DEBUG'            => ($opt['debug'] & DEBUG_DEVELOPER != 0),
-		'DB_SERVER' => $dbserver,
+		'DEBUG_PREVENT_SEMAPHORES' 
-		'DB_NAME' => $dbname,
+		                   => !$opt['php']['semaphores'],  # not available on current developer system
-		'DB_USERNAME' => $dbusername,
+		'DB_SERVER'        => $opt['db']['servername'],
-		'DB_PASSWORD' => $dbpasswd,
+		'DB_NAME'          => $opt['db']['placeholder']['db'],
-		'SITELANG' => $lang,
+		'DB_USERNAME'      => $opt['db']['username'],
-		'TIMEZONE' => $timezone,  # BTW, OCPL doesn't have it in settings.inc.php
+		'DB_PASSWORD'      => $opt['db']['password'],
-		'SITE_URL' => $absolute_server_URI,
+		'SITELANG'         => strtolower($opt['template']['default']['locale']),
+		'TIMEZONE'         => $opt['php']['timezone'],  # BTW, OCPL doesn't have it in settings.inc.php
+		'SITE_URL'         => $opt['page']['absolute_url'],
 		'VAR_DIR'          => $GLOBALS['rootpath'].'var',
-		'IMAGES_DIR' => rtrim($picdir, '/'),
+		'IMAGES_DIR'       => rtrim($opt['logic']['pictures']['dir'], '/'),
-		'OC_NODE_ID' => $oc_nodeid,
+		'OC_NODE_ID'       => $opt['logic']['node']['id'],
-		'OC_COOKIE_NAME' =>  $opt['cookie']['name'].'data',
+		'OC_COOKIE_NAME'   => $opt['session']['cookiename'].'data',
 	);
 }