diff --git a/e107_plugins/import/admin_import.php b/e107_plugins/import/admin_import.php index cff021d60..5cb1e272b 100644 --- a/e107_plugins/import/admin_import.php +++ b/e107_plugins/import/admin_import.php @@ -9,15 +9,24 @@ * * * $Source: /cvs_backup/e107_0.8/e107_plugins/import/admin_import.php,v $ - * $Revision: 1.4 $ - * $Date: 2009-11-18 01:05:46 $ - * $Author: e107coders $ + * $Revision: 1.5 $ + * $Date: 2010-01-02 22:57:40 $ + * $Author: e107steved $ */ -/* + +/** + * e107 Import plugin + * + * @package e107_plugins + * @subpackage import + * @version $Id: admin_import.php,v 1.5 2010-01-02 22:57:40 e107steved Exp $; + + Routine manages import from other databases Options supported: CSV (with format file) + WordPress (users) Mambo/Joomla PHPBB2 PHPBB3 @@ -35,14 +44,13 @@ require_once("../../class2.php"); // define("USE_PERSISTANT_DB",TRUE); -require_once (e_HANDLER."form_handler.php"); +require_once (e_HANDLER.'form_handler.php'); $frm = new e_form(); -require_once(e_HANDLER."message_handler.php"); +require_once(e_HANDLER.'message_handler.php'); $emessage = &eMessage::getInstance(); //nothing wrong with doing it twice -// Language defs - maybe move out later -include_lan(e_PLUGIN."import/languages/".e_LANGUAGE."_admin_import.php"); +include_lan(e_PLUGIN.'import/languages/'.e_LANGUAGE.'_admin_import.php'); // Source DB types (i.e. CMS types) supported. Key of each element is the 'short code' for the type @@ -67,8 +75,8 @@ $fl = new e_file; $importClassList = $fl->get_files(e_PLUGIN.'import', "^.+?_import_class\.php$", "standard", 1); foreach($importClassList as $file) { - $tag = str_replace('_class.php','',$file['fname']); - include_once($file['fpath'].$file['fname']); // This will set up the variables + $tag = str_replace('_class.php','',$file['fname']); + include_once($file['path'].$file['fname']); // This will set up the variables } unset($importClassList); unset($fl); @@ -368,7 +376,9 @@ else - +/* + * Currently unused function - shows available import methods and capabilities + */ function showStartPage() { global $ns, $emessage, $frm, $import_class_names, $import_class_support, $db_import_blocks, $import_class_comment; @@ -376,7 +386,7 @@ function showStartPage() $text = "
- ".DBLAN_10." + ".'DBLAN_10'." @@ -423,7 +433,6 @@ function showStartPage() $text .= " "; } diff --git a/e107_plugins/import/languages/English_admin_import.php b/e107_plugins/import/languages/English_admin_import.php index 7e5d1bbed..da5dc5fe7 100644 --- a/e107_plugins/import/languages/English_admin_import.php +++ b/e107_plugins/import/languages/English_admin_import.php @@ -9,11 +9,20 @@ * * * $Source: /cvs_backup/e107_0.8/e107_plugins/import/languages/English_admin_import.php,v $ - * $Revision: 1.3 $ - * $Date: 2009-12-19 17:54:00 $ + * $Revision: 1.4 $ + * $Date: 2010-01-02 22:57:40 $ * $Author: e107steved $ */ + +/** + * e107 Import plugin + * + * @package e107_plugins + * @subpackage import + * @version $Id: English_admin_import.php,v 1.4 2010-01-02 22:57:40 e107steved Exp $; +*/ + if (!defined('e107_INIT')) { exit; } //define('LAN_CONTINUE','Continue'); Now global definition diff --git a/e107_plugins/linkwords/admin_config.php b/e107_plugins/linkwords/admin_config.php index 452b224b5..e08679a30 100644 --- a/e107_plugins/linkwords/admin_config.php +++ b/e107_plugins/linkwords/admin_config.php @@ -6,22 +6,33 @@ * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * ***** START OF VERSION WHICH ALLOWS TOOLTIPS (also order of forms changed ) + * Linkwords plugin - admin page * * $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/admin_config.php,v $ - * $Revision: 1.11 $ - * $Date: 2009-11-18 01:05:47 $ - * $Author: e107coders $ + * $Revision: 1.12 $ + * $Date: 2010-01-02 22:57:41 $ + * $Author: e107steved $ */ -require_once("../../class2.php"); -if (!getperms("P") || !plugInstalled('linkwords')) + +/** + * e107 Linkword plugin + * + * @package e107_plugins + * @subpackage linkwords + * @version $Id: admin_config.php,v 1.12 2010-01-02 22:57:41 e107steved Exp $; + * + * Administration page + */ + +require_once('../../class2.php'); +if (!getperms('P') || !e107::isInstalled('linkwords')) { - header("location:".e_BASE."index.php"); + header('location:'.e_BASE.'index.php'); exit ; } -require_once(e_ADMIN."auth.php"); -include_lan(e_PLUGIN."linkwords/languages/".e_LANGUAGE."_admin_linkwords.php"); +require_once(e_ADMIN.'auth.php'); +include_lan(e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_admin_linkwords.php'); define('LW_CACHE_TAG', 'nomd5_linkwords'); $lw_context_areas = array( @@ -47,7 +58,7 @@ function lw_act_opts($curval) $ret = ''; foreach ($lwaction_vals as $opt => $val) { - $selected = ($curval == $opt ? "selected='selected'" : ""); + $selected = ($curval == $opt ? "selected='selected'" : ''); $ret .= "\n"; } return $ret; @@ -58,11 +69,11 @@ $deltest = array_flip($_POST); if(isset($deltest[LWLAN_17])) { - $delete_id = str_replace("delete_", "", $deltest[LWLAN_17]); + $delete_id = intval(str_replace('delete_', '', $deltest[LWLAN_17])); - if ($sql->db_Count("linkwords", "(*)", "WHERE linkword_id = ".$delete_id)) + if ($sql->db_Count('linkwords', '(*)', "WHERE linkword_id = ".$delete_id)) { - $sql->db_Delete("linkwords", "linkword_id=".$delete_id); + $sql->db_Delete('linkwords', 'linkword_id='.$delete_id); $admin_log->log_event('LINKWD_03','ID: '.$delete_id,''); $e107->ecache->clear_sys(LW_CACHE_TAG); $message = LWLAN_19; @@ -71,7 +82,7 @@ if(isset($deltest[LWLAN_17])) if(e_QUERY) { - $lw_qs = explode(".", e_QUERY); + $lw_qs = explode('.', e_QUERY); if (!isset($lw_qs[0])) $lw_qs[0] = 'words'; if (!isset($lw_qs[1])) $lw_qs[1] = -1; $action = $lw_qs[0]; @@ -181,7 +192,11 @@ if($action == "edit") } else { - unset($linkword_word, $linkword_link, $linkword_active); + $linkword_word = ''; + $linkword_link = ''; + $linkword_active = ''; + $linkword_tooltip = ''; + $linkword_tip_id = ''; } diff --git a/e107_plugins/linkwords/e_help.php b/e107_plugins/linkwords/e_help.php index 655abf8d3..223cfe516 100644 --- a/e107_plugins/linkwords/e_help.php +++ b/e107_plugins/linkwords/e_help.php @@ -9,16 +9,25 @@ * * * $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/e_help.php,v $ - * $Revision: 1.3 $ - * $Date: 2009-11-18 01:05:47 $ - * $Author: e107coders $ + * $Revision: 1.4 $ + * $Date: 2010-01-02 22:57:41 $ + * $Author: e107steved $ + */ + +/** + * e107 Linkword plugin + * + * @package e107_plugins + * @subpackage linkwords + * @version $Id: e_help.php,v 1.4 2010-01-02 22:57:41 e107steved Exp $; + * */ if (!defined('e107_INIT')) { exit; } include_lan(e_PLUGIN."linkwords/languages/".e_LANGUAGE."_admin_linkwords.php"); -if (e_QUERY) list($action,$junk) = explode('.',e_QUERY); else $action = 'words'; +if (e_QUERY) list($action,$junk) = explode('.',e_QUERY.'.'); else $action = 'words'; switch ($action) { diff --git a/e107_plugins/linkwords/e_tohtml.php b/e107_plugins/linkwords/e_tohtml.php index ace7d007c..4e3043621 100755 --- a/e107_plugins/linkwords/e_tohtml.php +++ b/e107_plugins/linkwords/e_tohtml.php @@ -9,9 +9,9 @@ * * * $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/e_tohtml.php,v $ - * $Revision: 1.9 $ - * $Date: 2009-11-18 01:05:47 $ - * $Author: e107coders $ + * $Revision: 1.10 $ + * $Date: 2010-01-02 22:57:41 $ + * $Author: e107steved $ */ /* | @@ -24,11 +24,21 @@ TODO: +----------------------------------------------------------------------------+ */ +/** + * e107 Linkword plugin + * + * @package e107_plugins + * @subpackage linkwords + * @version $Id: e_tohtml.php,v 1.10 2010-01-02 22:57:41 e107steved Exp $; + * + * 'Hook' page + * The class is 'hooked' by the parser, to add linkword capability to any context where its enabled. + */ + if (!defined('e107_INIT')) { exit; } // if (!plugInstalled('linkwords')) exit; // This will completely break a site during upgrades. define('LW_CACHE_ENABLE', TRUE); -define('LW_CACHE_TAG', 'nomd5_linkwords'); class e_tohtml_linkwords { @@ -71,6 +81,7 @@ class e_tohtml_linkwords } // Will probably need linkwords on this page - so get the info + define('LW_CACHE_TAG', 'nomd5_linkwords'); // Put it here to avoid conflict on admin pages if (LW_CACHE_ENABLE && ($temp = $e107->ecache->retrieve_sys(LW_CACHE_TAG))) { $ret = eval($temp);
".$frm->radio('import_type', $k)." -