From 19a9d8c1ef61e5e80096a7c0e6046ad49c32a955 Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Mon, 7 Sep 2015 11:49:12 +1000
Subject: [PATCH] Removed htaccess example files Started updating changelog

---
 .htaccess.example                          |  5 -----
 CHANGELOG                                  | 11 ++++++++---
 admin/.htaccess.example                    |  5 -----
 client/.htaccess.example                   |  5 -----
 include/limesurvey/.htaccess.example       |  4 ----
 include/limesurvey/admin/.htaccess.example |  8 --------
 6 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 .htaccess.example
 delete mode 100644 admin/.htaccess.example
 delete mode 100644 client/.htaccess.example
 delete mode 100644 include/limesurvey/.htaccess.example
 delete mode 100644 include/limesurvey/admin/.htaccess.example

diff --git a/.htaccess.example b/.htaccess.example
deleted file mode 100644
index 6351c87a..00000000
--- a/.htaccess.example
+++ /dev/null
@@ -1,5 +0,0 @@
-AuthType Basic
-AuthName "queXS CATI: Authentication Required"
-AuthUserFile /var/opt/quexs/htpasswd
-AuthGroupFile /var/opt/quexs/htgroup
-require group interviewers
diff --git a/CHANGELOG b/CHANGELOG
index b2390e9b..76c70a87 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,23 +1,28 @@
 queXS 1.14.0 - Changes since 1.13.1
 
+
+File changes for session authentication:
+
+If you have copied or used 
+
 Database changes for session authentication:
 
 /* Make the first user the admin user - with default password of: password */
 INSERT INTO `lime_users` (`users_name`, `password`, `full_name`, `parent_id`, `lang`, `superadmin`) 
 SELECT username, '0x35653838343839386461323830343731353164306535366638646336323932373733363033643064366161626264643632613131656637323164313534326438', firstName, 0, 'auto', 1
-FROM operators
+FROM operator
 WHERE operator_id = 1;
 
 /* Make all other users operators - with default password of: password */
 INSERT INTO `lime_users` (`users_name`, `password`, `full_name`, `parent_id`, `lang`, `superadmin`) 
 SELECT username, '0x35653838343839386461323830343731353164306535366638646336323932373733363033643064366161626264643632613131656637323164313534326438', firstName, 1, 'auto', 0
-FROM operators
+FROM operator
 WHERE operator_id != 1;
 
 /* Make all clients - with default password of: password */
 INSERT INTO `lime_users` (`users_name`, `password`, `full_name`, `parent_id`, `lang`, `superadmin`) 
 SELECT username, '0x35653838343839386461323830343731353164306535366638646336323932373733363033643064366161626264643632613131656637323164313534326438', firstName, 1, 'auto', 0
-FROM clients
+FROM client
 WHERE 1;
 
 /* Remove redundant table */
diff --git a/admin/.htaccess.example b/admin/.htaccess.example
deleted file mode 100644
index 416f0f13..00000000
--- a/admin/.htaccess.example
+++ /dev/null
@@ -1,5 +0,0 @@
-AuthType Basic
-AuthName "queXS CATI: Authentication Required"
-AuthUserFile /var/opt/quexs/htpasswd
-AuthGroupFile /var/opt/quexs/htgroup
-require group admin
diff --git a/client/.htaccess.example b/client/.htaccess.example
deleted file mode 100644
index 9d7db0a0..00000000
--- a/client/.htaccess.example
+++ /dev/null
@@ -1,5 +0,0 @@
-AuthType Basic
-AuthName "queXS CATI: Authentication Required"
-AuthUserFile /var/opt/quexs/htpasswd
-AuthGroupFile /var/opt/quexs/htgroup
-require group clients
diff --git a/include/limesurvey/.htaccess.example b/include/limesurvey/.htaccess.example
deleted file mode 100644
index a57f3ad0..00000000
--- a/include/limesurvey/.htaccess.example
+++ /dev/null
@@ -1,4 +0,0 @@
-AuthType None
-Satisfy Any
-Order Deny,Allow
-Allow from All
diff --git a/include/limesurvey/admin/.htaccess.example b/include/limesurvey/admin/.htaccess.example
deleted file mode 100644
index 2dfecac3..00000000
--- a/include/limesurvey/admin/.htaccess.example
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "queXS CATI: Authentication Required"
-AuthUserFile /var/opt/quexs/htpasswd
-AuthGroupFile /var/opt/quexs/htgroup
-require group admin
-Satisfy Any
-Order Deny,Allow
-Deny from all