diff --git a/core/SDL/class.rasocket.php b/core/SDL/class.rasocket.php
index dc0400b..2f2a4b6 100644
--- a/core/SDL/class.rasocket.php
+++ b/core/SDL/class.rasocket.php
@@ -251,7 +251,7 @@ public function executeCommand($type, $shost, $remote, $command)
// Check for error logging
if($this->debug == TRUE)
{
- $this->debugLog[] = 'Got Command: '.$cmd;
+ $this->debugLog[] = 'Got Command: '.$command;
}
fwrite($this->handle, $command."\n");
diff --git a/core/common.php b/core/common.php
index 7c8ac71..32a07f4 100644
--- a/core/common.php
+++ b/core/common.php
@@ -63,7 +63,7 @@ function output_message($type, $text, $file='', $line='')
{
if($file)$text .= "\n
in file: $file";
if($line)$text .= "\n
on line: $line";
- echo "
".$text."
";
+ echo "".$text."
";
}
// ************************************************************
@@ -346,7 +346,7 @@ function check_for_symbols($string, $space_check = 0)
{
//$space_check=1 means space is not allowed
$len=strlen($string);
- $allowed_chars="abcdefghijklmnopqrstuvwxyzæøåABCDEFGHIJKLMNOPQRSTUVWXYZÆØÅ0123456789";
+ $allowed_chars="abcdefghijklmnopqrstuvwxyz���ABCDEFGHIJKLMNOPQRSTUVWXYZ���0123456789";
if(!$space_check)
{
$allowed_chars .= " ";
@@ -376,7 +376,7 @@ function add_pictureletter($text)
{
global $Template;
$letter = substr($text, 0, 1);
- $imageletter = strtr(strtolower($letter),"ŠŒŽšœžŸ¥µÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ",
+ $imageletter = strtr(strtolower($letter),"���������������������������������������������������������������������",
"sozsozyyuaaaaaaaceeeeiiiidnoooooouuuuysaaaaaaaceeeeiiiionoooooouuuuyy");
if (strpos("abcdefghijklmnopqrstuvwxyz", $imageletter) === false)
{
diff --git a/inc/admin/body_header.php b/inc/admin/body_header.php
index 787f0f2..e922b36 100644
--- a/inc/admin/body_header.php
+++ b/inc/admin/body_header.php
@@ -33,50 +33,6 @@
-
-
+
+
+
diff --git a/inc/admin/script_files/admin.sendgamemail.php b/inc/admin/script_files/admin.sendgamemail.php
index 4550c35..de5f1b9 100644
--- a/inc/admin/script_files/admin.sendgamemail.php
+++ b/inc/admin/script_files/admin.sendgamemail.php
@@ -13,4 +13,47 @@
echo "Not Included!"; exit;
}
//=======================//
+
+if(isset($_GET['action']))
+{
+ // jquery / ajax character name lookup
+ if($_GET['action'] == "search")
+ {
+ $characters = $CDB->select("SELECT guid, name FROM characters WHERE name LIKE '%".$_GET['term']."%'");
+ foreach($characters as $row)
+ {
+ $json[]=array(
+ 'value' => $row['name'],
+ 'id' => $row['guid']
+ );
+ }
+
+ die(json_encode($json));
+ }
+}
+
+function sendCharacterMail()
+{
+ include('core/SDL/class.rasocket.php');
+ $RA = new RA;
+
+ $command = "send mail ".$_POST['mail_to']." \"".$_POST['subject']."\" \"".$_POST['msg']."\"";
+
+ $response = $RA->send($command, $GLOBALS['cur_selected_realm']);
+ if($response == 1)
+ {
+ output_message('error', 'Error: Unable to connect to server via remote access / SOAP.');
+ }
+ elseif($response == 2)
+ {
+ output_message('error', 'Error: You are not authorized to perform this command.');
+ }
+ else
+ {
+ output_message('success', 'Success: Your in game message has been sent to '.$_POST['mail_to'].'.');
+ }
+
+ $RA = null;
+}
+
?>
\ No newline at end of file
diff --git a/inc/admin/template_files/admin.chartools.php b/inc/admin/template_files/admin.chartools.php
index 562eeb3..e197ec3 100644
--- a/inc/admin/template_files/admin.chartools.php
+++ b/inc/admin/template_files/admin.chartools.php
@@ -207,13 +207,13 @@
echo "";
if($user['cur_selected_realm'] == $Rlm['id'])
{
- echo "".$Rlm['name']."";
+ echo "".$Rlm['name']."";
}
else
{
echo $Rlm['name'];
}
- echo " |";
+ echo " | ";
}
?>
diff --git a/inc/admin/template_files/admin.email.php b/inc/admin/template_files/admin.email.php
index 5a3a350..3d124be 100644
--- a/inc/admin/template_files/admin.email.php
+++ b/inc/admin/template_files/admin.email.php
@@ -9,6 +9,50 @@
/****************************************************************************/
?>
+
+