Issue #306 - Fixing ordering of the administrator's names in the installation script and in the systems's footer.

main/inc/footer.inc.php

@@ -60,7 +60,7 @@ api_plugin('footer');
 if (api_get_setting('show_administrator_data')=='true') {
 	
 	// Platform manager
-	echo '<span id="platformmanager">', get_lang('Manager'), ' : ', Display::encrypted_mailto_link(api_get_setting('emailAdministrator'), api_get_setting('administratorName').' '.api_get_setting('administratorSurname'));
+	echo '<span id="platformmanager">', get_lang('Manager'), ' : ', Display::encrypted_mailto_link(api_get_setting('emailAdministrator'), api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname')));
 
 }
 

main/install/index.php

@@ -691,8 +691,13 @@ elseif($_POST['step5'])
 	?><br /><br/>
 
 	<?php echo get_lang('AdminEmail').' : '.$emailForm; ?><br />
-    <?php echo get_lang('AdminFirstName').' : '.$adminFirstName; ?><br />
-	<?php echo get_lang('AdminLastName').' : '.$adminLastName; ?><br />
+	<?php
+	if (api_is_western_name_order()) {
+		echo get_lang('AdminFirstName').' : '.$adminFirstName, '<br />', get_lang('AdminLastName').' : '.$adminLastName, '<br />';
+	} else {
+		echo get_lang('AdminLastName').' : '.$adminLastName, '<br />', get_lang('AdminFirstName').' : '.$adminFirstName, '<br />';
+	}
+	?>
 	<?php echo get_lang('AdminPhone').' : '.$adminPhoneForm; ?><br />
 
 	<?php if($installType == 'new'): ?>

main/install/install_functions.inc.php

@@ -1061,11 +1061,14 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
 	//Parameter 3: administrator's email
 	display_configuration_parameter($installType, get_lang("AdminEmail"), "emailForm", $emailForm);
 
-    //Parameter 4: administrator's first name
+	//Parameters 4 and 5: administrator's names
+	if (api_is_western_name_order()) {
     display_configuration_parameter($installType, get_lang("AdminFirstName"), "adminFirstName", $adminFirstName);
-
-	//Parameter 5: administrator's last name
 	display_configuration_parameter($installType, get_lang("AdminLastName"), "adminLastName", $adminLastName);
+	} else {
+		display_configuration_parameter($installType, get_lang("AdminLastName"), "adminLastName", $adminLastName);
+		display_configuration_parameter($installType, get_lang("AdminFirstName"), "adminFirstName", $adminFirstName);
+	}
 
 	//Parameter 6: administrator's telephone
 	display_configuration_parameter($installType, get_lang("AdminPhone"), "adminPhoneForm", $adminPhoneForm);