Tickets 35, 37, 38, 39

https://github.com/easy-wi/developer/issues/35
https://github.com/easy-wi/developer/issues/37
https://github.com/easy-wi/developer/issues/38
https://github.com/easy-wi/developer/issues/39

web/install/update_370-400.php

@@ -45,7 +45,7 @@ if (isset($include) and $include==true) {
         $aesfilecvar=getconfigcvars(EASYWIDIR.'/stuff/keyphrasefile.php');
         $aeskey=$aesfilecvar['aeskey'];
     }
-    $insert_easywi_version=$sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES
+    $query=$sql->prepare("INSERT INTO `easywi_version` (`version`,`de`,`en`) VALUES
 ('4.00','<div align=\"right\">31.08.2013</div>
 <b>Änderungen:</b><br/>
 <p>
@@ -137,9 +137,12 @@ All processed developer tickets can be seen at <a href=\"https://github.com/easy
 <li>Receiver and sender flipped at SMTP mode</li>
 </ul>
 ')");
-    $insert_easywi_version->execute();
+    $query->execute();
     $response->add('Action: insert_easywi_version done: ');
-    $insert_easywi_version->closecursor();
+    $query->closecursor();
+
+    $query=$sql->prepare("UPDATE `settings` SET `template`='default' WHERE `template`='twitterbootstrap'");
+    $query->execute();
 } else {
     echo "Error: this file needs to be included by the updater!<br />";
 }

web/login.php

@@ -68,8 +68,8 @@ if (is_file(EASYWIDIR."/languages/$template_to_use/$default_language/login.xml")
 	$sprache=simplexml_load_file(EASYWIDIR."/languages/$default_language/login.xml");
 }
 if ($w=='lo') {
-	if (isset($_SERVER['HTTP_REFERER'])) {
+	if (isset($ui->server['HTTP_REFERER'])) {
-		$refstring=explode('/',substr(str_replace(array('http://'.$ui->domain('HTTP_HOST','server'),'https://'.$ui->domain('HTTP_HOST','server'),'//'),array('','','/'),strtolower($_SERVER['HTTP_REFERER'])),strlen($ewInstallPath)));
+		$refstring=explode('/',substr(str_replace(array('http://'.$ui->domain('HTTP_HOST','server'),'https://'.$ui->domain('HTTP_HOST','server'),'//'),array('','','/'),strtolower($ui->server['HTTP_REFERER'])),strlen($ewInstallPath)));
 		$referrer=(isset($refstring[1])) ? explode('?',$refstring[1]) : '';
 	} else {
 		$referrer[0]="login.php";
@@ -111,7 +111,7 @@ if ($w=='lo') {
 			$md5=md5($userid.$row['logintime'].$row['cname'].$row['lastlogin'].mt_rand());
             $query2=$sql->prepare("UPDATE `userdata` SET `token`=? WHERE `id`=? LIMIT 1");
             $query2->execute(array($md5,$userid));
-			$folders=explode("/",$_SERVER['SCRIPT_NAME']);
+			$folders=explode("/",$ui->server['SCRIPT_NAME']);
 			$amount=count($folders)-1;
 			$i=0;
 			$path="";
@@ -119,7 +119,7 @@ if ($w=='lo') {
 				$path .=$folders["$i"]."/";
 				$i++;
 			}
-            $webhostdomain=(isset($_SERVER['HTTPS'])) ? "https://".$_SERVER['HTTP_HOST'].$path : "http://".$_SERVER['HTTP_HOST'].$path;
+            $webhostdomain=(isset($ui->server['HTTPS'])) ? "https://".$ui->server['HTTP_HOST'].$path : "http://".$ui->server['HTTP_HOST'].$path;
 			$link=$webhostdomain.'login.php?w=pr&gamestring='.$md5;
 			$htmllink='<a href="'.$link.'">'.$link.'</a>';
 			sendmail('emailpwrecovery',$userid,$htmllink,'',$sql);
@@ -177,7 +177,7 @@ if ($w=='lo') {
 						$text=$sprache->send;
                         $query=$sql->prepare("UPDATE `userdata` SET `token`=?,`mail`=? WHERE `id`=? LIMIT 1");
                         $query->execute(array($md5,$ui->ismail('mail','post'),$row['userid']));
-						$folders=explode("/",$_SERVER['SCRIPT_NAME']);
+						$folders=explode("/",$ui->server['SCRIPT_NAME']);
 						$amount=count($folders)-1;
 						$i=0;
 						$path="";
@@ -185,7 +185,7 @@ if ($w=='lo') {
 							$path .=$folders["$i"]."/";
 							$i++;
 						}
-                        $webhostdomain=(isset($_SERVER['HTTPS'])) ? "https://".$_SERVER['HTTP_HOST'].$path : "http://".$_SERVER['HTTP_HOST'].$path;
+                        $webhostdomain=(isset($ui->server['HTTPS'])) ? "https://".$ui->server['HTTP_HOST'].$path : "http://".$ui->server['HTTP_HOST'].$path;
 						$link=$webhostdomain.'login.php?w=pr&amp;gamestring='.$md5;
 						$htmllink='<a href="'.$link.'">'.$link.'</a>';
 						sendmail('emailpwrecovery',$row['userid'],$htmllink,'',$sql);
@@ -360,7 +360,7 @@ XML;
 			} else if(isset($user_id)) {
 				redirect('userpanel.php');
 			} else if(isset($admin_id)) {
-				$folders=explode("/",$_SERVER['SCRIPT_NAME']);
+				$folders=explode("/",$ui->server['SCRIPT_NAME']);
 				$amount=count($folders)-1;
 				$i=0;
 				$path="";
@@ -368,7 +368,7 @@ XML;
 					$path .=$folders["$i"]."/";
 					$i++;
 				}
-                $webhostdomain=(isset($_SERVER['HTTPS'])) ? "https://".$_SERVER['HTTP_HOST'].$path : "http://".$_SERVER['HTTP_HOST'].$path;
+                $webhostdomain=(isset($ui->server['HTTPS'])) ? "https://".$ui->server['HTTP_HOST'].$path : "http://".$ui->server['HTTP_HOST'].$path;
                 $query=$sql->prepare("UPDATE `settings` SET `paneldomain`=? WHERE `resellerid`=0 LIMIT 1");
                 $query->execute(array($webhostdomain));
                 $params=@json_decode(licenceRequest(true));

web/stuff/page_download.php

@@ -49,6 +49,7 @@ if (isset($page_name) and isid($page_name,10)) {
 } else if ($ui->id('id',10,'get')) {
     $downloadID=$ui->id('id',10,'get');
 }
+if (!isset($user_language) or $user_language=='') $user_language=(isset($page_detect_language)) ? $page_detect_language : $rSA['language'];
 if ((isset($page_name) and $page_name=='get') or $ui->smallletters('action',3,'get')=='get') $startDownload=true;
 if (isset($downloadID)) {
     $query=$sql->prepare("SELECT d.*,t.`text` FROM `page_downloads` d LEFT JOIN `translations` t ON t.`type`='pd' AND t.`transID`=d.`fileID` AND t.`lang`=? WHERE d.`fileID`=? LIMIT 1");

web/stuff/root_dedicated.php

@@ -92,11 +92,11 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lDs']) and $licence
             $userID=$row['userID'];
             $useDHCP=$row['useDHCP'];
             $usePXE=$row['usePXE'];
-            if ($row['status'] == 1) {
+            if ($row['status']==1) {
                 $status=$sprache->stopped;
-            } else if ($row['status'] == 2) {
+            } else if ($row['status']==2) {
                 $status=$sprache->installing;
-            } else if ($row['status'] == 3) {
+            } else if ($row['status']==3) {
                 $status=$sprache->rescue;
             } else {
                 $status=$sprache->ok;

web/stuff/settings.php

@@ -168,6 +168,7 @@ if ($loguserip!='localhost') {
             $commentsModerated=$row['commentsModerated'];
             $honeyPotKey=$row['honeyPotKey'];
         }
+        $ewInstallPath=EASYWIDIR;
         $elements=(!empty($ewInstallPath) and strpos($ui->escaped('REQUEST_URI','server'),$ewInstallPath)===false) ? preg_split('/\//',$ui->escaped('REQUEST_URI','server'),-1,PREG_SPLIT_NO_EMPTY) : preg_split('/\//',substr($ui->escaped('REQUEST_URI','server'),strlen($ewInstallPath)),-1,PREG_SPLIT_NO_EMPTY);
         if (isset($seo) and $seo=='Y' and isset($elements[0])) {
             $page_detect_language=$elements[0];

web/template/default/admin_images_add.tpl

@@ -71,6 +71,7 @@
                 <label class="control-label" for="inputMods2"><?php echo $sprache->mods2;?></label>
                 <div class="controls">
                     <select class="span12" id="inputMods2" name="gamemod2">
+                        <option></option>
                         <?php foreach ($table as $table_row) { ?>
                         <option value="<?php echo $table_row['shorten'];?>" <?php if($shorten==$table_row['shorten']) echo 'selected="selected"';?>><?php echo $table_row['shorten'];?></option>
                         <?php } ?>

web/template/default/admin_images_md.tpl

@@ -51,6 +51,7 @@
                 <label class="control-label" for="inputMods2"><?php echo $sprache->mods2;?></label>
                 <div class="controls">
                     <select class="span12" id="inputMods2" name="gamemod2">
+                        <option></option>
                         <?php foreach ($table as $table_row) { ?>
                         <option value="<?php echo $table_row['shorten'];?>" <?php if($table_row['shorten']==$gamemod2) echo 'selected="selected"'; ?>><?php echo $table_row['shorten'];?></option>
                         <?php } ?>