[geeklog-hg] geeklog: Update to changeset 84afc9a91064. Removed SPAM-X admin ...

[geeklog-cvs at lists.geeklog.net]

changeset 9437:7b59e07c06ef
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7b59e07c06ef
user: Tom <websitemaster at cogeco.net>
date: Tue Jan 21 21:01:46 2014 -0500
description:
Update to changeset 84afc9a91064. Removed SPAM-X admin template file and now use Geeklog Admin menu.

diffstat:

 plugins/spamx/language/english.php        |   2 +-
 plugins/spamx/language/english_utf-8.php  |   2 +-
 plugins/spamx/templates/admin.thtml       |  10 ----------
 public_html/admin/plugins/spamx/index.php |  22 ++++++++++++++--------
 4 files changed, 16 insertions(+), 20 deletions(-)

diffs (84 lines):

diff -r 84afc9a91064 -r 7b59e07c06ef plugins/spamx/language/english.php
--- a/plugins/spamx/language/english.php	Tue Jan 21 23:26:21 2014 +0900
+++ b/plugins/spamx/language/english.php	Tue Jan 21 21:01:46 2014 -0500
@@ -41,7 +41,7 @@
     'add1' => 'Added ',
     'add2' => ' entries from ',
     'add3' => "'s blacklist.",
-    'adminc' => 'Administration Commands:',
+    'adminc' => 'SPAM-X plugin administration.',
     'mblack' => 'My Blacklist:',
     'rlinks' => 'Related Links:',
     'e3' => 'To Add the words from Geeklogs CensorList Press the Button:',
diff -r 84afc9a91064 -r 7b59e07c06ef plugins/spamx/language/english_utf-8.php
--- a/plugins/spamx/language/english_utf-8.php	Tue Jan 21 23:26:21 2014 +0900
+++ b/plugins/spamx/language/english_utf-8.php	Tue Jan 21 21:01:46 2014 -0500
@@ -41,7 +41,7 @@
     'add1' => 'Added ',
     'add2' => ' entries from ',
     'add3' => "'s blacklist.",
-    'adminc' => 'Administration Commands:',
+    'adminc' => 'SPAM-X plugin administration.',
     'mblack' => 'My Blacklist:',
     'rlinks' => 'Related Links:',
     'e3' => 'To Add the words from Geeklogs CensorList Press the Button:',
diff -r 84afc9a91064 -r 7b59e07c06ef plugins/spamx/templates/admin.thtml
--- a/plugins/spamx/templates/admin.thtml	Tue Jan 21 23:26:21 2014 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<table border="0" cellspacing="0" cellpadding="2" style="margin-top:5px;">
-    <tr>
-        <td>
-            <a href="{site_admin_url}/plugins/{plugin}/index.php"><img src="{site_admin_url}/plugins/{plugin}/images/{plugin}.png" alt="[{plugin_name}]"{xhtml}></a>
-        </td>
-        <td>
-            <h1>{header}</h1>
-        </td>
-    </tr>
-</table>
diff -r 84afc9a91064 -r 7b59e07c06ef public_html/admin/plugins/spamx/index.php
--- a/public_html/admin/plugins/spamx/index.php	Tue Jan 21 23:26:21 2014 +0900
+++ b/public_html/admin/plugins/spamx/index.php	Tue Jan 21 21:01:46 2014 -0500
@@ -65,13 +65,18 @@
 * Main
 */
 
-$T = COM_newTemplate($_CONF['path'] . 'plugins/spamx/templates');
-$T->set_file('admin', 'admin.thtml');
-$T->set_var('header', $LANG_SX00['admin']);
-$T->set_var('plugin_name', $LANG_SX00['plugin_name']);
-$T->set_var('plugin', 'spamx');
-$T->parse('output', 'admin');
-$display .= $T->finish($T->get_var('output'));
+$display = '';
+
+$menu_arr = array (
+    array('url' => $_CONF['site_admin_url'],
+          'text' => $LANG_ADMIN['admin_home'])
+);
+
+$display  = COM_startBlock ($LANG_SX00['plugin_name'],'', COM_getBlockTemplate ('_admin_block', 'header'));
+$display .= ADMIN_createMenu( $menu_arr,
+                             $LANG_SX00['adminc'],
+                             plugin_geticon_spamx()
+);
 
 $files = array();
 
@@ -88,7 +93,6 @@
     closedir($dir);
 }
 
-$display .= '<p><b>' . $LANG_SX00['adminc'] . '</b></p><ul>';
 $header_arr = array(
     array(
         'text'  => $LANG_SX00['plugin'],
@@ -141,6 +145,8 @@
     }
 }
 
+$display .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
+
 $display = COM_createHTMLDocument(
     $display,
     array('pagetitle' => $LANG_SX00['plugin_name'])