Changeset 199

Show
Ignore:
Timestamp:
09/15/07 20:21:37 (16 months ago)
Author:
jonas
Message:

CpVES 0.08

Location:
trunk
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r198 r199  
    1 CpVES 0.08 YYYY-MM-DD - Jonas Genannt - <jonas.genannt@brachium-system.net> 
     1CpVES 0.08 2007-09-15 - Jonas Genannt - <jonas.genannt@brachium-system.net> 
    22        o Added: policyd-weight per user/domain configuration 
    33        o Added: greylisting per user/domain configuration 
    44        o Added: some logging to listMailer.pl 
    55        o Improved: mailinglists feature 
     6        o Imrpoved: delete domain and delete lists 
    67        o Improved: some code cleanup 
    78        o Improved: display username only if an user is logged in (#34) 

  • trunk/includes/config.inc.default.php

    r198 r199  
    8585         "autoresponder_send", "email_options","fetchmail", 
    8686         "mailarchive","mailfilter","spamassassin","spamassassin_learn","autoresponder_xheader"); 
    87 $config['cpves_version']="0.08-SVN"; 
     87$config['cpves_version']="0.08"; 
    8888require_once(ROOT . '/includes/func.inc.php'); 
    89 require_once(ROOT . '/includes/select_labels.inc.php'); 
    9089?> 

  • trunk/includes/localization/cpves.pot

    r186 r199  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2007-09-10 18:39+0200\n" 
     11"POT-Creation-Date: 2007-09-15 18:57+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    … …  
    9595msgstr "" 
    9696 
     97msgid "options of %1" 
     98msgstr "" 
     99 
     100msgid "policyd-weight available" 
     101msgstr "" 
     102 
     103msgid "greylisting available" 
     104msgstr "" 
     105 
    97106msgid "server" 
    98107msgstr "" 
    … …  
    420429msgstr "" 
    421430 
     431msgid "email address is already on the list!" 
     432msgstr "" 
     433 
     434msgid "mailinglist" 
     435msgstr "" 
     436 
     437msgid "state" 
     438msgstr "" 
     439 
     440msgid "public" 
     441msgstr "" 
     442 
     443msgid "private" 
     444msgstr "" 
     445 
    422446msgid "imap connection" 
    423447msgstr "" 
    … …  
    517541 
    518542msgid "not active" 
     543msgstr "" 
     544 
     545msgid "list" 
     546msgstr "" 
     547 
     548msgid "recipients" 
     549msgstr "" 
     550 
     551msgid "no recipients found" 
     552msgstr "" 
     553 
     554msgid "Do you want to delete this list?" 
     555msgstr "" 
     556 
     557msgid "mailinglist deleted!" 
    519558msgstr "" 
    520559 
    … …  
    707746msgstr "" 
    708747 
    709 msgid "recipients" 
    710 msgstr "" 
    711  
    712 msgid "public" 
    713 msgstr "" 
    714  
    715 msgid "private" 
    716 msgstr "" 
    717  
    718748msgid "deactivate mailinglist." 
    719749msgstr "" 
    … …  
    776806msgstr "" 
    777807 
     808msgid "Mailinglist feature" 
     809msgstr "" 
     810 
     811msgid "activate mailinglists." 
     812msgstr "" 
     813 
     814msgid "deactivate mailinglists." 
     815msgstr "" 
     816 
     817msgid "Policyd-Weight" 
     818msgstr "" 
     819 
     820msgid "activate policyd-weight." 
     821msgstr "" 
     822 
     823msgid "deactivate policyd-weight." 
     824msgstr "" 
     825 
     826msgid "Greylisting" 
     827msgstr "" 
     828 
     829msgid "activate greylisting." 
     830msgstr "" 
     831 
     832msgid "deactivate greylisting." 
     833msgstr "" 
     834 
    778835msgid "activate CpVES webinterface." 
    779836msgstr "" 
    … …  
    857914msgstr "" 
    858915 
     916msgid "recipient" 
     917msgstr "" 
     918 
     919msgid "add address to list" 
     920msgstr "" 
     921 
     922msgid "list is" 
     923msgstr "" 
     924 
    859925msgid "fowardings" 
    860926msgstr "" 
    … …  
    883949msgid "delete domain..." 
    884950msgstr "" 
     951 
     952msgid "Once" 
     953msgstr "" 
     954 
     955msgid "Up to the second mail" 
     956msgstr "" 
     957 
     958msgid "Up to the third Mail" 
     959msgstr "" 
     960 
     961msgid "Up to the fourth Mail" 
     962msgstr "" 
     963 
     964msgid "Up to the fifth Mai" 
     965msgstr "" 
     966 
     967msgid "every mail" 
     968msgstr "" 

  • trunk/includes/localization/de_DE.UTF-8/LC_MESSAGES/cpves.po

    r186 r199  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2007-09-10 18:39+0200\n" 
     11"POT-Creation-Date: 2007-09-15 18:57+0200\n" 
    1212"PO-Revision-Date: 2007-09-04 21:21+0200\n" 
    1313"Last-Translator: Jonas Genannt <jonas@valentina.brachium-system.net>\n" 
    … …  
    101101msgstr "HinzufÃŒgen" 
    102102 
     103#, fuzzy 
     104msgid "options of %1" 
     105msgstr "Einstellungen von %1" 
     106 
     107#, fuzzy 
     108msgid "policyd-weight available" 
     109msgstr "Weiterleitung verfögbar" 
     110 
     111#, fuzzy 
     112msgid "greylisting available" 
     113msgstr "Weiterleitung verfögbar" 
     114 
    103115msgid "server" 
    104116msgstr "Server" 
    … …  
    434446msgstr "Beide X-Headerfelder werden benötigt!" 
    435447 
     448#, fuzzy 
     449msgid "email address is already on the list!" 
     450msgstr "E-Mailadresse schon vorhanden!" 
     451 
     452#, fuzzy 
     453msgid "mailinglist" 
     454msgstr "Mailinglisten" 
     455 
     456#, fuzzy 
     457msgid "state" 
     458msgstr "Speichern" 
     459 
     460msgid "public" 
     461msgstr "Öffentlich" 
     462 
     463msgid "private" 
     464msgstr "Privat" 
     465 
    436466msgid "imap connection" 
    437467msgstr "IMAP Verbindung" 
    … …  
    533563msgid "not active" 
    534564msgstr "Nicht aktiv" 
     565 
     566#, fuzzy 
     567msgid "list" 
     568msgstr "Whitelist" 
     569 
     570msgid "recipients" 
     571msgstr "EmpfÀnger" 
     572 
     573#, fuzzy 
     574msgid "no recipients found" 
     575msgstr "EmpfÀnger" 
     576 
     577#, fuzzy 
     578msgid "Do you want to delete this list?" 
     579msgstr "Wollen Sie diese Weiterleitung wirklich löschen?" 
     580 
     581#, fuzzy 
     582msgid "mailinglist deleted!" 
     583msgstr "Mailinglisten" 
    535584 
    536585msgid "menu" 
    … …  
    724773msgstr "Mailinglisten" 
    725774 
    726 msgid "recipients" 
    727 msgstr "EmpfÀanger" 
    728  
    729 msgid "public" 
    730 msgstr "Öffentlich" 
    731  
    732 msgid "private" 
    733 msgstr "Privat" 
    734  
    735775msgid "deactivate mailinglist." 
    736776msgstr "Mailingliste deaktivieren." 
    … …  
    793833msgstr "Webmail deaktivieren." 
    794834 
     835#, fuzzy 
     836msgid "Mailinglist feature" 
     837msgstr "Mailinglisten" 
     838 
     839#, fuzzy 
     840msgid "activate mailinglists." 
     841msgstr "Mailingliste aktivieren." 
     842 
     843#, fuzzy 
     844msgid "deactivate mailinglists." 
     845msgstr "Mailingliste deaktivieren." 
     846 
     847msgid "Policyd-Weight" 
     848msgstr "" 
     849 
     850#, fuzzy 
     851msgid "activate policyd-weight." 
     852msgstr "Weiterleitung aktivieren." 
     853 
     854#, fuzzy 
     855msgid "deactivate policyd-weight." 
     856msgstr "Weiterleitung deaktivieren." 
     857 
     858msgid "Greylisting" 
     859msgstr "" 
     860 
     861#, fuzzy 
     862msgid "activate greylisting." 
     863msgstr "Whitelisting aktivieren." 
     864 
     865#, fuzzy 
     866msgid "deactivate greylisting." 
     867msgstr "Whitelisting deaktivieren." 
     868 
    795869msgid "activate CpVES webinterface." 
    796870msgstr "CpVES Webinterface aktivieren." 
    … …  
    874948msgstr "E-Mailadresse wurde gelöscht." 
    875949 
     950#, fuzzy 
     951msgid "recipient" 
     952msgstr "EmpfÀanger" 
     953 
     954#, fuzzy 
     955msgid "add address to list" 
     956msgstr "Neue Adresse hinzufÃŒgen" 
     957 
     958msgid "list is" 
     959msgstr "" 
     960 
    876961msgid "fowardings" 
    877962msgstr "Weiterleitungen" 
    … …  
    900985msgid "delete domain..." 
    901986msgstr "Domain wird gelöscht..." 
     987 
     988msgid "Once" 
     989msgstr "Nur einmal" 
     990 
     991msgid "Up to the second mail" 
     992msgstr "Bis zur zweiten Mail" 
     993 
     994msgid "Up to the third Mail" 
     995msgstr "Bis zur dritten Mail" 
     996 
     997msgid "Up to the fourth Mail" 
     998msgstr "Bis zur vierten Mail" 
     999 
     1000msgid "Up to the fifth Mai" 
     1001msgstr "Bis zur fÃŒnften Mail" 
     1002 
     1003msgid "every mail" 
     1004msgstr "Bei jeder Mail" 

  • trunk/includes/sites/domain_del.php

    r144 r199  
    6767                $db->escapeSimple($_POST['did'])); 
    6868        $db->query($sql); 
    69          
     69        $sql=sprintf("SELECT id FROM lists WHERE domainid='%d'", 
     70                $db->escapeSimple($_POST['did'])); 
     71        $result= &$db->query($sql); 
     72        while ($row=$result->fetchrow(DB_FETCHMODE_ASSOC)) { 
     73                $sql=sprintf("DELETE FROM list_recp WHERE id='%d'", 
     74                        $db->escapeSimple($row['id'])); 
     75                $db->query($sql); 
     76        } 
    7077        $sql=sprintf("DELETE FROM lists WHERE domainid='%d'", 
    7178                $db->escapeSimple($_POST['did'])); 

  • trunk/includes/sites/list_del.php

    r142 r199  
    4949                        $db->escapeSimple($_GET['id'])); 
    5050                $db->query($sql); 
     51                $sql=sprintf("DELETE FROM list_recp WHERE id = %d", 
     52                        $db->escapeSimple($_GET['id'])); 
     53                $db->query($sql); 
    5154        } 
    5255 

  • trunk/mail_system.sql

    r189 r199  
    11-- phpMyAdmin SQL Dump 
    2 -- version 2.6.2-Debian-3sarge3 
     2-- version 2.9.1.1-Debian-3 
    33-- http://www.phpmyadmin.net 
    44--  
    55-- Host: localhost 
    6 -- Generation Time: Aug 25, 2007 at 02:18 AM 
    7 -- Server version: 4.1.11 
    8 -- PHP Version: 4.3.10-22 
     6-- Generation Time: Sep 15, 2007 at 08:13 PM 
     7-- Server version: 5.0.32 
     8-- PHP Version: 5.2.0-8+etch7 
    99--  
    1010-- Database: `mail_system` 
    … …  
    2525  `full_name` varchar(255) collate utf8_unicode_ci default NULL, 
    2626  `cpasswd` varchar(255) character set utf8 NOT NULL default '', 
     27  `web_lang` varchar(8) collate utf8_unicode_ci NOT NULL, 
    2728  PRIMARY KEY  (`id`), 
    2829  UNIQUE KEY `id` (`id`) 
    2930) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; 
    30  
    31 --  
    32 -- Dumping data for table `adm_users` 
    33 --  
    34  
    35 INSERT INTO `adm_users` VALUES (1, 'admin', '', 1, 1, 'Superadmin', '$1$Ekjbn5PV$lTKL1k2IkDKzpneppf6Wx0'); 
    3631 
    3732-- -------------------------------------------------------- 
    … …  
    4742  PRIMARY KEY  (`id`) 
    4843) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; 
    49  
    50 --  
    51 -- Dumping data for table `admin_access` 
    52 --  
    53  
    5444 
    5545-- -------------------------------------------------------- 
    … …  
    7060) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; 
    7161 
    72 --  
    73 -- Dumping data for table `autoresponder` 
    74 --  
    75  
    76  
    7762-- -------------------------------------------------------- 
    7863 
    … …  
    9075) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    9176 
    92 --  
    93 -- Dumping data for table `autoresponder_disable` 
    94 --  
    95  
    96  
    9777-- -------------------------------------------------------- 
    9878 
    … …  
    10888  KEY `email` (`email`) 
    10989) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    110  
    111 --  
    112 -- Dumping data for table `autoresponder_recipient` 
    113 --  
    114  
    11590 
    11691-- -------------------------------------------------------- 
    … …  
    129104) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; 
    130105 
    131 --  
    132 -- Dumping data for table `autoresponder_send` 
    133 --  
    134  
     106-- -------------------------------------------------------- 
     107 
     108--  
     109-- Table structure for table `autoresponder_xheader` 
     110--  
     111 
     112CREATE TABLE `autoresponder_xheader` ( 
     113  `id` int(11) NOT NULL auto_increment, 
     114  `email` int(11) NOT NULL, 
     115  `xheader` varchar(255) NOT NULL, 
     116  `value` varchar(255) NOT NULL, 
     117  PRIMARY KEY  (`id`), 
     118  KEY `email` (`email`) 
     119) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    135120 
    136121-- -------------------------------------------------------- 
    … …  
    160145  `p_fetchmail` tinyint(1) NOT NULL default '0', 
    161146  `p_webinterface` tinyint(1) NOT NULL default '1', 
     147  `p_autores_xheader` tinyint(1) NOT NULL default '0', 
     148  `p_check_polw` tinyint(1) NOT NULL default '1', 
     149  `p_check_grey` tinyint(1) NOT NULL default '0', 
     150  `p_mlists` tinyint(4) NOT NULL default '0', 
    162151  PRIMARY KEY  (`id`), 
    163152  UNIQUE KEY `dnsname_2` (`dnsname`) 
    164153) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; 
    165  
    166 --  
    167 -- Dumping data for table `domains` 
    168 --  
    169  
    170154 
    171155-- -------------------------------------------------------- 
    … …  
    184168  KEY `conf` (`conf`) 
    185169) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    186  
    187 --  
    188 -- Dumping data for table `email_options` 
    189 --  
    190  
    191170 
    192171-- -------------------------------------------------------- 
    … …  
    211190) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    212191 
    213 --  
    214 -- Dumping data for table `fetchmail` 
    215 --  
    216  
    217  
    218192-- -------------------------------------------------------- 
    219193 
    … …  
    228202  `eto` text collate utf8_unicode_ci NOT NULL, 
    229203  `access` tinyint(1) NOT NULL default '1', 
     204  `p_check_polw` tinyint(1) NOT NULL default '1', 
     205  `p_check_grey` tinyint(1) NOT NULL default '0', 
    230206  PRIMARY KEY  (`id`), 
    231207  UNIQUE KEY `efrom` (`efrom`) 
    232208) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; 
    233  
    234 --  
    235 -- Dumping data for table `forwardings` 
    236 --  
    237  
    238209 
    239210-- -------------------------------------------------------- 
    … …  
    247218  `recp` varchar(100) default NULL, 
    248219  KEY `listID` (`id`) 
    249 ) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    250  
    251 --  
    252 -- Dumping data for table `list_recp` 
    253 --  
    254  
     220) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    255221 
    256222-- -------------------------------------------------------- 
    … …  
    262228CREATE TABLE `lists` ( 
    263229  `id` int(11) NOT NULL auto_increment, 
    264   `domainid` int(11) NOT NULL default '0', 
    265   `address` varchar(80) NOT NULL default '', 
    266   `access` enum('y','n') NOT NULL default 'y', 
    267   `public` enum('y','n') NOT NULL default 'y', 
     230  `domainid` int(11) NOT NULL, 
     231  `address` varchar(80) NOT NULL, 
     232  `access` tinyint(1) default '1', 
     233  `public` enum('y','n') NOT NULL, 
    268234  PRIMARY KEY  (`id`), 
    269235  KEY `second` (`address`,`access`) 
    270 ) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    271  
    272 --  
    273 -- Dumping data for table `lists` 
    274 --  
    275  
     236) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    276237 
    277238-- -------------------------------------------------------- 
    … …  
    294255) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    295256 
    296 --  
    297 -- Dumping data for table `mailarchive` 
    298 --  
    299  
    300  
    301257-- -------------------------------------------------------- 
    302258 
    … …  
    316272) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    317273 
    318 --  
    319 -- Dumping data for table `mailfilter` 
    320 --  
    321  
    322  
    323274-- -------------------------------------------------------- 
    324275 
    … …  
    337288  KEY `type` (`type`) 
    338289) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    339  
    340 --  
    341 -- Dumping data for table `sa_wb_listing` 
    342 --  
    343  
    344290 
    345291-- -------------------------------------------------------- 
    … …  
    360306) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    361307 
    362 --  
    363 -- Dumping data for table `spamassassin` 
    364 --  
    365  
    366  
    367308-- -------------------------------------------------------- 
    368309 
    … …  
    379320  PRIMARY KEY  (`id`) 
    380321) ENGINE=MyISAM DEFAULT CHARSET=latin1; 
    381  
    382 --  
    383 -- Dumping data for table `spamassassin_learn` 
    384 --  
    385  
    386322 
    387323-- -------------------------------------------------------- 
    … …  
    412348  `p_fetchmail` tinyint(1) NOT NULL default '0', 
    413349  `p_webinterface` tinyint(1) NOT NULL default '1', 
     350  `p_autores_xheader` tinyint(1) NOT NULL default '0', 
     351  `mb_size` int(11) NOT NULL default '0', 
     352  `p_check_polw` tinyint(1) NOT NULL default '1', 
     353  `p_check_grey` tinyint(1) NOT NULL default '0', 
    414354  PRIMARY KEY  (`id`), 
    415355  UNIQUE KEY `email` (`email`) 
    416356) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; 
    417357 
    418 --  
    419 -- Dumping data for table `users` 
    420 -- 
    421 CREATE TABLE `autoresponder_xheader` ( 
    422   `id` int(11) NOT NULL auto_increment, 
    423   `email` int(11) NOT NULL, 
    424   `xheader` varchar(255) NOT NULL, 
    425   `value` varchar(255) NOT NULL, 
    426   PRIMARY KEY  (`id`), 
    427   KEY `email` (`email`) 
    428 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 
    429 ALTER TABLE `domains` ADD `p_autores_xheader` TINYINT( 1 ) NOT NULL DEFAULT '0'; 
    430 ALTER TABLE `users` ADD `p_autores_xheader` TINYINT( 1 ) NOT NULL DEFAULT '0'; 
    431 ALTER TABLE `users` ADD `mb_size` INT NOT NULL DEFAULT '0'; 
    432 ALTER TABLE `adm_users` ADD `web_lang` VARCHAR( 8 ) NOT NULL ; 
     358-- -------------------------------------------------------- 
     359 
     360--  
     361-- Table structure for table `smtpd_recipient_classes` 
     362--  
     363 
     364 
     365DROP VIEW IF EXISTS smtpd_recipient_classes; 
     366CREATE VIEW smtpd_recipient_classes AS  SELECT email,if(p_check_polw=1,'check_polw','') AS polw,if(p_check_grey=1,'check_grey','') AS grey FROM users WHERE access=1 AND p_check_polw!=0 AND p_check_polw!=0 UNION SELECT efrom,if(p_check_polw=1,'check_polw','') AS polw,if(p_check_grey=1,'check_grey','') AS grey FROM forwardings WHERE access=1 AND p_check_polw!=0 AND p_check_polw!=0; 
     367 
     368INSERT INTO `adm_users` ( `id` , `username` , `passwd` , `access` , `manager` , `full_name` , `cpasswd` , `web_lang` ) 
     369VALUES ( 
     370NULL , 'admin', '$1$Ekjbn5PV$lTKL1k2IkDKzpneppf6Wx0', '1', '1', NULL , '', '' 
     371); 
     372 

  • trunk/web/index.php

    r196 r199  
    202202        $site="main"; 
    203203} 
     204require_once(ROOT . '/includes/select_labels.inc.php'); 
    204205require_once(ROOT . "/includes/sites/" . $site . ".php"); 
    205206$smarty->assign('template', $site . ".tpl");