From a7a66e31da516b361180eafd5e63de21d07d26ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor?= <yesszus@gmail.com>
Date: Sat, 15 Oct 2016 20:10:16 +0200
Subject: [PATCH 01/11] Update plugin_class.php

Add lang codes.
---
 e107_handlers/plugin_class.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index e6165bb36..93b952e9d 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -581,7 +581,7 @@ class e107plugin
 			if (vartrue($this->unInstallOpts['delete_ipool'], FALSE))
 			{
 				$status = ($med->removePath(e_PLUGIN.$plugin, 'icon')) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR;
-				$mes->add('Removing Icons from Media-Manager', $status);
+				$mes->add(IMALAN_164, $status);
 			}
 			return;
 		}
@@ -1666,7 +1666,7 @@ class e107plugin
 		{
 			if ($function == 'install')
 			{
-				$text = "Installation Complete.";
+				$text = EPL_ADLAN_238;
 
 				if ($this->plugConfigFile)
 				{
@@ -1750,7 +1750,7 @@ class e107plugin
 						$query .= $tableData['data'][$k];
 						$query .= "\n) ENGINE=". vartrue($tableData['engine'][$k],"InnoDB")." DEFAULT CHARSET=utf8 ";
 
-						$txt = "Adding Table: <b>{$v}</b> ";
+						$txt = EPL_ADLAN_239." <b>{$v}</b> ";
 						$status = $sql->db_Query($query) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR;
 						break;
 
@@ -1758,7 +1758,7 @@ class e107plugin
 						if (!empty($options['delete_tables']))
 						{
 							$query = "DROP TABLE  `".MPREFIX.$v."`; ";
-							$txt = "Removing Table: {$v} <br />";
+							$txt = EPL_ADLAN_240." <b> {$v} </b><br />";
 							$status = $sql->db_Query_all($query) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR;
 
 						}
@@ -2270,7 +2270,7 @@ class e107plugin
 					
 					if($c == 4 || ($prevType == $type))
 					{
-						$mes->addDebug("Only 3 Media Categories are permitted during install. One for images and one for files.");
+						$mes->addDebug(EPL_ADLAN_244);
 						break;
 					}
 					
@@ -2510,7 +2510,7 @@ class e107plugin
 					$ret = $config->add($key, $value);
 					if($ret->data_has_changed == TRUE)
 					{
-						$mes->addSuccess("Adding Pref: ".$key);	
+						$mes->addSuccess(EPL_ADLAN_241." ".$key);	
 					}								
 					break;
 
@@ -2520,19 +2520,19 @@ class e107plugin
 
 					{
 						$config->remove($key, $value);
-						$mes->addSuccess("Removing Pref: ".$key);
+						$mes->addSuccess(EPL_ADLAN_242." ".$key);
 					}
 					else
 					{
 						$config->update($key, $value);
-						$mes->addSuccess("Updating Pref: ".$key);
+						$mes->addSuccess(EPL_ADLAN_243." ".$key);
 					}
 
 					break;
 
 				case 'uninstall':
 					$config->remove($key, $value);
-					$mes->addSuccess("Removing Pref: ".$key);
+					$mes->addSuccess(EPL_ADLAN_242." ".$key);
 					break;
 			}
 		}
@@ -3435,4 +3435,4 @@ class e107plugin
 	}
 
 }
-?>
\ No newline at end of file
+?>

From c9502d78bac51486150a1bfb181c51f2b29a7f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor?= <yesszus@gmail.com>
Date: Sat, 15 Oct 2016 20:41:39 +0200
Subject: [PATCH 02/11] Some corrections

---
 e107_handlers/plugin_class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 93b952e9d..713f8d9a0 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -2510,7 +2510,7 @@ class e107plugin
 					$ret = $config->add($key, $value);
 					if($ret->data_has_changed == TRUE)
 					{
-						$mes->addSuccess(EPL_ADLAN_241." ".$key);	
+						$mes->addSuccess(EPL_ADLAN_241, $key);	
 					}								
 					break;
 
@@ -2520,19 +2520,19 @@ class e107plugin
 
 					{
 						$config->remove($key, $value);
-						$mes->addSuccess(EPL_ADLAN_242." ".$key);
+						$mes->addSuccess(EPL_ADLAN_242, $key);
 					}
 					else
 					{
 						$config->update($key, $value);
-						$mes->addSuccess(EPL_ADLAN_243." ".$key);
+						$mes->addSuccess(EPL_ADLAN_243, $key);
 					}
 
 					break;
 
 				case 'uninstall':
 					$config->remove($key, $value);
-					$mes->addSuccess(EPL_ADLAN_242." ".$key);
+					$mes->addSuccess(EPL_ADLAN_242, $key);
 					break;
 			}
 		}

From 359b6e3a7f7942031192db7856b7789290eefb6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor?= <yesszus@gmail.com>
Date: Tue, 25 Oct 2016 08:02:58 +0200
Subject: [PATCH 03/11] Update language.php

Add bbcode support.
---
 e107_admin/language.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_admin/language.php b/e107_admin/language.php
index 77cd13265..b15752b40 100644
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -1158,7 +1158,7 @@ class lanDeveloper
 
 		$text .= "
 						<tr>
-							<td><div class='alert-info alert alert-block'>".LANG_LAN_140."</div></td>
+							<td><div class='alert-info alert alert-block'>".e107::getParser()->toHTML(LANG_LAN_140, true)."</div></td>
 							<td class='form-inline'>
 								<select name='deprecatedLans[]' multiple style='height:200px'>
 									<option value=''>".LANG_LAN_141."</option>";
@@ -1696,7 +1696,7 @@ class lanDeveloper
 
 			if($reverse != true)
 			{
-				$mes->addInfo(LANG_LAN_150); //Search Everywhere before commenting out
+				$mes->addInfo(e107::getParser()->toHTML(LANG_LAN_150, true)); //Search Everywhere before commenting out
 			}
 
 			$ret['text'] = $mes->render().$text;

From 2720c2af16f5811de6a7e3fa6ac03dca331b4888 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 25 Oct 2016 11:33:51 -0700
Subject: [PATCH 04/11] Fixes #1955 - Language 'tables' option hidden when not
 enabled.

---
 e107_admin/language.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/e107_admin/language.php b/e107_admin/language.php
index 77cd13265..7b79ff64a 100644
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -54,11 +54,8 @@ if(!empty($_GET['iframe']))
 		protected $adminMenu = array(
 
 			'main/prefs'	=> array('caption'=> LAN_PREFS, 'perm' => '0'),
-			'main/db'		=> array('caption'=> LAN_CREATE, 'perm' => 'L'),
 			'main/tools'    => array('caption'=>LANG_LAN_21, 'perm'=>'L')
-		//	'main/prefs' 		=> array('caption'=> LAN_PREFS, 'perm' => 'P'),
 
-			// 'main/custom'		=> array('caption'=> 'Custom Page', 'perm' => 'P')
 		);
 
 		protected $adminMenuAliases = array(
@@ -71,10 +68,13 @@ if(!empty($_GET['iframe']))
 		{
 			$pref = e107::getPref();
 
-			if (isset($pref['multilanguage']) && $pref['multilanguage'])
+			if (!empty($pref['multilanguage']))
 			{
-				$this->adminMenu['main/db']		= array('caption'=> LANG_LAN_03, 'perm' => 'P');
-
+				$this->adminMenu = array(
+					'main/prefs'    => $this->adminMenu['main/prefs'],
+					'main/db'       => 	array('caption'=> LANG_LAN_03, 'perm' => 'P'),
+					'main/tools'    => $this->adminMenu['main/tools'],
+				);
 			}
 
 			if(e_DEVELOPER == true)

From 3ba7181969c4f2e8775fcff2184e19645f6422e8 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 25 Oct 2016 16:24:53 -0700
Subject: [PATCH 05/11] Fixes #1780 Plugin Manager now alerts user if a newer
 version of an installed plugin is available from e107.org

---
 e107_admin/plugin.php           | 117 +++++---------------------------
 e107_handlers/e_marketplace.php |  47 +++++++++++++
 2 files changed, 64 insertions(+), 100 deletions(-)

diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 3cf5b1fcb..3477659fc 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -1224,6 +1224,9 @@ class pluginManager{
 
 // -----------------------------------------------------------------------------
 
+
+
+
 	function pluginRenderList() // Uninstall and Install sorting should be fixed once and for all now !
 	{
 
@@ -1235,8 +1238,14 @@ class pluginManager{
 		if($this->action == "" || $this->action == "installed")
 		{
 			$installed = $plugin->getall(1);
+
+			$mp = $this->getMarketplace();
+
+			$versions = $mp->getVersionList();
+
+		//	print_a($versions);
 			$caption = EPL_ADLAN_22;
-			$pluginRenderPlugin = $this->pluginRenderPlugin($installed);
+			$pluginRenderPlugin = $this->pluginRenderPlugin($installed, $versions);
 			$button_mode = "uninstall-selected";
 			$button_caption = EPL_ADLAN_85;
 			$button_action = "delete";
@@ -1292,7 +1301,7 @@ class pluginManager{
 
 // -----------------------------------------------------------------------------
 
-	function pluginRenderPlugin($pluginList)
+	function pluginRenderPlugin($pluginList, $versions = array())
 	{
 			global $plugin; 
 			
@@ -1405,107 +1414,15 @@ class pluginManager{
 					$text 			.= $pgf->renderTableRow($this->fields, $this->fieldpref, $data, 'plugin_id');
 
 
-/*
-
-					//LEGACY CODE 
-
-
-
-
-					$text .= "<tr>";
-
-					if(varset($this-> fields['checkboxes']))
+					$folder = $plug['plugin_path'];
+					if(!empty($versions[$folder]['version']) && version_compare( $plug['plugin_version'], $versions[$folder]['version'], '<'))
 					{
-                 		$rowid = "checkboxes[".$plug['plugin_id']."]";
-                		$text .= "<td class='center middle'>".$frm->checkbox($rowid, $plug['plugin_id'])."</td>\n";
+						$link = "<a rel='external' href='".$versions[$folder]['url']."'>".$versions[$folder]['name']."</a>";
+
+						$lan = "A newer version of [x] is available for download.";
+						e107::getMessage()->addInfo($tp->lanVars($lan,$link));
 					}
 
-				//	$text .= (in_array("plugin_status",$this->fieldpref)) ? "<td class='center'>".$img."</td>" : "";
-				
-			
-                    $text .= (in_array("plugin_icon",$this->fieldpref)) ? "<td class='center middle'>".$plugin_icon."</td>" : "";
-                    $text .= (in_array("plugin_name",$this->fieldpref)) ? "<td class='middle'>".$plugName."</td>" : "";
-                    $text .= (in_array("plugin_version",$this->fieldpref)) ? "<td class='middle'>".$plug['plugin_version']."</td>" : "";
-					$text .= (in_array("plugin_date",$this->fieldpref)) ? "<td class='middle'>".$plugDate."</td>" : "";
-					
-					$text .= (in_array("plugin_folder",$this->fieldpref)) ? "<td class='middle'>".$plug['plugin_path']."</td>" : "";
-					$text .= (in_array("plugin_category",$this->fieldpref)) ? "<td class='middle'>".$plug['plugin_category']."</td>" : "";
-                    $text .= (in_array("plugin_author",$this->fieldpref)) ? "<td class='middle'><a href='mailto:".$plugEmail."' title='".$plugEmail."'>".$plugAuthor."</a>&nbsp;</td>" : "";
-                    $text .= (in_array("plugin_website",$this->fieldpref)) ? "<td class='center middle'>".($plugURL ? "<a href='{$plugURL}' title='{$plugURL}' >".ADMIN_URL_ICON."</a>" : "")."</td>" : "";
-
-                   	$text .= (in_array("plugin_compatible",$this->fieldpref)) ? "<td class='center middle'>".$this->compatibilityLabel($plug_vars['@attributes']['compatibility'])."</td>" : "";
-					
-					$text .= (in_array("plugin_description",$this->fieldpref)) ? "<td class='middle'>".$description."</td>" : "";
-                 	$text .= (in_array("plugin_compliant",$this->fieldpref)) ? "<td class='center middle'>".((varset($plug_vars['compliant']) || varsettrue($plug_vars['@attributes']['xhtmlcompliant'])) ? ADMIN_TRUE_ICON : "&nbsp;")."</td>" : "";
-	     			$text .= (in_array("plugin_notes",$this->fieldpref)) ? "<td class='center middle'>".($plugReadme ? "<a href='".e_PLUGIN.$plug['plugin_path']."/".$plugReadme."' title='".$plugReadme."'>".ADMIN_INFO_ICON."</a>" : "&nbsp;")."</td>" : "";
-			
-
-
-				
-
-
-                	// Plugin options Column --------------
-
-   					$text .= "<td class='options center middle'>
-   					<div class='btn-group'>".$plugin_config_icon;
-
-
-						if ($plug_vars['@attributes']['installRequired'])
-						{
-							if ($plug['plugin_installflag'])
-							{
-						  		$text .= ($plug['plugin_installflag'] ? "<a class='btn' href=\"".e_SELF."?uninstall.{$plug['plugin_id']}\" title='".EPL_ADLAN_1."'  >".ADMIN_UNINSTALLPLUGIN_ICON."</a>" : "<a class='btn' href=\"".e_SELF."?install.{$plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON."</a>");
-
-                             //   $text .= ($plug['plugin_installflag'] ? "<button type='button' class='delete' value='no-value' onclick=\"location.href='".e_SELF."?uninstall.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_1."</span></button>" : "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>");
-								if (PLUGIN_SHOW_REFRESH && !varsettrue($plug_vars['plugin_php']))
-								{
-									$text .= "<br /><br /><input type='button' class='btn button' onclick=\"location.href='".e_SELF."?refresh.{$plug['plugin_id']}'\" title='".'Refresh plugin settings'."' value='".'Refresh plugin settings'."' /> ";
-								}
-							}
-							else
-							{
-							  //	$text .=  "<input type='button' class='btn' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\" title='".EPL_ADLAN_0."' value='".EPL_ADLAN_0."' />";
-							  //	$text .= "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>";
-                            	$text .= "<a class='btn' href=\"".e_SELF."?install.{$plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON."</a>";
-							}
-						}
-						else
-						{
-							if ($plug_vars['menuName'])
-							{
-								$text .= EPL_NOINSTALL.str_replace("..", "", e_PLUGIN.$plug['plugin_path'])."/ ".EPL_DIRECTORY;
-							}
-							else
-							{
-								$text .= EPL_NOINSTALL_1.str_replace("..", "", e_PLUGIN.$plug['plugin_path'])."/ ".EPL_DIRECTORY;
-								if($plug['plugin_installflag'] == false)
-								{					
-									e107::getDb()->db_Delete('plugin', "plugin_installflag=0 AND (plugin_path='{$plug['plugin_path']}' OR plugin_path='{$plug['plugin_path']}/' )  ");
-								}
-							}
-						}
-
-						if ($plug['plugin_version'] != $plug_vars['@attributes']['version'] && $plug['plugin_installflag'])
-						{
-						  //	$text .= "<br /><input type='button' class='btn' onclick=\"location.href='".e_SELF."?upgrade.{$plug['plugin_id']}'\" title='".EPL_UPGRADE." to v".$plug_vars['@attributes']['version']."' value='".EPL_UPGRADE."' />";
-							$text .= "<a class='btn' href='".e_SELF."?upgrade.{$plug['plugin_id']}' title=\"".EPL_UPGRADE." to v".$plug_vars['@attributes']['version']."\" >".ADMIN_UPGRADEPLUGIN_ICON."</a>";
-						}
-
-					$text .="</div></td>";
-              //      $text .= "</tr>";
-
-
-
-
-*/
-
-
-
-
-
-
-
-
 				}
 			}
 			return $text;
diff --git a/e107_handlers/e_marketplace.php b/e107_handlers/e_marketplace.php
index 4c899f648..e57da946d 100644
--- a/e107_handlers/e_marketplace.php
+++ b/e107_handlers/e_marketplace.php
@@ -223,6 +223,53 @@ class e_marketplace
 		$this->adapter = null;
 		//echo "Adapter destroyed", PHP_EOL;
 	}
+
+
+	public function getVersionList($type='plugin')
+	{
+		$cache = e107::getCache();
+		$cache->setMD5('_', false);
+
+		$tag = 'Versions_'.$type;
+
+		if($data = $cache->retrieve($tag,(60 * 12), true, true))
+		{
+			return e107::unserialize($data);
+		}
+
+	//	$mp = $this->getMarketplace();
+	//	$mp->generateAuthKey($e107SiteUsername, $e107SiteUserpass);
+		e107::getDebug()->log("Retrieving ".$type." version list from e107.org");
+
+		$xdata = $this->call('getList', array(
+			'type' => $type,
+			'params' => array('limit' => 200, 'search' => null, 'from' => 0)
+		));
+
+		$arr = array();
+
+		if(!empty($xdata['data']))
+		{
+
+			foreach($xdata['data'] as $row)
+			{
+				$k = $row['folder'];
+				$arr[$k] = $row;
+			}
+
+		}
+
+// print_a($xdata['data']);
+
+		$data = e107::serialize($arr);
+		$cache->set($tag, $data, true, null, true);
+
+		return $arr;
+
+	}
+
+
+
 }
 
 abstract class e_marketplace_adapter_abstract

From 85bbd217b15043aea6573a037f207c226f48c21a Mon Sep 17 00:00:00 2001
From: tgtje <the_guardian2@hotmail.com>
Date: Wed, 26 Oct 2016 03:28:38 +0200
Subject: [PATCH 06/11] all single quotes adjusted to double quote use in LAN

---
 e107_languages/English/admin/lan_plugin.php | 370 ++++++++++----------
 1 file changed, 185 insertions(+), 185 deletions(-)

diff --git a/e107_languages/English/admin/lan_plugin.php b/e107_languages/English/admin/lan_plugin.php
index e17e26e1b..abc2631db 100644
--- a/e107_languages/English/admin/lan_plugin.php
+++ b/e107_languages/English/admin/lan_plugin.php
@@ -59,7 +59,7 @@ define("EPL_ADLAN_45", "Your menu item has been uploaded and unzipped, to activa
 define("EPL_ADLAN_46", "PCLZIP extract error:");
 define("EPL_ADLAN_47", "PCLTAR extract error: ");
 define("EPL_ADLAN_48", "code:");
-define('EPL_ADLAN_49', "Tables not deleted during uninstall process by request");
+define("EPL_ADLAN_49", "Tables not deleted during uninstall process by request");
 
 // define("EPL_CANCEL", "Cancel"); use LAN_CANCEL instead !!
 // define("EPL_EMAIL", "email");
@@ -81,218 +81,218 @@ define("EPL_ADLAN_58", "If the tables are not removed, the plugin can be reinsta
 define("EPL_ADLAN_59", "Delete plugin files");
 define("EPL_ADLAN_60", "e107 will attempt to remove all plugin related files.");
 // define("EPL_ADLAN_61", "Confirm uninstall"); // duplicated. can be deleted.
-define('EPL_ADLAN_62', "Cancel uninstall");
-define('EPL_ADLAN_63', "Uninstall:");
-define('EPL_ADLAN_64', "Folder");
-define ('EPL_ADLAN_70',"Required plugin not installed: ");
-define ('EPL_ADLAN_71',"Newer plugin version required: ");
-define ('EPL_ADLAN_72'," Version: ");
-define ('EPL_ADLAN_73',"Required PHP extension not loaded: ");
-define ('EPL_ADLAN_74',"Newer PHP version required: ");
-define ('EPL_ADLAN_75',"Newer MySQL version required: ");
-define ('EPL_ADLAN_76',"Error in plugin.xml");
-define ('EPL_ADLAN_77',"Cannot find plugin.xml");
-define ('EPL_ADLAN_78',"Delete User Classes created by plugin:");
-define ('EPL_ADLAN_79',"Only delete these if you have not used them for other purposes.");
-define ('EPL_ADLAN_80',"Delete extended user fields created by plugin:");
-define ('EPL_ADLAN_81',"Xhtml");
-define ('EPL_ADLAN_82',"Icon");
-define ('EPL_ADLAN_83',"Notes");
-define ('EPL_ADLAN_84',"Install Selected");
-define ('EPL_ADLAN_85',"Uninstall Selected");
-define ('EPL_ADLAN_86',"All files removed from ");
-define ('EPL_ADLAN_87',"File deletion failed ");
+define("EPL_ADLAN_62", "Cancel uninstall");
+define("EPL_ADLAN_63", "Uninstall:");
+define("EPL_ADLAN_64", "Folder");
+define ("EPL_ADLAN_70","Required plugin not installed: ");
+define ("EPL_ADLAN_71","Newer plugin version required: ");
+define ("EPL_ADLAN_72"," Version: ");
+define ("EPL_ADLAN_73","Required PHP extension not loaded: ");
+define ("EPL_ADLAN_74","Newer PHP version required: ");
+define ("EPL_ADLAN_75","Newer MySQL version required: ");
+define ("EPL_ADLAN_76","Error in plugin.xml");
+define ("EPL_ADLAN_77","Cannot find plugin.xml");
+define ("EPL_ADLAN_78","Delete User Classes created by plugin:");
+define ("EPL_ADLAN_79","Only delete these if you have not used them for other purposes.");
+define ("EPL_ADLAN_80","Delete extended user fields created by plugin:");
+define ("EPL_ADLAN_81","Xhtml");
+define ("EPL_ADLAN_82","Icon");
+define ("EPL_ADLAN_83","Notes");
+define ("EPL_ADLAN_84","Install Selected");
+define ("EPL_ADLAN_85","Uninstall Selected");
+define ("EPL_ADLAN_86","All files removed from ");
+define ("EPL_ADLAN_87","File deletion failed ");
 
-define ('EPL_ADLAN_88',"Made for v2");
-define ('EPL_ADLAN_89',"Search Online");
-define ('EPL_ADLAN_90',"cURL is currently required to use this feature. Contact your webhosting provider to enable cURL");
-define ('EPL_ADLAN_91',"Featured");
-define ('EPL_ADLAN_92',"Buy");
-define ('EPL_ADLAN_93',"Free");
-define ('EPL_ADLAN_94',"Connecting...");
-define ('EPL_ADLAN_95',"Unable to continue");
-define ('EPL_ADLAN_96',"eg. http://website.com/some-plugin.zip");
-define ('EPL_ADLAN_97',"There was a problem extracting the .zip file to your plugin directory.");
-define ('EPL_ADLAN_98',"Unknown file:");
-define ('EPL_ADLAN_99',"Error messages above this line");
-define ('EPL_ADLAN_100',"click here to install some");
-define ('EPL_ADLAN_101',"No plugins installed - [x].");
-define ('EPL_ADLAN_102',"This Wizard will build an admin area for your plugin and generate a plugin.xml meta file. Before you start:");
-define ('EPL_ADLAN_103',"Create a new writable folder in the [x] directory eg. [b]myplugin[/b]");
+define ("EPL_ADLAN_88","Made for v2");
+define ("EPL_ADLAN_89","Search Online");
+define ("EPL_ADLAN_90","cURL is currently required to use this feature. Contact your webhosting provider to enable cURL");
+define ("EPL_ADLAN_91","Featured");
+define ("EPL_ADLAN_92","Buy");
+define ("EPL_ADLAN_93","Free");
+define ("EPL_ADLAN_94","Connecting...");
+define ("EPL_ADLAN_95","Unable to continue");
+define ("EPL_ADLAN_96","eg. http://website.com/some-plugin.zip");
+define ("EPL_ADLAN_97","There was a problem extracting the .zip file to your plugin directory.");
+define ("EPL_ADLAN_98","Unknown file:");
+define ("EPL_ADLAN_99","Error messages above this line");
+define ("EPL_ADLAN_100","click here to install some");
+define ("EPL_ADLAN_101","No plugins installed - [x].");
+define ("EPL_ADLAN_102","This Wizard will build an admin area for your plugin and generate a plugin.xml meta file. Before you start:");
+define ("EPL_ADLAN_103","Create a new writable folder in the [x] directory eg. [b]myplugin[/b]");
 // define ('EPL_ADLAN_104',"If your plugin will use sql tables, create a new file in this folder and name it the same as the directory but with [b]_sql.php[/b] as a sufix eg. [b]myplugin_sql.php[/b]");
-define ('EPL_ADLAN_105',"Create your table using phpMyAdmin in the same database as e107 and with the same table prefix. eg. [b]e107_myplugin[/b]");
-define ('EPL_ADLAN_106',"Select your plugin's folder to begin.");
-define ('EPL_ADLAN_107',"Build an admin-area and xml file for:");
-define ('EPL_ADLAN_108',"Check language files:");
-define ('EPL_ADLAN_109',"Basic Info.");
+define ("EPL_ADLAN_105","Create your table using phpMyAdmin in the same database as e107 and with the same table prefix. eg. [b]e107_myplugin[/b]");
+define ("EPL_ADLAN_106","Select your plugin's folder to begin.");
+define ("EPL_ADLAN_107","Build an admin-area and xml file for:");
+define ("EPL_ADLAN_108","Check language files:");
+define ("EPL_ADLAN_109","Basic Info.");
 // define ('EPL_ADLAN_110',"Preferences");
 // define ('EPL_ADLAN_111',"Generate");// LAN_GENERATE
-define ('EPL_ADLAN_112',"Review all fields and modify if necessary.");
-define ('EPL_ADLAN_113',"Review ALL tabs before clicking 'Generate'.");
-define ('EPL_ADLAN_114',"Plugin Builder");
-define ('EPL_ADLAN_115',"Step 2");
+define ("EPL_ADLAN_112","Review all fields and modify if necessary.");
+define ("EPL_ADLAN_113","Review ALL tabs before clicking 'Generate'.");
+define ("EPL_ADLAN_114","Plugin Builder");
+define ("EPL_ADLAN_115","Step 2");
 
-define ('EPL_ADLAN_116',"Text Box");
-define ('EPL_ADLAN_117',"Text Box (number)");
-define ('EPL_ADLAN_118',"Text Box (url)");
-define ('EPL_ADLAN_119',"Text Area");
-define ('EPL_ADLAN_120',"Rich-Text Area");
-define ('EPL_ADLAN_121',"True/False");
-define ('EPL_ADLAN_122',"Custom Function");
-define ('EPL_ADLAN_123',"Image");
-define ('EPL_ADLAN_124',"DropDown");
-define ('EPL_ADLAN_125',"DropDown (userclasses)");
-define ('EPL_ADLAN_126',"DropDown (languages)");
-define ('EPL_ADLAN_127',"Icon");
-define ('EPL_ADLAN_128',"File");
+define ("EPL_ADLAN_116","Text Box");
+define ("EPL_ADLAN_117","Text Box (number)");
+define ("EPL_ADLAN_118","Text Box (url)");
+define ("EPL_ADLAN_119","Text Area");
+define ("EPL_ADLAN_120","Rich-Text Area");
+define ("EPL_ADLAN_121","True/False");
+define ("EPL_ADLAN_122","Custom Function");
+define ("EPL_ADLAN_123","Image");
+define ("EPL_ADLAN_124","DropDown");
+define ("EPL_ADLAN_125","DropDown (userclasses)");
+define ("EPL_ADLAN_126","DropDown (languages)");
+define ("EPL_ADLAN_127","Icon");
+define ("EPL_ADLAN_128","File");
 
-define ('EPL_ADLAN_129',"Preference Name");
-define ('EPL_ADLAN_130',"Default Value");
-define ('EPL_ADLAN_131',"Field Type...");
-define ('EPL_ADLAN_132',"[x] has been generated");
-define ('EPL_ADLAN_133',"[x] is missing!");
-define ('EPL_ADLAN_134',"Please create [b][x][/b] in your plugin directory with the following content: [y]");
-define ('EPL_ADLAN_135',"The name of your plugin. (Must be written in English)");
-define ('EPL_ADLAN_136',"If you have a language file, enter the LAN_XXX value for the plugin's name");
-define ('EPL_ADLAN_137',"Creation date of your plugin");
-define ('EPL_ADLAN_138',"The version of your plugin. Format: x.x");
-define ('EPL_ADLAN_139',"Compatible with this version of e107");
-define ('EPL_ADLAN_140',"Author Name");
-define ('EPL_ADLAN_141',"Author Website URL");
-define ('EPL_ADLAN_142',"A short one-line description of the plugin");
-define ('EPL_ADLAN_143',"(Must be written in English)");
-define ('EPL_ADLAN_144',"Keyword/Tag for this plugin");
-define ('EPL_ADLAN_145',"A full description of the plugin");
-define ('EPL_ADLAN_146',"What category of plugin is this?");
+define ("EPL_ADLAN_129","Preference Name");
+define ("EPL_ADLAN_130","Default Value");
+define ("EPL_ADLAN_131","Field Type...");
+define ("EPL_ADLAN_132","[x] has been generated");
+define ("EPL_ADLAN_133","[x] is missing!");
+define ("EPL_ADLAN_134","Please create [b][x][/b] in your plugin directory with the following content: [y]");
+define ("EPL_ADLAN_135","The name of your plugin. (Must be written in English)");
+define ("EPL_ADLAN_136","If you have a language file, enter the LAN_XXX value for the plugin's name");
+define ("EPL_ADLAN_137","Creation date of your plugin");
+define ("EPL_ADLAN_138","The version of your plugin. Format: x.x");
+define ("EPL_ADLAN_139","Compatible with this version of e107");
+define ("EPL_ADLAN_140","Author Name");
+define ("EPL_ADLAN_141","Author Website URL");
+define ("EPL_ADLAN_142","A short one-line description of the plugin");
+define ("EPL_ADLAN_143","(Must be written in English)");
+define ("EPL_ADLAN_144","Keyword/Tag for this plugin");
+define ("EPL_ADLAN_145","A full description of the plugin");
+define ("EPL_ADLAN_146","What category of plugin is this?");
 
 // Categories
-define ('EPL_ADLAN_147',"settings");
-define ('EPL_ADLAN_148',"users");
-define ('EPL_ADLAN_149',"content");
-define ('EPL_ADLAN_150',"tools");
-define ('EPL_ADLAN_151',"manage");
-define ('EPL_ADLAN_152',"misc");
-define ('EPL_ADLAN_153',"menu");
-define ('EPL_ADLAN_154',"about");
+define ("EPL_ADLAN_147","settings");
+define ("EPL_ADLAN_148","users");
+define ("EPL_ADLAN_149","content");
+define ("EPL_ADLAN_150","tools");
+define ("EPL_ADLAN_151","manage");
+define ("EPL_ADLAN_152","misc");
+define ("EPL_ADLAN_153","menu");
+define ("EPL_ADLAN_154","about");
 
-define ('EPL_ADLAN_155',"Saved:");
-define ('EPL_ADLAN_156',"Couldn't Save:");
+define ("EPL_ADLAN_155","Saved:");
+define ("EPL_ADLAN_156","Couldn't Save:");
 
-define ('EPL_ADLAN_157',"Main Area");
-define ('EPL_ADLAN_158',"Categories");
-define ('EPL_ADLAN_159',"Other 1");
-define ('EPL_ADLAN_160',"Other 2");
-define ('EPL_ADLAN_161',"Other 3");
-define ('EPL_ADLAN_162',"Other 4");
-define ('EPL_ADLAN_163',"Exclude this table");
+define ("EPL_ADLAN_157","Main Area");
+define ("EPL_ADLAN_158","Categories");
+define ("EPL_ADLAN_159","Other 1");
+define ("EPL_ADLAN_160","Other 2");
+define ("EPL_ADLAN_161","Other 3");
+define ("EPL_ADLAN_162","Other 4");
+define ("EPL_ADLAN_163","Exclude this table");
 
 //FIXME TODO Excessive duplicate terms below.
-define ('EPL_ADLAN_164',"Field");
-define ('EPL_ADLAN_165',"Caption");
-define ('EPL_ADLAN_166',"Type");
-define ('EPL_ADLAN_167',"Data");
-define ('EPL_ADLAN_168',"Width");
-define ('EPL_ADLAN_169',"Batch");
-define ('EPL_ADLAN_170',"Filter");
-define ('EPL_ADLAN_171',"Inline");
-define ('EPL_ADLAN_172',"Validate");
-define ('EPL_ADLAN_173',"Display");
-define ('EPL_ADLAN_174',"HelpTip");
-define ('EPL_ADLAN_175',"ReadParms");
-define ('EPL_ADLAN_176',"WriteParms");
-define ('EPL_ADLAN_177',"Field is required to be filled");
-define ('EPL_ADLAN_178',"Displayed by Default");
+define ("EPL_ADLAN_164","Field");
+define ("EPL_ADLAN_165","Caption");
+define ("EPL_ADLAN_166","Type");
+define ("EPL_ADLAN_167","Data");
+define ("EPL_ADLAN_168","Width");
+define ("EPL_ADLAN_169","Batch");
+define ("EPL_ADLAN_170","Filter");
+define ("EPL_ADLAN_171","Inline");
+define ("EPL_ADLAN_172","Validate");
+define ("EPL_ADLAN_173","Display");
+define ("EPL_ADLAN_174","HelpTip");
+define ("EPL_ADLAN_175","ReadParms");
+define ("EPL_ADLAN_176","WriteParms");
+define ("EPL_ADLAN_177","Field is required to be filled");
+define ("EPL_ADLAN_178","Displayed by Default");
 
 // date, datetime
-define ('EPL_ADLAN_179',"Text Box");
-define ('EPL_ADLAN_180',"Hidden");
+define ("EPL_ADLAN_179","Text Box");
+define ("EPL_ADLAN_180","Hidden");
 
 // int, tinyint, bigint, smallint
-define ('EPL_ADLAN_181',"True/False");
-define ('EPL_ADLAN_182',"Text Box (number)");
-define ('EPL_ADLAN_183',"DropDown");
-define ('EPL_ADLAN_184',"DropDown (userclasses)");
+define ("EPL_ADLAN_181","True/False");
+define ("EPL_ADLAN_182","Text Box (number)");
+define ("EPL_ADLAN_183","DropDown");
+define ("EPL_ADLAN_184","DropDown (userclasses)");
 //define ('EPL_ADLAN_185',"Date");//LAN_DATE
-define ('EPL_ADLAN_186',"Custom Function");
-define ('EPL_ADLAN_187',"Hidden");
-define ('EPL_ADLAN_188',"User");
+define ("EPL_ADLAN_186","Custom Function");
+define ("EPL_ADLAN_187","Hidden");
+define ("EPL_ADLAN_188","User");
 
 // decimal
-define ('EPL_ADLAN_189',"Text Box");
-define ('EPL_ADLAN_190',"DropDown");
-define ('EPL_ADLAN_191',"Custom Function");
-define ('EPL_ADLAN_192',"Hidden");
+define ("EPL_ADLAN_189","Text Box");
+define ("EPL_ADLAN_190","DropDown");
+define ("EPL_ADLAN_191","Custom Function");
+define ("EPL_ADLAN_192","Hidden");
 
 // varchar, tinytext
-define ('EPL_ADLAN_193',"Text Box");
-define ('EPL_ADLAN_194',"Text Box (url)");
-define ('EPL_ADLAN_195',"Text Box (email)");
-define ('EPL_ADLAN_196',"Text Box (ip)");
-define ('EPL_ADLAN_197',"Text Box (number)");
-define ('EPL_ADLAN_198',"Text Box (password)");
-define ('EPL_ADLAN_199',"Text Box (keywords)");
-define ('EPL_ADLAN_200',"DropDown");
-define ('EPL_ADLAN_201',"DropDown (userclasses)");
-define ('EPL_ADLAN_202',"DropDown (languages)");
-define ('EPL_ADLAN_203',"Icon");
-define ('EPL_ADLAN_204',"Image");
-define ('EPL_ADLAN_205',"File");
-define ('EPL_ADLAN_206',"Custom Function");
-define ('EPL_ADLAN_207',"Hidden");
+define ("EPL_ADLAN_193","Text Box");
+define ("EPL_ADLAN_194","Text Box (url)");
+define ("EPL_ADLAN_195","Text Box (email)");
+define ("EPL_ADLAN_196","Text Box (ip)");
+define ("EPL_ADLAN_197","Text Box (number)");
+define ("EPL_ADLAN_198","Text Box (password)");
+define ("EPL_ADLAN_199","Text Box (keywords)");
+define ("EPL_ADLAN_200","DropDown");
+define ("EPL_ADLAN_201","DropDown (userclasses)");
+define ("EPL_ADLAN_202","DropDown (languages)");
+define ("EPL_ADLAN_203","Icon");
+define ("EPL_ADLAN_204","Image");
+define ("EPL_ADLAN_205","File");
+define ("EPL_ADLAN_206","Custom Function");
+define ("EPL_ADLAN_207","Hidden");
 
 // text, mediumtext, longtext
-define ('EPL_ADLAN_208',"Text Area");
-define ('EPL_ADLAN_209',"Rich-Text Area");
-define ('EPL_ADLAN_210',"Text Box");
-define ('EPL_ADLAN_211',"Text Box (keywords)");
-define ('EPL_ADLAN_212',"Custom Function");
-define ('EPL_ADLAN_213',"Image (string)");
-define ('EPL_ADLAN_214',"Images (array)");
-define ('EPL_ADLAN_215',"Hidden");
+define ("EPL_ADLAN_208","Text Area");
+define ("EPL_ADLAN_209","Rich-Text Area");
+define ("EPL_ADLAN_210","Text Box");
+define ("EPL_ADLAN_211","Text Box (keywords)");
+define ("EPL_ADLAN_212","Custom Function");
+define ("EPL_ADLAN_213","Image (string)");
+define ("EPL_ADLAN_214","Images (array)");
+define ("EPL_ADLAN_215","Hidden");
 
-define ('EPL_ADLAN_216',"Click Here");
-define ('EPL_ADLAN_217',"[x] to vist your generated admin area");
-define ('EPL_ADLAN_218',"Could not write to [x]");
-define ('EPL_ADLAN_219',"No Files have been created. Please Copy &amp; Paste the code below into your files.");
+define ("EPL_ADLAN_216","Click Here");
+define ("EPL_ADLAN_217","[x] to vist your generated admin area");
+define ("EPL_ADLAN_218","Could not write to [x]");
+define ("EPL_ADLAN_219","No Files have been created. Please Copy &amp; Paste the code below into your files.");
 
-define ('EPL_ADLAN_220',"Find Plugins");
-define ('EPL_ADLAN_221',"Language-File Check");
+define ("EPL_ADLAN_220","Find Plugins");
+define ("EPL_ADLAN_221","Language-File Check");
 
-define ('EPL_ADLAN_222',"Plugin Files");
-define ('EPL_ADLAN_223',"Used");
-define ('EPL_ADLAN_224',"Unused");
-define ('EPL_ADLAN_225',"Unsure");
+define ("EPL_ADLAN_222","Plugin Files");
+define ("EPL_ADLAN_223","Used");
+define ("EPL_ADLAN_224","Unused");
+define ("EPL_ADLAN_225","Unsure");
 
-define ('EPL_ADLAN_226',"Plugin Language-File Check");
+define ("EPL_ADLAN_226","Plugin Language-File Check");
 
-define ('EPL_ADLAN_227',"Scan for Changes");
-define ('EPL_ADLAN_228',"Plugin folders are scanned every [x] minutes for changes. Click the button below to scan now.");
-define ('EPL_ADLAN_229',"Refresh");
-define ('EPL_ADLAN_230', "Downloading and Installing: ");
-define ('EPL_ADLAN_231', "Remove icons from Media-Manager");
-define ('EPL_ADLAN_232', "Create Files");
-define ('TPVLAN_81', "Downloading...");
-define ('TPVLAN_82', "Download Complete!");
-define ('EPL_ADLAN_235', "Automated download not possible.");
-define ('EPL_ADLAN_236', "Please Download Manually");
-define ('EPL_ADLAN_237', "Download");
-define ('EPL_ADLAN_238',"Installation Complete!");
-define ('EPL_ADLAN_239',"Adding Table:");
-define ('EPL_ADLAN_240',"Removing Table:");
-define ('EPL_ADLAN_241',"Adding Pref:"); 
-define ('EPL_ADLAN_242',"Removing Pref:");
-define ('EPL_ADLAN_243',"Updating Pref:");
-define ('EPL_ADLAN_244',"Only 3 Media Categories are permitted during install. One for images and one for files.");  
+define ("EPL_ADLAN_227","Scan for Changes");
+define ("EPL_ADLAN_228","Plugin folders are scanned every [x] minutes for changes. Click the button below to scan now.");
+define ("EPL_ADLAN_229","Refresh");
+define ("EPL_ADLAN_230", "Downloading and Installing: ");
+define ("EPL_ADLAN_231", "Remove icons from Media-Manager");
+define ("EPL_ADLAN_232", "Create Files");
+define ("TPVLAN_81", "Downloading...");
+define ("TPVLAN_82", "Download Complete!");
+define ("EPL_ADLAN_235", "Automated download not possible.");
+define ("EPL_ADLAN_236", "Please Download Manually");
+define ("EPL_ADLAN_237", "Download");
+define ("EPL_ADLAN_238","Installation Complete!");
+define ("EPL_ADLAN_239","Adding Table:");
+define ("EPL_ADLAN_240","Removing Table:");
+define ("EPL_ADLAN_241","Adding Pref:"); 
+define ("EPL_ADLAN_242","Removing Pref:");
+define ("EPL_ADLAN_243","Updating Pref:");
+define ("EPL_ADLAN_244","Only 3 Media Categories are permitted during install. One for images and one for files.");  
 
-define ('LAN_RELEASED', "Released");
-define ('LAN_REPAIR_PLUGIN_SETTINGS', "Repair plugin settings");
-define ('LAN_SYNC_WITH_GIT_REPO', "Sync with Git Repo");
-define ('LAN_ADDONS', "Addons");
+define ("LAN_RELEASED", "Released");
+define ("LAN_REPAIR_PLUGIN_SETTINGS", "Repair plugin settings");
+define ("LAN_SYNC_WITH_GIT_REPO", "Sync with Git Repo");
+define ("LAN_ADDONS", "Addons");
 
-define('LAN_UPGRADE_SUCCESSFUL', "Upgrade successful");
-define('LAN_INSTALL_SUCCESSFUL', "Installation successful");
-define('LAN_INSTALL_FAIL', "Installation failed!");
-define('LAN_UNINSTALL_FAIL', "Unable to uninstall!");
-define('LAN_PLUGIN_IS_USED', "[x] plugin is used by:");
+define("LAN_UPGRADE_SUCCESSFUL", "Upgrade successful");
+define("LAN_INSTALL_SUCCESSFUL", "Installation successful");
+define("LAN_INSTALL_FAIL", "Installation failed!");
+define("LAN_UNINSTALL_FAIL", "Unable to uninstall!");
+define("LAN_PLUGIN_IS_USED", "[x] plugin is used by:");
 
-?>
+?>
\ No newline at end of file

From 9f45609caed07f9c2385a966f79a5c2b82987212 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 26 Oct 2016 13:12:12 -0700
Subject: [PATCH 07/11] Issue #1780, Issue #1780, Issue #854. e107.org now
 supports plugin version x.x.x format.

---
 e107_admin/plugin.php                       | 2 +-
 e107_languages/English/admin/lan_plugin.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 3477659fc..18123e33f 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -2809,7 +2809,7 @@ class pluginBuilder
 					$default 	= '1.0';
 					$required 	= true;
 					$help 		= EPL_ADLAN_138;
-					$pattern	= "^[\d]{1,2}\.[\d]{1,2}$";
+					$pattern	= "^[\d]{1,2}\.[\d]{1,2}(\.[\d]{1,2})?$";
 					$xsize		= 'small';
 				break;
 
diff --git a/e107_languages/English/admin/lan_plugin.php b/e107_languages/English/admin/lan_plugin.php
index abc2631db..f1d73817f 100644
--- a/e107_languages/English/admin/lan_plugin.php
+++ b/e107_languages/English/admin/lan_plugin.php
@@ -155,7 +155,7 @@ define ("EPL_ADLAN_134","Please create [b][x][/b] in your plugin directory with
 define ("EPL_ADLAN_135","The name of your plugin. (Must be written in English)");
 define ("EPL_ADLAN_136","If you have a language file, enter the LAN_XXX value for the plugin's name");
 define ("EPL_ADLAN_137","Creation date of your plugin");
-define ("EPL_ADLAN_138","The version of your plugin. Format: x.x");
+define ("EPL_ADLAN_138","The version of your plugin. Format: x.x or x.x.x");
 define ("EPL_ADLAN_139","Compatible with this version of e107");
 define ("EPL_ADLAN_140","Author Name");
 define ("EPL_ADLAN_141","Author Website URL");

From fe56126e3f817d54eb20d73171386f60f75308b0 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 26 Oct 2016 17:55:59 -0700
Subject: [PATCH 08/11] Fixes #1946 - System meta event added.
 'system_meta_pre'

---
 e107_handlers/application.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/e107_handlers/application.php b/e107_handlers/application.php
index a32d9ae14..d6d20ea76 100644
--- a/e107_handlers/application.php
+++ b/e107_handlers/application.php
@@ -4053,6 +4053,8 @@ class eResponse
 	public function renderMeta()
 	{
 		$attrData = '';
+
+		e107::getEvent()->trigger('system_meta_pre');
 		
 		foreach ($this->_meta as $attr) 
 		{
@@ -4063,6 +4065,7 @@ class eResponse
 			}
 			$attrData .= ' />'."\n";
 		}
+
 		return $attrData;
 	}
 

From 95752b0f72830bc14bda4beda7da401629664cd1 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 27 Oct 2016 11:13:38 -0700
Subject: [PATCH 09/11] Fixes #1875 - Remove crons installed by plugin.

---
 e107_handlers/plugin_class.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 713f8d9a0..b1b2272b7 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -1643,6 +1643,9 @@ class e107plugin
 			
 			e107::getConfig('core')->setPref('plug_installed', $p_installed);
 
+
+			$this->removeCrons($plug_vars);
+
 		}
 		
 		e107::getMessage()->addDebug("updated Installed plugins pref: ".print_a($p_installed,true));
@@ -1701,6 +1704,25 @@ class e107plugin
 	}
 
 
+	private function removeCrons($plug_vars)
+	{
+
+		if(!file_exists(e_PLUGIN. $plug_vars['folder']."/e_cron.php"))
+		{
+			return false;
+		}
+
+		if(e107::getDb()->delete('cron', 'cron_function LIKE "'. $plug_vars['folder'] . '::%"'))
+		{
+			e107::getMessage()->addDebug($plug_vars['folder']." crons removed successfully."); // No LAN necessary
+		}
+
+		return false;
+
+	}
+
+
+
 	/**
 	 * Parse {plugin}_sql.php file and install/upgrade/uninstall tables.
 	 * @param $function string install|upgrade|uninstall

From 2fc22a669aa8a1351d2e7aee3c01c62701af7aed Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 27 Oct 2016 11:48:40 -0700
Subject: [PATCH 10/11] Fixes #1750

---
 e107_plugins/social/images/icon_16.png | Bin 0 -> 1748 bytes
 e107_plugins/social/images/icon_32.png | Bin 0 -> 2446 bytes
 e107_plugins/social/plugin.xml         |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 e107_plugins/social/images/icon_16.png
 create mode 100644 e107_plugins/social/images/icon_32.png

diff --git a/e107_plugins/social/images/icon_16.png b/e107_plugins/social/images/icon_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..366159abb9c789d1bb7993a31b349e30d86b8e69
GIT binary patch
literal 1748
zcmaJ?do)ye93R43v{}op+Ln8+A}8j~#V|7ri}B3ZSw<t#c4y{hhGy=#b7MxO-HO(V
zRxhl!R!B;r@+zgU*k1D3-BR09iV{5(n<aZkX#ZGy&$;*aIG@kw`}lo+=ce+4{pK4i
zGN4c>^8@@jA>?SRdG+<kujTM0LJkWFpKu}+TSp`yI7;ypV?q=NkRj1%2#Sc+alfE$
z6v{knDL<SD=LWGvn2d^OFjSRHL9!_nHxHEp5yheeAVj03ayIz%Tpb8V#cWVO=hC<e
zZ&V`nPsGvC#9+QCF;>JBgC6dHn~FsW$WQ_SRI>GQB}>Hyr*v85T(b><z!ZdtWrJ^%
z3g_|wZwyBPI@Q@;1j8`k!lc4<hNA=B4sf8sbcn`;V46J*X2CR;0}YsdKr$LGUdIaI
z_)f<nS8Py15DFFqB_t$J6C9}+9u2`vCKIALKn@P}B*I>)mJ^7|Uaqv7QQ)9T5iV5_
zQcMnL6cHh|fnbAVrf*A-DQ0Em%IP+d4TDsO0)nYDO-VCAF8BYTGTAIzNra&9^8HU?
zC10&Tp%7GwZNNq3!L75>gi^4)aTFmioR4AaXS&FfU<9U=U<$z7d#Y=|GJ#Ys#uAja
zQyear6(Cm<h+KpQaM&QJLX}FzEQT+G$sl{p^md`cu#Ypt)5Xi%3wEY^(w!Y(XT}Vd
zgNZiCP&qNf6~E&;&B@i+L8c%hb5L9wkBWV9Oa@Gq&63WY3p}UZG*>)#E)H{YAu<_A
zbGZLH?3pdnL7M5Tb;-r7`B6FPc$~EMVMF(3^2TriIG%h}SHYguL7}TmQzl0aj3|~>
zni`zg3hJ98L@j;I;f$tbAKBamUkHWwwxz~(2Gz2&Vc&e%{irH!5!A*QTkCYSpRqHv
zLWg&ZtFztfMDXf}jS|BOd)~&Uah5xqZs#t)1#K*S)pvU`VnySy+Xb6`2x{j%i(ip-
zU0f+BQcI+Pb`};E_+Dx6r~qnT*!g(8^@YzNlkCCGKm3vPvN_G^a#t7g0q-)}E!BJT
zx&CBD{Jo5xM-89RPgj;4k7}DJ_ct~UE=vD2s-lPgd&crzDnpl+D%bH%e=m3WQ=}aJ
z;CizwJL$s7yxi7Fb?#_m&6N)K&Q#q@6=*y5ir=7XUG&p2VWdT3WKwpNR_)_mz~b~g
z$r*zjqx45H-TfmKueZ3VlFmOUkK4<01)ud<4QuBQ47T@}CZAm6Q4(pqim#2clBsfY
z=tp<Pd96G2x=Zl99a%(i<q$rRSid0Rq6Bu01u`#<O;Vb~sb$q?%?CLxPf~##y^vJ%
z-V)PzuTErv$-wD0@vGA3XQON$Eh%T^1PaD03ycOUDG#|<8{Q-uZtBr7kJuiWqqEub
zV?p|2YqOTjolCX8^WC!BHm>^4E#do1eLD>63TkPejE>khbljyK46iTSK{3ptTshVM
zlGAq6Q774MUWnTI!|x6Jyt)g8J(jC>6NfOGcK)wvIZF+CkD6`I)yfX)w?2B~$+sp|
z;ha!VY~tCIp0PkT+|~@-wxs@)C4X$c1vWTT_g)##)!<x`ZHkSt=d~x#{fl;2ON{a)
zc4=XbO<pVf2e_rkK-!u8`}g_zoh`$M8gnO|s%r9XT<k6=tAe#x^Yx<2O%@t$yEZ&r
z{@R946sp5%HTuDOzA4QSs8?FICV5;AGwbTU8*}Z*=CS52NE6;DjLRMqF-j8d^OQ!J
ze7)C>mjo$gedBd4actMxfqJw1(fJ25{K}t?TE(_{M1PSVvrpJ3)EycL>9=Sxzh&<1
z{&isAd>z-9e)6x}s!!wX{5Qv=jE&C6Poz{1tsMBxvp6P|{v}P%RNB!!@Hui*80j9S
ze0cHTU}9n5#2`9mTx>2aEao<;Ym*yA5jj7P9T{iTcnCuO3LA3O(xX&lC-lC#hk%;@
OOn^@?=cL!#t^WXE(6}G~

literal 0
HcmV?d00001

diff --git a/e107_plugins/social/images/icon_32.png b/e107_plugins/social/images/icon_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3a39a1f87eeb269bfbda6f0e91a6205f633ff2e
GIT binary patch
literal 2446
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
M07*qoM6N<$f@ON2xBvhE

literal 0
HcmV?d00001

diff --git a/e107_plugins/social/plugin.xml b/e107_plugins/social/plugin.xml
index 3fae77705..326ba04e2 100644
--- a/e107_plugins/social/plugin.xml
+++ b/e107_plugins/social/plugin.xml
@@ -9,6 +9,6 @@
         <word>twitter</word>
     </keywords>
     <adminLinks>
-        <link url="admin_config.php" description="" icon="" iconSmall="" primary="true" >LAN_CONFIGURE</link>
+        <link url="admin_config.php" description="" icon="images/icon_32.png" iconSmall="images/icon_16.png" primary="true" >LAN_CONFIGURE</link>
     </adminLinks>
 </e107Plugin>
\ No newline at end of file

From f3412a4e89482182e428f6e6096d65e8b7c4fd0e Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 27 Oct 2016 12:31:55 -0700
Subject: [PATCH 11/11] Update version to 2.1.3 (git)

---
 e107_admin/ver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e107_admin/ver.php b/e107_admin/ver.php
index 577fc3d08..c430e8881 100644
--- a/e107_admin/ver.php
+++ b/e107_admin/ver.php
@@ -16,6 +16,6 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-$e107info['e107_version'] = "2.1.2 (git)";
+$e107info['e107_version'] = "2.1.3 (git)";
 
 ?>
\ No newline at end of file