From e76a8114f86d4ca883b89b4521c16e086f9b7ff4 Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Mon, 6 Dec 2004 11:15:00 +0000 Subject: [PATCH] sendmail modifications + emails modularization * Sendmail moved to emails/send * sql + README files git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-61 --- htdocs/{sendmail.php => emails/send.php} | 4 +-- include/conf.d/emails.menu.inc.php | 6 ++-- install.d/emails/README | 31 +++++++++++++++++++ install.d/emails/files | 7 ++--- install.d/emails/install.sql | 47 +++++++++++++++++++++++++++++ install.d/emails/uninstall.sql | 4 +++ install.d/money/files | 2 +- templates/docs/faq.tpl | 2 +- templates/docs/plan.tpl | 2 +- templates/docs/services.tpl | 2 +- templates/{sendmail.tpl => emails/send.tpl} | 14 ++++----- 11 files changed, 101 insertions(+), 20 deletions(-) rename htdocs/{sendmail.php => emails/send.php} (96%) create mode 100644 install.d/emails/README create mode 100644 install.d/emails/install.sql create mode 100644 install.d/emails/uninstall.sql rename templates/{sendmail.tpl => emails/send.tpl} (90%) diff --git a/htdocs/sendmail.php b/htdocs/emails/send.php similarity index 96% rename from htdocs/sendmail.php rename to htdocs/emails/send.php index 08caaff..9db6665 100644 --- a/htdocs/sendmail.php +++ b/htdocs/emails/send.php @@ -20,7 +20,7 @@ ***************************************************************************/ require_once("xorg.inc.php"); -new_skinned_page('sendmail.tpl',AUTH_MDP); +new_skinned_page('emails/send.tpl',AUTH_MDP); // action si on recoit un formulaire @@ -65,7 +65,7 @@ if (isset($_REQUEST['submit']) and $_REQUEST['submit'] == 'Envoyer' $sql = "SELECT u.prenom, u.nom, u.promo, a.alias as forlife FROM auth_user_md5 AS u INNER JOIN contacts AS c ON (u.user_id = c.contact) - INNER JOIN aliases AS a ON (u.user_id=a.id AND type='a_vie') + INNER JOIN aliases AS a ON (u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags)) WHERE c.uid = {$_SESSION['uid']} ORDER BY u.nom, u.prenom"; $page->mysql_assign($sql, 'contacts','nb_contacts'); diff --git a/include/conf.d/emails.menu.inc.php b/include/conf.d/emails.menu.inc.php index cf4367b..557f750 100644 --- a/include/conf.d/emails.menu.inc.php +++ b/include/conf.d/emails.menu.inc.php @@ -1,9 +1,9 @@ addPrivateEntry(XOM_CUSTOM, 00, 'Mes emails', 'emails.php'); +$this->addPrivateEntry(XOM_CUSTOM, 00, 'Mes emails', 'emails.php'); if ($globals->mail->send_form) { - $this->addPrivateEntry(XOM_SERVICES, 00, 'Envoyer un mail', 'sendmail.php'); + $this->addPrivateEntry(XOM_SERVICES, 00, 'Envoyer un mail', 'emails/send.php'); } -$this->addPrivateEntry(XOM_SERVICES, 40, 'Patte cassée', 'emails/broken.php'); +$this->addPrivateEntry(XOM_SERVICES, 40, 'Patte cassée', 'emails/broken.php'); ?> diff --git a/install.d/emails/README b/install.d/emails/README new file mode 100644 index 0000000..8c9357e --- /dev/null +++ b/install.d/emails/README @@ -0,0 +1,31 @@ + + Notes for the emails module for plat/al + + +CONFIG OPTIONS +-------------- + + All settings of the module are shown here with their default and meaning + + [Mail] + + domain = '' ; main domain for email addresses + domain2 = '' ; secondary domain for email addresses + + alias_dom = '' ; main domain for ``PAPS'' aliases + alias_dom2 = '' ; secondary domain for ``PAPS'' aliases + + send_form = 1 ; enable the emails/send.php form + + +BUGS +---- + + http://trackers.polytechnique.org/index.php?cat=17 + + +DEPENDS +------- + + platal + diff --git a/install.d/emails/files b/install.d/emails/files index 4863df1..4897f46 100644 --- a/install.d/emails/files +++ b/install.d/emails/files @@ -4,17 +4,16 @@ htdocs/antispam.php htdocs/emails/broken.php htdocs/emails.php htdocs/emails/redirect.php +htdocs/emails/send.php include/emails.inc.php include/validations/aliases.inc.php templates/alias.tpl templates/antispam.tpl +templates/emails/broken.tpl templates/emails/redirect.tpl +templates/emails/send.tpl templates/emails.tpl -templates/emailx/broken.tpl templates/include/form.valid.aliases.tpl templates/mails/valid.alias.tpl templates/preferences.tpl.d/10.mails.tpl templates/preferences.tpl.d/20.alias.tpl - -htdocs/sendmail.php -templates/sendmail.tpl diff --git a/install.d/emails/install.sql b/install.d/emails/install.sql new file mode 100644 index 0000000..ae6475a --- /dev/null +++ b/install.d/emails/install.sql @@ -0,0 +1,47 @@ +-- +-- Table structure for table `emails` +-- + +CREATE TABLE `emails` ( + `uid` smallint(5) unsigned NOT NULL default '0', + `email` char(60) NOT NULL default '', + `rewrite` char(128) NOT NULL default '', + `panne` date NOT NULL default '0000-00-00', + `flags` set('active','filter','mtic') NOT NULL default '', + PRIMARY KEY (`uid`,`email`), + KEY `emails` (`email`(20)), + KEY `uid` (`uid`) +) TYPE=MyISAM PACK_KEYS=1 COMMENT='listes des emails'; + +-- +-- Table structure for table `virtual` +-- + +CREATE TABLE `virtual` ( + `vid` int(11) NOT NULL auto_increment, + `alias` varchar(255) NOT NULL default '', + `type` enum('user','list','dom') NOT NULL default 'user', + PRIMARY KEY (`vid`), + UNIQUE KEY `alias` (`alias`) +) TYPE=MyISAM; + +-- +-- Table structure for table `virtual_domains` +-- + +CREATE TABLE `virtual_domains` ( + `domain` varchar(255) NOT NULL default '', + PRIMARY KEY (`domain`) +) TYPE=MyISAM; + +-- +-- Table structure for table `virtual_redirect` +-- + +CREATE TABLE `virtual_redirect` ( + `vid` int(11) NOT NULL auto_increment, + `redirect` varchar(255) NOT NULL default '', + PRIMARY KEY (`vid`,`redirect`), + KEY `redirect` (`redirect`) +) TYPE=MyISAM; + diff --git a/install.d/emails/uninstall.sql b/install.d/emails/uninstall.sql new file mode 100644 index 0000000..08b9273 --- /dev/null +++ b/install.d/emails/uninstall.sql @@ -0,0 +1,4 @@ +DROP TABLE `emails`; +DROP TABLE `virtual`; +DROP TABLE `virtual_domains`; +DROP TABLE `virtual_redirect`; diff --git a/install.d/money/files b/install.d/money/files index 788f542..b4074dc 100644 --- a/install.d/money/files +++ b/install.d/money/files @@ -7,7 +7,7 @@ include/conf.d/money.globals.inc.php include/conf.d/money.menu.inc.php include/money/cyberpaiement.inc.php include/money.inc.php -include/trezo.inc.php +include/money/trezo.inc.php templates/paiment/index.tpl templates/trezo/choix_date.tpl templates/trezo/gere_operations.tpl diff --git a/templates/docs/faq.tpl b/templates/docs/faq.tpl index df5a32e..b9240d1 100644 --- a/templates/docs/faq.tpl +++ b/templates/docs/faq.tpl @@ -118,7 +118,7 @@ que des informations manquent. les champs contenant une adresse @ifrance.com). Dans ce cas, tu peux utiliser le serveur SMTP de polytechnique.org. Quand tu n'as pas accès au un logiciel de courrier électronique, tu peux aussi - utiliser cette page pour envoyer un petit courriel. + utiliser cette page pour envoyer un petit courriel.

diff --git a/templates/docs/plan.tpl b/templates/docs/plan.tpl index b22379e..ae0864a 100644 --- a/templates/docs/plan.tpl +++ b/templates/docs/plan.tpl @@ -134,7 +134,7 @@