diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index b8af3ef5c..6fda3cffd 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -236,6 +236,7 @@ define("LAN_CREATED_FAILED","Creation Unsuccessful"); define("LAN_DELETED_FAILED","Deletion Unsuccessful"); define("LAN_UPDATED_FAILED","Update Unsuccessful"); define("LAN_NO_CHANGE","Nothing updated as no changes were made."); +define("LAN_REQUIRED_BLANK", "Required field(s) left blank."); define("LAN_TRY_AGAIN","Please try again."); define("LAN_NEVER", "Never"); define("LAN_PRUNE", "Prune"); diff --git a/e107_plugins/linkwords/admin_config.php b/e107_plugins/linkwords/admin_config.php index 8fbb1e9be..6e39ceb15 100644 --- a/e107_plugins/linkwords/admin_config.php +++ b/e107_plugins/linkwords/admin_config.php @@ -22,6 +22,11 @@ require_once(e_ADMIN.'auth.php'); include_lan(e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_admin_linkwords.php'); define('LW_CACHE_TAG', 'nomd5_linkwords'); +require_once(e_HANDLER.'message_handler.php'); +$mes = e107::getMessage(); + +$tp = e107::getParser(); + $lw_context_areas = array( 'TITLE' => LWLAN_33, 'SUMMARY' => LWLAN_34, @@ -54,16 +59,17 @@ function lw_act_opts($curval) $deltest = array_flip($_POST); -if(isset($deltest[LWLAN_17])) +if(isset($deltest[LAN_DELETE])) { - $delete_id = intval(str_replace('delete_', '', $deltest[LWLAN_17])); + $delete_id = intval(str_replace('delete_', '', $deltest[LAN_DELETE])); if ($sql->db_Count('linkwords', '(*)', "WHERE 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; + //$message = LWLAN_19; + $mes->addSuccess(LAN_DELETED); } } @@ -116,15 +122,15 @@ if (isset($_POST['saveopts_linkword'])) if (isset($_POST['submit_linkword']) || isset($_POST['update_linkword'])) { - if(!$_POST['linkwords_word'] && $_POST['linkwords_url']) + if(!$_POST['linkwords_word'] && $_POST['linkwords_url']) // TODO FIX check is not functional { // Key fields empty - $message = LWLAN_1; + $mes->addError(LAN_REQUIRED_BLANK); } else { - $data['linkword_word'] = $tp -> toDB($_POST['linkword_word']); - $data['linkword_link'] = $tp -> toDB($_POST['linkword_link']); - $data['linkword_tooltip'] = $tp -> toDB($_POST['linkword_tooltip']); + $data['linkword_word'] = $tp->toDB($_POST['linkword_word']); + $data['linkword_link'] = $tp->toDB($_POST['linkword_link']); + $data['linkword_tooltip'] = $tp->toDB($_POST['linkword_tooltip']); $data['linkword_tip_id'] = intval($_POST['linkword_tip_id']); $data['linkword_active'] = intval($_POST['linkword_active']); $data['linkword_newwindow'] = isset($_POST['linkword_newwindow']) ? 1 : 0; @@ -132,39 +138,38 @@ if (isset($_POST['submit_linkword']) || isset($_POST['update_linkword'])) $logString = implode('[!br!]',$data); if (isset($_POST['submit_linkword'])) { - if ($sql -> db_Insert('linkwords', $data)) + if ($sql->db_Insert('linkwords', $data)) { - $message = LWLAN_2; // TODO FIX $emessage style $admin_log->log_event('LINKWD_01',$logString,''); + $mes->addSuccess(LAN_CREATED); } else { - $message = LWLAN_57; + //$message = LWLAN_57; + $mes->addError(LAN_CREATED_FAILED); } } elseif (isset($_POST['update_linkword'])) { $id = intval(varset($_POST['lw_edit_id'],0)); - if (($id > 0) && $sql -> db_UpdateArray('linkwords', $data, ' WHERE `linkword_id`='.$id)) + if (($id > 0) && $sql->db_UpdateArray('linkwords', $data, ' WHERE `linkword_id`='.$id)) { - $message = LWLAN_3; // TODO FIX $emessage style + //$message = LWLAN_3; + $mes->addSuccess(LAN_UPDATED); $logString = 'ID: '.$id.'[!br!]'.$logString; $admin_log->log_event('LINKWD_02',$logString,''); } else { - $message = LWLAN_57; + //$message = LWLAN_57; + $mes->addError(LAN_UPDATED_FAILED); } } $e107->ecache->clear_sys(LW_CACHE_TAG); } } - -if (isset($message)) -{ - $ns->tablerender("", "
".$message."
"); -} +$ns->tablerender($caption, $mes->render() . $text); $chkNewWindow = " checked='checked'"; // Open links in new window by default @@ -271,17 +276,17 @@ if (($action == 'words') || ($action == 'edit')) - ".LWLAN_61." + ".LAN_ID." ".LWLAN_5." ".LWLAN_6." ".LWLAN_56." ".LWLAN_50." ".LWLAN_60." ".LWLAN_7." - ".LWLAN_8." + ".LAN_OPTIONS." \n"; - while($row = $sql -> db_Fetch()) + while($row = $sql->db_Fetch()) { $text .= " @@ -306,7 +311,7 @@ if (($action == 'words') || ($action == 'edit')) $text .= ""; } - $ns -> tablerender(LWLAN_11, $text); + $ns->tablerender(LWLAN_11, $mes->render() . $text); } @@ -362,7 +367,7 @@ if ($action=='options') \n"; -$ns -> tablerender(LWLAN_32, $text); +$ns -> tablerender(LAN_OPTIONS, $text); } @@ -381,7 +386,7 @@ function admin_config_adminmenu() // TODO FIX v2 style $var['words']['text'] = LWLAN_24; $var['words']['link'] = "admin_config.php"; - $var['options']['text'] = LWLAN_25; + $var['options']['text'] = LAN_OPTIONS; $var['options']['link'] ="admin_config.php?options"; show_admin_menu(LWLAN_23, $action, $var); diff --git a/e107_plugins/linkwords/languages/English_admin_linkwords.php b/e107_plugins/linkwords/languages/English_admin_linkwords.php index 2b104baf7..3f6992fdc 100644 --- a/e107_plugins/linkwords/languages/English_admin_linkwords.php +++ b/e107_plugins/linkwords/languages/English_admin_linkwords.php @@ -11,38 +11,38 @@ * $Id* */ -define("LWLAN_1", "Field(s) left blank."); -define("LWLAN_2", "Link word saved."); -define("LWLAN_3", "Link word updated."); +//define("LWLAN_1", "Field(s) left blank."); +//define("LWLAN_2", "Link word saved."); +//define("LWLAN_3", "Link word updated."); define("LWLAN_4", "No link words defined yet."); define("LWLAN_5", "Words"); define("LWLAN_6", "Link"); define("LWLAN_7", "Active?"); -define("LWLAN_8", "Options"); -define("LWLAN_9", "yes"); -define("LWLAN_10", "no"); +//define("LWLAN_8", "Options"); +//define("LWLAN_9", "yes"); +//define("LWLAN_10", "no"); define("LWLAN_11", "Existing Linkwords"); -define("LWLAN_12", "Yes"); -define("LWLAN_13", "No"); -define("LWLAN_14", "Submit LinkWord"); -define("LWLAN_15", "Update LinkWord"); +//define("LWLAN_12", "Yes"); +//define("LWLAN_13", "No"); +//define("LWLAN_14", "Submit LinkWord"); +//define("LWLAN_15", "Update LinkWord"); //define("LWLAN_16", "Edit"); //define("LWLAN_17", "Delete"); define("LWLAN_18", "Are you sure you want to delete this linkword?"); -define("LWLAN_19", "Linkword deleted."); +//define("LWLAN_19", "Linkword deleted."); define("LWLAN_20", "Unable to find that linkword entry."); define("LWLAN_21", "Word to autolink (or comma-separated list of words)"); define("LWLAN_22", "Activate?"); define("LWLAN_23", "Linkwords Administration"); define("LWLAN_24", "Manage Words"); -define("LWLAN_25", "Options"); +//define("LWLAN_25", "Options"); define("LWLAN_26", "Areas in which to enable linkwords"); define("LWLAN_27", "This is the 'context' of the displayed text"); define("LWLAN_28", "Pages on which to disable linkwords"); define("LWLAN_29", "Same format as menu visibility control. One match per line. Specify a partial or complete URL. End with '!' for exact match of the end part of the link"); //define("LWLAN_30", "Save options"); define("LWLAN_31", "Add/edit linkword"); -define("LWLAN_32", "Linkword Options"); +//define("LWLAN_32", "Linkword Options"); define("LWLAN_33", 'Title areas'); define("LWLAN_34", 'Item summaries'); define("LWLAN_35", 'Body text'); @@ -70,11 +70,11 @@ define('LWLAN_53', 'Tooltip only'); define('LWLAN_54', 'Linkword and Tooltip'); define('LWLAN_55', 'Open link in new window'); define('LWLAN_56', 'Open in new page'); -define('LWLAN_57', 'Error writing new values'); +//define('LWLAN_57', 'Error writing new values'); define('LWLAN_58', 'Pref hook converted to 0.8 format'); // Used in 0.7-compatible stub only define('LWLAN_59', 'Enable Ajax functionality'); define('LWLAN_60', 'LW ID'); -define('LWLAN_61', 'ID'); +//define('LWLAN_61', 'ID'); define('LWLAN_62', 'Tooltip ID (LW ID)'); define('LWLAN_63', 'Positive integers only'); define('LWLAN_64', 'Suppress link on current page');