From ff6c9ff6252157087e9100f3992153d5c1f3b83e Mon Sep 17 00:00:00 2001 From: Alan Garcia Date: Fri, 6 Apr 2012 10:10:36 +0000 Subject: [PATCH] Commit "bourrin", beaucoup de choses. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Nouvelle interface de mail, elle n'est pas terminée mais est bien avancée - Beaucoup de correction php (notice) - Premier jet de la gestion de tache planifiées (cron) - Ajout d'un mode de debug pour l'admin Reste en ToDo : - pas mal de fixme dans le code - corriger le schema de base pour les mails (Squidly a tout ce qu'il faut, il faut qu'il le commit) - configuration Dovecot et Postfix a commiter (pareil, Squidly à tout, plukacommiter) - suppression de mail - et beaucoup de debug... Maintenant que le gros est commité, attendez-vous à beaucoup de petit commit. --- .gitattributes | 25 +- bureau/admin/adm_domstype.php | 6 +- bureau/admin/adm_domstypeedit.php | 2 +- bureau/admin/adm_list.php | 4 +- bureau/admin/adm_login.php | 4 +- bureau/admin/adm_panel.php | 10 +- bureau/admin/alternc_debugme.php | 21 + bureau/admin/cron.php | 70 ++ bureau/admin/dom_edit.php | 4 +- bureau/admin/dom_subedit.php | 4 +- bureau/admin/foot.php | 5 + bureau/admin/ftp_edit.php | 10 +- bureau/admin/ftp_list.php | 2 +- bureau/admin/images/check_no.png | Bin 0 -> 1460 bytes bureau/admin/images/check_ok.png | Bin 0 -> 4059 bytes bureau/admin/images/row-down.png | Bin 0 -> 372 bytes bureau/admin/images/row-down.png2 | Bin 0 -> 618 bytes bureau/admin/images/schedule.png | Bin 0 -> 1867 bytes bureau/admin/index.php | 4 +- bureau/admin/ip_main.php | 37 +- bureau/admin/js/alternc.js | 51 +- bureau/admin/mail_add.php | 73 +- bureau/admin/mail_alias_create.inc.php | 58 + bureau/admin/mail_alias_doedit.php | 54 + bureau/admin/mail_del.php | 92 -- bureau/admin/mail_doadd.php | 42 +- bureau/admin/mail_doedit.php | 85 +- bureau/admin/mail_edit.inc.php | 115 ++ bureau/admin/mail_edit.php | 116 -- bureau/admin/mail_list.php | 146 +-- bureau/admin/mail_localbox_doedit.php | 76 ++ bureau/admin/mail_localbox_edit.inc.php | 73 ++ bureau/admin/mail_properties.php | 160 +++ bureau/admin/mail_redirection_doedit.php | 51 + bureau/admin/mail_redirection_edit.inc.php | 93 ++ bureau/admin/menu_adm.php | 13 +- .../admin/{mail_dodel.php => menu_cron.php} | 39 +- bureau/admin/menu_dom.php | 7 +- bureau/admin/menu_ftp.php | 7 +- bureau/admin/menu_ip.php | 2 +- bureau/admin/menu_lang.php | 11 +- bureau/admin/menu_mail.php | 19 +- bureau/admin/menu_sql.php | 5 +- bureau/admin/quotas_users.php | 11 +- bureau/admin/sql_users_list.php | 6 +- bureau/admin/sql_users_rights.php | 6 +- bureau/class/config.php | 2 + bureau/class/db_mysql.php | 8 + bureau/class/functions.php | 6 + bureau/class/local.php | 1 + bureau/class/m_authip.php | 2 + bureau/class/m_bro.php | 6 +- bureau/class/m_cron.php | 147 +++ bureau/class/m_debug_alternc.php | 78 ++ bureau/class/m_dom.php | 2 +- bureau/class/m_err.php | 2 + bureau/class/m_export.php | 8 - bureau/class/m_mail.php | 1012 +++++------------ bureau/class/m_mail_alias.php | 150 +++ bureau/class/m_mail_jabber.php | 86 ++ bureau/class/m_mail_localbox.php | 177 +++ bureau/class/m_mail_redirection.php | 161 +++ bureau/class/m_mem.php | 16 +- bureau/class/m_quota.php | 8 +- bureau/class/m_trash.php | 2 + bureau/class/variables.php | 13 +- install/mysql.sql | 17 + install/upgrades/1.1.sql | 17 +- src/Makefile | 2 +- 69 files changed, 2272 insertions(+), 1270 deletions(-) create mode 100644 bureau/admin/alternc_debugme.php create mode 100644 bureau/admin/cron.php create mode 100644 bureau/admin/images/check_no.png create mode 100644 bureau/admin/images/check_ok.png create mode 100644 bureau/admin/images/row-down.png create mode 100644 bureau/admin/images/row-down.png2 create mode 100644 bureau/admin/images/schedule.png create mode 100644 bureau/admin/mail_alias_create.inc.php create mode 100644 bureau/admin/mail_alias_doedit.php delete mode 100644 bureau/admin/mail_del.php create mode 100644 bureau/admin/mail_edit.inc.php delete mode 100644 bureau/admin/mail_edit.php create mode 100644 bureau/admin/mail_localbox_doedit.php create mode 100644 bureau/admin/mail_localbox_edit.inc.php create mode 100644 bureau/admin/mail_properties.php create mode 100644 bureau/admin/mail_redirection_doedit.php create mode 100644 bureau/admin/mail_redirection_edit.inc.php rename bureau/admin/{mail_dodel.php => menu_cron.php} (67%) create mode 100644 bureau/class/m_cron.php create mode 100644 bureau/class/m_debug_alternc.php create mode 100644 bureau/class/m_mail_alias.php create mode 100644 bureau/class/m_mail_jabber.php create mode 100644 bureau/class/m_mail_localbox.php create mode 100644 bureau/class/m_mail_redirection.php diff --git a/.gitattributes b/.gitattributes index da063ecc..1b37a279 100644 --- a/.gitattributes +++ b/.gitattributes @@ -85,12 +85,14 @@ bureau/admin/aide/inline/tiret.gif -text bureau/admin/alternc.jpg -text bureau/admin/alternc.png -text bureau/admin/alternc3.png -text +bureau/admin/alternc_debugme.php -text bureau/admin/bro_editor.php -text bureau/admin/bro_main.php -text bureau/admin/bro_pref.php -text bureau/admin/bro_tgzdown.php -text bureau/admin/bro_view.php -text bureau/admin/browseforfolder.php -text +bureau/admin/cron.php -text bureau/admin/direct.php -text bureau/admin/dom_add.php -text bureau/admin/dom_doadd.php -text @@ -161,6 +163,8 @@ bureau/admin/icon/zip.png -text bureau/admin/images/admin.png -text bureau/admin/images/bgborder.gif -text bureau/admin/images/blank.gif -text +bureau/admin/images/check_no.png -text +bureau/admin/images/check_ok.png -text bureau/admin/images/config.png -text bureau/admin/images/delete.png -text bureau/admin/images/dom.png -text @@ -203,6 +207,9 @@ bureau/admin/images/password.png -text bureau/admin/images/passwordstrength.jpg -text bureau/admin/images/plus.png -text bureau/admin/images/quota.png -text +bureau/admin/images/row-down.png -text +bureau/admin/images/row-down.png2 -text +bureau/admin/images/schedule.png -text bureau/admin/images/stat.png -text bureau/admin/index.php -text bureau/admin/ip_main.php -text @@ -234,12 +241,17 @@ bureau/admin/login.php -text bureau/admin/logo.png -text bureau/admin/logo2.png -text bureau/admin/mail_add.php -text -bureau/admin/mail_del.php -text +bureau/admin/mail_alias_create.inc.php -text +bureau/admin/mail_alias_doedit.php -text bureau/admin/mail_doadd.php -text -bureau/admin/mail_dodel.php -text bureau/admin/mail_doedit.php -text -bureau/admin/mail_edit.php -text +bureau/admin/mail_edit.inc.php -text bureau/admin/mail_list.php -text +bureau/admin/mail_localbox_doedit.php -text +bureau/admin/mail_localbox_edit.inc.php -text +bureau/admin/mail_properties.php -text +bureau/admin/mail_redirection_doedit.php -text +bureau/admin/mail_redirection_edit.inc.php -text bureau/admin/main.php -text bureau/admin/mem_admin.php -text bureau/admin/mem_chgmail.php -text @@ -252,6 +264,7 @@ bureau/admin/menu.php -text bureau/admin/menu_adm.php -text bureau/admin/menu_aide.php -text bureau/admin/menu_brouteur.php -text +bureau/admin/menu_cron.php -text bureau/admin/menu_dom.php -text bureau/admin/menu_ftp.php -text bureau/admin/menu_ip.php -text @@ -314,6 +327,8 @@ bureau/class/local.php -text bureau/class/m_admin.php -text bureau/class/m_authip.php -text bureau/class/m_bro.php -text +bureau/class/m_cron.php -text +bureau/class/m_debug_alternc.php -text bureau/class/m_dom.php -text bureau/class/m_err.php -text bureau/class/m_export.php -text @@ -321,6 +336,10 @@ bureau/class/m_ftp.php -text bureau/class/m_hooks.php -text bureau/class/m_hta.php -text bureau/class/m_mail.php -text +bureau/class/m_mail_alias.php -text +bureau/class/m_mail_jabber.php -text +bureau/class/m_mail_localbox.php -text +bureau/class/m_mail_redirection.php -text bureau/class/m_mem.php -text bureau/class/m_mysql.php -text bureau/class/m_quota.php -text diff --git a/bureau/admin/adm_domstype.php b/bureau/admin/adm_domstype.php index 7f47f25a..41ea8349 100644 --- a/bureau/admin/adm_domstype.php +++ b/bureau/admin/adm_domstype.php @@ -43,9 +43,9 @@ include_once("head.php");
$error

"; - } +if (isset($error) && $error) { + echo "

$error

"; +} ?>

diff --git a/bureau/admin/adm_domstypeedit.php b/bureau/admin/adm_domstypeedit.php index d0071cf1..d85a1215 100644 --- a/bureau/admin/adm_domstypeedit.php +++ b/bureau/admin/adm_domstypeedit.php @@ -59,7 +59,7 @@ if (! $d=$dom->domains_type_get($name)) {


$error_edit

"; $error_edit=""; diff --git a/bureau/admin/adm_list.php b/bureau/admin/adm_list.php index ee2b3f54..6ff8efb7 100644 --- a/bureau/admin/adm_list.php +++ b/bureau/admin/adm_list.php @@ -67,7 +67,7 @@ $r=$admin->get_list($show == 'all' ? 1 : 0, $creator);

$error

"; } ?> @@ -75,7 +75,7 @@ $r=$admin->get_list($show == 'all' ? 1 : 0, $creator); ()   -' . _('List all AlternC accounts') . ''; if ($subadmin!=0 || $cuid==2000) { $list_creators = $admin->get_creator_list(); diff --git a/bureau/admin/adm_login.php b/bureau/admin/adm_login.php index 254abbf5..2b8629b1 100644 --- a/bureau/admin/adm_login.php +++ b/bureau/admin/adm_login.php @@ -37,7 +37,7 @@ require_once("../class/config.php"); // * with no parameter when the admin want to go back to his admin account. -if (!$_REQUEST["id"] && $_COOKIE["oldid"]) { +if ( ( !isset($_REQUEST["id"]) || !$_REQUEST["id"]) && $_COOKIE["oldid"]) { // We check the cookie's value : list($newuid,$passcheck)=explode("/",$_COOKIE["oldid"]); $newuid=intval($newuid); @@ -119,4 +119,4 @@ if ($error) { include_once("foot.php"); -?> \ No newline at end of file +?> diff --git a/bureau/admin/adm_panel.php b/bureau/admin/adm_panel.php index a6a4292f..af5bc5e8 100644 --- a/bureau/admin/adm_panel.php +++ b/bureau/admin/adm_panel.php @@ -41,11 +41,11 @@ include_once("head.php");

$error

"; - include_once("foot.php"); - exit; - } +if (isset($error) && $error) { + echo "

$error

"; + include_once("foot.php"); + exit; +} ?>