From dfbbf2be1ffd8bd550be4d3fc4e968c1a500758a Mon Sep 17 00:00:00 2001
From: Wojciech Rygielski <rygielski@mimuw.edu.pl>
Date: Sat, 18 Aug 2012 15:41:39 +0200
Subject: [PATCH] Added proper OKAPI settings to lib/settings-dist and
 lib/settings-dev files.

---
 .gitignore                       | 39 ++++++++++++++++----------------
 htdocs/lib/settings-dev.inc.php  |  8 ++++++-
 htdocs/lib/settings-dist.inc.php |  7 ++++++
 htdocs/var/.htaccess             |  4 ++++
 htdocs/var/index.html            |  0
 5 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 htdocs/var/.htaccess
 create mode 100644 htdocs/var/index.html

diff --git a/.gitignore b/.gitignore
index b0c04dba..9d1ae46e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,21 @@
-# common exclude files list
-#
-# for local exclude files, see .git/info/exclude
-
-htdocs/*/settings.inc.php
-htdocs/*/*/settings.inc.php
-htdocs/cache/*
-htdocs/cache2/*
-htdocs/download/*
-htdocs/images/statpics/*
-htdocs/images/uploads/*
-htdocs/resource2/tinymce/tiny_mce_*.gz
-htdocs/sitemap*xml*
-htdocs/util-local/ocxml11client/data-files
-htdocs/util-local/ocxml11client/tmp
-
-lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/CSS/*
-lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/HTML/*
-lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/URI/*
+# Commonly ignored files list. For locally ignored files (e.g. local IDE
+# settings), use .git/info/exclude file. Keep the lines in this file sorted.
 
+/lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/CSS/*
+/lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/HTML/*
+/lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/URI/*
+/htdocs/cache/*
+/htdocs/cache2/*
+/htdocs/config2/settings.inc.php
+/htdocs/download/*
+/htdocs/images/statpics/*
+/htdocs/images/uploads/*
+/htdocs/lib/settings.inc.php
+/htdocs/resource2/tinymce/tiny_mce_*.gz
+/htdocs/util-local/ocxml11client/data-files
+/htdocs/util-local/ocxml11client/tmp
+/htdocs/util/mysql_root/settings.inc.php
+/htdocs/util/notification/settings.inc.php
+/htdocs/util/publish_caches/settings.inc.php
+/htdocs/util/watchlist/settings.inc.php
+/htdocs/var/*
diff --git a/htdocs/lib/settings-dev.inc.php b/htdocs/lib/settings-dev.inc.php
index 7cd02b1b..c487a45a 100644
--- a/htdocs/lib/settings-dev.inc.php
+++ b/htdocs/lib/settings-dev.inc.php
@@ -231,5 +231,11 @@
 	// (e.g. xml-interface and mapserver-results)
 	// you can use -1 to use the master (not recommended, because replicated to slaves)
 	$opt['db']['slave']['primary'] = -1;
-	
+
+	$OKAPI_SETTINGS = array(
+		'OC_BRANCH' => 'oc.de',
+		'SITELANG' => 'de',
+		'VAR_DIR' => $opt['rootpath'].'var',
+	);
+
 ?>
diff --git a/htdocs/lib/settings-dist.inc.php b/htdocs/lib/settings-dist.inc.php
index 2a644077..f9e161da 100644
--- a/htdocs/lib/settings-dist.inc.php
+++ b/htdocs/lib/settings-dist.inc.php
@@ -297,4 +297,11 @@ function post_config()
 		'filename' => 'http://geokrety.org/index.php?lang=de_DE.UTF-8'
 	);
 }
+
+$OKAPI_SETTINGS = array(
+	'OC_BRANCH' => 'oc.de',
+	'SITELANG' => 'de',
+	'VAR_DIR' => $opt['rootpath'].'var',
+);
+
 ?>
diff --git a/htdocs/var/.htaccess b/htdocs/var/.htaccess
new file mode 100644
index 00000000..be029b2a
--- /dev/null
+++ b/htdocs/var/.htaccess
@@ -0,0 +1,4 @@
+<FilesMatch ".*">
+Order Deny,Allow
+Deny from All
+</FilesMatch>
diff --git a/htdocs/var/index.html b/htdocs/var/index.html
new file mode 100644
index 00000000..e69de29b