developer system settings

bin/dbupdate.php

@@ -6,11 +6,11 @@
 	 * Tables must be updated manually, see htdocs/doc/sql/db-changes.txt
 	 */ 
   
-	require('htdocs/util/mysql_root/settings.inc.php');
+	require('htdocs/lib/settings.inc.php');
 	
   echo "importing data.sql ...\n";
   chdir ('htdocs/doc/sql');
-	system('cat static-data/data.sql | mysql -uroot --password=' . $db_root_password . ' opencaching');
+	system('cat static-data/data.sql | mysql -u' . $dbusername . ' --password=' . $dbpasswd . ' ' . $dbname);
 
   echo "importing triggers ...\n";
   chdir('stored-proc');

htdocs/config2/settings-dev.inc.php

@@ -38,11 +38,6 @@
 	/* settings for the template engine
 	 *
 	 */
-	$opt['db']['servername'] = ':/var/lib/mysql/mysql.sock';
-	$opt['db']['username'] = 'oc';
-	$opt['db']['password'] = 'developer';
-	$opt['db']['pconnect'] = true;
-
 	// ... how long a query can take without warning (0 <= disabled)
 	$opt['db']['warn']['time'] = 0;
 	$opt['db']['warn']['mail'] = 'root';
@@ -53,11 +48,6 @@
 	$opt['db']['error']['mail'] = 'root';
 	$opt['db']['error']['subject'] = 'sql_error';
 
-	// database placeholder
-	$opt['db']['placeholder']['db'] = 'opencaching';
-	$opt['db']['placeholder']['tmpdb'] = 'octmp';
-	$opt['db']['placeholder']['hist'] = 'ochist';
-
 	/* cookie or session
 	 *
 	 * SAVE_COOKIE            = only use cookies
@@ -131,9 +121,6 @@
 
 	$opt['template']['default']['style'] = 'ocstyle';
 
- 	// Google maps key
-        $opt['lib']['google']['mapkey']['local.opencaching.de'] = 'ABQIAAAAwY6rAeeTA2cLnBDnf5FWGhQ9ZMVXtHZ4yn114tr66PefbkFZhBQXKkJK_k96Ci1JimzyaUwfhFhGrQ';
-
 	$opt['bin']['cs2cs'] = '/var/www/bin/cs2cs';
 	
 	// Flag paths
@@ -152,6 +139,5 @@
 	$opt['template']['locales']['DA']['show'] = false;
 	$opt['template']['locales']['PT']['show'] = false;
 	$opt['template']['locales']['JA']['show'] = false;
-
 	
 ?>

htdocs/lib/settings-dev.inc.php

@@ -78,19 +78,10 @@
 	
 	// news settings
 	$use_news_approving = true;
-	$news_approver_email = 'news-approver@devel.opencaching.de';
+	$news_approver_email = 'root';
 
 	$opt['page']['showdonations'] = false;
 
-	//local database settings
-	$dbusername = 'ocold';
-	$dbname = 'opencaching';
-	$dbserver = ':/var/lib/mysql/mysql.sock';
-	$dbpasswd = 'developer';
-	$dbpconnect = false;
-
-	$tmpdbname = 'test'; // empty db with CREATE and DROP priviledges
-
 	// date format
 	$opt['db']['dateformat'] = 'Y-m-d H:i:s';