Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	horde-sam.spec
@@ -33,7 +33,7 @@ Requires: horde-webmail Version: 0.1 -Release: 2 +Release: 3 Source0: %{_pname}.tar.bz2 URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -76,5 +76,8 @@ %{apache_horde}/sam %changelog -* Sun Oct 12 2008 Carsten Schoene <cs@linux-administrator.com> +* Thu Dec 17 2009 Carsten Schoene <cs@linux-administrator.com> - 0.1-3 +- update to current CVS + +* Sun Oct 12 2008 Carsten Schoene <cs@linux-administrator.com> - 0.1-1 - initial package
[-] [+]	Changed	sam.tar.bz2/COPYING ^
@@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. + Copyright 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
[-] [+]	Changed	sam.tar.bz2/blacklist.php ^
@@ -1,8 +1,8 @@ <?php /** - * $Horde: sam/blacklist.php,v 1.28 2008-06-04 17:50:42 jan Exp $ + * $Horde: sam/blacklist.php,v 1.31 2009-07-08 18:29:51 slusarz Exp $ * - * Copyright 2002-2007 The Horde Project (http://www.horde.org/) + * Copyright 2002-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -14,7 +14,6 @@ @define('SAM_BASE', dirname(__FILE__)); require_once SAM_BASE . '/lib/base.php'; require_once SAM_BASE . '/lib/Forms/Blacklist.php'; -require_once 'Horde/Variables.php'; /* Request retrieval of related user data. / $result = $sam_driver->retrieve(); @@ -23,7 +22,7 @@ } / Initialize the form. */ -$vars = Variables::getDefaultVariables(); +$vars = Horde_Variables::getDefaultVariables(); $form = new BlacklistForm($vars); $renderer = new Horde_Form_Renderer(); $defaults = false; @@ -33,7 +32,7 @@ if ($form->isSubmitted() && $vars->exists('global_defaults') && $vars->get('global_defaults')) { - if (!Auth::isAdmin()) { + if (!Horde_Auth::isAdmin()) { $notification->push(_("Only an administrator may change the global defaults."), 'horde.error'); $vars->remove('global_defaults'); $form->setSubmitted(false);
[-] [+]	Changed	sam.tar.bz2/docs/CHANGES ^
@@ -2,6 +2,7 @@ v0.1 ---- +[jan] Add Italian translation (Marco Favero <falon@csi.it>). [jan] Add Estonian translation (Alar Sing <alar.sing@err.ee>). [jan] Don't set policy values to 0 in the amavisd_sql driver, if not provided by the user (Bug #5834).
[-] [+]	Changed	sam.tar.bz2/docs/CREDITS ^
@@ -38,9 +38,10 @@ Finnish Petteri Karttunen <pkarttun@siba.fi> French Thierry Thomas <thierry@pompo.net> German Jan Schneider <jan@horde.org> +Italian Marco Favero <falon@csi.it> Norwegian Nynorsk Per-Stian Vatne <psv@orsta.org> Romanian Eugen Hoanca <eugenh@urban-grafx.ro> Spanish Manuel Perez Ayala <mperaya@alcazaba.unex.es> -$Horde: sam/docs/CREDITS,v 1.15 2008-07-30 17:16:32 jan Exp $ +$Horde: sam/docs/CREDITS,v 1.17 2009-05-21 12:07:04 jan Exp $
[-] [+]	Changed	sam.tar.bz2/index.php ^
@@ -1,8 +1,8 @@ <?php /* - * $Horde: sam/index.php,v 1.17 2008-06-04 17:50:42 jan Exp $ + * $Horde: sam/index.php,v 1.18 2009-01-06 18:01:43 jan Exp $ * - * Copyright 2002-2007 The Horde Project (http://www.horde.org/) + * Copyright 2002-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
[-] [+]	Changed	sam.tar.bz2/lib/Driver/spamd.php ^
@@ -9,9 +9,9 @@ /** * Base class for all SpamAssassin drivers. * - * $Horde: sam/lib/Driver/spamd.php,v 1.16 2008-06-04 17:50:43 jan Exp $ + * $Horde: sam/lib/Driver/spamd.php,v 1.17 2009-01-06 18:01:44 jan Exp $ * - * Copyright 2003-2007 The Horde Project (http://www.horde.org/) + * Copyright 2003-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
[-] [+]	Changed	sam.tar.bz2/lib/Driver/spamd_ftp.php ^
@@ -11,9 +11,9 @@ * 'user_prefs' The file with the user preferences, relative to the home * directory. DEFAULT: '.spamassassin/user_prefs'</pre> * - * $Horde: sam/lib/Driver/spamd_ftp.php,v 1.22 2008-09-26 23:09:10 chuck Exp $ + * $Horde: sam/lib/Driver/spamd_ftp.php,v 1.24 2009-07-08 18:29:52 slusarz Exp $ * - * Copyright 2003-2007 The Horde Project (http://www.horde.org/) + * Copyright 2003-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -83,7 +83,7 @@ function _retrieve() { $this->_params['username'] = $this->_user; - $this->_params['password'] = Auth::getCredential('password'); + $this->_params['password'] = Horde_Auth::getCredential('password'); // Get config file(s). require_once 'VFS.php'; @@ -144,7 +144,7 @@ function _store() { $this->_params['username'] = $this->_user; - $this->_params['password'] = Auth::getCredential('password'); + $this->_params['password'] = Horde_Auth::getCredential('password'); // Generate config file. $output = _("# SpamAssassin config file generated by SAM") . ' (' . date('F j, Y, g:i a') . ")\n";
[-] [+]	Changed	sam.tar.bz2/lib/Driver/spamd_ldap.php ^
@@ -13,9 +13,9 @@ * 'attribute' -- The spamAssassin attribute to use. * 'uid' -- The uid attribute for building userDNs. * - * $Horde: sam/lib/Driver/spamd_ldap.php,v 1.25 2008-09-26 23:09:10 chuck Exp $ + * $Horde: sam/lib/Driver/spamd_ldap.php,v 1.27 2009-07-08 18:29:52 slusarz Exp $ * - * Copyright 2003-2007 The Horde Project (http://www.horde.org/) + * Copyright 2003-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -168,7 +168,7 @@ return true; } - $bindpass = Auth::getCredential('password'); + $bindpass = Horde_Auth::getCredential('password'); $user = $this->_user; $binddn = sprintf('%s=%s,%s', $this->_params['uid'], $user, $this->_params['basedn']); Horde::assertDriverConfig($this->_params, 'spamd_ldap',
[-] [+]	Changed	sam.tar.bz2/lib/Driver/spamd_sql.php ^
@@ -26,9 +26,9 @@ * script appropriate for your database, or modified from one that is * available. * - * $Horde: sam/lib/Driver/spamd_sql.php,v 1.58 2008-09-26 23:09:10 chuck Exp $ + * $Horde: sam/lib/Driver/spamd_sql.php,v 1.59 2009-01-06 18:01:44 jan Exp $ * - * Copyright 2003-2007 The Horde Project (http://www.horde.org/) + * Copyright 2003-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
[-] [+]	Changed	sam.tar.bz2/lib/Forms/Blacklist.php ^
@@ -2,9 +2,9 @@ /** * Form Class for Blacklist Management. * - * $Horde: sam/lib/Forms/Blacklist.php,v 1.3 2008-01-02 11:13:55 jan Exp $ + * $Horde: sam/lib/Forms/Blacklist.php,v 1.5 2009-07-08 18:29:52 slusarz Exp $ * - * Copyright 2003-2008 The Horde Project (http://www.horde.org/) + * Copyright 2003-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -40,7 +40,7 @@ } } - if ($sam_driver->hasCapability('global_defaults') && Auth::isAdmin()) { + if ($sam_driver->hasCapability('global_defaults') && Horde_Auth::isAdmin()) { $this->addVariable('', '', 'spacer', false); $var = &$this->addVariable(_("Make Settings Global"), 'global_defaults', 'boolean', false);
[-] [+]	Changed	sam.tar.bz2/lib/Forms/Options.php ^
@@ -2,9 +2,9 @@ /** * Form Class for SpamAssassin Options Management. * - * $Horde: sam/lib/Forms/Options.php,v 1.3 2008-01-02 11:13:55 jan Exp $ + * $Horde: sam/lib/Forms/Options.php,v 1.5 2009-07-08 18:29:52 slusarz Exp $ * - * Copyright 2003-2008 The Horde Project (http://www.horde.org/) + * Copyright 2003-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -84,7 +84,7 @@ } } - if ($sam_driver->hasCapability('global_defaults') && Auth::isAdmin()) { + if ($sam_driver->hasCapability('global_defaults') && Horde_Auth::isAdmin()) { $this->addVariable('', '', 'spacer', false); $var = &$this->addVariable(_("Make Settings Global"), 'global_defaults', 'boolean', false);
[-] [+]	Changed	sam.tar.bz2/lib/Forms/Whitelist.php ^
@@ -2,9 +2,9 @@ /** * Form Class for Whitelist Management. * - * $Horde: sam/lib/Forms/Whitelist.php,v 1.3 2008-01-02 11:13:55 jan Exp $ + * $Horde: sam/lib/Forms/Whitelist.php,v 1.5 2009-07-08 18:29:52 slusarz Exp $ * - * Copyright 2003-2008 The Horde Project (http://www.horde.org/) + * Copyright 2003-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -40,7 +40,7 @@ } } - if ($sam_driver->hasCapability('global_defaults') && Auth::isAdmin()) { + if ($sam_driver->hasCapability('global_defaults') && Horde_Auth::isAdmin()) { $this->addVariable('', '', 'spacer', false); $var = &$this->addVariable(_("Make Settings Global"), 'global_defaults', 'boolean', false);
[-] [+]	Changed	sam.tar.bz2/lib/SAM.php ^
@@ -2,9 +2,9 @@ /** * Sam base class. * - * $Horde: sam/lib/SAM.php,v 1.37 2008-06-04 17:50:43 jan Exp $ + * $Horde: sam/lib/SAM.php,v 1.41 2009-07-08 18:29:52 slusarz Exp $ * - * Copyright 2002-2007 The Horde Project (http://www.horde.org/) + * Copyright 2002-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -115,7 +115,7 @@ / function mapUser($hordeauth) { - $uid = $hordeauth === 'full' ? Auth::getAuth() : Auth::getBareAuth(); + $uid = $hordeauth === 'full' ? Horde_Auth::getAuth() : Horde_Auth::getBareAuth(); if (!empty($GLOBALS['conf']['hooks']['username'])) { return Horde::callHook('_sam_hook_username', array($uid), 'sam'); } @@ -128,9 +128,7 @@ / function getMenu($returnType = 'object') { - require_once 'Horde/Menu.php'; - - $menu = &new Menu(HORDE_MENU_MASK_ALL & ~HORDE_MENU_MASK_PREFS); + $menu = new Horde_Menu(Horde_Menu::MASK_ALL & ~Horde_Menu::MASK_PREFS); if ($GLOBALS['conf']['enable']['rules']) { $menu->add(Horde::applicationUrl('spam.php'), _("Spam Options"), 'sam.png', null, null, null, basename($_SERVER['PHP_SELF']) == 'index.php' ? 'current' : null); }
[-] [+]	Changed	sam.tar.bz2/lib/base.php ^
@@ -1,8 +1,8 @@ <?php /** - * $Horde: sam/lib/base.php,v 1.34 2008-06-04 17:50:43 jan Exp $ + * $Horde: sam/lib/base.php,v 1.40 2009-07-13 20:05:55 slusarz Exp $ * - * Copyright 2002-2007 The Horde Project (http://www.horde.org/) + * Copyright 2002-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -20,23 +20,25 @@ require_once HORDE_BASE . '/lib/core.php'; // Registry. -$registry = &Registry::singleton(); -if (is_a(($pushed = $registry->pushApp('sam', !defined('AUTH_HANDLER'))), 'PEAR_Error')) { - if ($pushed->getCode() == 'permission_denied') { +$registry = Horde_Registry::singleton(); +try { + $registry->pushApp('sam', !defined('AUTH_HANDLER')); +} catch (Horde_Exception $e) { + if ($e->getCode() == 'permission_denied') { Horde::authenticationFailureRedirect(); } - Horde::fatal($pushed, __FILE__, __LINE__, false); + Horde::fatal($e, __FILE__, __LINE__, false); } $conf = &$GLOBALS['conf']; @define('SAM_TEMPLATES', $registry->get('templates')); // Notification system. -$notification = &Notification::singleton(); +$notification = &Horde_Notification::singleton(); $notification->attach('status'); // Redirect the user to the Horde login page if they haven't // authenticated. -if (!Auth::isAuthenticated()) { +if (!Horde_Auth::isAuthenticated()) { Horde::authenticationFailureRedirect(); } @@ -49,7 +51,6 @@ // Horde libraries. require_once 'Horde/Form.php'; require_once 'Horde/Form/Renderer.php'; -require_once 'Horde/Variables.php'; // Start compression. Horde::compressOutput();
[-] [+]	Changed	sam.tar.bz2/lib/version.php ^
@@ -1 +1 @@ -<?php define('SAM_VERSION', '1.0-cvs') ?> +<?php define('SAM_VERSION', 'H4 (1.0-cvs)') ?>
[-] [+]	Changed	sam.tar.bz2/po/cs_CZ.po ^
@@ -1,5 +1,5 @@ # Czech translations for SAM package. -# Copyright (C) 2003 Horde Project +# Copyright 2003-2009 The Horde Project # This file is distributed under the same license as the SAM package. # t macek <maca02@atlas.cz>, 2003. #
[-] [+]	Changed	sam.tar.bz2/po/de_DE.po ^
@@ -1,6 +1,6 @@ # German translations for SAM package # German messages for SAM. -# Copyright (C) 2002-2006 Horde Project +# Copyright 2002-2009 The Horde Project # This file is distributed under the same license as the SAM package. # Jan Schneider <jan@horde.org>, 2002-2006. #
[-] [+]	Changed	sam.tar.bz2/po/es_ES.po ^
@@ -1,6 +1,6 @@ # Spanish translations for sam package # Traducciones al español para el paquete sam. -# Copyright (C) 2008 Horde Project +# Copyright 2008-2009 The Horde Project # This file is distributed under the same license as the sam package. # Automatically generated, 2008. #
[-] [+]	Changed	sam.tar.bz2/po/et_EE.po ^
@@ -1,5 +1,5 @@ # Estonian translations for Sam package. -# Copyright (C) 2008 Horde Project +# Copyright 2008-2009 The Horde Project # This file is distributed under the same license as the Sam package. # Automatically generated, 2008. #
[-] [+]	Changed	sam.tar.bz2/po/fi_FI.po ^
@@ -1,5 +1,5 @@ # Finnish translation for Sam. -# Copyright (C) +# Copyright # Petteri Karttunen <pkarttun@siba.fi>, 2003. # Leena Heino <liinu@uta.fi>, 2003-2004. #
[-] [+]	Changed	sam.tar.bz2/po/fr_FR.po ^
@@ -1,5 +1,5 @@ # SAM french translation. -# Copyright (C) 2002. +# Copyright 2002. # This file is distributed under the same license as the SAM package. # First author : Thierry Thomas <thierry@pompo.net>, 2002. #
[-] [+]	Added	sam.tar.bz2/po/it_IT.po ^
@@ -0,0 +1,299 @@ +# Italian translation for sam package +# Traduzione Italiana per il pacchetto sam +# Copyright (C) 2009 Horde Project +# This file is distributed under the same license as the sam package. +# Automatically generated, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: Sam 1.0-cvs\n" +"Report-Msgid-Bugs-To: dev@lists.horde.org\n" +"POT-Creation-Date: 2009-05-01 18:31+0200\n" +"PO-Revision-Date: 2009-05-21 13:59+0200\n" +"Last-Translator: CSI Piemonte <sistemisti-posta@csi.it>\n" +"Language-Team: i18n@lists.horde.org\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/Driver/spamd_ftp.php:152 +msgid "# SpamAssassin config file generated by SAM" +msgstr "# File di configurazione generato da SAM" + +#: blacklist.php:32 +msgid "Black List Manager" +msgstr "Gestione Lista Nera" + +#: lib/SAM.php:141 +msgid "Blacklist" +msgstr "Lista Nera (Blacklist)" + +#: lib/Forms/Blacklist.php:26 +msgid "Blacklist From" +msgstr "Includi mittente nella Lista Nera" + +#: lib/Forms/Blacklist.php:21 +msgid "Blacklist Manager" +msgstr "Gestione Lista Nera" + +#: lib/Forms/Blacklist.php:27 +msgid "Blacklist To" +msgstr "Includi destinatario nella Lista Nera" + +#: lib/Driver/amavisd_sql.php:178 +#, php-format +msgid "Cannot create recipient %s: %s" +msgstr "Non si può creare il destinatario %s: %s" + +#: whitelist.php:21 blacklist.php:22 spam.php:27 +#, php-format +msgid "Cannot get options: %s" +msgstr "Non si possono applicare le opzioni: %s" + +#: whitelist.php:57 blacklist.php:58 spam.php:91 +#, php-format +msgid "Cannot set options: %s" +msgstr "Non è possibile impostare le opzioni: %s" + +#: lib/Driver/amavisd_ldap.php:96 lib/Driver/amavisd_ldap.php:176 +msgid "Could not bind to LDAP server" +msgstr "Impossibile autenticarsi al server LDAP" + +#: lib/Driver/amavisd_ldap.php:376 +msgid "Could not connect to LDAP-server: " +msgstr "Impossibile collegarsi al server LDAP:" + +#: config/attributes.php.dist:243 +msgid "Daily" +msgstr "Giornaliero" + +#: config/attributes.php.dist:104 +msgid "Filtering options" +msgstr "Opzioni di filtro" + +#: config/attributes.php.dist:62 +msgid "" +"From this page, you will be able to configure the options about the SPAM and " +"virus filter. For help about any option, please click the help button, at " +"the right of each option." +msgstr "" +"Da questa pagina, si sarà in grado di configurare le opzioni in merito allo " +"SPAM e del filtro Antivirus. Per ulteriori informazioni su ogni opzione, " +"fare clic sul pulsante Guida, situato a destra di ogni opzione." + +#: config/attributes.php.dist:148 +msgid "Hit Level" +msgstr "Soglia di livello" + +#: config/attributes.php.dist:155 +msgid "Kill Level" +msgstr "Soglia di eliminazione" + +#: config/attributes.php.dist:137 +msgid "Level options" +msgstr "Opzioni del livello" + +#: lib/Forms/Options.php:89 lib/Forms/Blacklist.php:45 +#: lib/Forms/Whitelist.php:45 +msgid "Make Settings Global" +msgstr "Effettuare le impostazioni Globali" + +#: config/attributes.php.dist:230 +msgid "Maximum message size" +msgstr "Dimensione massima del messaggio" + +#: config/attributes.php.dist:225 +msgid "Miscelaneous options" +msgstr "Opzioni varie" + +#: config/attributes.php.dist:246 +msgid "Monthly" +msgstr "Mensilmente" + +#: config/attributes.php.dist:247 +msgid "Monthly + Daily" +msgstr "Mensile + Giornaliero" + +#: config/attributes.php.dist:248 +msgid "Monthly + Weekly" +msgstr "Mensile + Settimanale" + +#: config/attributes.php.dist:249 +msgid "Monthly + Weekly + Daily" +msgstr "Mensile + Settimale + Giornaliero" + +#: config/attributes.php.dist:242 +msgid "Never" +msgstr "Mai" + +#: lib/SAM.php:58 +#, php-format +msgid "No \"%s\" element found in backend configuration." +msgstr "Nessun elemento trovato \"%s\" nel backend di configurazione." + +#: lib/SAM.php:56 +msgid "No backend configured for this host" +msgstr "Nessun backend configurato per questo host" + +#: lib/SAM.php:33 +msgid "No backends configured in backends.php" +msgstr "Nessun backend configurato in backends.php" + +#: config/attributes.php.dist:213 +msgid "Notify bad headers recipient" +msgstr "Notifica al destinatario errata intestazione" + +#: config/attributes.php.dist:205 +msgid "Notify banned files recipient" +msgstr "Notifica al destinatario files proibiti" + +#: config/attributes.php.dist:192 +msgid "Notify options" +msgstr "Opzioni di notifica" + +#: config/attributes.php.dist:197 +msgid "Notify virus recipient" +msgstr "Notifica al destinatario virus" + +#: whitelist.php:36 blacklist.php:37 spam.php:42 +msgid "Only an administrator may change the global defaults." +msgstr "Solo un Amministratore può cambiare le impostazioni globali." + +#: config/attributes.php.dist:94 +msgid "Receive Bad Headers" +msgstr "Ricevi errate intestazioni" + +#: config/attributes.php.dist:88 +msgid "Receive Banned Files" +msgstr "Ricevi file proibiti" + +#: config/attributes.php.dist:76 +msgid "Receive Spam" +msgstr "Ricevi Spam" + +#: config/attributes.php.dist:82 +msgid "Receive Viruses" +msgstr "Ricevi Virus" + +#: config/attributes.php.dist:71 +msgid "Receiving options" +msgstr "Opzioni di ricezione" + +#: lib/Driver/amavisd_sql.php:181 +#, php-format +msgid "Recipient created: %s" +msgstr "Destinatario creato: %s" + +#: config/attributes.php.dist:236 +msgid "Reminder frequency" +msgstr "Frequenza promemoria" + +#: config/attributes.php.dist:170 +msgid "Rewrite Subject" +msgstr "Riscrivi l'oggetto del messaggio" + +#: config/attributes.php.dist:165 +msgid "Rewrite options" +msgstr "Opzioni di riscrittura" + +#: lib/Forms/Options.php:23 lib/Forms/Blacklist.php:23 +#: lib/Forms/Whitelist.php:23 +msgid "Save" +msgstr "Salva" + +#: config/attributes.php.dist:241 +msgid "Select Value:" +msgstr "Seleziona valore" + +#: config/attributes.php.dist:127 +msgid "Skip Bad Header Checks" +msgstr "Salta controlli intestazione errata" + +#: config/attributes.php.dist:121 +msgid "Skip Banned File Checks" +msgstr "Salta i controlli di files proibiti" + +#: config/attributes.php.dist:109 +msgid "Skip Spam Checks" +msgstr "Salta i controlli dello Spam" + +#: config/attributes.php.dist:115 +msgid "Skip Virus Checks" +msgstr "Salta controlli Virus" + +#: spam.php:37 lib/SAM.php:135 lib/Forms/Options.php:21 +msgid "Spam Options" +msgstr "Opzioni di Spam" + +#: config/attributes.php.dist:176 +msgid "Subject Tag" +msgstr "Prefisso Oggetto (Tag)" + +#: config/attributes.php.dist:182 +msgid "Subject Tag 2" +msgstr "Prefisso Oggetto su mail di Spam (Tag 2)" + +#: config/attributes.php.dist:142 +msgid "Tag Level" +msgstr "Livello di etichettatura (Tag)" + +#: spam.php:19 +msgid "The Spam Rules page is not enabled." +msgstr "Non è attiva la pagina delle regole dello Spam" + +#: whitelist.php:40 blacklist.php:41 spam.php:46 +msgid "The configured backend does not support global defaults." +msgstr "Il backend non supporta i valori predefiniti configurati." + +#: blacklist.php:60 +msgid "Updated global blacklists" +msgstr "Sono state aggiornate globalmente le Liste Nere" + +#: spam.php:93 +msgid "Updated global default rules" +msgstr "Sono state aggiornate globalmente le regole predefinite" + +#: whitelist.php:59 +msgid "Updated global whitelists" +msgstr "Sono state aggiornate globalmente le Liste Bianche" + +#: blacklist.php:62 +msgid "Updated user blacklists" +msgstr "E' stato aggiornato l'utente della Lista Nera" + +#: spam.php:95 +msgid "Updated user spam rules" +msgstr "Sono state aggiornate le regole Spam per l'utente" + +#: whitelist.php:61 +msgid "Updated user whitelists" +msgstr "E' stato aggiornato l'utente della Lista Bianca" + +#: config/attributes.php.dist:244 +msgid "Weekly" +msgstr "Settimanale" + +#: config/attributes.php.dist:245 +msgid "Weekly + Daily" +msgstr "Settimanale + Giornaliero" + +#: whitelist.php:31 +msgid "White List Manager" +msgstr "Gestione Lista Bianca" + +#: lib/SAM.php:138 +msgid "Whitelist" +msgstr "Lista Bianca (Whitelist)" + +#: lib/Forms/Whitelist.php:26 +msgid "Whitelist From" +msgstr "Includi mittente nella Lista Bianca" + +#: lib/Forms/Whitelist.php:21 +msgid "Whitelist Manager" +msgstr "Gestione Lista Bianca" + +#: lib/Forms/Whitelist.php:27 +msgid "Whitelist To" +msgstr "Includi destinatario nella Lista Bianca"
[-] [+]	Changed	sam.tar.bz2/po/nn_NO.po ^
@@ -1,5 +1,5 @@ # SAM Norwegian Nynorsk translation -# Copyright (C) 2002 Per-Stian Vatne +# Copyright 2002 Per-Stian Vatne # This file is distributed under the same license as the SAM package. # Per-Stian Vatne <psv@orsta.org>, 2002. #
[-] [+]	Changed	sam.tar.bz2/po/ro_RO.po ^
@@ -1,5 +1,5 @@ # Romanian translations for SAM package. -# Copyright (C) 2003 Horde Project +# Copyright 2003-2009 The Horde Project # This file is distributed under the same license as the SAM package. # Eugen Hoanca <eugenh@urban-grafx.ro>, 2003. #
[-] [+]	Changed	sam.tar.bz2/po/sam.pot ^
@@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Horde Project +# Copyright YEAR Horde Project # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. #
[-] [+]	Changed	sam.tar.bz2/po/zh_TW.po ^
@@ -1,5 +1,5 @@ # Sam Traditional Chinese Translation. -# Copyright (C) 2002 David Chang. ±i¨}¤å,¥xÆW +# Copyright 2002 David Chang. ±i¨}¤å,¥xÆW # David Chang <david@tmv.gov.tw>, 2002. # msgid ""
[-] [+]	Changed	sam.tar.bz2/spam.php ^
@@ -1,8 +1,8 @@ <?php /** - * $Horde: sam/spam.php,v 1.22 2008-06-04 17:50:42 jan Exp $ + * $Horde: sam/spam.php,v 1.26 2009-07-08 18:29:51 slusarz Exp $ * - * Copyright 2002-2007 The Horde Project (http://www.horde.org/) + * Copyright 2002-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -28,7 +28,7 @@ } /* Initialize the form. */ -$vars = Variables::getDefaultVariables(); +$vars = Horde_Variables::getDefaultVariables(); $form = new OptionsForm($vars); $renderer = new Horde_Form_Renderer(); $defaults = false; @@ -38,7 +38,7 @@ if ($form->isSubmitted() && $vars->exists('global_defaults') && $vars->get('global_defaults')) { - if (!Auth::isAdmin()) { + if (!Horde_Auth::isAdmin()) { $notification->push(_("Only an administrator may change the global defaults."), 'horde.error'); $vars->remove('global_defaults'); $form->setSubmitted(false); @@ -74,6 +74,8 @@ } } elseif ($attribute['type'] == 'boolean') { $sam_driver->setOption($key, $sam_driver->booleanToOption($data), $defaults); + } elseif ($attribute['type'] == 'number') { + $sam_driver->setOption($key, number_format($data, 1, '.', ''), $defaults); } else { $sam_driver->setOption($key, $data, $defaults); }
[-] [+]	Changed	sam.tar.bz2/templates/common-header.inc ^
@@ -1,11 +1,11 @@ <?php if (isset($language)) { - header('Content-type: text/html; charset=' . NLS::getCharset()); + header('Content-type: text/html; charset=' . Horde_Nls::getCharset()); header('Vary: Accept-Language'); } ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> -<!-- Sam: Copyright 2002-2008 The Horde Project. Sam is under a Horde license. --> +<!-- Sam: Copyright 2002-2009 The Horde Project. Sam is under a Horde license. --> <!-- Horde Project: http://www.horde.org/ \| Sam: http://www.horde.org/sam/ --> <!-- Horde Licenses: http://www.horde.org/licenses/ --> <?php echo !empty($language) ? '<html lang="' . strtr($language, '_', '-') . '">' : '<html>' ?> @@ -21,7 +21,7 @@ ?> <title><?php echo htmlspecialchars($page_title) ?></title> <link href="<?php echo $GLOBALS['registry']->getImageDir()?>/favicon.ico" rel="SHORTCUT ICON" /> -<?php echo Horde::stylesheetLink('sam') ?> +<?php Horde::includeStylesheetFiles() ?> </head> -<body<?php if ($bc = Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>> +<body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
[-] [+]	Changed	sam.tar.bz2/whitelist.php ^
@@ -1,8 +1,8 @@ <?php /** - * $Horde: sam/whitelist.php,v 1.28 2008-06-04 17:50:42 jan Exp $ + * $Horde: sam/whitelist.php,v 1.31 2009-07-08 18:29:51 slusarz Exp $ * - * Copyright 2002-2007 The Horde Project (http://www.horde.org/) + * Copyright 2002-2009 The Horde Project (http://www.horde.org/) * * See the enclosed file COPYING for license information (GPL). If you * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. @@ -22,7 +22,7 @@ } /* Initialize the form. */ -$vars = Variables::getDefaultVariables(); +$vars = Horde_Variables::getDefaultVariables(); $form = new WhitelistForm($vars); $renderer = new Horde_Form_Renderer(); $defaults = false; @@ -32,7 +32,7 @@ if ($form->isSubmitted() && $vars->exists('global_defaults') && $vars->get('global_defaults')) { - if (!Auth::isAdmin()) { + if (!Horde_Auth::isAdmin()) { $notification->push(_("Only an administrator may change the global defaults."), 'horde.error'); $vars->remove('global_defaults'); $form->setSubmitted(false);