Parse and PEAR error

This is a multi-part message in MIME format.
--------------040909040002020905070902
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

The first patch (attributes.txt) remove a potential parse error.
The second patch (SAM.txt) check for PEAR error.

Thanks,

-- 
Programming today is a race between software engineers
to build bigger and better idiot-proof programs,
and the Universe trying to produce bigger and better idiots.

So far, the Universe is winning.
                                    Rich Cook - Author

Serge Grondin
Technicien en Informatique
Commission Scolaire des Bois-Francs
Tel. bur.:   (819) 758-6453, poste 2920
e-Mail bur.: [email protected]


--------------040909040002020905070902
Content-Type: text/plain;
 name="SAM.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="SAM.txt"

Index: SAM.php
===================================================================
RCS file: /repository/sam/lib/SAM.php,v
retrieving revision 1.28
diff -u -r1.28 SAM.php
--- SAM.php     3 Jul 2005 02:44:56 -0000       1.28
+++ SAM.php     12 Aug 2005 18:16:17 -0000
@@ -136,10 +136,10 @@
         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);
         }
-        if (($whitelist_url = $GLOBALS['registry']->link('mail/showWhitelist'))) {
+        if (!is_a($whitelist_url = $GLOBALS['registry']->link('mail/showWhitelist'), 'PEAR_Error')) {
             $menu->add(Horde::url($whitelist_url), _("Whitelist"), 'whitelist.png');
         }
-        if (($blacklist_url = $GLOBALS['registry']->link('mail/showBlacklist'))) {
+        if (!is_a($blacklist_url = $GLOBALS['registry']->link('mail/showBlacklist'), 'PEAR_Error')) {
             $menu->add(Horde::url($blacklist_url), _("Blacklist"), 'blacklist.png');
         }


--------------040909040002020905070902
Content-Type: text/plain;
 name="attributes.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="attributes.txt"

Index: attributes.php.dist
===================================================================
RCS file: /repository/sam/config/attributes.php.dist,v
retrieving revision 1.9
diff -u -r1.9 attributes.php.dist
--- attributes.php.dist 23 Jun 2005 20:59:03 -0000      1.9
+++ attributes.php.dist 12 Aug 2005 18:14:17 -0000
@@ -95,7 +95,7 @@
 //    'params' => array(array(
 //        'Y' => 'Yes',
 //        'N' => 'No',
-//    ));
+//    )),
 //);
 $_attributes['spam_quarantine'] = array(
     'label' => _("Spam Quarantine Address"),

--------------040909040002020905070902
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

-- 
sam mailing list - Join the hunt: http://horde.org/bounties/#sam
Frequently Asked Questions: http://horde.org/faq/
To unsubscribe, mail: [email protected]

--------------040909040002020905070902--