diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 8e7e644f7..32987b48c 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -44,6 +44,7 @@ if(e_AJAX_REQUEST && isset($_GET['src'])) // Ajax $dir = basename($unarc[0]['filename']); + /* Cannot use this yet until 'folder' is included in feed. if($dir != $p['plugin_folder']) { @@ -52,6 +53,7 @@ if(e_AJAX_REQUEST && isset($_GET['src'])) // Ajax echo "
pfolder=".$p['plugin_folder']; exit; } + */ if($unarc[0]['folder'] ==1 && is_dir($unarc[0]['filename'])) { @@ -70,6 +72,7 @@ if(e_AJAX_REQUEST && isset($_GET['src'])) // Ajax { print_a($unarc); $status = "There was a problem"; + //unlink(e_UPLOAD.$localfile); } echo $status; @@ -94,7 +97,6 @@ require_once (e_HANDLER.'message_handler.php'); $plugin = new e107plugin; -$frm = new e_form(); $pman = new pluginManager; define("e_PAGETITLE",ADLAN_98." - ".$pman->pagetitle); require_once("auth.php"); @@ -126,6 +128,11 @@ class pluginManager{ $this -> action = ($tmp[0]) ? $tmp[0] : "installed"; $this -> id = varset($tmp[1]) ? intval($tmp[1]) : ""; $this -> titlearray = array('installed'=>EPL_ADLAN_22,'avail'=>EPL_ADLAN_23, 'upload'=>EPL_ADLAN_38); + + if(isset($_GET['mode'])) + { + $this->action = $_GET['mode']; + } $keys = array_keys($this -> titlearray); $this->pagetitle = (in_array($this->action,$keys)) ? $this -> titlearray[$this->action] : $this -> titlearray['installed']; @@ -137,6 +144,8 @@ class pluginManager{ "plugin_icon" => array("title" => EPL_ADLAN_82, "type"=>"icon", "width" => "5%", "thclass" => "middle center",'class'=>'center', "url" => ""), "plugin_name" => array("title" => EPL_ADLAN_10, "type"=>"text", "width" => "30", "thclass" => "middle", "url" => ""), "plugin_version" => array("title" => EPL_ADLAN_11, "type"=>"numeric", "width" => "5%", "thclass" => "middle", "url" => ""), + "plugin_date" => array("title" => "Release ".LAN_DATE, "type"=>"text", "width" => "auto", "thclass" => "middle"), + "plugin_folder" => array("title" => EPL_ADLAN_64, "type"=>"text", "width" => "10%", "thclass" => "middle", "url" => ""), "plugin_category" => array("title" => LAN_CATEGORY, "type"=>"text", "width" => "15%", "thclass" => "middle", "url" => ""), "plugin_author" => array("title" => EPL_ADLAN_12, "type"=>"text", "width" => "auto", "thclass" => "middle", "url" => ""), @@ -259,61 +268,84 @@ class pluginManager{ function pluginOnline() { - global $plugin, $frm; + global $plugin; + $tp = e107::getParser(); + $frm = e107::getForm(); + $caption = "Search Online"; $e107 = e107::getInstance(); $xml = e107::getXml(); $mes = e107::getMessage(); - $mes->addWarning("Experimental: Release plugin must be installed and contain data in order to bug-test this mechanism"); - // $file = "http://www.e107.org/releases.php"; //pluginfeed.php or similar. - - $file = SITEURLBASE.e_PLUGIN_ABS."release/release.php"; // temporary testing + $mes->addWarning("This area is experimental and may produce unpredictable results."); + $from = intval($_GET['frm']); + + // $file = SITEURLBASE.e_PLUGIN_ABS."release/release.php"; // temporary testing + $file = "http://e107.org/feed?frm=".$from; $xml->setOptArrayTags('plugin'); // make sure 'plugin' tag always returns an array $xdata = $xml->loadXMLfile($file,'advanced'); + $total = $xdata['@attributes']['total']; + //TODO use admin_ui including filter capabilities by sending search queries back to the xml script. // XML data array. + $c = 1; foreach($xdata['plugin'] as $r) { $row = $r['@attributes']; $data[] = array( - 'plugin_icon' => $row['icon'], + 'plugin_id' => $c, + 'plugin_icon' => vartrue($row['icon'],e_IMAGE."admin_images/plugins_32.png"), 'plugin_name' => $row['name'], 'plugin_folder' => $row['folder'], - 'plugin_version' => $row['version'], - 'plugin_description' => vartrue($row['description']), - 'plugin_category' => vartrue($row['category']), + 'plugin_date' => vartrue($row['date']), + 'plugin_category' => vartrue($r['category'][0]), 'plugin_author' => vartrue($row['author']), + 'plugin_version' => $row['version'], + 'plugin_description' => $tp->text_truncate(vartrue($r['description'][0]),200), + + 'plugin_website' => vartrue($row['authorUrl']), 'plugin_url' => $row['url'], 'plugin_notes' => '' ); + $c++; } - +// print_a($data); + $fieldList = $this->fields; + unset($fieldList['plugin_checkboxes']); $text = "
".$caption." - ".$frm->colGroup($this->fields,$this->fieldpref). - $frm->thead($this->fields,$this->fieldpref)." + ".$frm->colGroup($fieldList,$this->fieldpref). + $frm->thead($fieldList,$this->fieldpref)." "; + + + foreach($data as $key=>$val ) { + // print_a($val); $text .= ""; - $text .= "\n"; - foreach($this->fieldpref as $k=>$v) + + foreach($this->fields as $v=>$foo) { + if(!in_array($v,$this->fieldpref) || $v == 'plugin_checkboxes') + { + continue; + } + // echo '
v='.$v; $text .= "\n"; } $text .= ""; @@ -329,11 +361,17 @@ class pluginManager{ "; - - $emessage = &eMessage::getInstance(); + + $amount = 30; - e107::getRender()->tablerender(ADLAN_98." :: ".$caption, $emessage->render(). $text); + if($total > $amount) + { + $parms = $total.",".$amount.",".$from.",".e_SELF.'?mode='.$_GET['mode'].'&frm=[FROM]'; + $text .= "
".$tp->parseTemplate("{NEXTPREV=$parms}",TRUE)."
"; + } + + e107::getRender()->tablerender(ADLAN_98." :: ".$caption, $mes->render(). $text); } @@ -343,8 +381,9 @@ class pluginManager{ $d = http_build_query($data,false,'&'); $url = e_SELF."?src=".base64_encode($d); $id = 'plug_'.$data['plugin_folder']; - return "
-
"; + return "
+ +
"; } @@ -728,7 +767,8 @@ class pluginManager{ function pluginUpload() { - global $plugin,$frm; + global $plugin; + $frm = e107::getForm(); //TODO 'install' checkbox in plugin upload form. (as it is for theme upload) @@ -778,7 +818,8 @@ class pluginManager{ function pluginRenderList() // Uninstall and Install sorting should be fixed once and for all now ! { - global $plugin, $frm; + global $plugin; + $frm = e107::getForm(); $e107 = e107::getInstance(); if($this->action == "" || $this->action == "installed") @@ -843,7 +884,8 @@ class pluginManager{ function pluginRenderPlugin($pluginList) { - global $plugin, $frm; + global $plugin; + $frm = e107::getForm(); if (empty($pluginList)) return ''; @@ -890,6 +932,8 @@ class pluginManager{ $plugEmail = varset($plug_vars['author']['@attributes']['email'],''); $plugAuthor = varset($plug_vars['author']['@attributes']['name'],''); $plugURL = varset($plug_vars['author']['@attributes']['url'],''); + $plugDate = varset($plug_vars['@attributes']['date'],''); + $plugReadme = ""; if(varset($plug['plugin_installflag'])) { @@ -920,6 +964,8 @@ class pluginManager{ $text .= (in_array("plugin_icon",$this->fieldpref)) ? "" : ""; $text .= (in_array("plugin_name",$this->fieldpref)) ? "" : ""; $text .= (in_array("plugin_version",$this->fieldpref)) ? "" : ""; + $text .= (in_array("plugin_date",$this->fieldpref)) ? "" : ""; + $text .= (in_array("plugin_folder",$this->fieldpref)) ? "" : ""; $text .= (in_array("plugin_category",$this->fieldpref)) ? "" : ""; $text .= (in_array("plugin_author",$this->fieldpref)) ? "" : ""; @@ -964,9 +1010,8 @@ class pluginManager{ { $text .= EPL_NOINSTALL_1.str_replace("..", "", e_PLUGIN.$plug['plugin_path'])."/ ".EPL_DIRECTORY; if($plug['plugin_installflag'] == false) - { - global $sql; - $sql->db_Delete('plugin', "plugin_installflag=0 AND (plugin_path='{$plug['plugin_path']}' OR plugin_path='{$plug['plugin_path']}/' ) "); + { + e107::getDb()->db_Delete('plugin', "plugin_installflag=0 AND (plugin_path='{$plug['plugin_path']}' OR plugin_path='{$plug['plugin_path']}/' ) "); } } } @@ -1199,7 +1244,7 @@ class pluginManager{ // $var['upload']['link'] = e_SELF."?upload"; $var['online']['text'] = "Search"; - $var['online']['link'] = e_SELF."?online"; + $var['online']['link'] = e_SELF."?mode=online"; $keys = array_keys($var); diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index 6b3de26ea..5a944c18d 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -2276,6 +2276,7 @@ class e107plugin $ret['@attributes']['name'] = varset($eplug_name); $ret['@attributes']['version'] = varset($eplug_version); + $ret['@attributes']['date'] = varset($eplug_date); $ret['@attributes']['compatibility'] = varset($eplug_compatible); $ret['@attributes']['installRequired'] = ($eplug_conffile || is_array($eplug_table_names) || is_array($eplug_prefs) || $eplug_module || $eplug_userclass || $eplug_status || $eplug_latest) ? 'true' : ''; $ret['@attributes']['xhtmlcompliant'] = vartrue($eplug_compliant) ? 'true' : ''; diff --git a/e107_plugins/_blank/plugin.xml b/e107_plugins/_blank/plugin.xml index 92bc38fe4..f587d231d 100644 --- a/e107_plugins/_blank/plugin.xml +++ b/e107_plugins/_blank/plugin.xml @@ -1,6 +1,6 @@ - + A Blank Plugin to help you get started in plugin development misc diff --git a/e107_plugins/alt_auth/plugin.xml b/e107_plugins/alt_auth/plugin.xml index 312356ed6..72f059bd5 100644 --- a/e107_plugins/alt_auth/plugin.xml +++ b/e107_plugins/alt_auth/plugin.xml @@ -2,7 +2,7 @@ - + LAN_ALT_66 users diff --git a/e107_plugins/banner/plugin.xml b/e107_plugins/banner/plugin.xml index d6482ba51..9d853b3b0 100644 --- a/e107_plugins/banner/plugin.xml +++ b/e107_plugins/banner/plugin.xml @@ -2,7 +2,7 @@ - + BNRLAN_100 diff --git a/e107_plugins/calendar_menu/plugin.xml b/e107_plugins/calendar_menu/plugin.xml index c04669eae..ecd21ea9a 100644 --- a/e107_plugins/calendar_menu/plugin.xml +++ b/e107_plugins/calendar_menu/plugin.xml @@ -2,7 +2,7 @@ - + EC_ADLAN_A206 readme.pdf diff --git a/e107_plugins/chatbox_menu/plugin.xml b/e107_plugins/chatbox_menu/plugin.xml index 5676db990..78d3b8e7e 100644 --- a/e107_plugins/chatbox_menu/plugin.xml +++ b/e107_plugins/chatbox_menu/plugin.xml @@ -2,7 +2,7 @@ - + CHBLAN_41 content diff --git a/e107_plugins/download/plugin.xml b/e107_plugins/download/plugin.xml index 245d4a9cd..c3a12a2c3 100755 --- a/e107_plugins/download/plugin.xml +++ b/e107_plugins/download/plugin.xml @@ -1,6 +1,6 @@ - + DOWLAN_DESCRIPTION content diff --git a/e107_plugins/faqs/plugin.xml b/e107_plugins/faqs/plugin.xml index 8e9b9dec8..d224413a2 100644 --- a/e107_plugins/faqs/plugin.xml +++ b/e107_plugins/faqs/plugin.xml @@ -2,7 +2,7 @@ - + Based on the original FAQ plugin by Cameron @ e107 Inc. Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) diff --git a/e107_plugins/featurebox/plugin.xml b/e107_plugins/featurebox/plugin.xml index 15e1a3e80..5db264234 100644 --- a/e107_plugins/featurebox/plugin.xml +++ b/e107_plugins/featurebox/plugin.xml @@ -2,7 +2,7 @@ - + FBLAN_02 content diff --git a/e107_plugins/forum/plugin.xml b/e107_plugins/forum/plugin.xml index 8c8624233..09475de2f 100755 --- a/e107_plugins/forum/plugin.xml +++ b/e107_plugins/forum/plugin.xml @@ -1,6 +1,6 @@ - + This plugin is a fully featured Forum system content diff --git a/e107_plugins/gallery/plugin.xml b/e107_plugins/gallery/plugin.xml index b59712675..9a3733a7d 100644 --- a/e107_plugins/gallery/plugin.xml +++ b/e107_plugins/gallery/plugin.xml @@ -1,6 +1,6 @@ - + Gallery content diff --git a/e107_plugins/gsitemap/plugin.xml b/e107_plugins/gsitemap/plugin.xml index 27110591a..d98c39668 100644 --- a/e107_plugins/gsitemap/plugin.xml +++ b/e107_plugins/gsitemap/plugin.xml @@ -1,6 +1,6 @@ - + GSLAN_41 Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) diff --git a/e107_plugins/import/plugin.xml b/e107_plugins/import/plugin.xml index 84c7b4000..d24ff869a 100644 --- a/e107_plugins/import/plugin.xml +++ b/e107_plugins/import/plugin.xml @@ -2,8 +2,8 @@ - - + + Import into e107 tools Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) diff --git a/e107_plugins/links_page/plugin.xml b/e107_plugins/links_page/plugin.xml index 406f3f329..edb9825d8 100644 --- a/e107_plugins/links_page/plugin.xml +++ b/e107_plugins/links_page/plugin.xml @@ -2,7 +2,7 @@ - + Links Page For Displaying External Web Links content diff --git a/e107_plugins/linkwords/plugin.xml b/e107_plugins/linkwords/plugin.xml index a1a631526..b236a1429 100644 --- a/e107_plugins/linkwords/plugin.xml +++ b/e107_plugins/linkwords/plugin.xml @@ -1,6 +1,6 @@ - + This plugin will link specified words with a defined link and/or tooltip diff --git a/e107_plugins/list_new/plugin.xml b/e107_plugins/list_new/plugin.xml index 92615c945..2bba507e0 100644 --- a/e107_plugins/list_new/plugin.xml +++ b/e107_plugins/list_new/plugin.xml @@ -2,7 +2,7 @@ - + LIST_PLUGIN_2 Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) diff --git a/e107_plugins/log/plugin.xml b/e107_plugins/log/plugin.xml index a68ffd136..011b7320c 100644 --- a/e107_plugins/log/plugin.xml +++ b/e107_plugins/log/plugin.xml @@ -1,6 +1,6 @@ - + ADSTAT_L1 diff --git a/e107_plugins/metaweblog/plugin.xml b/e107_plugins/metaweblog/plugin.xml index b1f68361f..48c0260b7 100644 --- a/e107_plugins/metaweblog/plugin.xml +++ b/e107_plugins/metaweblog/plugin.xml @@ -1,6 +1,6 @@ - + Metaweblog API support for e107 tools diff --git a/e107_plugins/newforumposts_main/plugin.php b/e107_plugins/newforumposts_main/plugin.php index 43bbe3360..8b621ab8b 100644 --- a/e107_plugins/newforumposts_main/plugin.php +++ b/e107_plugins/newforumposts_main/plugin.php @@ -24,6 +24,7 @@ $eplug_url = "http://e107.org"; $eplug_email = "jalist@e107.org"; $eplug_description = "This plugin displays a list of new forum posts on your front page"; $eplug_compatible = "e107v6"; +$eplug_date = "2012-08-01"; $eplug_readme = ""; // leave blank if no readme file diff --git a/e107_plugins/news/plugin.xml b/e107_plugins/news/plugin.xml index 4357561df..3f4b9d010 100644 --- a/e107_plugins/news/plugin.xml +++ b/e107_plugins/news/plugin.xml @@ -1,5 +1,5 @@ - + menu \ No newline at end of file diff --git a/e107_plugins/newsfeed/plugin.xml b/e107_plugins/newsfeed/plugin.xml index 3bb823d7d..0594cae65 100644 --- a/e107_plugins/newsfeed/plugin.xml +++ b/e107_plugins/newsfeed/plugin.xml @@ -3,7 +3,7 @@ - + NFLAN_02 content diff --git a/e107_plugins/newsletter/plugin.xml b/e107_plugins/newsletter/plugin.xml index 876b3b408..2f4733fc5 100644 --- a/e107_plugins/newsletter/plugin.xml +++ b/e107_plugins/newsletter/plugin.xml @@ -3,7 +3,7 @@ - + NLLAN_02 newsletter diff --git a/e107_plugins/page/plugin.xml b/e107_plugins/page/plugin.xml index 454646ee2..ad6a7484f 100644 --- a/e107_plugins/page/plugin.xml +++ b/e107_plugins/page/plugin.xml @@ -1,5 +1,5 @@ - + menu \ No newline at end of file diff --git a/e107_plugins/pdf/plugin.xml b/e107_plugins/pdf/plugin.xml index b426f130e..af0bce54e 100644 --- a/e107_plugins/pdf/plugin.xml +++ b/e107_plugins/pdf/plugin.xml @@ -2,7 +2,7 @@ - + PDF_PLUGIN_LAN_2 Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) diff --git a/e107_plugins/pm/plugin.xml b/e107_plugins/pm/plugin.xml index ce02954a8..acad4bc02 100755 --- a/e107_plugins/pm/plugin.xml +++ b/e107_plugins/pm/plugin.xml @@ -1,7 +1,7 @@ - - + + ADLAN_PM_57 users diff --git a/e107_plugins/poll/plugin.xml b/e107_plugins/poll/plugin.xml index 39c4e0fa0..5ba425940 100644 --- a/e107_plugins/poll/plugin.xml +++ b/e107_plugins/poll/plugin.xml @@ -1,6 +1,6 @@ - + POLL_ADLAN02 content diff --git a/e107_plugins/release/plugin.xml b/e107_plugins/release/plugin.xml index 5ad200891..0caae0df8 100644 --- a/e107_plugins/release/plugin.xml +++ b/e107_plugins/release/plugin.xml @@ -1,6 +1,6 @@ - + Manage Release Feeds for e107 Plugins and Themes tools diff --git a/e107_plugins/rss_menu/plugin.xml b/e107_plugins/rss_menu/plugin.xml index c1c4c1f50..a8033f820 100644 --- a/e107_plugins/rss_menu/plugin.xml +++ b/e107_plugins/rss_menu/plugin.xml @@ -2,7 +2,7 @@ - + RSS_PLUGIN_LAN_2 0.8 diff --git a/e107_plugins/siteinfo/plugin.xml b/e107_plugins/siteinfo/plugin.xml index 09f1b6194..27a23fc95 100644 --- a/e107_plugins/siteinfo/plugin.xml +++ b/e107_plugins/siteinfo/plugin.xml @@ -1,5 +1,5 @@ - + menu \ No newline at end of file diff --git a/e107_plugins/tagwords/plugin.xml b/e107_plugins/tagwords/plugin.xml index 3b8b7682d..44f6ad621 100644 --- a/e107_plugins/tagwords/plugin.xml +++ b/e107_plugins/tagwords/plugin.xml @@ -1,6 +1,6 @@ - + A fully featured Tagword system misc diff --git a/e107_plugins/tinymce/plugin.xml b/e107_plugins/tinymce/plugin.xml index ce6b0c335..4f0333a69 100644 --- a/e107_plugins/tinymce/plugin.xml +++ b/e107_plugins/tinymce/plugin.xml @@ -1,6 +1,6 @@ - + Wysiwyg Text-Area Replacement misc diff --git a/e107_plugins/trackback/plugin.xml b/e107_plugins/trackback/plugin.xml index 112b1bfd9..f9a131577 100644 --- a/e107_plugins/trackback/plugin.xml +++ b/e107_plugins/trackback/plugin.xml @@ -2,8 +2,8 @@ - - + + TRACKBACK_L2 Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)
checkbox".$frm->renderValue($v, $val[$v], $this->fields[$v])."".$this->options($val)." ".$plugin_icon."".$plugName."".$plug['plugin_version']."".$plugDate."".$plug['plugin_path']."".$plug['plugin_category']."".$plugAuthor."