Changeset 2823:f011562dadc7 for plugins/antispam

Timestamp:

11/27/14 15:28:36 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Using dcAdminURL, work in progress on plugins…

Location:

plugins/antispam

Files:

• _admin.php (modified) (4 diffs)
• inc/class.dc.spamfilter.php (modified) (1 diff)
• inc/lib.dc.antispam.php (modified) (2 diffs)
• index.php (modified) (4 diffs)

plugins/antispam/_admin.php

@@ -16 +16 @@
 }
 
-$_menu['Plugins']->addItem(__('Antispam'),'plugin.php?p=antispam','index.php?pf=antispam/icon.png',
-          preg_match('/plugin.php\?p=antispam(&.*)?$/',$_SERVER['REQUEST_URI']),
-          $core->auth->check('admin',$core->blog->id));
+$_menu['Plugins']->addItem(__('Antispam'),
+     $core->adminurl->get('admin.plugin.antispam'),
+     $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/icon.png')),
+     preg_match('/'.preg_quote($core->adminurl->get('admin.plugin.antispam')).'(&.*)?$/',$_SERVER['REQUEST_URI']),
+     $core->auth->check('admin',$core->blog->id));
 
 $core->addBehavior('coreAfterCommentUpdate',array('dcAntispam','trainFilters'));
@@ -31 +33 @@
      $favs->register('antispam', array(
           'title' => __('Antispam'),
-          'url' => 'plugin.php?p=antispam',
-          'small-icon' => 'index.php?pf=antispam/icon.png',
-          'large-icon' => 'index.php?pf=antispam/icon-big.png',
+          'url' => $core->adminurl->get('admin.plugin.antispam'),
+          'small-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/icon.png')),
+          'large-icon' => $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/icon-big.png')),
           'permissions' => 'admin')
      );
@@ -79 +81 @@
           if ($ttl != null && $ttl >=0) {
                echo '<p>'.sprintf(__('All spam comments older than %s day(s) will be automatically deleted.'), $ttl).' '.
-               sprintf(__('You can modify this duration in the %s'),'<a href="blog_pref.php#antispam_moderation_ttl"> '.__('Blog settings').'</a>').
+               sprintf(__('You can modify this duration in the %s'),'<a href="'.$core->adminurl->get('admin.blog.pref').
+                    '#antispam_moderation_ttl"> '.__('Blog settings').'</a>').
                '.</p>';
           }
@@ -93 +96 @@
           ' '.__('days').
           '</label></p>'.
-          '<p><a href="plugin.php?p=antispam">'.__('Set spam filters.').'</a></p>'.
+          '<p><a href="'.$core->adminurl->get('admin.plugin.antispam').'">'.__('Set spam filters.').'</a></p>'.
           '</div>';
      }

plugins/antispam/inc/class.dc.spamfilter.php

@@ -40 +40 @@
           }
 
-          $this->gui_url = 'plugin.php?p=antispam&f='.get_class($this);
+          $this->gui_url = $core->adminurl->decode('admin.plugin.antispam',array('f' => get_class($this)));
      }
 

plugins/antispam/inc/lib.dc.antispam.php

@@ -75 +75 @@
           if (($count = self::countSpam($core)) > 0) {
                $str = ($count > 1) ? __('(including %d spam comments)') : __('(including %d spam comment)');
-               $icons['comments'][0] .= '</span></a> <br /><a href="comments.php?status=-2"><span>'.sprintf($str,$count);
+               $icons['comments'][0] .= '</span></a> <br /><a href="'.$core->adminurl->get('admin.comments',array('status' => '-2')).'"><span>'.
+                    sprintf($str,$count);
           }
      }
@@ -83 +84 @@
           if (($count = self::countSpam($core)) > 0) {
                $str = ($count > 1) ? __('(including %d spam comments)') : __('(including %d spam comment)');
-               return '</span></a> <br /><a href="comments.php?status=-2"><span>'.sprintf($str,$count);
+               return '</span></a> <br /><a href="'.$core->adminurl->get('admin.comments',array('status' => '-2')).'"><span>'.
+                    sprintf($str,$count);
           } else {
                return '';

plugins/antispam/index.php

@@ -118 +118 @@
           dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
           dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js').
-          dcPage::jsLoad('index.php?pf=antispam/antispam.js');
+          dcPage::jsLoad($core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/antispam.js')));
   }
   ?>
-  <link rel="stylesheet" type="text/css" href="index.php?pf=antispam/style.css" />
+  <link rel="stylesheet" type="text/css" href="<?php echo $core->adminurl->decode('load.plugin.file',array('pf' => 'antispam/style.css')); ?>" />
 </head>
 <body>
@@ -136 +136 @@
           dcPage::notices();
 
-     echo '<p><a href="plugin.php?p=antispam" class="back">'.__('Back to filters list').'</a></p>';
+     echo '<p><a href="'.$p_url.'" class="back">'.__('Back to filters list').'</a></p>';
 
      echo $filter_gui;
@@ -164 +164 @@
      echo
      '<ul class="spaminfo">'.
-     '<li class="spamcount"><a href="comments.php?status=-2">'.__('Junk comments:').'</a> '.
+     '<li class="spamcount"><a href="'.$core->adminurl->get('admin.comments',array('status' => '-2')).'">'.__('Junk comments:').'</a> '.
      '<strong>'.$spam_count.'</strong></li>'.
-     '<li class="hamcount"><a href="comments.php?status=1">'.__('Published comments:').'</a> '.
+     '<li class="hamcount"><a href="'.$core->adminurl->get('admin.comments',array('status' => '1')).'">'.__('Published comments:').'</a> '.
      $published_count.'</li>'.
      '</ul>';
@@ -179 +179 @@
      if ($moderationTTL != null && $moderationTTL >=0) {
           echo '<p>'.sprintf(__('All spam comments older than %s day(s) will be automatically deleted.'), $moderationTTL).' '.
-          sprintf(__('You can modify this duration in the %s'),'<a href="blog_pref.php#antispam_moderation_ttl"> '.__('Blog settings').'</a>').
+          sprintf(__('You can modify this duration in the %s'),'<a href="'.$core->adminurl->get('admin.blog.pref').
+               '#antispam_moderation_ttl"> '.__('Blog settings').'</a>').
                '.</p>';
      }