bayes 0.4.22: fix menu in 2.1-beta1 by using parseTemplate

s9y · Jul 27, 2016 · f54b1d5 · f54b1d5
1 parent d960114
commit f54b1d5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 20 deletions.
diff --git a/serendipity_event_spamblock_bayes/ChangeLog b/serendipity_event_spamblock_bayes/ChangeLog
@@ -1,3 +1,7 @@
+0.4.22:
+    * Use parseTemplate method to be compatible with s9y 2.1-beta1, some
+      template files needed to be moved from admin/ to the root dir
+
 0.4.21:
     * Fix mal-written case-statemens in setupdb, blocking sqlite
 

diff --git a/...t_spamblock_bayes/admin/bayesAnalysis.tpl → ...y_event_spamblock_bayes/bayesAnalysis.tpl b/...t_spamblock_bayes/admin/bayesAnalysis.tpl → ...y_event_spamblock_bayes/bayesAnalysis.tpl
diff --git a/...amblock_bayes/admin/bayesAnalysismenu.tpl → ...ent_spamblock_bayes/bayesAnalysismenu.tpl b/...amblock_bayes/admin/bayesAnalysismenu.tpl → ...ent_spamblock_bayes/bayesAnalysismenu.tpl
diff --git a/...ent_spamblock_bayes/admin/bayesDBmenu.tpl → ...ity_event_spamblock_bayes/bayesDBmenu.tpl b/...ent_spamblock_bayes/admin/bayesDBmenu.tpl → ...ity_event_spamblock_bayes/bayesDBmenu.tpl
diff --git a/...spamblock_bayes/admin/bayesImportmenu.tpl → ...event_spamblock_bayes/bayesImportmenu.tpl b/...spamblock_bayes/admin/bayesImportmenu.tpl → ...event_spamblock_bayes/bayesImportmenu.tpl
diff --git a/..._spamblock_bayes/admin/bayesLearnmenu.tpl → ..._event_spamblock_bayes/bayesLearnmenu.tpl b/..._spamblock_bayes/admin/bayesLearnmenu.tpl → ..._event_spamblock_bayes/bayesLearnmenu.tpl
diff --git a/...spamblock_bayes/admin/bayesNavigation.tpl → ...event_spamblock_bayes/bayesNavigation.tpl b/...spamblock_bayes/admin/bayesNavigation.tpl → ...event_spamblock_bayes/bayesNavigation.tpl
diff --git a/...amblock_bayes/admin/bayesRecyclermenu.tpl → ...ent_spamblock_bayes/bayesRecyclermenu.tpl b/...amblock_bayes/admin/bayesRecyclermenu.tpl → ...ent_spamblock_bayes/bayesRecyclermenu.tpl
diff --git a/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php b/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
@@ -42,7 +42,7 @@ function introspect(&$propbag) {
 		$this->title = PLUGIN_EVENT_SPAMBLOCK_BAYES_NAME;
 		$propbag->add ( 'description', PLUGIN_EVENT_SPAMBLOCK_BAYES_DESC);
 		$propbag->add ( 'name', $this->title);
-		$propbag->add ( 'version', '0.4.21' );
+		$propbag->add ( 'version', '0.4.22' );
 		$propbag->add ( 'event_hooks', array ('frontend_saveComment' => true,
 		                                     'backend_spamblock_comments_shown' => true,
 		                                     'external_plugin' => true,
@@ -1413,7 +1413,7 @@ function displayMenu($subpage=0) {
             $jquery_needed = true;
         }
 
-        echo $this->smarty_show('admin/bayesNavigation.tpl', array('css' => $css,
+        echo $this->smarty_show('bayesNavigation.tpl', array('css' => $css,
                                                                 'jquery_needed' => $jquery_needed,
                                                                 'path' => $this->path,
                                                                 'subpage' => $subpage,
@@ -1453,22 +1453,11 @@ function smarty_show($template, $data = null) {
         }
 
         $serendipity['smarty']->assign($data);
-
-        $tfile = serendipity_getTemplateFile($template, 'serendipityPath');
-
-        if ($tfile == $template) {
-            $tfile = dirname(__FILE__) . "/$template";
-        }
-        $inclusion = $serendipity['smarty']->security_settings[INCLUDE_ANY];
-        $serendipity['smarty']->security_settings[INCLUDE_ANY] = true;
-        $content = $serendipity['smarty']->fetch('file:'. $tfile);
-        $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion;
-
-        echo $content;
+        echo $this->parseTemplate($template);
     }
 
     function showLearnMenu() {
-        echo $this->smarty_show('admin/bayesLearnmenu.tpl', array('s9ybackend' => $GLOBALS['s9ybackend']));
+        echo $this->smarty_show('bayesLearnmenu.tpl', array('s9ybackend' => $GLOBALS['s9ybackend']));
     }
 
     function showDBMenu($commentpage) {
@@ -1507,7 +1496,7 @@ function showDBMenu($commentpage) {
 
         $data['path'] = $this->path;
         $data['s9ybackend'] = $GLOBALS['s9ybackend'];
-        echo $this->smarty_show('admin/bayesDBmenu.tpl', $data);
+        echo $this->smarty_show('bayesDBmenu.tpl', $data);
     }
 
     function showRecyclerMenu($commentpage) {
@@ -1528,7 +1517,7 @@ function showRecyclerMenu($commentpage) {
         } else {
             $comments = array();
         }
-        echo $this->smarty_show('admin/bayesRecyclermenu.tpl', array('comments' => $comments,
+        echo $this->smarty_show('bayesRecyclermenu.tpl', array('comments' => $comments,
                                                         'types' => array_values($this->type),
                                                         'commentpage' => $commentpage,
                                                         'path' => $this->path,
@@ -1554,7 +1543,7 @@ function showAnalysisMenu($commentpage=0) {
             if (!is_array($comments[0])) {
                 $comments = array();
             }
-            echo $this->smarty_show('admin/bayesAnalysismenu.tpl', array(
+            echo $this->smarty_show('bayesAnalysismenu.tpl', array(
                                                                     'comments' => $comments,
                                                                     'commentpage' => $commentpage,
                                                                     'path' => $this->path,
@@ -1565,7 +1554,7 @@ function showAnalysisMenu($commentpage=0) {
 
     function showImportMenu() {
         global $serendipity;
-        echo $this->smarty_show('admin/bayesImportmenu.tpl', array(
+        echo $this->smarty_show('bayesImportmenu.tpl', array(
                                                                     'trojaRegistered' => $this->get_config('troja_registered', false) == true,
                                                                     's9ybackend' => $GLOBALS['s9ybackend']
                                                                 ));
@@ -1592,7 +1581,7 @@ function showAnalysis($comment_id) {
             $comment['ratings'] = $ratings;
             $comments[$i] = $comment;
         }
-        echo $this->smarty_show('admin/bayesAnalysis.tpl', array('comments' => $comments,
+        echo $this->smarty_show('bayesAnalysis.tpl', array('comments' => $comments,
                                                         'types' => array_values($this->type),
                                                         's9ybackend' => $GLOBALS['s9ybackend']
                                                         ));