Changeset 2205:4d5c86bc51e9 for plugins/antispam

Timestamp:

10/02/13 14:18:52 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add success messages using the new notices system. Closes #1494, #1495

Location:

plugins/antispam/filters

Files:

• class.dc.filter.ip.php (modified) (3 diffs)
• class.dc.filter.iplookup.php (modified) (2 diffs)
• class.dc.filter.words.php (modified) (4 diffs)

plugins/antispam/filters/class.dc.filter.ip.php

@@ -75 +75 @@
 
                     $this->addIP($ip_type,$_POST['addip'],$global);
-                    http::redirect($url.'&added=1&ip_type='.$ip_type);
+                    dcPage::addSuccessNotice(__('IP address has been successfully added.'));
+                    http::redirect($url.'&ip_type='.$ip_type);
                }
                catch (Exception $e)
@@ -88 +89 @@
                try {
                     $this->removeRule($_POST['delip']);
-                    http::redirect($url.'&removed=1&ip_type='.$ip_type);
+                    dcPage::addSuccessNotice(__('IP addresses have been successfully removed.'));
+                    http::redirect($url.'&ip_type='.$ip_type);
                } catch (Exception $e) {
                     $core->error->add($e->getMessage());
@@ -96 +98 @@
           /* DISPLAY
           ---------------------------------------------- */
-          $res = '';
-
-          if (!empty($_GET['added'])) {
-               $res .= dcPage::success(__('IP address has been successfully added.'),true,false,false);
-          }
-          if (!empty($_GET['removed'])) {
-               $res .= dcPage::success(__('IP addresses have been successfully removed.'),true,false,false);
-          }
+          $res = dcPage::notices();
 
           $res .=

plugins/antispam/filters/class.dc.filter.iplookup.php

@@ -65 +65 @@
                     $this->core->blog->settings->addNamespace('antispam');
                     $this->core->blog->settings->antispam->put('antispam_dnsbls',$_POST['bls'],'string','Antispam DNSBL servers',true,false);
-                    http::redirect($url.'&upd=1');
+                    dcPage::addSuccessNotice(__('The list of DNSBL servers has been succesfully updated.'));
+                    http::redirect($url);
                } catch (Exception $e) {
                     $core->error->add($e->getMessage());
@@ -73 +74 @@
           /* DISPLAY
           ---------------------------------------------- */
-          $res = '';
+          $res = dcPage::notices();
 
           $res .=

plugins/antispam/filters/class.dc.filter.words.php

@@ -70 +70 @@
                try {
                     $this->defaultWordsList();
-                    http::redirect($url.'&list=1');
+                    dcPage::addSuccessNotice(__('Words have been successfully added.'));
+                    http::redirect($url);
                } catch (Exception $e) {
                     $core->error->add($e->getMessage());
@@ -83 +84 @@
                try {
                     $this->addRule($_POST['swa'],$globalsw);
-                    http::redirect($url.'&added=1');
+                    dcPage::addSuccessNotice(__('Word has been successfully added.'));
+                    http::redirect($url);
                } catch (Exception $e) {
                     $core->error->add($e->getMessage());
@@ -94 +96 @@
                try {
                     $this->removeRule($_POST['swd']);
-                    http::redirect($url.'&removed=1');
+                    dcPage::addSuccessNotice(__('Words have been successfully removed.'));
+                    http::redirect($url);
                } catch (Exception $e) {
                     $core->error->add($e->getMessage());
@@ -102 +105 @@
           /* DISPLAY
           ---------------------------------------------- */
-          $res = '';
-
-          if (!empty($_GET['list'])) {
-               $res .= dcPage::message(__('Words have been successfully added.'),true,false,false);
-          }
-          if (!empty($_GET['added'])) {
-               $res .= dcPage::message(__('Word has been successfully added.'),true,false,false);
-          }
-          if (!empty($_GET['removed'])) {
-               $res .= dcPage::message(__('Words have been successfully removed.'),true,false,false);
-          }
+          $res = dcPage::notices();
 
           $res .=