gistfile1.txt

diff --git a/map/func.php b/map/func.php
index 43903f3..3714b2e 100644
--- a/map/func.php
+++ b/map/func.php
@@ -6,7 +6,7 @@ class DBLayer
        var $saved_queries = [];
        var $num_queries = 0;

-       function DBLayer($db_host, $db_username, $db_password, $db_name)
+        function __construct($db_host, $db_username, $db_password, $db_name)^M
        {
                $this->link_id = @mysqli_connect($db_host, $db_username, $db_password, $db_name);

@@ -170,4 +170,4 @@ function test_realm(){
        $s = @fsockopen("$server", $port, $ERROR_NO, $ERROR_STR,(float)0.5);
        if($s){@fclose($s);return true;} else return false;
 }
-?>
\ No newline at end of file
+?>^M
diff --git a/map/pomm_play.php b/map/pomm_play.php
index 6944998..bf48475 100644
--- a/map/pomm_play.php
+++ b/map/pomm_play.php
@@ -39,7 +39,7 @@ if(!$realm_db->isValid())
     $_RESULT['status']['online'] = 2;
     exit();
 }
-$realm_db->query("SET NAMES $database_encoding");
+$realm_db->query("SET NAMES '".str_replace("-", "", $database_encoding)."'");^M

 $gm_online = 0;
 $gm_accounts = [];
@@ -54,8 +54,8 @@ if(!$characters_db->isValid())
     $_RESULT['status']['online'] = 2;
     exit();
 }
-$characters_db->query("SET NAMES $database_encoding");
-$query = $characters_db->query("SELECT `groups`.`leaderGuid`, `group_member`.`memberGuid` FROM `groups` LEFT JOIN `group_member` ON `groups.`guid` = `group_member`.`guid` WHERE `memberGuid` IN(SELECT `guid` FROM `characters` WHERE `online`='1')");
+$characters_db->query("SET NAMES '".str_replace("-", "", $database_encoding)."'");^M
+$query = $characters_db->query("SELECT `groups`.`leaderGuid`, `group_member`.`memberGuid` FROM `groups` LEFT JOIN `group_member` ON `groups`.`guid` = `group_member`.`guid` WHERE `memberGuid` IN(SELECT `guid` FROM `characters` WHERE `online`='1')");^M
 if($query)
     while($result = $characters_db->fetch_assoc($query))
         $groups[$result['memberGuid']] = $result['leaderGuid'];
@@ -154,4 +154,5 @@ unset($realm_db);
 $res['status'] = $status;

 $_RESULT = $res;
+echo json_encode($_RESULT);^M
 ?>