branch for major stability breakage

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@1440 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 136 insertions, 123 deletions

diff --git a/src/map/mail.c b/src/map/mail.c
index 019f6303d..42a83de52 100644
--- a/src/map/mail.c
+++ b/src/map/mail.c
@@ -1,18 +1,22 @@
+#ifndef TXT_ONLY
 // Mail System for eAthena SQL
 // Created by Valaris
+// moved all strings to msg_athena.conf [Lupus]
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "socket.h"
-#include "timer.h"
-#include "nullpo.h"
+#include "../common/strlib.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
 
 #include "map.h"
 #include "clif.h"
 #include "chrif.h"
 #include "intif.h"
+#include "atcommand.h"
 #include "pc.h"
 #include "mail.h"
 
@@ -20,6 +24,7 @@ char mail_db[32] = "mail";
 
 int MAIL_CHECK_TIME = 120000;
 int mail_timer;
+//extern char *msg_table[1000]; // Server messages (0-499 reserved for GM commands, 500-999 reserved for others)
 
 #ifdef MEMWATCH
 #include "memwatch.h"
@@ -27,13 +32,13 @@ int mail_timer;
 
 int mail_check(struct map_session_data *sd,int type)
 {
-	int i=0,new=0,priority=0;
+	int i = 0, new_ = 0, priority = 0;
 	char message[50];
 
-	if(sd==NULL)
-		return 0;
-	
-	sprintf(tmp_msql,"SELECT `message_id`,`to_account_id`,`from_char_name`,`read_flag`,`priority`,`check_flag` FROM `%s` WHERE `to_account_id` = \"%d\" ORDER by `message_id`", mail_db, sd->status.account_id);
+	nullpo_retr (0, sd);
+
+	sprintf(tmp_msql,"SELECT `message_id`,`to_account_id`,`from_char_name`,`read_flag`,`priority`,`check_flag` "
+		"FROM `%s` WHERE `to_account_id` = \"%d\" ORDER by `message_id`", mail_db, sd->status.account_id);
 
 	if (mysql_query(&mail_handle, tmp_msql)) {
 		printf("Database server error (executing query for %s): %s\n", mail_db, mysql_error(&mail_handle));
@@ -42,63 +47,66 @@ int mail_check(struct map_session_data *sd,int type)
 
    	mail_res = mysql_store_result(&mail_handle);
 	if(mail_res) {
-	        if (mysql_num_rows(mail_res) == 0) {
-			clif_displaymessage(sd->fd,"You have no messages.");
-		        mysql_free_result(mail_res);
-		        return 0;
-	        }
+		if (mysql_num_rows(mail_res) == 0) {
+			//clif_displaymessage(sd->fd,"You have no messages.");
+			clif_displaymessage(sd->fd, msg_txt(516));
 
-	        while ((mail_row = mysql_fetch_row(mail_res))) {
-				i++;
+			mysql_free_result(mail_res);
+			return 0;
+		}
 
-				if(!atoi(mail_row[5])) {
+		while ((mail_row = mysql_fetch_row(mail_res))) {
+			i++;
+			if(!atoi(mail_row[5])) {
 				sprintf(tmp_msql,"UPDATE `%s` SET `check_flag`='1' WHERE `message_id`= \"%d\"", mail_db, atoi(mail_row[0]));
-				        if(mysql_query(&mail_handle, tmp_msql) ) {
-						printf("DB server Error (update Read `%s`)- %s\n", mail_db, mysql_error(&mail_handle) );
-				        }
+				if(mysql_query(&mail_handle, tmp_msql) ) {
+					printf("DB server Error (update Read `%s`)- %s\n", mail_db, mysql_error(&mail_handle) );
 				}
+			}
 
-				if(!atoi(mail_row[3])) {
-					new++;
-					if(atoi(mail_row[4]))
-						priority++;
-					if(type==2 || type==3) {
-						if(atoi(mail_row[4])) {
-							sprintf(message, "%d - From : %s (New - Priority)", i, mail_row[2]);
-							clif_displaymessage(sd->fd, message);
-						}
-
-						else {
-							sprintf(message, "%d - From : %s (New)", i, mail_row[2]);
-							clif_displaymessage(sd->fd, message);
-						}
+			if(!atoi(mail_row[3])) {
+				new_++;
+				if(atoi(mail_row[4]))
+					priority++;
+				if(type==2 || type==3) {
+					if(atoi(mail_row[4])) {
+						//sprintf(message, "%d - From : %s (New - Priority)", i, mail_row[2]);
+						sprintf(message, msg_txt(511), i, mail_row[2]);
+
+						clif_displaymessage(sd->fd, jstrescape(message));
+					} else {
+						//sprintf(message, "%d - From : %s (New)", i, mail_row[2]);
+						sprintf(message, msg_txt(512), i, mail_row[2]);
+						clif_displaymessage(sd->fd, jstrescape(message));
 					}
 				}
+			} else if(type==2){
+				//sprintf(message, "%d - From : %s", i, mail_row[2]);
+				sprintf(message, msg_txt(513), i, mail_row[2]);
+				clif_displaymessage(sd->fd, jstrescape(message));
+			}
+		}
 
-					else if(type==2){
-						sprintf(message, "%d - From : %s", i, mail_row[2]);
-						clif_displaymessage(sd->fd, message);
-					}
-				
-	        }
-    	
 		mysql_free_result(mail_res);
-	
 	} else {
-        	printf("MySQL error (storing query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
+        printf("MySQL error (storing query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
 		return 0;
-    	}
+    }
 
-	if(i>0 && new>0 && type==1) {
-		sprintf(message, "You have %d new messages.", new);
-		clif_displaymessage(sd->fd, message);
+	if(i>0 && new_>0 && type==1) {
+		//sprintf(message, "You have %d new messages.", new_);
+		sprintf(message, msg_txt(514), new_);
+
+		clif_displaymessage(sd->fd, jstrescape(message));
 	}
-	if(i>0 && new>0 && priority>0 && type==1) {
-		sprintf(message, "You have %d unread priority messages.", priority);
-		clif_displaymessage(sd->fd, message);
+	if(i>0 && new_>0 && priority>0 && type==1) {
+		//sprintf(message, "You have %d unread priority messages.", priority);
+		sprintf(message, msg_txt(515), priority);
+		clif_displaymessage(sd->fd, jstrescape(message));
 	}
-	if(!new) {
-		clif_displaymessage(sd->fd, "You have no new messages.");
+	if(!new_) {
+		//clif_displaymessage(sd->fd, "You have no new messages.");
+		clif_displaymessage(sd->fd, msg_txt(516));
 	}
 
 	return 0;
@@ -109,9 +117,8 @@ int mail_read(struct map_session_data *sd, int message_id)
 
 	char message[80];
 
-	if(sd==NULL)
-		return 0;
-	
+	nullpo_retr (0, sd);
+
 	sprintf(tmp_msql,"SELECT `message_id`,`to_account_id`,`from_char_name`,`message`,`read_flag`,`priority`,`check_flag` from `%s` WHERE `to_account_id` = \"%d\" ORDER by `message_id` LIMIT %d, 1",mail_db,sd->status.account_id,message_id-1);
 
 	if (mysql_query(&mail_handle, tmp_msql)) {
@@ -121,48 +128,47 @@ int mail_read(struct map_session_data *sd, int message_id)
 
    	mail_res = mysql_store_result(&mail_handle);
 	if(mail_res) {
-	        if (mysql_num_rows(mail_res) == 0) {
-		        mysql_free_result(mail_res);
-			clif_displaymessage(sd->fd, "Message not found.");
-		        return 0;
-	        }
-
-	        if ((mail_row = mysql_fetch_row(mail_res))) {
+		if (mysql_num_rows(mail_res) == 0) {
+			mysql_free_result(mail_res);
+			//clif_displaymessage(sd->fd, "Message not found.");
+			clif_displaymessage(sd->fd, msg_txt(517));
+		       return 0;
+		}
 
+		if ((mail_row = mysql_fetch_row(mail_res))) {
 			if(!atoi(mail_row[6])) {
 				sprintf(tmp_msql,"UPDATE `%s` SET `check_flag`='1' WHERE `message_id`= \"%d\"", mail_db, atoi(mail_row[0]));
-			        if(mysql_query(&mail_handle, tmp_msql) ) {
-						printf("DB server Error (update Read `%s`)- %s\n", mail_db, mysql_error(&mail_handle) );
-				        }
+				if(mysql_query(&mail_handle, tmp_msql) ) {
+					printf("DB server Error (update Read `%s`)- %s\n", mail_db, mysql_error(&mail_handle) );
+				}
 			}
 
-			sprintf(message, "Reading message from %s", mail_row[2]);
-			clif_displaymessage(sd->fd, message);
+			//sprintf(message, "Reading message from %s", mail_row[2]);
+			sprintf(message, msg_txt(518), mail_row[2]);
+			clif_displaymessage(sd->fd, jstrescape(message));
 
 			sprintf(message, "%s", mail_row[3]);
-			clif_displaymessage(sd->fd, message);
+			clif_displaymessage(sd->fd, jstrescape(message));
 
 			sprintf(tmp_msql,"UPDATE `%s` SET `read_flag`='1' WHERE `message_id`= \"%d\"", mail_db, atoi(mail_row[0]));
-		        if(mysql_query(&mail_handle, tmp_msql) ) {
+			if(mysql_query(&mail_handle, tmp_msql) ) {
 				printf("DB server Error (update Read `%s`)- %s\n", mail_db, mysql_error(&mail_handle) );
-		        }
+			}
 		}
-	
+
 		mysql_free_result(mail_res);
-	
+
 	} else {
-        	printf("MySQL error (storing query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
-		return 0;
-    	}
+		printf("MySQL error (storing query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
+    }
 
 	return 0;
 }
 
 int mail_delete(struct map_session_data *sd, int message_id)
 {
-	if(sd==NULL)
-		return 0;
-	
+	nullpo_retr (0, sd);
+
 	sprintf(tmp_msql,"SELECT `message_id`,`to_account_id`,`read_flag`,`priority`,`check_flag` from `%s` WHERE `to_account_id` = \"%d\" ORDER by `message_id` LIMIT %d, 1",mail_db,sd->status.account_id,message_id-1);
 
 	if (mysql_query(&mail_handle, tmp_msql)) {
@@ -172,21 +178,25 @@ int mail_delete(struct map_session_data *sd, int message_id)
 
    	mail_res = mysql_store_result(&mail_handle);
 	if(mail_res) {
-	        if (mysql_num_rows(mail_res) == 0) {
-		        mysql_free_result(mail_res);
-			clif_displaymessage(sd->fd, "Message not found.");
-		        return 0;
-	        }
+		if (mysql_num_rows(mail_res) == 0) {
+			mysql_free_result(mail_res);
+			//clif_displaymessage(sd->fd, "Message not found.");
+			clif_displaymessage(sd->fd, msg_txt(517));
+			return 0;
+		}
 
-	        if ((mail_row = mysql_fetch_row(mail_res))) {
+		if ((mail_row = mysql_fetch_row(mail_res))) {
 			if(!atoi(mail_row[2]) && atoi(mail_row[3])) {
 				mysql_free_result(mail_res);
-				clif_displaymessage(sd->fd,"Cannot delete unread priority mail.");
+				//clif_displaymessage(sd->fd,"Cannot delete unread priority mail.");
+				clif_displaymessage(sd->fd,msg_txt(519));
+
 				return 0;
 			}
 			if(!atoi(mail_row[4])) {
 				mysql_free_result(mail_res);
-				clif_displaymessage(sd->fd,"You have recieved new mail, use @listmail before deleting.");
+				//clif_displaymessage(sd->fd,"You have recieved new mail, use @listmail before deleting.");
+				clif_displaymessage(sd->fd,msg_txt(520));
 				return 0;
 			}
 			sprintf(tmp_msql,"DELETE FROM `%s` WHERE `message_id` = \"%d\"", mail_db, atoi(mail_row[0]));
@@ -195,75 +205,77 @@ int mail_delete(struct map_session_data *sd, int message_id)
 				printf("DB server Error (update Read `%s`)- %s\n", mail_db, mysql_error(&mail_handle) );
 				return 0;
 		        }
-			else clif_displaymessage(sd->fd,"Message deleted.");
+			//else clif_displaymessage(sd->fd,"Message deleted.");
+			else clif_displaymessage(sd->fd,msg_txt(521));
 		}
-	
+
 		mysql_free_result(mail_res);
-	
+
 	} else {
-        	printf("MySQL error (delete query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
-		return 0;
-    	}
+		printf("MySQL error (delete query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
+	}
 
 	return 0;
 }
 
 int mail_send(struct map_session_data *sd, char *name, char *message, int flag)
 {
-	if(sd==NULL)
-		return 0;
-		
+	nullpo_retr (0, sd);
+
 	if(pc_isGM(sd) < 80 && sd->mail_counter > 0) {
-		clif_displaymessage(sd->fd,"You must wait 10 minutes before sending another message");
+		//clif_displaymessage(sd->fd,"You must wait 10 minutes before sending another message");
+		clif_displaymessage(sd->fd,msg_txt(522));
 		return 0;
 	}
 
 	if(strcmp(name,"*")==0) {
 		if(pc_isGM(sd) < 80) {
-			clif_displaymessage(sd->fd, "Access Denied.");
+			//clif_displaymessage(sd->fd, "Access Denied.");
+			clif_displaymessage(sd->fd, msg_txt(523));
 			return 0;
 		}
 		else
 			sprintf(tmp_msql,"SELECT DISTINCT `account_id` FROM `%s` WHERE `account_id` <> '%d' ORDER BY `account_id`", char_db, sd->status.account_id);
 	}
 	else
-		sprintf(tmp_msql,"SELECT `account_id`,`name` FROM `%s` WHERE `name` = \"%s\"", char_db, name);
+		sprintf(tmp_msql,"SELECT `account_id`,`name` FROM `%s` WHERE `name` = \"%s\"", char_db, jstrescape(name));
 
 	if (mysql_query(&mail_handle, tmp_msql)) {
 		printf("Database server error (executing query for %s): %s\n", char_db, mysql_error(&mail_handle));
 		return 0;
-   	}	
-	
+   	}
+
    	mail_res = mysql_store_result(&mail_handle);
 	if(mail_res) {
-	        if (mysql_num_rows(mail_res) == 0) {
+		if (mysql_num_rows(mail_res) == 0) {
 			mysql_free_result(mail_res);
-			clif_displaymessage(sd->fd,"Character does not exist.");
-		        return 0;
-	        }
+			//clif_displaymessage(sd->fd,"Character does not exist.");
+			clif_displaymessage(sd->fd,msg_txt(524));
+			return 0;
+		}
 
-	        while ((mail_row = mysql_fetch_row(mail_res))) {
+		while ((mail_row = mysql_fetch_row(mail_res))) {
 			if(strcmp(name,"*")==0) {
-				sprintf(tmp_msql, "INSERT INTO `%s` (`to_account_id`,`from_account_id`,`from_char_name`,`message`,`priority`)"
-					" VALUES ('%d', '%d', '%s', '%s', '%d')",mail_db, atoi(mail_row[0]), sd->status.account_id, sd->status.name, message, flag);			
+				sprintf(tmp_msql, "INSERT DELAYED INTO `%s` (`to_account_id`,`from_account_id`,`from_char_name`,`message`,`priority`)"
+					" VALUES ('%d', '%d', '%s', '%s', '%d')",mail_db, atoi(mail_row[0]), sd->status.account_id, sd->status.name, jstrescape(message), flag);
 			}
 			else {
-				sprintf(tmp_msql, "INSERT INTO `%s` (`to_account_id`,`to_char_name`,`from_account_id`,`from_char_name`,`message`,`priority`)"
-					" VALUES ('%d', '%s', '%d', '%s', '%s', '%d')",mail_db, atoi(mail_row[0]), mail_row[1], sd->status.account_id, sd->status.name, message, flag);
+				sprintf(tmp_msql, "INSERT DELAYED INTO `%s` (`to_account_id`,`to_char_name`,`from_account_id`,`from_char_name`,`message`,`priority`)"
+					" VALUES ('%d', '%s', '%d', '%s', '%s', '%d')",mail_db, atoi(mail_row[0]), mail_row[1], sd->status.account_id, sd->status.name, jstrescape(message), flag);
 				if(pc_isGM(sd) < 80)
 					sd->mail_counter=5;
 			}
-	
+
 			if(mysql_query(&mail_handle, tmp_msql) ) {
 				mysql_free_result(mail_res);
 				printf("DB server Error (insert `mail_db`)- %s\n", mysql_error(&mail_handle) );
 				return 0;
 			}
-
 		}
 	}
 
-	clif_displaymessage(sd->fd,"Mail has been sent.");
+	//clif_displaymessage(sd->fd,"Mail has been sent.");
+	clif_displaymessage(sd->fd,msg_txt(525));
 
 	return 0;
 }
@@ -271,43 +283,43 @@ int mail_send(struct map_session_data *sd, char *name, char *message, int flag)
 int mail_check_timer(int tid,unsigned int tick,int id,int data)
 {
 	struct map_session_data *sd = NULL;
-	int i;		
+	int i;
 
 	if(mail_timer != tid)
 		return 0;
 
 	sprintf(tmp_msql,"SELECT DISTINCT `to_account_id` FROM `%s` WHERE `read_flag` = '0' AND `check_flag` = '0'", mail_db);
-	
+
 	if (mysql_query(&mail_handle, tmp_msql)) {
 		printf("Database server error (executing query for %s): %s\n", char_db, mysql_error(&mail_handle));
 		mail_timer=add_timer(gettick()+MAIL_CHECK_TIME,mail_check_timer,0,0);
 		return 0;
-   	}	
+   	}
 
 	mail_res = mysql_store_result(&mail_handle);
 
 	if (mail_res) {
-
-	        if (mysql_num_rows(mail_res) == 0) {
+		if (mysql_num_rows(mail_res) == 0) {
 			mysql_free_result(mail_res);
 			mail_timer=add_timer(gettick()+MAIL_CHECK_TIME,mail_check_timer,0,0);
-		        return 0;
-	       }
+			return 0;
+		}
 
-	       while ((mail_row = mysql_fetch_row(mail_res))) {
+		while ((mail_row = mysql_fetch_row(mail_res))) {
 			for (i = 0; i < fd_max; i++) {
-				if (session[i] && (sd = session[i]->session_data) && sd->state.auth){
+				if (session[i] && (sd = (struct map_session_data *) session[i]->session_data) && sd->state.auth){
 					if(pc_isGM(sd) < 80 && sd->mail_counter > 0)
 						sd->mail_counter--;
 					if(sd->status.account_id==atoi(mail_row[0]))
-						clif_displaymessage(sd->fd, "You have new mail.");						
+						//clif_displaymessage(sd->fd, "You have new mail.");
+						clif_displaymessage(sd->fd, msg_txt(526));
 				}
 			}
 		}
 	}
 
 	sprintf(tmp_msql,"UPDATE `%s` SET `check_flag`='1' WHERE `check_flag`= '0' ", mail_db);
-        if(mysql_query(&mail_handle, tmp_msql) ) {
+	if(mysql_query(&mail_handle, tmp_msql) ) {
 		printf("DB server Error (update Read `%s`)- %s\n", mail_db, mysql_error(&mail_handle) );
 	}
 
@@ -316,9 +328,10 @@ int mail_check_timer(int tid,unsigned int tick,int id,int data)
 }
 
 int do_init_mail(void)
-{	
+{
 	add_timer_func_list(mail_check_timer,"mail_check_timer");
 	mail_timer=add_timer(gettick()+MAIL_CHECK_TIME,mail_check_timer,0,0);
 	return 0;
 }
 
+#endif