From b6590e63d4b45f4c5178de1922c49dd01889e81a Mon Sep 17 00:00:00 2001 From: secretr Date: Fri, 25 Sep 2009 20:13:12 +0000 Subject: [PATCH] Tagwords e_url profile implemented (SEF URLs),minor fixes, news items (rewrites) linked proper now --- e107_plugins/tagwords/e_meta.php | 10 +++--- .../e_url/apache_mod_rewrite/main.php | 33 +++++++++++++++++++ .../e_url/apache_mod_rewrite/profile.xml | 5 +++ e107_plugins/tagwords/e_url/main.php | 24 ++++++++++++++ .../tagwords/section/e_tagwords_news.php | 8 +++-- e107_plugins/tagwords/tagwords.php | 10 +++--- e107_plugins/tagwords/tagwords_class.php | 13 ++++---- e107_plugins/tagwords/tagwords_shortcodes.php | 14 ++++---- e107_plugins/tagwords/tagwords_template.php | 10 +++--- 9 files changed, 97 insertions(+), 30 deletions(-) create mode 100644 e107_plugins/tagwords/e_url/apache_mod_rewrite/main.php create mode 100644 e107_plugins/tagwords/e_url/apache_mod_rewrite/profile.xml create mode 100644 e107_plugins/tagwords/e_url/main.php diff --git a/e107_plugins/tagwords/e_meta.php b/e107_plugins/tagwords/e_meta.php index 5fc63fd6f..620e80b74 100644 --- a/e107_plugins/tagwords/e_meta.php +++ b/e107_plugins/tagwords/e_meta.php @@ -9,9 +9,9 @@ * Tagwords Meta Handler * * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/e_meta.php,v $ - * $Revision: 1.2 $ - * $Date: 2009-01-17 22:46:37 $ - * $Author: lisa_ $ + * $Revision: 1.3 $ + * $Date: 2009-09-25 20:13:12 $ + * $Author: secretr $ * */ @@ -19,9 +19,9 @@ if (!defined('e107_INIT')) { exit; } if (is_readable(THEME."tagwords_css.php")) { - $src = THEME."tagwords_css.php"; + $src = THEME_ABS."tagwords_css.php"; } else { - $src = e_PLUGIN."tagwords/tagwords_css.php"; + $src = e_PLUGIN_ABS."tagwords/tagwords_css.php"; } echo "\n"; diff --git a/e107_plugins/tagwords/e_url/apache_mod_rewrite/main.php b/e107_plugins/tagwords/e_url/apache_mod_rewrite/main.php new file mode 100644 index 000000000..9dcafe196 --- /dev/null +++ b/e107_plugins/tagwords/e_url/apache_mod_rewrite/main.php @@ -0,0 +1,33 @@ + $request['q']); + } + + return $request; +} + diff --git a/e107_plugins/tagwords/e_url/apache_mod_rewrite/profile.xml b/e107_plugins/tagwords/e_url/apache_mod_rewrite/profile.xml new file mode 100644 index 000000000..52c95485f --- /dev/null +++ b/e107_plugins/tagwords/e_url/apache_mod_rewrite/profile.xml @@ -0,0 +1,5 @@ + + + {LAN_EURL_MODREWR_TITLE} + {LAN_EURL_MODREWR_DESCR} + diff --git a/e107_plugins/tagwords/e_url/main.php b/e107_plugins/tagwords/e_url/main.php new file mode 100644 index 000000000..2cda3e575 --- /dev/null +++ b/e107_plugins/tagwords/e_url/main.php @@ -0,0 +1,24 @@ +row = $this->getRecord($id); } - $url = e_BASE."news.php?item.".$this->row['news_id']; + //$url = e_BASE."news.php?item.".$this->row['news_id']; + $url = e107::getUrl()->createCoreNews('action=extend&id='.$this->row['news_id'].'&sef='.$this->row['news_rewrite_string']); return "".$this->e107->tp->toHTML($this->row['news_title'], TRUE, '').""; } function getRecord($id) { $this->row = ''; - - $qry = "SELECT n.* + //FIXME - only if news mod rewrite is on + $qry = "SELECT n.*, nr.* FROM #news as n + LEFT JOIN #news_rewrite AS nr ON n.news_id=nr.news_rewrite_source AND nr.news_rewrite_type=1 WHERE n.news_id='{$id}' AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().") diff --git a/e107_plugins/tagwords/tagwords.php b/e107_plugins/tagwords/tagwords.php index c0cdb1db0..f4392a84f 100644 --- a/e107_plugins/tagwords/tagwords.php +++ b/e107_plugins/tagwords/tagwords.php @@ -9,15 +9,17 @@ * Tagwords Page * * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/tagwords.php,v $ - * $Revision: 1.2 $ - * $Date: 2009-01-17 22:46:37 $ - * $Author: lisa_ $ + * $Revision: 1.3 $ + * $Date: 2009-09-25 20:13:12 $ + * $Author: secretr $ * */ require_once('../../class2.php'); if (!defined('e107_INIT')) { exit; } +$_GET = e107::getUrl()->parseRequest('tagwords', 'main', e_QUERY); + require_once(HEADERF); require_once(e_PLUGIN."tagwords/tagwords_class.php"); @@ -25,7 +27,7 @@ $tag = new tagwords(); if(varsettrue($tag->pref['tagwords_class']) && !check_class($tag->pref['tagwords_class']) ) { - header("location:".e_BASE); exit; + header("location:".SITEURL); exit; } if(varsettrue($_GET['q'])) diff --git a/e107_plugins/tagwords/tagwords_class.php b/e107_plugins/tagwords/tagwords_class.php index b116aac78..4f475e9fb 100644 --- a/e107_plugins/tagwords/tagwords_class.php +++ b/e107_plugins/tagwords/tagwords_class.php @@ -9,9 +9,9 @@ * Tagwords Class * * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/tagwords_class.php,v $ - * $Revision: 1.5 $ - * $Date: 2009-05-04 13:39:37 $ - * $Author: bugrain $ + * $Revision: 1.6 $ + * $Date: 2009-09-25 20:13:12 $ + * $Author: secretr $ * */ @@ -270,11 +270,12 @@ class tagwords function createTagWordLink($word, $class='') { $word = trim($word); - $qry = $this->e107->tp->toDB($word); - $qry = str_replace(' ', '+', $qry); + /*$qry = $this->e107->tp->toDB($word); + $qry = str_replace(' ', '+', $qry);*/ + $url = e107::getUrl()->createTagwords('q='.$word); $word = $this->e107->tp->toHTML($word,true,'no_hook, emotes_off'); $class = ($class ? "class='tag".intval($class)."'" : ""); - return "".$word.""; + return "".$word.""; } /* diff --git a/e107_plugins/tagwords/tagwords_shortcodes.php b/e107_plugins/tagwords/tagwords_shortcodes.php index cb76caad8..21e50ed83 100644 --- a/e107_plugins/tagwords/tagwords_shortcodes.php +++ b/e107_plugins/tagwords/tagwords_shortcodes.php @@ -9,9 +9,9 @@ * Tagwords Shortcodes * * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/tagwords_shortcodes.php,v $ - * $Revision: 1.6 $ - * $Date: 2009-07-21 10:21:20 $ - * $Author: marj_nl_fr $ + * $Revision: 1.7 $ + * $Date: 2009-09-25 20:13:12 $ + * $Author: secretr $ * */ if (!defined('e107_INIT')) { exit; } @@ -61,7 +61,7 @@ class tagwords_shortcodes $id = 'tagwords_searchform_menu'; return " -
+
@@ -76,7 +76,7 @@ class tagwords_shortcodes } $id = 'tagwords_searchform'; return " - +
@@ -108,10 +108,10 @@ class tagwords_shortcodes switch($sc_mode) { case 'menu': - return "".LAN_TAG_MENU_1.""; + return "".LAN_TAG_MENU_1.""; break; case 'home': - return "".LAN_TAG_7.""; + return "".LAN_TAG_7.""; break; default: if(method_exists($tag->area, 'getLink')) diff --git a/e107_plugins/tagwords/tagwords_template.php b/e107_plugins/tagwords/tagwords_template.php index 0a57b6074..3e75f9c54 100644 --- a/e107_plugins/tagwords/tagwords_template.php +++ b/e107_plugins/tagwords/tagwords_template.php @@ -9,9 +9,9 @@ * Tagwords Template * * $Source: /cvs_backup/e107_0.8/e107_plugins/tagwords/tagwords_template.php,v $ - * $Revision: 1.4 $ - * $Date: 2009-07-21 08:27:23 $ - * $Author: e107coders $ + * $Revision: 1.5 $ + * $Date: 2009-09-25 20:13:12 $ + * $Author: secretr $ * */ @@ -54,10 +54,10 @@ $TEMPLATE_TAGWORDS['link_end'] = "
"; //##### options -------------------------------------------------- $TEMPLATE_TAGWORDS['options'] = " - + {TAG_SEARCH} -
+
{TAG_TYPE} {TAG_SORT} {TAG_AREA} {TAG_BUTTON}