Changeset 229

Show
Ignore:
Timestamp:
09/14/08 22:32:08 (4 months ago)
Author:
jonas
Message:

Version 0.10.1

Location:
tags/cpves-0.10
Files:
11 modified

Legend:

Unmodified
Added
Removed

  • tags/cpves-0.10/ChangeLog

    r215 r229  
     1CpVES 0.10.1 2008-09-14 - Jonas Genannt - <jonas.genannt@brachium-system.net> 
     2        o Fixed: recipient classes VIEW 
     3        o Fixed: de_DE language 
     4        o Fixed: domain_add: php array_in warning 
     5        o Fixed: superadmin could not view setting 
     6        o Improved: display mailbox size with units 
    17CpVES 0.10 2007-10-11 - Jonas Genannt - <jonas.genannt@brachium-system.net> 
    28        o Improved: sa_learn.pl no longer debug output 

  • tags/cpves-0.10/includes/config.inc.default.php

    r214 r229  
    8484         "autoresponder_send", "email_options","fetchmail", 
    8585         "mailarchive","mailfilter","spamassassin","spamassassin_learn","autoresponder_xheader"); 
    86 $config['cpves_version']="0.10"; 
     86$config['cpves_version']="0.10.1"; 
    8787require_once(ROOT . '/includes/func.inc.php'); 
    8888?> 

  • tags/cpves-0.10/includes/func.inc.php

    r205 r229  
    893893                        'sadmin_add'       => 'manager', 
    894894                        'sadmin_edit'      => 'manager', 
    895                         'sadmin_options'   => 'manager', 
     895                        'sadmin_options'   => 'superadmin', 
    896896                        'sadmin_passwd'    => 'superadmin', 
    897897                        'domain_add'       => 'superadmin'); 
    … …  
    931931        } 
    932932}  
     933function mailbox_size_human($size) {  
     934        if( empty($size) ) $size = 0; 
     935                if ($size > 1024) {  
     936                        $mb_size['size']=sprintf("%01.2f",$size/1024);  
     937                        $mb_size['unit']="gb";  
     938                          
     939                }  
     940                else {  
     941                        $mb_size['size']=$size;  
     942                        $mb_size['unit']="mb";  
     943                }  
     944        return $mb_size; 
     945         
     946}  
     947 
    933948?> 

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

    r213 r229  
    8787 
    8888msgid "delete selected addresses" 
    89 msgstr "Markierte Adressen l&oeschen" 
     89msgstr "Markierte Adressen löschen" 
    9090 
    9191msgid "delete" 
    … …  
    107107#, fuzzy 
    108108msgid "policyd-weight available" 
    109 msgstr "Weiterleitung verfÃgbar" 
     109msgstr "Weiterleitung verfÃŒgbar" 
    110110 
    111111#, fuzzy 
    112112msgid "greylisting available" 
    113 msgstr "Weiterleitung verfÃgbar" 
     113msgstr "Weiterleitung verfÃŒgbar" 
    114114 
    115115msgid "server" 
    … …  
    173173msgstr "" 
    174174"Diese Option wird alle Mailfilter im System neubauen!<br>Falls Filter per " 
    175 "Hand editiert wurden, werden diese Änderungen nun gel&oumlscht!" 
     175"Hand editiert wurden, werden diese Änderungen nun gelöscht!" 
    176176 
    177177msgid "Yes, rebuild all filters" 
    … …  
    226226 
    227227msgid "Superadmin: user summary" 
    228 msgstr "Supadmin: Benutzer&uml;berisucht" 
     228msgstr "Supadmin: BenutzerÃŒberisucht" 
    229229 
    230230msgid "Superadmin: add user" 

  • tags/cpves-0.10/includes/sites/domain_add.php

    r165 r229  
    9696                                foreach($res_array as $value) 
    9797                                { 
    98                                         if (in_array($value['ipaddr'], $config['server_ip'])) 
     98                                        if (isset($value['ipaddr']) && in_array($value['ipaddr'], $config['server_ip'])) 
    9999                                        { 
    100100                                                $this_server=true; 

  • tags/cpves-0.10/includes/sites/domain_view.php

    r205 r229  
    229229        'email' =>$data['email'], 
    230230        'access' =>$data['access'], 
    231         'mb_size' =>$data['mb_size'], 
     231        'mb_size' =>mailbox_size_human($data['mb_size']), 
    232232        'autoresponder' => $autoresponder) ); 
    233233} //ENDE WHILE eMails 

  • tags/cpves-0.10/includes/sites/user_mailfilter.php

    r105 r229  
    2323 
    2424//get IMAP Folders 
    25 $folders =list_imap_folders($config['imap_server'],$_SESSION['email'],decrypt_passwd($_SESSION['cpasswd'])); 
     25$folders =list_imap_folders($config['imap_server'],$_SESSION['email'],decrypt_passwd($_SESSION['cpasswd']),0); 
    2626if ($folders== false ) { 
    2727        $smarty->assign('imap_folder_exits', 0); 

  • tags/cpves-0.10/mail_system.sql

    r214 r229  
    361361 
    362362DROP VIEW IF EXISTS smtpd_recipient_classes; 
    363 CREATE 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; 
     363CREATE 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 AND efrom NOT REGEXP '^@';  
    364364 
    365365INSERT INTO `adm_users` ( `id` , `username` , `passwd` , `access` , `manager` , `full_name` , `cpasswd` , `web_lang` ) 

  • tags/cpves-0.10/sql_upgrades

    r206 r229  
    174174ALTER TABLE `users` ADD `p_spam_fwd` TINYINT( 1 ) NOT NULL DEFAULT '0'; 
    175175ALTER TABLE `adm_users` CHANGE `web_lang` `web_lang` VARCHAR( 14 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL  
     176 
     177 
     178Version 0.10 to 0.10.1 
     179 
     180DROP VIEW IF EXISTS smtpd_recipient_classes;  
     181 CREATE 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 AND efrom NOT REGEXP '^@';  
     182 
     183 

  • tags/cpves-0.10/system_scripts/autoresponder.pl

    r170 r229  
    100100#Now check if autoresponder is enabled 
    101101my $dbh = DBI->connect($dsn, $config{'db_username'}, $config{'db_password'}); 
    102 $dbh->do("SET NAMES utf8"); 
     102#$dbh->do("SET NAMES utf8"); 
    103103 
    104104sub check_du_feature($$) { 
    … …  
    216216        my $e_send_to = MIME::Entity->build( 
    217217                Type    => "text/plain", 
    218                 Charset => "UTF-8", 
     218                Charset => "utf-8", 
    219219                Disposition => 'inline', 
    220220                Data    => $mail_text); 

  • tags/cpves-0.10/templates/domain_view.tpl

    r205 r229  
    2828{if $display_mb_size == 1} 
    2929<td style="width:250px;"> </td> 
    30 <td style="text-align:left;width:50px;">{$row.mb_size} M</td> 
     30<td style="text-align:left;width:50px;">{$row.mb_size.size} {if $row.mb_size.unit == 'gb'}GB{else}MB{/if}</td> 
    3131{else} 
    3232 <td style="width:300px;"> </td>