From 6488bd561bba631e7f5f7d68c0df64b64c764952 Mon Sep 17 00:00:00 2001
From: Axel ROGER <axel.roger2@gmail.com>
Date: Thu, 6 Dec 2012 10:10:33 +0000
Subject: [PATCH] Warnings mis dans les templates

---
 roundcube/roundcube-install                   | 32 ++-----------------
 .../templates/logrotate.d/roundcube-core      |  7 ++++
 roundcube/templates/roundcube/main.inc.php    | 11 +++++++
 .../plugins/managesieve/config.inc.php        | 11 +++++++
 .../roundcube/plugins/password/config.inc.php | 11 +++++++
 5 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/roundcube/roundcube-install b/roundcube/roundcube-install
index 3ef959e8..9a673e09 100644
--- a/roundcube/roundcube-install
+++ b/roundcube/roundcube-install
@@ -39,7 +39,7 @@ then
     . /etc/alternc/local.sh
     # Configuration template location
     TEMPLATE_DIR="/etc/alternc/templates"
-    CONFIG_FILES="etc/roundcube/main.inc.php etc/roundcube/plugins/password/config.inc.php"
+    CONFIG_FILES="etc/roundcube/main.inc.php etc/roundcube/plugins/password/config.inc.php etc/roundcube/plugins/managesieve/config.inc.php"
     LOGROTATE_FILES="etc/logrotate.d/roundcube-core"
 
     cat > $SED_SCRIPT <<EOF
@@ -54,25 +54,7 @@ EOF
 	TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
 	echo -n " $file"
 	if [ -f "$TEMPLATE" ]; then
-            (
-              echo '<?php'
-              echo '/*****************************************************/'
-              echo '/* /!\ DO NOT EDIT THIS FILE /!\                     */'
-              echo '/* Edit the one in /etc/alternc/templates/roundcube/ */'
-              echo '/* and launch alternc.install again.                 */'
-              echo '/*****************************************************/'
-              echo ''
-            ) > /$file
-            sed -f "$SED_SCRIPT" < $TEMPLATE >> /$file
-             (
-              echo ''
-              echo '/*****************************************************/'
-              echo '/* /!\ DO NOT EDIT THIS FILE /!\                     */'
-              echo '/* Edit the one in /etc/alternc/templates/roundcube/ */'
-              echo '/* and launch alternc.install again.                 */'
-              echo '/*****************************************************/'
-              echo '?>'
-            ) >> /$file
+            sed -f "$SED_SCRIPT" < $TEMPLATE > /$file
 	fi
     done
 
@@ -84,15 +66,7 @@ EOF
         TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
         echo -n " $file"
         if [ -f "$TEMPLATE" ]; then
-            (
-              echo '#######################################################'
-              echo '# /!\ DO NOT EDIT THIS FILE /!\                       #'
-              echo '# Edit the one in /etc/alternc/templates/logrotate.d/ #'
-              echo '# and launch alternc.install again.                   #'
-              echo '#######################################################'
-              echo ''
-            ) > /$file
-            cat $TEMPLATE >> /$file
+            cat $TEMPLATE > /$file
         fi
     done
 
diff --git a/roundcube/templates/logrotate.d/roundcube-core b/roundcube/templates/logrotate.d/roundcube-core
index 3c6012f4..c5a9e8f6 100644
--- a/roundcube/templates/logrotate.d/roundcube-core
+++ b/roundcube/templates/logrotate.d/roundcube-core
@@ -1,3 +1,10 @@
+######
+# Configuration file of Roundcube's logrotate for AlternC
+#
+# /!\ WARNING /!\ Do not edit this file, edit the one in
+# /etc/alternc/templates/logrotate.d/ and launch alternc.install again.
+######
+
 /var/log/roundcube/password /var/log/roundcube/errors /var/log/roundcube/sendmail /var/log/roundcube/userlogins {
   create 0640 alternc-roundcube root 
   compress
diff --git a/roundcube/templates/roundcube/main.inc.php b/roundcube/templates/roundcube/main.inc.php
index 9a3a7fbd..6d06dc74 100644
--- a/roundcube/templates/roundcube/main.inc.php
+++ b/roundcube/templates/roundcube/main.inc.php
@@ -1,3 +1,12 @@
+<?php
+
+/***********************************************************************/
+// Roundcube's Configuration file for AlternC                          //
+//                                                                     //
+// /!\ WARNING /!\ Do not edit this file, edit the one in              //
+// /etc/alternc/templates/roundcube/ and launch alternc.install again. //
+//                                                                     //
+/***********************************************************************/
 
 /*
 +-----------------------------------------------------------------------+
@@ -790,3 +799,5 @@ $rcmail_config['spellcheck_before_send'] = false;
 $rcmail_config['autocomplete_single'] = false;
 
 // end of config file
+
+?>
diff --git a/roundcube/templates/roundcube/plugins/managesieve/config.inc.php b/roundcube/templates/roundcube/plugins/managesieve/config.inc.php
index 54c8ebaf..3558a104 100644
--- a/roundcube/templates/roundcube/plugins/managesieve/config.inc.php
+++ b/roundcube/templates/roundcube/plugins/managesieve/config.inc.php
@@ -1,3 +1,13 @@
+<?php
+
+/***********************************************************************/
+// Configuration file of managesieve's plugin of Roundcube for AlternC //
+//                                                                     //
+// /!\ WARNING /!\ Do not edit this file, edit the one in              //
+// /etc/alternc/templates/roundcube/plugins/managesieve/               //
+// and launch alternc.install again.                                   //
+//                                                                     //
+/***********************************************************************/
 
 // managesieve server port
 $rcmail_config['managesieve_port'] = 2000;
@@ -63,3 +73,4 @@ $rcmail_config['managesieve_filename_extension'] = '.sieve';
 // Scripts listed here will be not presented to the user.
 $rcmail_config['managesieve_filename_exceptions'] = array();
 
+?>
diff --git a/roundcube/templates/roundcube/plugins/password/config.inc.php b/roundcube/templates/roundcube/plugins/password/config.inc.php
index 9b048310..f2741c57 100644
--- a/roundcube/templates/roundcube/plugins/password/config.inc.php
+++ b/roundcube/templates/roundcube/plugins/password/config.inc.php
@@ -1,3 +1,13 @@
+<?php
+
+/***********************************************************************/
+// Configuration file of password's plugin of Roundcube for AlternC    //
+//                                                                     //
+// /!\ WARNING /!\ Do not edit this file, edit the one in              //
+// /etc/alternc/templates/roundcube/plugins/password/                  //
+// and launch alternc.install again.                                   //
+//                                                                     //
+/***********************************************************************/
 
 // Password Plugin options
 // -----------------------
@@ -305,3 +315,4 @@ $rcmail_config['hmailserver_server'] = array(
 // 7: domain_username
 $rcmail_config['password_virtualmin_format'] = 0;
 
+?>