From 80e96bc49f3e5e028f33b59b43ba3e086a1e1548 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Fri, 8 Feb 2013 11:14:42 +0000 Subject: [PATCH] fixing upgrade, telling about procmail to sieve --- .gitattributes | 2 +- install/upgrades/1.1.php | 10 +++++++++- src/Makefile | 2 +- .../procmail_to_sieve.php | 0 4 files changed, 11 insertions(+), 3 deletions(-) rename squirrelmail/procmail_to_sieve_squirrelmail.php => src/procmail_to_sieve.php (100%) diff --git a/.gitattributes b/.gitattributes index ecd650ca..7764b8f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -586,7 +586,6 @@ squirrelmail/Makefile -text squirrelmail/alternc_changepass/change.php -text squirrelmail/alternc_changepass/setup.php -text squirrelmail/class/m_squirrelmail.php -text -squirrelmail/procmail_to_sieve_squirrelmail.php -text squirrelmail/squirrelmail-install -text squirrelmail/templates/apache2/squirrelmail.conf -text squirrelmail/templates/squirrelmail/alternc-changepass.conf -text @@ -615,6 +614,7 @@ src/mail_dodelete.php -text src/mem_add -text src/mem_del -text src/popimap-log-login.sh -text +src/procmail_to_sieve.php -text src/quota-warning.sh -text src/quota_delete -text src/quota_edit -text diff --git a/install/upgrades/1.1.php b/install/upgrades/1.1.php index 0fe511f4..83c10fca 100644 --- a/install/upgrades/1.1.php +++ b/install/upgrades/1.1.php @@ -17,7 +17,15 @@ $admin->enabled=1; $db->query("SELECT * FROM sub_domaines WHERE type='webmail'"); if ($db->num_rows()) { - echo "WARNING: You have webmail domain-types, you need to install alternc-squirrelmail or alternc-roundcube to be able to use them again. They will work but may break until you do that\n"; + echo "################################################################################\n"; + echo "WARNING: You have WEBMAIL domain-types, you need to install alternc-squirrelmail or alternc-roundcube\n"; + echo "to be able to use them again. those subdomains will be broken until you do that\n"; + echo "Also, a script converts your procmail-builder filters to the new SIEVE protocol.\n"; + echo "This script is in /usr/lib/alternc/procmail_to_sieve.php once to migrate\n"; + echo "PRESS ENTER TO CONTINUE\n"; + echo "################################################################################\n"; + $f=fopen("php://stdin","rb");fgets($f,10); fclose($f); + } //updating db and dbusers tables diff --git a/src/Makefile b/src/Makefile index ee40769c..b5b92ea7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------- # Purpose of file: Makefile des binaires de /usr/lib/alternc # ---------------------------------------------------------------------- -SCRIPTS=sqlbackup.sh quota_init quota_delete update_domains.sh slave_dns sendmail spoolsize.php fixperms.sh alternc-dboptimize export_account.php cron_users_doit.sh cron_users.sh compress_logs.sh delete_logs.sh quota-warning.sh update_mails.sh alternc_add_policy_dovecot rebuild_all_webconf.sh courier-dovecot-migrate.pl popimap-log-login.sh mem_add mem_del quota_edit quota_get du.pl update_quota_mail.sh inotify_update_domains.sh functions.sh functions_hosting.sh functions_dns.sh mail_dodelete.php +SCRIPTS=sqlbackup.sh quota_init quota_delete update_domains.sh slave_dns sendmail spoolsize.php fixperms.sh alternc-dboptimize export_account.php cron_users_doit.sh cron_users.sh compress_logs.sh delete_logs.sh quota-warning.sh update_mails.sh alternc_add_policy_dovecot rebuild_all_webconf.sh courier-dovecot-migrate.pl popimap-log-login.sh mem_add mem_del quota_edit quota_get du.pl update_quota_mail.sh inotify_update_domains.sh functions.sh functions_hosting.sh functions_dns.sh mail_dodelete.php procmail_to_sieve.php BIN=$(DESTDIR)/usr/lib/alternc/ install: diff --git a/squirrelmail/procmail_to_sieve_squirrelmail.php b/src/procmail_to_sieve.php similarity index 100% rename from squirrelmail/procmail_to_sieve_squirrelmail.php rename to src/procmail_to_sieve.php