Merge pull request #3 from NB-Core/v1.2.8

V1.2.8.1

CHANGELOG.txt

@@ -1,3 +1,14 @@
+Changes to 1.2.7 +nb
+[CHANGES]
+[FIXES]
+*battle.php -> isset() needs to check for index values not existing
+*prefs.php -> mail address defaulting to 127.0.0.1 in email change email (not nice, not critical), changed
+*modules/* -> modules updated to current
+[REMOVES]
+
+[NEW]
+*modules/charrestore.hp -> added char restorer
+
 Changes to 1.2.6 +nb
 [CHANGES]
 *lib/buffs.php -> added strip_companion($name) which removes one or more companions safely

battle.php

@@ -113,6 +113,10 @@
 	show_enemies($enemies);
 }
 
+if (!isset($options['type'])) {
+	// no type set, do it for them, to pve
+	$options['type'] = 'forest';
+}
 suspend_buffs((($options['type'] == 'pvp')?"allowinpvp":false));
 suspend_companions((($options['type'] == 'pvp')?"allowinpvp":false));
 
@@ -394,6 +398,7 @@
 					// experience would stay the same
 					// We'll also check if the user is actually alive. If we didn't, we would hand out
 					// experience for graveyard fights.
+					if (!isset($badguy['creatureexp'])) $badguy['creatureexp']=0; //if this was not set, make it
 					if (getsetting("instantexp",false) == true && $session['user']['alive'] && $options['type'] != "pvp" && $options['type'] != "train") {
 						if (!isset($badguy['expgained']) || $badguy['expgained'] == false) {
 							$cr_xp_gain = round($badguy['creatureexp']/count($newenemies));

lib/all_tables.php

@@ -34,7 +34,7 @@ function get_all_tables(){
 			),			
 		//these are the main stats. buffed up attack or defense will be reset eventually =)
 		'specialty'=>array(
-			'name'=>'specialty', 'type'=>'varchar(20)', //normally 2 chars are used only
+			'name'=>'specialty', 'type'=>'varchar(20)', 'default'=>'', //normally 2 chars are used only
 			),
 		'experience'=>array(
 			'name'=>'experience', 'type'=>'bigint(11) unsigned', 'default'=>'0' //the amount of experience
@@ -177,7 +177,7 @@ function get_all_tables(){
 			'name'=>'gentimecount', 'type'=>'int(11) unsigned', 'default'=>'0'
 			),
 		'lastip'=>array(
-			'name'=>'lastip', 'type'=>'varchar(40)'
+			'name'=>'lastip', 'type'=>'varchar(40)', 'default'=>''
 			),
 		'uniqueid'=>array(
 			'name'=>'uniqueid', 'type'=>'varchar(32)', 'null'=>'1'
@@ -636,7 +636,7 @@ function get_all_tables(){
 			'name'=>'descauthor', 'type'=>'int(11) unsigned', 'default'=>'0'
 			),
 		'customsay'=>array(
-			'name'=>'customsay', 'type'=>'varchar(15)'
+			'name'=>'customsay', 'type'=>'varchar(15)', 'default'=>''
 			),
 		'key-PRIMARY'=>array(
 			'name'=>'PRIMARY',