diff --git a/e107_admin/language.php b/e107_admin/language.php index 77cd13265..ae20f0fea 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) @@ -1158,7 +1158,7 @@ class lanDeveloper $text .= " -
".LANG_LAN_140."
+
".e107::getParser()->toHTML(LANG_LAN_140, true)."
"; - } - } - else - { - // $text .= ""; - // $text .= ""; - $text .= "".ADMIN_INSTALLPLUGIN_ICON.""; - } - } - 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 .= "
"; - $text .= "".ADMIN_UPGRADEPLUGIN_ICON.""; - } - - $text .=""; - // $text .= ""; - - - - -*/ - - - - - - - - } } return $text; @@ -2892,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_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 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; } 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 diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index e6165bb36..b1b2272b7 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; } @@ -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)); @@ -1666,7 +1669,7 @@ class e107plugin { if ($function == 'install') { - $text = "Installation Complete."; + $text = EPL_ADLAN_238; if ($this->plugConfigFile) { @@ -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 @@ -1750,7 +1772,7 @@ class e107plugin $query .= $tableData['data'][$k]; $query .= "\n) ENGINE=". vartrue($tableData['engine'][$k],"InnoDB")." DEFAULT CHARSET=utf8 "; - $txt = "Adding Table: {$v} "; + $txt = EPL_ADLAN_239." {$v} "; $status = $sql->db_Query($query) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR; break; @@ -1758,7 +1780,7 @@ class e107plugin if (!empty($options['delete_tables'])) { $query = "DROP TABLE `".MPREFIX.$v."`; "; - $txt = "Removing Table: {$v}
"; + $txt = EPL_ADLAN_240." {$v}
"; $status = $sql->db_Query_all($query) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR; } @@ -2270,7 +2292,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 +2532,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 +2542,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 +3457,4 @@ class e107plugin } } -?> \ No newline at end of file +?> diff --git a/e107_languages/English/admin/lan_plugin.php b/e107_languages/English/admin/lan_plugin.php index e17e26e1b..f1d73817f 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 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"); +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 & 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 & 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 diff --git a/e107_plugins/social/images/icon_16.png b/e107_plugins/social/images/icon_16.png new file mode 100644 index 000000000..366159abb Binary files /dev/null and b/e107_plugins/social/images/icon_16.png differ diff --git a/e107_plugins/social/images/icon_32.png b/e107_plugins/social/images/icon_32.png new file mode 100644 index 000000000..b3a39a1f8 Binary files /dev/null and b/e107_plugins/social/images/icon_32.png differ 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 @@ twitter - LAN_CONFIGURE + LAN_CONFIGURE \ No newline at end of file