From bb6423c32916816999a78081e33a0d3eff25041c Mon Sep 17 00:00:00 2001
From: Axel ROGER <axel.roger2@gmail.com>
Date: Wed, 5 Dec 2012 11:15:09 +0000
Subject: [PATCH] I did a mistake, warnings are now writen into configuration
 files, and not in templates...

---
 roundcube/roundcube-install                   | 20 ++++++++++++++++++-
 roundcube/templates/roundcube/main.inc.php    |  1 -
 .../plugins/managesieve/config.inc.php        |  2 --
 .../roundcube/plugins/password/config.inc.php | 12 -----------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/roundcube/roundcube-install b/roundcube/roundcube-install
index a0565c10..95942c0f 100644
--- a/roundcube/roundcube-install
+++ b/roundcube/roundcube-install
@@ -53,7 +53,25 @@ EOF
 	TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
 	echo -n " $file"
 	if [ -f "$TEMPLATE" ]; then
-            sed -f "$SED_SCRIPT" < $TEMPLATE > /$file
+            (
+              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
 	fi
     done
     rm -f $SED_SCRIPT
diff --git a/roundcube/templates/roundcube/main.inc.php b/roundcube/templates/roundcube/main.inc.php
index 7b924b2b..9a3a7fbd 100644
--- a/roundcube/templates/roundcube/main.inc.php
+++ b/roundcube/templates/roundcube/main.inc.php
@@ -1,4 +1,3 @@
-<?php
 
 /*
 +-----------------------------------------------------------------------+
diff --git a/roundcube/templates/roundcube/plugins/managesieve/config.inc.php b/roundcube/templates/roundcube/plugins/managesieve/config.inc.php
index cb9b2a97..54c8ebaf 100644
--- a/roundcube/templates/roundcube/plugins/managesieve/config.inc.php
+++ b/roundcube/templates/roundcube/plugins/managesieve/config.inc.php
@@ -1,4 +1,3 @@
-<?php
 
 // managesieve server port
 $rcmail_config['managesieve_port'] = 2000;
@@ -64,4 +63,3 @@ $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 6734d4a0..9b048310 100644
--- a/roundcube/templates/roundcube/plugins/password/config.inc.php
+++ b/roundcube/templates/roundcube/plugins/password/config.inc.php
@@ -1,10 +1,3 @@
-<?php
-
-/**********************************************************************/
-/* /!\ DO NOT EDIT THIS FILE /!\                                      */
-/* Edit the one in /etc/alternc/templates/roundcube/plugins/password/ */
-/* and launch alternc.install again.                                  */
-/**********************************************************************/
 
 // Password Plugin options
 // -----------------------
@@ -312,8 +305,3 @@ $rcmail_config['hmailserver_server'] = array(
 // 7: domain_username
 $rcmail_config['password_virtualmin_format'] = 0;
 
-/**********************************/
-/* /!\ DO NOT EDIT THIS FILE /!\  */
-/**********************************/
-
-?>