From f48927041d5e1d80c21e6611045c28edcde1d459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Tue, 8 May 2018 06:31:24 +0200 Subject: [PATCH 1/5] Update userposts.php --- userposts.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/userposts.php b/userposts.php index 7613d4b26..f95ae64f6 100644 --- a/userposts.php +++ b/userposts.php @@ -70,7 +70,8 @@ if ($action == "comments") $sql2 = e107::getDb('sql2'); if($user_name) { - $ccaption = UP_LAN_1.$user_name; + // $ccaption = UP_LAN_1.$user_name; + $ccaption = str_replace('[x]', $user_name, UP_LAN_1); /*$sql->db_Select("user", "user_comments", "user_id=".$id); $row = $sql->db_Fetch(); $ctotal = $row['user_comments'];*/ @@ -159,7 +160,8 @@ elseif ($action == 'forums') exit; } - $fcaption = UP_LAN_0.' '.$user_name; +// $fcaption = UP_LAN_0.' '.$user_name; + $fcaption = str_replace('[x]', $user_name, UP_LAN_0); /* if (!$USERPOSTS_FORUM_TABLE) { @@ -312,4 +314,4 @@ function parse_userposts_comments_table($row, $template) return e107::getParser()->simpleParse($template, $vars); } -?> \ No newline at end of file +?> From 01ad6fe896492fa6add94382e011420a0678aae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Tue, 8 May 2018 06:33:44 +0200 Subject: [PATCH 2/5] Update lan_userposts.php --- e107_languages/English/lan_userposts.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_languages/English/lan_userposts.php b/e107_languages/English/lan_userposts.php index c23fc6037..d598e0adb 100644 --- a/e107_languages/English/lan_userposts.php +++ b/e107_languages/English/lan_userposts.php @@ -11,8 +11,8 @@ */ define("PAGE_NAME", "User Posts"); -define("UP_LAN_0", "All Forum Posts for "); -define("UP_LAN_1", "All Comments for "); +define("UP_LAN_0", "All Forum Posts for [x]"); +define("UP_LAN_1", "All Comments for [x]"); define("UP_LAN_2", "Thread"); define("UP_LAN_3", "Views"); define("UP_LAN_4", "Replies"); @@ -28,4 +28,4 @@ define("UP_LAN_12", "Search"); define("UP_LAN_14", "Forum Posts"); define("UP_LAN_15", "Re"); define("UP_LAN_16", "IP Address"); -?> \ No newline at end of file +?> From 7b13e891eefdbb445af68d3c3ad188fe6cd98713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Tue, 8 May 2018 08:22:12 +0200 Subject: [PATCH 3/5] Update lan_error.php --- e107_languages/English/lan_error.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/e107_languages/English/lan_error.php b/e107_languages/English/lan_error.php index b7e1e5d53..5d52e8470 100644 --- a/e107_languages/English/lan_error.php +++ b/e107_languages/English/lan_error.php @@ -64,4 +64,8 @@ define("LAN_ERROR_44", "Site logo"); define("LAN_ERROR_45", "What can you do now?"); define("LAN_ERROR_46", "Check log for details."); +define("LAN_ERROR_47", "Validation error: News title can\'t be empty!"); +define("LAN_ERROR_48", "Validation error: News SEF URL value is required field and can\'t be empty!"); +define("LAN_ERROR_49", "Validation error: News SEF URL is unique field - current value already in use! Please choose another SEF URL value."); +define("LAN_ERROR_50", "Validation error: News category can\'t be empty!"); ?> From 1109854538bb10df7987d7e67117935b581319a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Tue, 8 May 2018 08:26:17 +0200 Subject: [PATCH 4/5] Update news_class.php --- e107_handlers/news_class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php index 68e4d7df3..43781be88 100644 --- a/e107_handlers/news_class.php +++ b/e107_handlers/news_class.php @@ -49,7 +49,8 @@ class news { if(empty($news['news_title'])) { $error = true; - $emessage->add('Validation error: News title can\'t be empty!', E_MESSAGE_ERROR, $smessages); + $message = LAN_ERROR_47; + $emessage->add(LAN_ERROR_47, E_MESSAGE_ERROR, $smessages); if(!empty($news['news_sef'])) { $news['news_sef'] = eHelper::secureSef($news['news_sef']); @@ -72,18 +73,21 @@ class news { if(empty($news['news_sef'])) { $error = true; - $emessage->add('Validation error: News SEF URL value is required field and can\'t be empty!', E_MESSAGE_ERROR, $smessages); + $message = LAN_ERROR_48; + $emessage->add(LAN_ERROR_48, E_MESSAGE_ERROR, $smessages); } elseif($sql->db_Count('news', '(news_id)', ($news['news_sef'] ? 'news_id<>'.intval($news['news_id']).' AND ' : '')."news_sef='".$tp->toDB($news['news_sef'])."'")) { $error = true; - $emessage->add('Validation error: News SEF URL is unique field - current value already in use! Please choose another SEF URL value.', E_MESSAGE_ERROR, $smessages); + $message = LAN_ERROR_49; + $emessage->add(LAN_ERROR_49, E_MESSAGE_ERROR, $smessages); } if(empty($news['news_category'])) { $error = true; - $emessage->add('Validation error: News category can\'t be empty!', E_MESSAGE_ERROR, $smessages); + $message = LAN_ERROR_50; + $emessage->add(LAN_ERROR_50, E_MESSAGE_ERROR, $smessages); } From cbfb476799ff149a47f7215efdbff831379622dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Wed, 9 May 2018 06:19:48 +0200 Subject: [PATCH 5/5] Update lan_error.php --- e107_languages/English/lan_error.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_languages/English/lan_error.php b/e107_languages/English/lan_error.php index 5d52e8470..7ea413f67 100644 --- a/e107_languages/English/lan_error.php +++ b/e107_languages/English/lan_error.php @@ -64,8 +64,8 @@ define("LAN_ERROR_44", "Site logo"); define("LAN_ERROR_45", "What can you do now?"); define("LAN_ERROR_46", "Check log for details."); -define("LAN_ERROR_47", "Validation error: News title can\'t be empty!"); -define("LAN_ERROR_48", "Validation error: News SEF URL value is required field and can\'t be empty!"); +define("LAN_ERROR_47", "Validation error: News title can't be empty!"); +define("LAN_ERROR_48", "Validation error: News SEF URL value is required field and can't be empty!"); define("LAN_ERROR_49", "Validation error: News SEF URL is unique field - current value already in use! Please choose another SEF URL value."); -define("LAN_ERROR_50", "Validation error: News category can\'t be empty!"); +define("LAN_ERROR_50", "Validation error: News category can't be empty!"); ?>