From f6ea20b3ac710cfa4867749f2ca4fb9b9aa3f32a Mon Sep 17 00:00:00 2001
From: Christian Matzat <cmanie@matzat.net>
Date: Wed, 19 Jun 2013 18:45:50 +0200
Subject: [PATCH] moving local utils from /htdocs/util-local to /local

---
 .gitignore                                            | 11 +++++++++--
 htdocs/util-local/.htaccess                           |  4 ----
 htdocs/util-local/mailing/.htaccess                   |  4 ----
 htdocs/util-local/maintenance/.htaccess               |  4 ----
 htdocs/util-local/ocxml11client/.htaccess             |  4 ----
 htdocs/util-local/prodsys/.htaccess                   |  4 ----
 .../mailing/email-addresslist.php                     |  2 +-
 {htdocs/util-local => local}/mailing/mailing.php      |  0
 .../maintenance/update_queries.php                    |  2 +-
 {htdocs/util-local => local}/ocxml11client/index.php  |  2 +-
 .../ocxml11client/settings-dist.php                   |  0
 .../ocxml11client/xml2array.inc.php                   |  0
 {htdocs/util-local => local}/prodsys/Contents         |  0
 {htdocs/util-local => local}/prodsys/phpzip.php       |  0
 .../prodsys/purge_master_logs.php                     |  0
 {htdocs/util-local => local}/stat/coordstat.php       |  2 +-
 16 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 htdocs/util-local/.htaccess
 delete mode 100644 htdocs/util-local/mailing/.htaccess
 delete mode 100644 htdocs/util-local/maintenance/.htaccess
 delete mode 100644 htdocs/util-local/ocxml11client/.htaccess
 delete mode 100644 htdocs/util-local/prodsys/.htaccess
 rename {htdocs/util-local => local}/mailing/email-addresslist.php (91%)
 rename {htdocs/util-local => local}/mailing/mailing.php (100%)
 rename {htdocs/util-local => local}/maintenance/update_queries.php (97%)
 rename {htdocs/util-local => local}/ocxml11client/index.php (99%)
 rename {htdocs/util-local => local}/ocxml11client/settings-dist.php (100%)
 rename {htdocs/util-local => local}/ocxml11client/xml2array.inc.php (100%)
 rename {htdocs/util-local => local}/prodsys/Contents (100%)
 rename {htdocs/util-local => local}/prodsys/phpzip.php (100%)
 rename {htdocs/util-local => local}/prodsys/purge_master_logs.php (100%)
 rename {htdocs/util-local => local}/stat/coordstat.php (99%)

diff --git a/.gitignore b/.gitignore
index 73000158..af610d3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,9 +29,16 @@
 /htdocs/resource2/tinymce/tiny_mce_*.gz
 /htdocs/robots.txt
 /htdocs/sitemap*xml*
-/htdocs/util-local/ocxml11client/data-files
-/htdocs/util-local/ocxml11client/tmp
 /htdocs/var/*
 /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/*
+
+/local/ocxml11client/data-files
+/local/ocxml11client/tmp
+/local/ocxml11client/settings.php
+
+# IDE related files
+/.idea/
+*.iml
+atlassian-ide-plugin.xml
diff --git a/htdocs/util-local/.htaccess b/htdocs/util-local/.htaccess
deleted file mode 100644
index d75c7092..00000000
--- a/htdocs/util-local/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<FilesMatch "*">
-Order Deny,Allow
-Deny from All
-</FilesMatch>
diff --git a/htdocs/util-local/mailing/.htaccess b/htdocs/util-local/mailing/.htaccess
deleted file mode 100644
index d75c7092..00000000
--- a/htdocs/util-local/mailing/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<FilesMatch "*">
-Order Deny,Allow
-Deny from All
-</FilesMatch>
diff --git a/htdocs/util-local/maintenance/.htaccess b/htdocs/util-local/maintenance/.htaccess
deleted file mode 100644
index d75c7092..00000000
--- a/htdocs/util-local/maintenance/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<FilesMatch "*">
-Order Deny,Allow
-Deny from All
-</FilesMatch>
diff --git a/htdocs/util-local/ocxml11client/.htaccess b/htdocs/util-local/ocxml11client/.htaccess
deleted file mode 100644
index d75c7092..00000000
--- a/htdocs/util-local/ocxml11client/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<FilesMatch "*">
-Order Deny,Allow
-Deny from All
-</FilesMatch>
diff --git a/htdocs/util-local/prodsys/.htaccess b/htdocs/util-local/prodsys/.htaccess
deleted file mode 100644
index d75c7092..00000000
--- a/htdocs/util-local/prodsys/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-<FilesMatch "*">
-Order Deny,Allow
-Deny from All
-</FilesMatch>
diff --git a/htdocs/util-local/mailing/email-addresslist.php b/local/mailing/email-addresslist.php
similarity index 91%
rename from htdocs/util-local/mailing/email-addresslist.php
rename to local/mailing/email-addresslist.php
index 50be0609..5adf0bdc 100644
--- a/htdocs/util-local/mailing/email-addresslist.php
+++ b/local/mailing/email-addresslist.php
@@ -1,7 +1,7 @@
 <?php
 	//	For license information see doc/license.txt
 
-  $opt['rootpath'] = '../../';
+  $opt['rootpath'] = '../htdocs/';
   header('Content-type: text/html; charset=utf-8');
   require($opt['rootpath'] . 'lib2/web.inc.php');
 
diff --git a/htdocs/util-local/mailing/mailing.php b/local/mailing/mailing.php
similarity index 100%
rename from htdocs/util-local/mailing/mailing.php
rename to local/mailing/mailing.php
diff --git a/htdocs/util-local/maintenance/update_queries.php b/local/maintenance/update_queries.php
similarity index 97%
rename from htdocs/util-local/maintenance/update_queries.php
rename to local/maintenance/update_queries.php
index e4b5ddde..cad5050a 100644
--- a/htdocs/util-local/maintenance/update_queries.php
+++ b/local/maintenance/update_queries.php
@@ -8,7 +8,7 @@
  *  Unicode Reminder メモ
  ***************************************************************************/
 
-	$opt['rootpath'] = '../../';
+	$opt['rootpath'] = '../htdocs/';
   require($opt['rootpath'] . 'lib2/web.inc.php');
 
 	$rs = sql("SELECT * FROM queries");
diff --git a/htdocs/util-local/ocxml11client/index.php b/local/ocxml11client/index.php
similarity index 99%
rename from htdocs/util-local/ocxml11client/index.php
rename to local/ocxml11client/index.php
index 72549b5b..591e9c6f 100644
--- a/htdocs/util-local/ocxml11client/index.php
+++ b/local/ocxml11client/index.php
@@ -28,7 +28,7 @@
 		
 	***************************************************************************/
 
-	$rootpath = '../../';
+	$rootpath = '../htdocs/';
 
 	// chdir to proper directory (needed for cronjobs)
 	chdir(substr(realpath($_SERVER['PHP_SELF']), 0, strrpos(realpath($_SERVER['PHP_SELF']), '/')));
diff --git a/htdocs/util-local/ocxml11client/settings-dist.php b/local/ocxml11client/settings-dist.php
similarity index 100%
rename from htdocs/util-local/ocxml11client/settings-dist.php
rename to local/ocxml11client/settings-dist.php
diff --git a/htdocs/util-local/ocxml11client/xml2array.inc.php b/local/ocxml11client/xml2array.inc.php
similarity index 100%
rename from htdocs/util-local/ocxml11client/xml2array.inc.php
rename to local/ocxml11client/xml2array.inc.php
diff --git a/htdocs/util-local/prodsys/Contents b/local/prodsys/Contents
similarity index 100%
rename from htdocs/util-local/prodsys/Contents
rename to local/prodsys/Contents
diff --git a/htdocs/util-local/prodsys/phpzip.php b/local/prodsys/phpzip.php
similarity index 100%
rename from htdocs/util-local/prodsys/phpzip.php
rename to local/prodsys/phpzip.php
diff --git a/htdocs/util-local/prodsys/purge_master_logs.php b/local/prodsys/purge_master_logs.php
similarity index 100%
rename from htdocs/util-local/prodsys/purge_master_logs.php
rename to local/prodsys/purge_master_logs.php
diff --git a/htdocs/util-local/stat/coordstat.php b/local/stat/coordstat.php
similarity index 99%
rename from htdocs/util-local/stat/coordstat.php
rename to local/stat/coordstat.php
index d129957d..cbec3425 100644
--- a/htdocs/util-local/stat/coordstat.php
+++ b/local/stat/coordstat.php
@@ -7,7 +7,7 @@
 
 // statistical data for cache and log activity map
 
-chdir ("../..");
+chdir ("../htdocs");
 require('lib2/web.inc.php');
 
 error_reporting(error_reporting() & ~E_NOTICE);