From 530efc8d0ec4ad1b4709b42cf8692f54a10211e6 Mon Sep 17 00:00:00 2001
From: Karl Burkhart <burkhart@technikum-wien.at>
Date: Fri, 13 Jan 2012 12:30:49 +0000
Subject: [PATCH] =?UTF-8?q?Die=20Namen=20englischer=20Staaten=20werden=20j?=
 =?UTF-8?q?etzt=20richtig=20sortiert=20Zur=C3=BCck=20und=20Weiter=20Button?=
 =?UTF-8?q?s=20stehen=20im=20IE=20jetzt=20auch=20in=20einer=20Zeile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/public/incoming/incoming.php     | 11 +++++++----
 cis/public/incoming/registration.php | 10 +++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cis/public/incoming/incoming.php b/cis/public/incoming/incoming.php
index 4d3c2443c..f6dfbb648 100644
--- a/cis/public/incoming/incoming.php
+++ b/cis/public/incoming/incoming.php
@@ -66,8 +66,11 @@ if(isset($_GET['method']))
 $zugangscode = $_SESSION['incoming/user']; 
 
 $nation = new nation(); 
-$nation->getAll($ohnesperre = true); 
-
+if($sprache == "German")
+	$nation->getAll($ohnesperre = true); 
+else if($sprache == "English")
+	$nation->getAll($ohnesperre = true, $orderEnglish= true);
+	
 $mobility = new mobilitaetsprogramm(); 
 $mobility->getAll(true); 
 
@@ -176,7 +179,7 @@ if($method =="austauschprogram")
 					</tr>
 					</table>
 				<tr>
-					<td><input type="button" value="'.$p->t('global/zurueck').'" onclick="document.location.href = \'incoming.php?method=university\'"; ><input type="button" value="'.$p->t('incoming/weiter').'" onclick="document.location.href = \'incoming.php?method=lehrveranstaltungen\'"; style="float:right"></td>
+					<td><input type="button" value="'.$p->t('global/zurueck').'" onclick="document.location.href = \'incoming.php?method=university\'"; style="float:left"><input type="button" value="'.$p->t('incoming/weiter').'" onclick="document.location.href = \'incoming.php?method=lehrveranstaltungen\'"; style="float:right"></td>
 				</tr>
 				<tr>
 					<td>* '.$p->t('incoming/wennVorhanden').'</td>
@@ -1177,7 +1180,7 @@ echo'					<td>'.$p->t('incoming/masterstudiengang').'</td>
 					</tr>
 					</table>
 					<tr>
-						<td><input type="button" value="'.$p->t('global/zurueck').'" onclick="document.location.href = \'incoming.php?method=profil\'"; ><input type="button" value="'.$p->t('incoming/weiter').'" onclick="document.location.href = \'incoming.php?method=austauschprogram\'"; style="float:right"></td>
+						<td><input type="button" value="'.$p->t('global/zurueck').'" onclick="document.location.href = \'incoming.php?method=profil\'"; style="float:left"><input type="button" value="'.$p->t('incoming/weiter').'" onclick="document.location.href = \'incoming.php?method=austauschprogram\'"; style="float:right"></td>
 					</tr>
 						</table>
 			</form>
diff --git a/cis/public/incoming/registration.php b/cis/public/incoming/registration.php
index df6419a9a..c3f0181e3 100644
--- a/cis/public/incoming/registration.php
+++ b/cis/public/incoming/registration.php
@@ -34,11 +34,15 @@ require_once '../../../include/mail.class.php';
 if(isset($_GET['lang']))
 	setSprache($_GET['lang']);
 
-$nation = new nation(); 
-$nation->getAll($ohnesperre = true); 
-
 $sprache = getSprache(); 
 $p=new phrasen($sprache); 
+	
+$nation = new nation(); 
+if($sprache == "German")
+	$nation->getAll($ohnesperre = true); 
+else if($sprache == "English")
+	$nation->getAll($ohnesperre = true, $orderEnglish= true);
+
 
 $date = new datum();