[10171] Clarify acoount password/lock command errors.

sql/mangos.sql

@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
   `cache_id` int(10) default '0',
-  `required_10159_01_mangos_spell_proc_event` bit(1) default NULL
+  `required_10171_01_mangos_mangos_string` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -3017,7 +3017,7 @@ INSERT INTO `mangos_string` VALUES
 (24,'You used it recently.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (25,'Password not changed (unknown error)!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (26,'The password was changed',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(27,'The new passwords do not match or the old password is wrong',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(27,'The old password is wrong',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (28,'Your account is now locked.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (29,'Your account is now unlocked.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (30,', rank ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -3660,6 +3660,7 @@ INSERT INTO `mangos_string` VALUES
 (1026,'GUID: %u Name: %s Account: %s (%u) Date: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1027,'Log filters state:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1028,'All log filters set to: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1029, 'Command can be called only from RA-console.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1100,'Account %s (Id: %u) have up to %u expansion allowed now.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1101,'Message of the day changed to:\r\n%s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1102,'Message sent to %s: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),

sql/updates/10171_01_mangos_mangos_string.sql

@@ -0,0 +1,7 @@
+ALTER TABLE db_version CHANGE COLUMN required_10159_01_mangos_spell_proc_event required_10171_01_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry IN (27,1029);
+
+INSERT INTO mangos_string VALUES
+(27,'The old password is wrong',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1029, 'Command can be called only from RA-console.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

sql/updates/Makefile.am

@@ -105,6 +105,7 @@ pkgdata_DATA = \
 	10159_01_mangos_spell_proc_event.sql \
 	10160_01_characters_character_aura.sql \
 	10160_02_characters_pet_aura.sql \
+	10171_01_mangos_mangos_string.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -190,4 +191,5 @@ EXTRA_DIST = \
 	10159_01_mangos_spell_proc_event.sql \
 	10160_01_characters_character_aura.sql \
 	10160_02_characters_pet_aura.sql \
+	10171_01_mangos_mangos_string.sql \
 	README

src/game/Language.h

@@ -796,7 +796,8 @@ enum MangosStrings
     LANG_CHARACTER_DELETED_LIST_LINE_CHAT = 1026,
     LANG_LOG_FILTERS_STATE_HEADER       = 1027,
     LANG_ALL_LOG_FILTERS_SET_TO_S       = 1028,
-    // Room for more level 4              1029-1099 not used
+    LANG_RA_ONLY_COMMAND                = 1029,
+    // Room for more level 4              1030-1099 not used
 
     // Level 3 (continue)
     LANG_ACCOUNT_SETADDON               = 1100,

src/game/Level0.cpp

@@ -184,7 +184,11 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args)
 {
     // allow use from RA, but not from console (not have associated account id)
     if (!GetAccountId())
+    {
+        SendSysMessage (LANG_RA_ONLY_COMMAND);
+        SetSentErrorMessage (true);
         return false;
+    }
 
     if(!*args)
         return false;
@@ -239,7 +243,11 @@ bool ChatHandler::HandleAccountLockCommand(const char* args)
 {
     // allow use from RA, but not from console (not have associated account id)
     if (!GetAccountId())
+    {
+        SendSysMessage (LANG_RA_ONLY_COMMAND);
+        SetSentErrorMessage (true);
         return false;
+    }
 
     if (!*args)
     {

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10170"
+ #define REVISION_NR "10171"
 #endif // __REVISION_NR_H__

src/shared/revision_sql.h

@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_10160_02_characters_pet_aura"
- #define REVISION_DB_MANGOS "required_10159_01_mangos_spell_proc_event"
+ #define REVISION_DB_MANGOS "required_10171_01_mangos_mangos_string"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__