Browse Source

[svn r21487] FS#4341 - Implementing a clickable sever mode indicator, placed in the footer. This indicator is visible by the platform administrators only and in "test server" mode only.

Ivan Tcholakov 15 years ago
parent
commit
c6c5be6371
2 changed files with 35 additions and 26 deletions
  1. 6 2
      main/admin/settings.php
  2. 29 24
      main/inc/footer.inc.php

+ 6 - 2
main/admin/settings.php

@@ -1,4 +1,4 @@
-<?php // $Id: settings.php 21362 2009-06-11 04:34:31Z ivantcholakov $
+<?php // $Id: settings.php 21487 2009-06-18 09:52:42Z ivantcholakov $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -132,6 +132,10 @@ if (!empty($_GET['category']) and !in_array($_GET['category'], array('Plugins',
 	//while ($row = mysql_fetch_array($resultsettings))
 	$default_values = array();
 	foreach($settings as $row) {			
+
+		$anchor_name = $row['variable'].(!empty($row['subkey']) ? '_'.$row['subkey'] : '');
+		$form->addElement('html',"\n<a name=\"$anchor_name\"></a>\n");
+
 		($countsetting['0']%10) < 5 ?$b=$countsetting['0']-10:$b=$countsetting['0'];		
 		if ($i % 10 == 0 and $i<$b){
 			if ($_GET['category'] <> "Languages"){
@@ -374,7 +378,7 @@ function get_settings_options($var)
 	$table_settings_options = Database :: get_main_table(TABLE_MAIN_SETTINGS_OPTIONS);
 	$sql = "SELECT * FROM $table_settings_options WHERE variable='$var'";
 	$result = api_sql_query($sql, __FILE__, __LINE__);
-	while ($row = mysql_fetch_array($result))
+	while ($row = Database::fetch_array($result))
 	{
 		$temp_array = array ('value' => $row['value'], 'display_text' => $row['display_text']);
 		$settings_options_array[] = $temp_array;

+ 29 - 24
main/inc/footer.inc.php

@@ -1,4 +1,4 @@
-<?php // $Id: footer.inc.php 21359 2009-06-11 00:13:22Z ivantcholakov $
+<?php // $Id: footer.inc.php 21487 2009-06-18 09:52:42Z ivantcholakov $
  
 /*
 ==============================================================================
@@ -36,18 +36,15 @@
 /**** display of tool_navigation_menu according to admin setting *****/
 require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
 
-if(api_get_setting('show_navigation_menu') != 'false')
-{
+if (api_get_setting('show_navigation_menu') != 'false') {
 
    $course_id = api_get_course_id();
-   if ( !empty($course_id) && ($course_id != -1) )
-   {
-   		if( api_get_setting('show_navigation_menu') != 'icons')
-		{
+   if (!empty($course_id) && ($course_id != -1)) {
+   		if ( api_get_setting('show_navigation_menu') != 'icons') {
 	    	echo '</div> <!-- end #center -->';
     		echo '</div> <!-- end #centerwrap -->';
 		}
-      	require_once(api_get_path(INCLUDE_PATH)."tool_navigation_menu.inc.php");
+      	require_once api_get_path(INCLUDE_PATH).'tool_navigation_menu.inc.php';
       	show_navigation_menu();
    }
 }
@@ -58,10 +55,19 @@ if(api_get_setting('show_navigation_menu') != 'false')
 
 <div id="footer"> <!-- start of #footer section -->
 <div id="bottom_corner"></div> 
- <div class="copyright">
-  <?php global $_configuration; ?>
-  <?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>
+<div class="copyright">
+<?php
+global $_configuration;
+echo get_lang("Platform"), ' <a href="http://www.dokeos.com" target="_blank">Dokeos ', $_configuration['dokeos_version'], '</a> &copy; ', date('Y');
+// Server mode indicator.
+if (api_is_platform_admin()) {
+	if (api_get_setting('server_type') == 'test') {
+		echo ' <a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Platform#server_type">';
+		echo '<span style="background-color: white; color: red; border: 1px solid red;">&nbsp;Test&nbsp;server&nbsp;mode&nbsp;</span></a>';
+	}
+}
+?>
+</div>
 
 <?php
 /*
@@ -70,36 +76,35 @@ if(api_get_setting('show_navigation_menu') != 'false')
 -----------------------------------------------------------------------------
 */
 api_plugin('footer');
-?>
-<?php
-if (get_setting('show_administrator_data')=="true") {
 	
-	// platform manager
-	echo "<span id=\"platformmanager\">".get_lang("Manager") ?> : <?php echo Display::encrypted_mailto_link(get_setting('emailAdministrator'),get_setting('administratorName')." ".get_setting('administratorSurname'));
+if (get_setting('show_administrator_data')=='true') {
+	
+	// Platform manager
+	echo '<span id="platformmanager">', get_lang('Manager'), ' : ', Display::encrypted_mailto_link(get_setting('emailAdministrator'), get_setting('administratorName').' '.get_setting('administratorSurname'));
 
 	// course manager
 	$id_course=api_get_course_id();
 	$id_session=api_get_session_id();
-	if (isset($id_course) && $id_course!=-1){
-		echo "<span id=\"coursemanager\">";
+	if (isset($id_course) && $id_course!=-1) {
+		echo '<span id="coursemanager">';
 		if ($id_session==0){
 			$mail=CourseManager::get_emails_of_tutors_to_course($id_course);
 			if (count($mail)>1){
 				$bar='&nbsp;|&nbsp;';
-				echo '&nbsp;'.get_lang('Teachers')." : ";
+				echo '&nbsp;'.get_lang('Teachers').' : ';
 			} else {
 				$bar='';
-				echo '&nbsp;'.get_lang('Teacher')." : ";
+				echo '&nbsp;'.get_lang('Teacher').' : ';
 			}
-			foreach($mail as $value=>$key) {
-				foreach($key as $email=>$name){
+			foreach ($mail as $value=>$key) {
+				foreach ($key as $email=>$name){
 					echo Display::encrypted_mailto_link($email,$name).$bar;		
 				}
 			}
 		} else {
 			$mail=CourseManager::get_email_of_tutor_to_session($id_session);
 			echo '&nbsp;'.get_lang('Tutor')." : ";
-			foreach($mail as $v=>$k) {
+			foreach ($mail as $v=>$k) {
 				echo Display::encrypted_mailto_link($v,$k); 
 			}
 		}