From 94f772577a38630c50aef6bcd399548011378cba Mon Sep 17 00:00:00 2001 From: Cameron <e107inc@gmail.com> Date: Tue, 29 Dec 2020 10:04:33 -0800 Subject: [PATCH] trackback plugin removed. --- comment.php | 14 +- .../shortcodes/batch/news_shortcodes.php | 5 +- e107_core/templates/trackback_template.php | 11 -- e107_handlers/e107_class.php | 12 +- e107_handlers/news_class.php | 4 +- e107_handlers/plugin_class.php | 2 +- e107_languages/English/admin/lan_newspost.php | 4 +- e107_languages/English/lan_comment.php | 6 +- e107_plugins/news/news.php | 18 +- e107_plugins/trackback/admin_config.php | 65 ------- e107_plugins/trackback/e_admin.php | 126 ------------ e107_plugins/trackback/e_meta.php | 19 -- .../trackback/images/trackback_16.png | Bin 707 -> 0 bytes .../trackback/images/trackback_32.png | Bin 1608 -> 0 bytes .../languages/English_admin_trackback.php | 39 ---- .../trackback/languages/English_global.php | 5 - e107_plugins/trackback/modtrackback.php | 89 --------- e107_plugins/trackback/plugin.xml | 13 -- e107_plugins/trackback/trackback.php | 25 --- e107_plugins/trackback/trackbackClass.php | 180 ------------------ e107_plugins/trackback/trackback_sql.php | 10 - .../_data/testcore/languages/English.php | 2 +- e107_tests/tests/_data/testcore/theme.php | 4 +- .../_data/testkubrick/languages/English.php | 3 +- e107_tests/tests/_data/testkubrick/theme.php | 6 +- e107_themes/_blank/languages/English.php | 3 +- 26 files changed, 40 insertions(+), 625 deletions(-) delete mode 100644 e107_core/templates/trackback_template.php delete mode 100644 e107_plugins/trackback/admin_config.php delete mode 100644 e107_plugins/trackback/e_admin.php delete mode 100644 e107_plugins/trackback/e_meta.php delete mode 100644 e107_plugins/trackback/images/trackback_16.png delete mode 100644 e107_plugins/trackback/images/trackback_32.png delete mode 100644 e107_plugins/trackback/languages/English_admin_trackback.php delete mode 100644 e107_plugins/trackback/languages/English_global.php delete mode 100644 e107_plugins/trackback/modtrackback.php delete mode 100644 e107_plugins/trackback/plugin.xml delete mode 100644 e107_plugins/trackback/trackback.php delete mode 100644 e107_plugins/trackback/trackbackClass.php delete mode 100644 e107_plugins/trackback/trackback_sql.php diff --git a/comment.php b/comment.php index 75d84590f..63ccf8d65 100644 --- a/comment.php +++ b/comment.php @@ -408,7 +408,7 @@ elseif ($action == 'comment') switch ($table) { case 'news' : - if(isset($pref['trackbackEnabled']) && $pref['trackbackEnabled']) + /*if(!empty($pref['trackbackEnabled'])) { $query = "SELECT COUNT(tb.trackback_pid) AS tb_count, n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_name, nc.category_icon FROM #news AS n LEFT JOIN #user AS u ON n.news_author = u.user_id @@ -420,14 +420,14 @@ elseif ($action == 'comment') GROUP by n.news_id"; } else - { + {*/ $query = "SELECT n.*, u.user_id, u.user_name, u.user_customtitle, nc.category_name, nc.category_icon FROM #news AS n LEFT JOIN #user AS u ON n.news_author = u.user_id LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id WHERE n.news_class REGEXP '".e_CLASS_REGEXP."' AND n.news_id={$id} AND n.news_allow_comments=0"; - } + // } if (!$sql->gen($query)) { @@ -542,16 +542,16 @@ else e107::redirect(); exit; } - +/* if(isset($pref['trackbackEnabled']) && $pref['trackbackEnabled'] && $table == 'news') { echo "<span class='smalltext'><b>".$pref['trackbackString']."</b> ".SITEURLBASE.e_PLUGIN_ABS."trackback/trackback.php?pid={$id}</span>"; -} +}*/ $field = ($field ? $field : ($id ? $id : "")); // ID of associated source item $width = (isset($width) && $width ? $width : ""); $cobj->compose_comment($table, $action, $field, $width, $subject, $rate=FALSE); - +/* if(isset($pref['trackbackEnabled']) && $pref['trackbackEnabled'] && $table == 'news') { if($sql->select("trackback", "*", "trackback_pid={$id}")) @@ -597,7 +597,7 @@ if(isset($pref['trackbackEnabled']) && $pref['trackbackEnabled'] && $table == 'n { echo "<div style='text-align:right'><a href='".e_PLUGIN_ABS."trackback/modtrackback.php?".$id."'>".COMLAN_317."</a></div><br />"; } -} +}*/ //if (!strstr(e_QUERY, "poll")) diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index 57c735756..d4c5d4dc8 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -168,12 +168,13 @@ class news_shortcodes extends e_shortcode function sc_trackback($parm=null) { - global $pref; + return null; + /* global $pref; if(!vartrue($pref['trackbackEnabled'])) { return ''; } $news_item = $this->news_item; $news_item['#'] = 'track'; - return ($this->param['trackbackbeforestring'] ? $this->param['trackbackbeforestring'] : '')."<a href='".e107::getUrl()->create('news/view/item', $this->news_item)."'>".$this->param['trackbackstring'].$this->news_item['tb_count'].'</a>'.($this->param['trackbackafterstring'] ? $this->param['trackbackafterstring'] : ''); + return ($this->param['trackbackbeforestring'] ? $this->param['trackbackbeforestring'] : '')."<a href='".e107::getUrl()->create('news/view/item', $this->news_item)."'>".$this->param['trackbackstring'].$this->news_item['tb_count'].'</a>'.($this->param['trackbackafterstring'] ? $this->param['trackbackafterstring'] : '');*/ } diff --git a/e107_core/templates/trackback_template.php b/e107_core/templates/trackback_template.php deleted file mode 100644 index b26cad960..000000000 --- a/e107_core/templates/trackback_template.php +++ /dev/null @@ -1,11 +0,0 @@ -<?php - -if (!defined('e107_INIT')) { exit; } - -$TRACKBACK = " -<div class='fcaption'>{TITLE}</div> -{EXCERPT}<br />From: {BLOGNAME}<br /><br /> -"; - -$TRACKBACK_RENDER_METHOD = TRUE; /* TRUE=tablerender, FALSE=echo */ - diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 49af4d7fd..be507fb44 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -4943,14 +4943,12 @@ class e107 { $inArray = array("'", '/**/', '/UNION/', '/SELECT/', 'AS '); - if (strpos($_SERVER['PHP_SELF'], 'trackback') === false) + + foreach($inArray as $res) { - foreach($inArray as $res) - { - if(stripos($_SERVER['QUERY_STRING'], $res) !== false) - { - die('Access denied.'); - } + if(stripos($_SERVER['QUERY_STRING'], $res) !== false) + { + die('Access denied.'); } } diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php index de43211f5..50d5f6e71 100644 --- a/e107_handlers/news_class.php +++ b/e107_handlers/news_class.php @@ -278,9 +278,9 @@ class news { $tmp['caticon'] = defset('ICONSTYLE'); $tmp['commentoffstring'] = defset('COMMENTOFFSTRING', ''); $tmp['commentlink'] = defset('COMMENTLINK', e107::getParser()->toGlyph('fa-comment')); - $tmp['trackbackstring'] = defset('TRACKBACKSTRING'); + /* $tmp['trackbackstring'] = defset('TRACKBACKSTRING'); $tmp['trackbackbeforestring'] = defset('TRACKBACKBEFORESTRING'); - $tmp['trackbackafterstring'] = defset('TRACKBACKAFTERSTRING'); + $tmp['trackbackafterstring'] = defset('TRACKBACKAFTERSTRING');*/ $tmp['itemlink'] = defset('NEWSLIST_ITEMLINK'); $tmp['thumbnail'] = defset('NEWSLIST_THUMB', "border:0px"); $tmp['catlink'] = defset('NEWSLIST_CATLINK'); diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index 61158b552..c7a1ae0f3 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -88,7 +88,7 @@ class e_plugin "metaweblog", "newforumposts_main", "news", "newsfeed", "newsletter","online", "page", "pm","poll", "rss_menu","search_menu","siteinfo", "social", "tagcloud", "tinymce4", - "trackback","tree_menu","user" + "tree_menu","user" ); diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php index 885bbd3e2..ecc05f95a 100644 --- a/e107_languages/English/admin/lan_newspost.php +++ b/e107_languages/English/admin/lan_newspost.php @@ -159,8 +159,8 @@ define("LAN_NEWS_30", "If selected, news item will appear above all others"); define("LAN_NEWS_32", "Date stamp"); define("LAN_NEWS_33", "Set the date stamp for the current news item"); -define("LAN_NEWS_34", "Trackback"); -define("LAN_NEWS_35", "Add trackback URLs"); +// define("LAN_NEWS_34", "Trackback"); +// define("LAN_NEWS_35", "Add trackback URLs"); // define("LAN_NEWS_36", "<b>Pingback</b> (send a pingback to all URLs in this post)"); define("LAN_NEWS_37", "One URL per line)"); // define("LAN_NEWS_38", "Insert images"); diff --git a/e107_languages/English/lan_comment.php b/e107_languages/English/lan_comment.php index 9b5ff90e5..105c97da6 100644 --- a/e107_languages/English/lan_comment.php +++ b/e107_languages/English/lan_comment.php @@ -39,9 +39,9 @@ define("COMLAN_310", "Unable to accept post as that username is registered - if define("COMLAN_312", "Duplicate post - unable to accept."); define("COMLAN_313", "Location"); define("COMLAN_314", "moderate comments"); -define("COMLAN_315", "Trackbacks"); -define("COMLAN_316", "No trackbacks for this newspost."); -define("COMLAN_317", "Moderate trackbacks"); +// define("COMLAN_315", "Trackbacks"); +// define("COMLAN_316", "No trackbacks for this newspost."); +// define("COMLAN_317", "Moderate trackbacks"); define("COMLAN_318", "Edit comment"); define("COMLAN_319", "edited"); define("COMLAN_320", "Update comment"); diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php index 2f313d975..a8cceb71e 100644 --- a/e107_plugins/news/news.php +++ b/e107_plugins/news/news.php @@ -1128,7 +1128,7 @@ class news_front $sql = e107::getDb(); // <-- Cache - if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled']) + /* if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled']) { $query = " SELECT COUNT(tb.trackback_pid) AS tb_count, n.*, u.user_id, u.user_name, u.user_customtitle, u.user_image, nc.category_id, nc.category_name, nc.category_sef, @@ -1143,7 +1143,7 @@ class news_front GROUP by n.news_id"; } else - { + {*/ $query = " SELECT n.*, u.user_id, u.user_name, u.user_customtitle, u.user_image, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords, nc.category_meta_description @@ -1155,7 +1155,7 @@ class news_front AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().") AND n.news_id=".intval($this->subAction); - } + // } if ($sql->gen($query)) @@ -1375,7 +1375,7 @@ class news_front case "item" : $sub_action = intval($this->subAction); $news_total = 1; - if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled']) + /* if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled']) { $query = " SELECT COUNT(tb.trackback_pid) AS tb_count, n.*, u.user_id, u.user_name, u.user_customtitle, u.user_image, nc.category_id, nc.category_name, nc.category_sef, @@ -1389,7 +1389,7 @@ class news_front GROUP by n.news_id"; } else - { + {*/ $query = " SELECT n.*, u.user_id, u.user_name, u.user_customtitle, u.user_image, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords, nc.category_meta_description, nc.category_template @@ -1398,7 +1398,7 @@ class news_front LEFT JOIN #news_category AS nc ON n.news_category = nc.category_id WHERE n.news_id=".$this->subAction." AND n.news_class REGEXP '".e_CLASS_REGEXP."' AND NOT (n.news_class REGEXP ".$this->nobody_regexp.") AND n.news_start < ".time()." AND (n.news_end=0 || n.news_end>".time().")"; - } + // } $noNewsMessage = LAN_NEWS_83; break; @@ -1463,7 +1463,7 @@ class news_front $interval = $this->pref['newsposts']-$this->pref['newsposts_archive']; // Number of 'full' posts to show // Get number of news item to show - if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled']) { + /* if(isset($this->pref['trackbackEnabled']) && $this->pref['trackbackEnabled']) { $query = " SELECT SQL_CALC_FOUND_ROWS COUNT(tb.trackback_pid) AS tb_count, n.*, u.user_id, u.user_name, u.user_customtitle, u.user_image, nc.category_id, nc.category_name, nc.category_sef, nc.category_icon, nc.category_meta_keywords, nc.category_meta_description, nc.category_template, @@ -1479,11 +1479,11 @@ class news_front ORDER BY news_sticky DESC, ".$this->order." DESC LIMIT ".intval($this->from).",".ITEMVIEW; } else - { + {*/ $query = $this->getQuery(); - } + // } $noNewsMessage = LAN_NEWS_83; } // END - switch($action) diff --git a/e107_plugins/trackback/admin_config.php b/e107_plugins/trackback/admin_config.php deleted file mode 100644 index 484c7f8d8..000000000 --- a/e107_plugins/trackback/admin_config.php +++ /dev/null @@ -1,65 +0,0 @@ -<?php -/* - * e107 website system - * - * Copyright (C) 2008-2013 e107 Inc (e107.org) - * Released under the terms and conditions of the - * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) - * - * Plugin administration - Trackback - * - * $URL$ - * $Id$ - * -*/ -require_once("../../class2.php"); -if (!getperms("P") || !e107::isInstalled('trackback')) -{ - e107::redirect('admin'); - exit() ; -} - -e107::includeLan(e_PLUGIN."trackback/languages/".e_LANGUAGE."_admin_trackback.php"); - -require_once(e_ADMIN."auth.php"); -$frm = e107::getForm(); -$mes = e107::getMessage(); - -if (isset($_POST['updatesettings'])) -{ - $temp = array(); - if ($pref['trackbackEnabled'] != $_POST['trackbackEnabled']) - { - $temp['trackbackEnabled'] = $_POST['trackbackEnabled']; - $e107cache->clear('news.php'); - } - $temp['trackbackString'] = $tp->toDB($_POST['trackbackString']); - - e107::getConfig('core')->setPref($temp)->save(false); - -} - -$ns->tablerender($caption, $mes->render() . $text); - -$text = " -<form method='post' action='".e_SELF."'> -<table class='table adminform'> -<tr> - <td>".TRACKBACK_L7."</td> - <td>".$frm->radio_switch('trackbackEnabled', $pref['trackbackEnabled'])."</td> -</tr> - -<tr> - <td>".TRACKBACK_L8."</td> - <td><input size='50' class='tbox' type='text' name='trackbackString' value='".$pref['trackbackString']."' /> </td> -</table> -<div class='buttons-bar center'> - ".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')." -</div> -</form> -</div> -"; - -$ns->tablerender(TRACKBACK_L10, $text); - -require_once(e_ADMIN."footer.php"); diff --git a/e107_plugins/trackback/e_admin.php b/e107_plugins/trackback/e_admin.php deleted file mode 100644 index d1ace6fcf..000000000 --- a/e107_plugins/trackback/e_admin.php +++ /dev/null @@ -1,126 +0,0 @@ -<?php - - -//v2.x Standard for extending admin areas. - - -class trackback_admin -{ - private $active = false; - - - function __construct() - { - $pref = e107::pref('core','trackbackEnabled'); - $this->active = vartrue($pref); - } - - - /** - * Extend Admin-ui Parameters - * @param $ui admin-ui object - * @return array - */ - public function config($ui) - { - $action = $ui->getAction(); // current mode: create, edit, list - $type = $ui->getEventName(); // 'wmessage', 'news' etc. - - $config = array(); - - switch($type) - { - case "news": - - if($this->active == true) - { - $config['fields']['urls'] = array ( 'title' =>LAN_NEWS_35, 'type' => 'textarea', 'tab'=>1, 'writeParms'=> array('size'=>'xxlarge', 'placeholder'=>''), 'width' => 'auto', 'help' => '', 'readParms' => '', 'class' => 'left', 'thclass' => 'left', ); - } - break; - } - - //Note: 'urls' will be returned as $_POST['x_trackback_urls']. ie. x_{PLUGIN_FOLDER}_{YOURKEY} - - return $config; - - } - - - /** - * Process Posted Data. - * @param $ui admin-ui object - */ - public function process($ui) - { - $data = $ui->getPosted(); - e107::getMessage()->addDebug(print_a($data,true)); - - if($data['news_id'] && $this->active) - { - $excerpt = e107::getParser()->text_truncate(strip_tags(e107::getParser()->post_toHTML($data['news_body'])), 100, '...'); - -// $id=mysql_insert_id(); - $permLink = e107::getInstance()->base_path."comment.php?comment.news.".intval($data['news_id']); - - require_once(e_PLUGIN."trackback/trackbackClass.php"); - $trackback = new trackbackClass(); - - if($data['x_trackback_urls']) - { - $urlArray = explode("\n", $data['x_trackback_urls']); - foreach($urlArray as $pingurl) - { - if(!$terror = $trackback->sendTrackback($permLink, $pingurl, $data['news_title'], $excerpt)) - { - - e107::getMessage()->add("Successfully pinged {$pingurl}.", E_MESSAGE_SUCCESS); - } - else - { - - e107::getMessage()->add("was unable to ping {$pingurl}<br />[ Error message returned was : '{$terror}'. ]", E_MESSAGE_ERROR); - } - } - } - - /* - if(isset($_POST['pingback_urls'])) - { - if ($urlArray = $trackback->getPingUrls($data['news_body'])) //FIXME - missing method!!! - { - foreach($urlArray as $pingurl) - { - - if ($trackback->sendTrackback($permLink, $pingurl, $data['news_title'], $excerpt)) - { - - e107::getMessage()->add("Successfully pinged {$pingurl}.", E_MESSAGE_SUCCESS); - } - else - { - - e107::getMessage()->add("Pingback to {$pingurl} failed ...", E_MESSAGE_ERROR); - } - } - } - else - { - - e107::getMessage()->add("No pingback addresses were discovered", E_MESSAGE_INFO, $smessages); - } - } - */ - } - - - - /* end trackback */ - } - - - -} - - - - diff --git a/e107_plugins/trackback/e_meta.php b/e107_plugins/trackback/e_meta.php deleted file mode 100644 index 674150a51..000000000 --- a/e107_plugins/trackback/e_meta.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/* - * e107 website system - * - * Copyright (C) 2008-2015 e107 Inc (e107.org) - * Released under the terms and conditions of the - * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) - * - * Plugin Trackback - * - * -*/ -if (!defined('e107_INIT')) { exit; } - -if(e107::isInstalled('trackback') && !empty($pref['trackbackEnabled']) && USER_AREA) -{ - echo "<link rel='pingback' href='".SITEURLBASE.e_PLUGIN_ABS."trackback/trackback.php' />"; -} - diff --git a/e107_plugins/trackback/images/trackback_16.png b/e107_plugins/trackback/images/trackback_16.png deleted file mode 100644 index 6129fa0c77eb1d2100ed1c99b5643ab8990a9566..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 707 zcmV;!0zCbRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!RY^oaRCwBA zWWWNfjE&{(SXnoG{P^+N^y}BX8Snsr0AfNHa8*;Y4^vXQP`hoLfdnU~I0FFy5I`u% zOJ2TyTXXaO|8L*^|NrLA|3)31ryfd5@jw^x<I)2VKrkos=NcL9f3#}V|Nl2`{QrOL z+W-GouKfRh@#6nS%a;A06&d*+WH>gx00G1Zv_aomR`x(qRh0l2FE0bbpFa!?fB$08 zkFQ)|s9L!2z&&2xfMaLReuNnS5I{^UzkfRf$Hoe9fp{-pGBCV;4WVDWU|@Lm41ym& zW{~CPX6X0xb5MHuav8D<00M~l)~8P=@1HyOnT?gzU0Y6$f#K#&28Oq985rKZgBbSe z6~w?NPZ+p>wDzArsy8?}Ki_-*{y4}0fB<3!5w|~mI{y0k^X(5GJqk7R^5S3xY54Gg z;V@9{y|_37pRO(g>+jzT438c$h_JFUeEIar>Y2FstQW6ee+LL4W|&hReEj(I13UYi zn<r0N>bkhd^K)@A%v-naX4mP{i91)X{{CA+!pI;bgn{AeRR)QlKiRi``0yC0=M+Ey zVT~0JdHJSom6iV+{r%6t#LV>djcY9}FMXXe=l_3O+y7ZoQhPw+00D#(*(oWx*+@tv zp{LLZetz%&x3v79qNw;ED8va6Kn$b;P{O)4dGi0A+S>nhH8gAh0*IMZ1Ma+ke^KiH z{{%~Qb%Axyo~;K6ASMPf!11eBC%hFCV_^OEO$;D_$THxanAm~S7cMXefB&up5J1f2 p81VS{^OpjgoMw-I|K0`=U;x^&`B18C?@a&z002ovPDHLkV1f|(PF(;1 diff --git a/e107_plugins/trackback/images/trackback_32.png b/e107_plugins/trackback/images/trackback_32.png deleted file mode 100644 index 28915c0d7fa7da77197979a209352e778d6cfaa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1608 zcmV-O2DkZ%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%+DSw~RCwBA z{Qv(y10y3N1F^u$*qERF`}Yk@|Nbd_=jIMLcJ}N=1_}T`05OrG7-+e@;Oo~9qPe*p z?BBdm`2OQZ8Uuv@Ab^N=fW3}Rz4U_z2MQAs1d^97W#D3GX8?vC3#ASK2p|?>f}G>q zw*`7%z62C4Sim6b>B+!w_bvmq06+k-5U^aI|LxliUh?t^NmHgUaLLIrFns;W!0`P$ z)f@m2KrDDH&zE@octS!z0E2H;6$1ks8^m&8qJ=p?;r;tG2_+@9PlAFQfZPSZ1o@Fv z2LJ>RBYG|X1v$&FUlTN6y-Fx-Ze~z-c7|Ar1wX!ajp5eGlMJW!?qxXj>>0y55s?Ld z*w`9?4tYqd0{{XD#Q~ro=l$?uffEmpK~7&E1DBW>!oq+5@Uq|BxWTXym`1kVy!qj! zj10&T6NzyEKmfrV0JJ<_{K=CEiO$XfzIk~J3`|T2i;!u2Y#_e5e?P;FWy=^Y2?%WX z!Nrw8C|Upl2<!lRJ-zvAFJC5PXJjxKxVb?L{reZEC4}&|moFK*IyxAR3JPBM#>3-) z&k+Ct1a^R*tnB}agaigF3k!(F92}?)0AXZ4E;(fJpFbI<Oq|HDk(2Yno|`vKfOh@G z<^X^I0vALd`S^<G0ORl2>C+I)@84%&c<}-#@ez{pzkET^F#P#51H-3J2n<pSqoMke zf`S;VU%oW3(a~9iD+B-n2%ZK^_4UIfUca6bWMssfP*K6aaP=w!!<#n{Rm{wgGyzJi zpy+@BWS;|l48|Zf$bmn8fF1GX^=pR8D_0oK%g98Xy?l8&x&r_L2qhPo=;<l*|M;=q zij7S-udR(i<l8p}hFiB782<c$V36T3HZCz_K9qgz$rFawFJC_2XJb>je&^0BWCs8Q z5F?h_kl9L0Ynu9}Pic7t1q=p;h71g#r~w5pvf;6@2pvFQG5{?BJNCf?td8lrc#&a) zsA%u;8#hXjEdvN3MqJggnZACS)QcBA5l&9L;h=1J<_yFVsDZs})-ap|1~Wgfgw)s6 zWY9D)V6gP{W#9ru$)-&V4EOG#IN;{nw+yAPUw^*v|G)0z=g;8<6+i&ttPM|Hyg2Kb zgoNYVlP9lr<>xbe)6oIO5il{cvclEelaktel$$$h&hzJ8t(!OBOb7{KSUG17!#7~@ z%@7_ANzhQB&d<+a@clclu%KWtvONF+gts~dI^yhCK|!mHU%#%*kBVZr`R*M9gNFwL zgP<TZ4gP%&jML>8uU{|UfBUxKS#ECgY3I+M1giz*n#4pDM|g;cFo=Ko0%}8W!o&aq z2vnyNRb~SdXl9U@*#AvwY5)J9IrG0qSNFexmex!xN|`}wgGEF>9j&kb|9{h_|Np(c z|NpnM`~TJ4{C}vh@P8#aIWw4IfB+)8L2~BOrRfjF#m%Sf+Vyx!SsBAOP?p0E{({s# zkd$=koHOSGuoPrq2n_{GaIvs37y{E99}kZ|Off(Jk<=su=HpW@xVQ}0JbAKm-`~Gy z-+%mg0H4}75)uIufbEFKpmbwr2Nu@>Mv1_WA67sn8;B1OKtx9YdN2bqu&QL>C!$4F zU!bh~|Nr5`|NpzV{J){4_1{ZI<|$B07$gr6KulydWI*LQs6Zju00Blp<8=mx3!4`& z1~x418DzP*7&w0Yk`faZ26=!1Ab^+{=m0(o2o$W{xs&0Wu`vS|4-bRTuU`zn>}UXz z0|+3xH~<(52cNOCAK1GA*mBd;V^9LtEzHc!${;y_0HTWnK;SDc?}R-EfN9pzk%1pr zLb5P3%YwuK0*G!70EWWGyFY$>xBzU@%L)s_gxLTBh;9x5rv-lg4HrP60IWCI{{H0w zIRGGl=;{Dqi+KaE*al`mVFtb*Kh!~D00Bf-2Y{mC0kDnn7TAP`0e}Fas{=sb3m@Nw z)5ni9d}n0^y8<A9Sm^BlU@JM`z`uXKPhY&a0ObAx2rvM$?)~r49M4<;0000<MNUMn GLSTaUgwg^4 diff --git a/e107_plugins/trackback/languages/English_admin_trackback.php b/e107_plugins/trackback/languages/English_admin_trackback.php deleted file mode 100644 index 4e30a24f4..000000000 --- a/e107_plugins/trackback/languages/English_admin_trackback.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php -/* - * e107 website system - * - * Copyright (C) 2008-2009 e107 Inc (e107.org) - * Released under the terms and conditions of the - * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) - * - * Plugin administration - newsfeeds - * - * $Id$ - * -*/ - -//define("TRACKBACK_L1", "Configure Trackback"); -//define("TRACKBACK_L2", "This plugin enables you to use trackback in your news posts."); -//define("TRACKBACK_L3", "Trackback is now installed and enabled."); -//define("TRACKBACK_L4", "Trackback settings saved."); -//define("TRACKBACK_L5", "On"); -//define("TRACKBACK_L6", "Off"); -define("TRACKBACK_L7", "Activate trackback"); -define("TRACKBACK_L8", "Trackback URL text"); -//define("TRACKBACK_L9", "Save Settings"); -define("TRACKBACK_L10", "Trackback Settings"); -define("TRACKBACK_L11", "Trackback address for this post:"); - -define("TRACKBACK_L12", "No trackbacks for this item"); -define("TRACKBACK_L13", "Moderate trackbacks"); -//define("TRACKBACK_L14", "Delete"); -//define("TRACKBACK_L15", "Trackbacks deleted."); -define("TRACKBACK_L16", "Trackback"); -//define("TRACKBACK_L17", "Nothing changed - not saved"); - - -// Admin log messages -//------------------- -//define("LAN_AL_TRACK_01", "Trackback settings changed"); -//define("LAN_AL_TRACK_02", "Trackback items deleted"); - diff --git a/e107_plugins/trackback/languages/English_global.php b/e107_plugins/trackback/languages/English_global.php deleted file mode 100644 index c9c6d0551..000000000 --- a/e107_plugins/trackback/languages/English_global.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php - -define("LAN_PLUGIN_TRACKBACK_NAME", "Trackback"); -define("LAN_PLUGIN_TRACKBACK_DESCRIPTION", "This plugin enables you to use trackback in your news posts."); - diff --git a/e107_plugins/trackback/modtrackback.php b/e107_plugins/trackback/modtrackback.php deleted file mode 100644 index 1ac1bc81c..000000000 --- a/e107_plugins/trackback/modtrackback.php +++ /dev/null @@ -1,89 +0,0 @@ -<?php -/* - * e107 website system - * - * Copyright (C) 2008-2009 e107 Inc (e107.org) - * Released under the terms and conditions of the - * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) - * - * Plugin administration - newsfeeds - * - * $Source: /cvs_backup/e107_0.8/e107_plugins/trackback/modtrackback.php,v $ - * $Revision$ - * $Date$ - * $Author$ - * -*/ -$eplug_admin = true; -require_once("../../class2.php"); -$pref = e107::pref(); -if (!getperms("P") || !e107::isInstalled('trackback') || !$pref['trackbackEnabled']) -{ - e107::redirect(); - exit; -} - -require_once(e_ADMIN."auth.php"); -if (isset($_POST['moderate'])) -{ - $temp = array(); - $sql = e107::getDb(); - - if (is_array($_POST['trackback_delete'])) - { - foreach($_POST['trackback_delete'] as $key=>$cid) - { - $cid = intval($cid); - if ($cid > 0) - { - $sql->delete("trackback", "trackback_id=".$cid); - $temp[] = $cid; - } - } - if (count($temp)) - { - e107::getLog()->add('TRACK_02',implode(', ',$temp)); - } - } - e107::getRender()->tablerender(null, "<div style='text-align:center'><b>".LAN_DELETED."</b></div>"); - e107::getCache()->clear("news.php"); -} - -$sql = e107::getDb(); -$text = "<div style='text-align:center'> -<form method='post' action='".e_SELF."?".e_QUERY."'> -<table style='".ADMIN_WIDTH."' class='fborder'>"; - -if (e_QUERY=='all') -{ - $res=$sql->select("trackback"); -} -else -{ - $res=$sql->select("trackback", "*", "trackback_pid=".intval(e_QUERY)); -} - -if (!$res) -{ - $text .= "<tr><td class='forumheader3' style='text-align:center'>".TRACKBACK_L12.".</td></tr></table></form></div>"; -} -else -{ - $tbArray = $sql -> db_getList(); - foreach($tbArray as $row) - { - - $text .= "<tr> - <td class='forumheader3' style='width: 30%;'><a href='".$row['trackback_url']."' rel='external'>".$row['trackback_title']."</a></td> - <td class='forumheader3' style='width: 40%;'>".$row['trackback_excerpt']."</td> - <td class='forumheader3' style='width: 20%;'>".$row['trackback_blogname']."</td> - <td class='forumheader3' style='width: 10%;'><input type='checkbox' name='trackback_delete[]' value='".$row['trackback_id']."' /> ".LAN_DELETE."</td> - </tr>\n"; - } - $text .= "<tr><td colspan='5' class='forumheader' style='text-align:center'><input class='btn btn-default btn-secondary button' type='submit' name='moderate' value='".TRACKBACK_L13."' /></td></tr></table></form></div>"; -} - -e107::getRender()->tablerender(TRACKBACK_L13, $text); - -require_once(e_ADMIN."footer.php"); - diff --git a/e107_plugins/trackback/plugin.xml b/e107_plugins/trackback/plugin.xml deleted file mode 100644 index b2ff26f07..000000000 --- a/e107_plugins/trackback/plugin.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<e107Plugin name="Trackback" lan="LAN_PLUGIN_TRACKBACK_NAME" version="1.1" date="2012-08-01" compatibility="1.0" installRequired="true"> - <author name="e107 Inc." url="http://e107.org" email="devs@e107.org" /> - <description lan="LAN_PLUGIN_TRACKBACK_DESCRIPTION">This plugin enables you to use trackback in your news posts.</description> - <copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright> - <adminLinks> - <link url='admin_config.php' description='TRACKBACK_L1' icon='images/trackback_32.png' iconSmall='images/trackback_16.png' primary='true' >TRACKBACK_L1</link> - </adminLinks> - <mainPrefs> - <pref name="trackbackEnabled">0</pref> - <pref name="trackbackString">Trackback address for this post:</pref> - </mainPrefs> -</e107Plugin> \ No newline at end of file diff --git a/e107_plugins/trackback/trackback.php b/e107_plugins/trackback/trackback.php deleted file mode 100644 index d31586744..000000000 --- a/e107_plugins/trackback/trackback.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php -/* - * e107 website system - * - * Copyright (C) 2008-2009 e107 Inc (e107.org) - * Released under the terms and conditions of the - * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) - * - * Plugin administration - newsfeeds - * - * $Source: /cvs_backup/e107_0.8/e107_plugins/trackback/trackback.php,v $ - * $Revision$ - * $Date$ - * $Author$ - * -*/ -require_once("../../class2.php"); -if (!e107::isInstalled('trackback')) -{ - exit(); -} -header('Content-Type: text/xml'); -include(e_PLUGIN."trackback/trackbackClass.php"); -$trackback = trackbackClass::respondTrackback(); - diff --git a/e107_plugins/trackback/trackbackClass.php b/e107_plugins/trackback/trackbackClass.php deleted file mode 100644 index 6f7582f06..000000000 --- a/e107_plugins/trackback/trackbackClass.php +++ /dev/null @@ -1,180 +0,0 @@ -<?php -/* - * e107 website system - * - * Copyright (C) 2008-2009 e107 Inc (e107.org) - * Released under the terms and conditions of the - * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) - * - * Plugin administration - newsfeeds - * - * $Source: /cvs_backup/e107_0.8/e107_plugins/trackback/trackbackClass.php,v $ - * $Revision$ - * $Date$ - * $Author$ - * -*/ - -if (!defined('e107_INIT')) { exit; } - -class trackbackClass -{ - - static function sendTrackback ($permLink, $pingUrl, $title, $excerpt) - { - global $e107; - - $title = urlencode(stripslashes($title)); - $excerpt = urlencode(stripslashes($excerpt)); - $blog_name = urlencode(stripslashes(SITENAME)); - $permLink = urlencode(stripslashes($e107->base_path.$permLink)); - $query_string = "title=".$title."&url=".$permLink."&blog_name=".$blog_name."&excerpt=".$excerpt; - - if (strpos($pingUrl, '?') !== false) - { - $pingUrl .= "&".$query_string; - $fp = fopen($pingUrl, 'r'); - $response = fread($fp, 4096); - fclose($fp); - } - else - { - - $trackback_url = parse_url($pingUrl); - - if ((isset($trackback_url["query"])) && ($trackback_url["query"] != "")) - { - $trackback_url["query"] = "?" . $trackback_url["query"]; - } - else - { - $trackback_url["query"] = ""; - } - - if ((isset($trackback_url["port"]) && !is_numeric($trackback_url["port"])) || (!isset($trackback_url["port"]))) - { - $trackback_url["port"] = 80; - } - - $header = 'POST ' . $trackback_url['path'] . $trackback_url['query'] . " HTTP/1.0\r\n"; - $header .= 'Host: '.$trackback_url['host']."\r\n"; - $header .= 'Content-Type: application/x-www-form-urlencoded; charset=utf-8'."\r\n"; - $header .= 'Content-Length: '.strlen($query_string)."\r\n"; - $header .= "\r\n"; - $header .= $query_string; - - $socket = fsockopen($trackback_url["host"], $trackback_url["port"]); - - if (!is_resource($socket)) - { - return 'trackbackClass -> sendTrackback: Unable to connect to {$trackback_url[\'host\']}.'; - } - - fwrite($socket, $header); - - $response = ""; - while (!feof($socket)) { - $response .= fgets($socket, 4096); - } - fclose($socket); - - } - - if(strpos($response, "<error>0</error>") !== false) - { - return FALSE; - } - else - { - if(preg_match('#\<message\>(.*?)\<\/message\>#', $response, $match)) - { - return $match[0]; - } - else - { - return "No error returned."; - } - } - - } - - static function respondTrackback () - { - global $sql, $pref, $tp, $e107cache; - $errorMessage = ""; - if(!$pref['trackbackEnabled']) - { - $errorMessage = "This site does not allow trackbacks."; - } - - $pid = (isset($_GET['pid']) ? intval($_GET['pid']) : intval($_POST['pid'])); - $permLink = (isset($_GET['url']) ? $_GET['url'] : $_POST['url']); - $permLink = $tp -> toDB($permLink); - $blog_name = (isset($_GET['blog_name']) ? $_GET['blog_name'] : $_POST['blog_name']); - $blog_name = $tp -> toDB($blog_name); - $title = (isset($_GET['title']) ? $_GET['title'] : $_POST['title']); - $title = $tp -> toDB($title); - $excerpt = (isset($_GET['excerpt']) ? $_GET['excerpt'] : $_POST['excerpt']); - $excerpt = $tp -> toDB($excerpt); - - /* debug */ - /* - $debug_str = "Query string: ".e_TBQS."\n"; - $debug_str .= "GET INFO: \n"; - foreach($_GET as $key => $get) - { - $debug_str .= "$key => $get\n"; - } - $debug_str .= "POST INFO: \n"; - foreach($_POST as $key => $get) - { - $debug_str .= "$key => $get\n"; - } - $sql -> db_Insert("debug", "0, '".time()."', '$debug_str' "); - */ - /* end debug */ - - - if(!$pid) - { - $errorMessage = "No permanent ID sent."; - } - - if(!isset($pid) || !is_numeric($pid)) - { - $errorMessage = "No known item with that pid (pid sent as ".$pid.")."; - } - - $excerpt = ($excerpt ? strip_tags($excerpt) : "I found your news item interesting, I've added a trackback to it on my website :)"); - $title = ($title ? $title : "Trackbacking your news item ..."); - $blog_name = ($blog_name ? $blog_name : "Anonymous site"); - - if(!$errorMessage) - { - if(!$sql->insert("trackback", "0, {$pid}, '{$title}', '{$excerpt}', '{$permLink}', '{$blog_name}' ")) - { - $errorMessage = "Unable to enter your trackback information into the database -> 0, {$pid}, '{$title}', '{$excerpt}', '{$permLink}', '{$blog_name}'"; - } - else - { - $e107cache->clear("comment.php?news.{$pid}"); - } - } - - if($errorMessage) - { - echo '<?xml version="1.0" encoding="utf-8"?'.">\n"; - echo "<response>\n"; - echo "<error>1</error>\n"; - echo "<message>".$errorMessage."</message>\n"; - echo "</response>"; - } - else - { - echo '<?xml version="1.0" encoding="utf-8"?'.">\n"; - echo "<response>\n"; - echo "<error>0</error>\n"; - echo "</response>"; - } - } -} diff --git a/e107_plugins/trackback/trackback_sql.php b/e107_plugins/trackback/trackback_sql.php deleted file mode 100644 index fbc9f79cf..000000000 --- a/e107_plugins/trackback/trackback_sql.php +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE trackback ( - `trackback_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `trackback_pid` int(10) unsigned NOT NULL DEFAULT '0', - `trackback_title` varchar(200) NOT NULL DEFAULT '', - `trackback_excerpt` varchar(250) NOT NULL DEFAULT '', - `trackback_url` varchar(150) NOT NULL DEFAULT '', - `trackback_blogname` varchar(150) NOT NULL DEFAULT '', - PRIMARY KEY (`trackback_id`), - KEY `trackback_pid` (`trackback_pid`) -) ENGINE=MyISAM; diff --git a/e107_tests/tests/_data/testcore/languages/English.php b/e107_tests/tests/_data/testcore/languages/English.php index ed370c942..c872f1156 100644 --- a/e107_tests/tests/_data/testcore/languages/English.php +++ b/e107_tests/tests/_data/testcore/languages/English.php @@ -3,7 +3,7 @@ define('LAN_THEME_1', 'e107 core theme by <a href="http://e107.org" title="e107 define('LAN_THEME_2', 'Comments: '); define('LAN_THEME_3', 'Comments are turned off for this item'); define('LAN_THEME_4', 'Read the full story'); -define('LAN_THEME_5', 'Trackbacks: '); +// define('LAN_THEME_5', 'Trackbacks: '); define('LAN_THEME_8', 'in'); define('LAN_THEME_9', 'by'); define("LAN_THEME_11", "Latest news"); diff --git a/e107_tests/tests/_data/testcore/theme.php b/e107_tests/tests/_data/testcore/theme.php index f70aaa1d8..5fd1e1ba2 100644 --- a/e107_tests/tests/_data/testcore/theme.php +++ b/e107_tests/tests/_data/testcore/theme.php @@ -353,8 +353,8 @@ define('COMMENTOFFSTRING', LAN_THEME_3); define('PRE_EXTENDEDSTRING', '<div class="readmore">'); define('EXTENDEDSTRING', LAN_THEME_4); define('POST_EXTENDEDSTRING', '</div>'); -define('TRACKBACKSTRING', LAN_THEME_5); -define('TRACKBACKBEFORESTRING', ' :: '); +//define('TRACKBACKSTRING', LAN_THEME_5); +// define('TRACKBACKBEFORESTRING', ' :: '); define('ICONMAIL', 'mail.png'); define('ICONPRINT', 'print.png'); define('ICONPRINTPDF', 'pdf.png'); diff --git a/e107_tests/tests/_data/testkubrick/languages/English.php b/e107_tests/tests/_data/testkubrick/languages/English.php index 48d7dad67..2c1616f48 100644 --- a/e107_tests/tests/_data/testkubrick/languages/English.php +++ b/e107_tests/tests/_data/testkubrick/languages/English.php @@ -21,9 +21,8 @@ define("LAN_THEME_1", "'kubrick' by <a href='http://e107.org' title='e107.org' r define("LAN_THEME_2", "Comments are turned off for this item"); define("LAN_THEME_3", "comment: "); define("LAN_THEME_4", "Read the rest ..."); -define("LAN_THEME_5", "Trackbacks: "); +// define("LAN_THEME_5", "Trackbacks: "); define('LAN_THEME_6', 'on'); define('LAN_THEME_7', 'by'); -?> \ No newline at end of file diff --git a/e107_tests/tests/_data/testkubrick/theme.php b/e107_tests/tests/_data/testkubrick/theme.php index d88b4ebf2..c86847b1b 100644 --- a/e107_tests/tests/_data/testkubrick/theme.php +++ b/e107_tests/tests/_data/testkubrick/theme.php @@ -97,7 +97,7 @@ $NEWSSTYLE = " {EXTENDED} </div> <div style='text-align:right' class='smalltext'> -{NEWSCOMMENTS}{TRACKBACK} +{NEWSCOMMENTS} </div> <br />"; define("ICONSTYLE", "float: left; border:0"); @@ -106,8 +106,8 @@ define("COMMENTOFFSTRING", LAN_THEME_2); define("PRE_EXTENDEDSTRING", "<br /><br />[ "); define("EXTENDEDSTRING", LAN_THEME_4); define("POST_EXTENDEDSTRING", " ]<br />"); -define("TRACKBACKSTRING", LAN_THEME_5); -define("TRACKBACKBEFORESTRING", " | "); +// define("TRACKBACKSTRING", LAN_THEME_5); +// define("TRACKBACKBEFORESTRING", " | "); // [linkstyle] diff --git a/e107_themes/_blank/languages/English.php b/e107_themes/_blank/languages/English.php index 822357ef8..542138476 100644 --- a/e107_themes/_blank/languages/English.php +++ b/e107_themes/_blank/languages/English.php @@ -8,7 +8,6 @@ define("EMESSLAN_TITLE_DEBUG", "System Debug"); define("LAN_THEME_1", "Comments are turned off for this item"); define("LAN_THEME_2", "Read/Post Comment: "); define("LAN_THEME_3", "Read the rest..."); -define("LAN_THEME_4", "Trackbacks: "); +// define("LAN_THEME_4", "Trackbacks: "); define("LAN_THEME_5", "Posted by "); define("LAN_THEME_6", "on "); -?> \ No newline at end of file