Browse Source

[svn r21359] FS#4308 - Adding attribute target="_blank" to some links and other minor fixes.

Ivan Tcholakov 15 years ago
parent
commit
c34b7c9c99

+ 4 - 4
main/admin/index.php

@@ -1,4 +1,4 @@
-<?php // $Id: index.php 20809 2009-05-18 20:52:17Z yannoo $
+<?php // $Id: index.php 21359 2009-06-11 00:13:22Z ivantcholakov $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -254,9 +254,9 @@ if(api_is_platform_admin()){
 <div class="admin_section">
  <h4><?php Display::display_icon('dokeos.gif', 'Dokeos'); ?> Dokeos.com</h4>
  <ul>
-  <li><a href="http://www.dokeos.com/"><?php echo get_lang('DokeosHomepage'); ?></a></li>
-  <li><a href="http://www.dokeos.com/forum/"><?php echo get_lang('DokeosForum'); ?></a></li>  
-  <li><a href="http://www.dokeos.com/extensions/"><?php echo get_lang('DokeosExtensions'); ?></a></li>
+  <li><a href="http://www.dokeos.com/" target="_blank"><?php echo get_lang('DokeosHomepage'); ?></a></li>
+  <li><a href="http://www.dokeos.com/forum/" target="_blank"><?php echo get_lang('DokeosForum'); ?></a></li>  
+  <li><a href="http://www.dokeos.com/extensions/" target="_blank"><?php echo get_lang('DokeosExtensions'); ?></a></li>
   <li>
   <?php
   //try to display a maximum before we check the dokeos version and all that

+ 3 - 3
main/inc/footer.inc.php

@@ -1,4 +1,4 @@
-<?php // $Id: footer.inc.php 19990 2009-04-22 20:11:36Z cvargas1 $
+<?php // $Id: footer.inc.php 21359 2009-06-11 00:13:22Z ivantcholakov $
  
 /*
 ==============================================================================
@@ -60,7 +60,7 @@ if(api_get_setting('show_navigation_menu') != 'false')
 <div id="bottom_corner"></div> 
  <div class="copyright">
   <?php global $_configuration; ?>
-  <?php echo get_lang("Platform") ?> <a href="http://www.dokeos.com">Dokeos <?php echo $_configuration['dokeos_version']; ?></a> &copy; <?php echo date('Y'); ?>
+  <?php echo get_lang("Platform") ?> <a href="http://www.dokeos.com" target="_blank">Dokeos <?php echo $_configuration['dokeos_version']; ?></a> &copy; <?php echo date('Y'); ?>
  </div>
 
 <?php
@@ -109,4 +109,4 @@ if (get_setting('show_administrator_data')=="true") {
 ?>&nbsp;
 </div> <!-- end of #footer -->
 </body>
-</html>
+</html>

+ 13 - 10
main/inc/global.inc.php

@@ -24,7 +24,6 @@
 // PHP version check
 if ( !function_exists('version_compare') || version_compare( phpversion(), '5', '<' ) )
 {
-	header('Content-Type: text/html; charset=UTF-8');
 	$error_message_php_version = <<<EOM
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
@@ -57,6 +56,7 @@ if ( !function_exists('version_compare') || version_compare( phpversion(), '5',
 		</body>
 </html>
 EOM;
+	header('Content-Type: text/html; charset=UTF-8');
 	die($error_message_php_version);
 }
 
@@ -96,7 +96,8 @@ $error_message_not_installed = <<<EOM
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 		<head>
-			<title>Dokeos not installed!</title>
+			<title>Dokeos has been not installed!</title>
+			<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 			<style type="text/css" media="screen, projection">
 				/*<![CDATA[*/
 				@import "main/css/public_admin/default.css";
@@ -105,7 +106,7 @@ $error_message_not_installed = <<<EOM
 		</head>
 		<body>
 			<div id="header">
-				<div id="header1"><a href="http://www.dokeos.com">Dokeos Homepage</a></div>
+				<div id="header1"><a href="http://www.dokeos.com" target="_blank">Dokeos Homepage</a></div>
 				<div class="clear"></div>
 				<div id="header2">&nbsp;</div>
 				<div id="header3">&nbsp;</div>
@@ -117,7 +118,7 @@ $error_message_not_installed = <<<EOM
 			</div>
 
 			<div id="footer">
-				<div class="copyright">Platform <a href="http://www.dokeos.com"> Dokeos </a> &copy; 2008 </div>
+				<div class="copyright">Platform <a href="http://www.dokeos.com" target="_blank"> Dokeos </a> &copy; 2009 </div>
 				&nbsp;
 			</div>
 		</body>
@@ -129,6 +130,7 @@ $error_message_db_problem = <<<EOM
 <html>
 		<head>
 			<title>Dokeos database unavailable!</title>
+			<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 			<style type="text/css" media="screen, projection">
 				/*<![CDATA[*/
 				@import "main/css/public_admin/default.css";
@@ -137,7 +139,7 @@ $error_message_db_problem = <<<EOM
 		</head>
 		<body>
 			<div id="header">
-				<div id="header1"><a href="http://www.dokeos.com">Dokeos Homepage</a></div>
+				<div id="header1"><a href="http://www.dokeos.com" target="_blank">Dokeos Homepage</a></div>
 				<div class="clear"></div>
 				<div id="header2">&nbsp;</div>
 				<div id="header3">&nbsp;</div>
@@ -148,7 +150,7 @@ $error_message_db_problem .= '
 					This portal is currently experiencing database issues. Please report this to the portal administrator. Thank you for your help.</a>
 			</div>
 			<div id="footer">
-				<div class="copyright">Platform <a href="http://www.dokeos.com"> Dokeos </a> &copy; 2008 </div>
+				<div class="copyright">Platform <a href="http://www.dokeos.com" target="_blank"> Dokeos </a> &copy; 2009 </div>
 				&nbsp;
 			</div>
 		</body>
@@ -157,6 +159,7 @@ $error_message_db_problem .= '
 
 if (!$already_installed)
 {
+	header('Content-Type: text/html; charset=UTF-8');
 	//require('installedVersion.inc.php');
 	die($error_message_not_installed);
 }
@@ -380,7 +383,7 @@ if (!$x=strpos($_SERVER['PHP_SELF'],'whoisonline.php'))
 
 // ===== end "who is logged in?" module section =====
 
-if(get_setting('server_type') == 'test')
+if(api_get_setting('server_type') == 'test')
 {
 	/*
 	--------------------------------------------
@@ -488,7 +491,7 @@ if (!empty($_POST["language_list"]))
 $valid_languages=api_get_languages();
 if (!in_array($user_language,$valid_languages['folder']))
 {
-	$user_language=get_setting('platformLanguage');
+	$user_language=api_get_setting('platformLanguage');
 }
 
 if (in_array($user_language,$valid_languages['folder']) and (isset($_GET['language']) OR isset($_POST['language_list'])))
@@ -497,7 +500,7 @@ if (in_array($user_language,$valid_languages['folder']) and (isset($_GET['langua
 	$_SESSION["user_language_choice"] = $user_selected_language;
 	$platformLanguage = $user_selected_language;
 }else{
-	$platformLanguage = get_setting('platformLanguage');
+	$platformLanguage = api_get_setting('platformLanguage');
 }
 
 
@@ -507,7 +510,7 @@ if (isset($_SESSION["user_language_choice"]))
 }
 else
 {
-	$language_interface = get_setting('platformLanguage');
+	$language_interface = api_get_setting('platformLanguage');
 }
 
 if (isset($_user['language']))

+ 2 - 2
main/install/index.php

@@ -46,7 +46,6 @@
 
 if ( !function_exists('version_compare') || version_compare( phpversion(), '5', '<' ) )
 {
-	header('Content-Type: text/html; charset=UTF-8');
 	$error_message_php_version = <<<EOM
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
@@ -79,6 +78,7 @@ if ( !function_exists('version_compare') || version_compare( phpversion(), '5',
 		</body>
 </html>
 EOM;
+	header('Content-Type: text/html; charset=UTF-8');
 	die($error_message_php_version);
 }
 
@@ -786,7 +786,7 @@ else
 </form>
 <br style="clear:both;" />
 <div id="footer">
-	<div class="copyright"><?php echo get_lang('Platform');?> <a href="http://www.dokeos.com"> Dokeos <?php echo $new_version ?></a> &copy; <?php echo date('Y'); ?> </div>
+	<div class="copyright"><?php echo get_lang('Platform');?> <a href="http://www.dokeos.com" target="_blank"> Dokeos <?php echo $new_version ?></a> &copy; <?php echo date('Y'); ?> </div>
 	&nbsp;
 </div>
 </body>

+ 1 - 1
main/install/install_functions.inc.php

@@ -688,7 +688,7 @@ function display_license_agreement()
 {
 	echo '<h2>'.display_step_sequence().get_lang('Licence').'</h2>';
 	echo '<p>'.get_lang('DokeosLicenseInfo').'</p>';
-	echo '<p><a href="../../documentation/license.html">'.get_lang('PrintVers').'</a></p>';
+	echo '<p><a href="../../documentation/license.html" target="_blank">'.get_lang('PrintVers').'</a></p>';
 	?>
 	<table><tr><td>
 		<p><textarea cols="75" rows="15" ><?php htmlentities(include('../../documentation/license.txt')); ?></textarea></p>