diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php index a858b7350a..f662210a4e 100644 --- a/main/calendar/agenda.inc.php +++ b/main/calendar/agenda.inc.php @@ -1,4 +1,4 @@ - 0 ? ($dayone['wday'] - 1) : 6; - $backwardsURL = $_SERVER['PHP_SELF']."?coursePath=".$_GET['coursePath']."&courseCode=".$_GET['courseCode']."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year); - $forewardsURL = $_SERVER['PHP_SELF']."?coursePath=".$_GET['coursePath']."&courseCode=".$_GET['courseCode']."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year); + $backwardsURL = $_SERVER['PHP_SELF']."?".api_get_cidreq()."&coursePath=".$_GET['coursePath']."&courseCode=".$_GET['courseCode']."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year); + $forewardsURL = $_SERVER['PHP_SELF']."?".api_get_cidreq()."&coursePath=".$_GET['coursePath']."&courseCode=".$_GET['courseCode']."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year); echo "\n", "\n", @@ -185,7 +185,7 @@ function display_minimonthcalendar($agendaitems, $month, $year, $monthName) echo "\t"; @@ -1762,9 +1762,9 @@ function display_one_agenda_item($agenda_id) if (is_allowed_to_edit()) { // edit - echo "", + echo "", "\"".get_lang("ModifyCalendarItem")."\"", - "", + "", "\"".get_lang("Delete")."\""; if ($myrow['visibility']==1) { @@ -1774,7 +1774,7 @@ function display_one_agenda_item($agenda_id) { $image_visibility="invisible"; } - echo "", + echo "", "\"".get_lang("Visible")."\"

"; } echo ""; diff --git a/main/course_description/index.php b/main/course_description/index.php index 2d42ca88b1..054467c0be 100644 --- a/main/course_description/index.php +++ b/main/course_description/index.php @@ -1,4 +1,4 @@ -'; } echo '
-
'.$title.' +
'.$title.'
'; if($i==4 || $i==8){ echo '
'; diff --git a/main/document/document.inc.php b/main/document/document.inc.php index cba06af555..8212a16ed1 100644 --- a/main/document/document.inc.php +++ b/main/document/document.inc.php @@ -1,4 +1,4 @@ -".get_lang("ShowCourseQuotaUse").""; + $message = "".get_lang("ShowCourseQuotaUse").""; echo /*"
" .*/ "

" . $message . "

" /*. "
"*/; @@ -129,7 +129,7 @@ function create_document_link($www,$title,$path,$filetype,$size,$visibility) //add class="invisible" on invisible files $visibility_class= ($visibility==0)?' class="invisible"':''; //build download link (icon) - $forcedownload_link=($filetype=='folder')?$_SERVER['PHP_SELF'].'?action=downloadfolder&path='.$url_path.$req_gid:$_SERVER['PHP_SELF'].'?action=download&id='.$url_path.$req_gid; + $forcedownload_link=($filetype=='folder')?$_SERVER['PHP_SELF'].'?'.api_get_cidreq().'&action=downloadfolder&path='.$url_path.$req_gid:$_SERVER['PHP_SELF'].'?action=download&id='.$url_path.$req_gid; //folder download or file download? $forcedownload_icon=($filetype=='folder')?'folder_zip.gif':'filesave.gif'; //prevent multiple clicks on zipped folder download @@ -226,10 +226,10 @@ function build_edit_icons($curdirpath,$type,$path,$visibility,$id) $visibility_command = ($visibility==0)?'set_visible':'set_invisible'; $curdirpath = urlencode($curdirpath); - $modify_icons = ''; - $modify_icons .= ' '; - $modify_icons .= ' '; - $modify_icons .= ' '; + $modify_icons = ''; + $modify_icons .= ' '; + $modify_icons .= ' '; + $modify_icons .= ' '; return $modify_icons; } diff --git a/main/document/document.php b/main/document/document.php index e73c82231a..0a49442520 100644 --- a/main/document/document.php +++ b/main/document/document.php @@ -1,4 +1,4 @@ - - +   - -    + +    - -   + +   - -   + +   - (ZIP)" alt="" /> - (ZIP)  + (ZIP)" alt="" /> + (ZIP)   ". get_lang('ViewSlideshow') . ""; + echo " ". get_lang('ViewSlideshow') . ""; } echo ""; diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php index e912245714..bc77cf8e80 100644 --- a/main/exercice/exercice.php +++ b/main/exercice/exercice.php @@ -24,7 +24,7 @@ * @author Olivier Brouckaert, original author * @author Denes Nagy, HotPotatoes integration * @author Wolfgang Schneider, code/html cleanup -* @version $Id: exercice.php 12048 2007-04-18 08:08:26Z elixir_julian $ +* @version $Id: exercice.php 12220 2007-05-01 22:19:23Z yannoo $ */ @@ -436,7 +436,7 @@ if($show == 'test'){ { //error_log('is_allowedToEdit and origin<> learnpath',0); echo "", "", "", "", "", "", "", "", "
"; if ($agendaitems[$curday] <> "") { - echo "".$dayheader.""; + echo "".$dayheader.""; } else { @@ -233,8 +233,8 @@ function display_monthcalendar($month, $year) //Start the week on monday $startdayofweek = $dayone['wday']<>0 ? ($dayone['wday']-1) : 6; - $backwardsURL = $_SERVER['PHP_SELF']."?origin=$origin&month=".($month==1 ? 12 : $month-1)."&year=".($month==1 ? $year-1 : $year); - $forewardsURL = $_SERVER['PHP_SELF']."?origin=$origin&month=".($month==12 ? 1 : $month+1)."&year=".($month==12 ? $year+1 : $year); + $backwardsURL = $_SERVER['PHP_SELF']."?".api_get_cidreq()."&origin=$origin&month=".($month==1 ? 12 : $month-1)."&year=".($month==1 ? $year-1 : $year); + $forewardsURL = $_SERVER['PHP_SELF']."?".api_get_cidreq()."&origin=$origin&month=".($month==12 ? 1 : $month+1)."&year=".($month==12 ? $year+1 : $year); $maand_array_maandnummer=$month-1; @@ -270,7 +270,7 @@ function display_monthcalendar($month, $year) $dayheader = "$curday"; if (in_array($curday,$data)) - { $dayheader="".$curday.""; } + { $dayheader="".$curday.""; } if (($curday==$today['mday'])&&($year ==$today['year'])&&($month == $today[mon])) { @@ -1032,7 +1032,7 @@ function change_visibility($tool,$id) */ function display_courseadmin_links() { - echo "
  • \"".get_lang('MoreStats')."\" ".get_lang("AgendaAdd")."
    • "; + echo "
  • \"".get_lang('MoreStats')."\" ".get_lang("AgendaAdd")."
    • "; if (empty ($_SESSION['toolgroup'])) { echo "
  • ".get_lang(UserGroupFilter)."
    "; @@ -1054,21 +1054,21 @@ function display_student_links() global $show; if ($_SESSION['sort'] == 'DESC') { - echo "
  • ".Display::return_icon('calendar_up.gif',get_lang('AgendaSortChronologicallyUp')).' '.get_lang("AgendaSortChronologicallyUp")."
    • "; + echo "
  • ".Display::return_icon('calendar_up.gif',get_lang('AgendaSortChronologicallyUp')).' '.get_lang("AgendaSortChronologicallyUp")."
    • "; } else { - echo "
  • ".Display::return_icon('calendar_down.gif',get_lang('AgendaSortChronologicallyDown')).' '.get_lang("AgendaSortChronologicallyDown")."
    • "; + echo "
  • ".Display::return_icon('calendar_down.gif',get_lang('AgendaSortChronologicallyDown')).' '.get_lang("AgendaSortChronologicallyDown")."
    • "; } // showing the link to show all items or only those of the current month if ($_SESSION['show']=="showcurrent") { - echo "
  • ".Display::return_icon('calendar_select.gif').' '.get_lang("ShowAll")."
    • "; + echo "
  • ".Display::return_icon('calendar_select.gif').' '.get_lang("ShowAll")."
    • "; } else { - echo "
  • ".Display::return_icon('calendar_month.gif').' '.get_lang("ShowCurrent")."
    • "; + echo "
  • ".Display::return_icon('calendar_month.gif').' '.get_lang("ShowCurrent")."
    • "; } } @@ -1567,11 +1567,11 @@ function display_agenda_items() if (is_allowed_to_edit() OR api_get_course_setting('allow_user_edit_agenda')) { // edit - echo "", + echo "", "\"".get_lang("ModifyCalendarItem")."\"", - "", + "", "\"".get_lang("Delete")."\"/"; - echo "". + echo "". "\"".get_lang("AddAnnouncement")."\"/"; if ($myrow['visibility']==1) { @@ -1581,7 +1581,7 @@ function display_agenda_items() { $image_visibility="invisible"; } - echo "", + echo "", "\"".get_lang("Visible")."\""; } echo "    		 ", - "\"new ".get_lang("NewEx")."", + "\"new ".get_lang("NewEx")."", //"\"new".get_lang("QuestionPool")." | ", //" | \"HotPotatoes\" ".get_lang("ImportHotPotatoesQuiz")."", diff --git a/main/link/link.php b/main/link/link.php index 5cd2bdbb3e..97ff222f77 100644 --- a/main/link/link.php +++ b/main/link/link.php @@ -273,22 +273,22 @@ if (isset($up)) */ if(is_allowed_to_edit()) { - echo Display::return_icon('file_html_new.gif')." ".get_lang("LinkAdd")."\n"; - echo Display::return_icon('folder_new.gif')." ".get_lang("CategoryAdd")."\n"; - /* "".get_lang('CsvImport')."\n", // RH*/ + echo Display::return_icon('file_html_new.gif')." ".get_lang("LinkAdd")."\n"; + echo Display::return_icon('folder_new.gif')." ".get_lang("CategoryAdd")."\n"; + /* "".get_lang('CsvImport')."\n", // RH*/ } //making the show none / show all links. Show none means urlview=0000 (number of zeros depending on the //number of categories). Show all means urlview=1111 (number of 1 depending on teh number of categories). $sqlcategories="SELECT * FROM ".$tbl_categories." ORDER BY display_order DESC"; $resultcategories=api_sql_query($sqlcategories); $aantalcategories = @mysql_num_rows($resultcategories); -echo Display::return_icon('remove.gif')." $shownone"; -echo Display::return_icon('add.gif')." ", - "- ".htmlentities($myrow["category_title"])."
       ".$myrow["description"]; + "    		- ".htmlentities($myrow["category_title"])."
       ".$myrow["description"]; if (is_allowed_to_edit()) { showcategoryadmintools($myrow["id"]); @@ -351,7 +351,7 @@ while ($myrow=@mysql_fetch_array($resultcategories)) else { - echo "
    + + ".htmlentities($myrow["category_title"])."
       "; echo $myrow["description"]; diff --git a/main/link/linkfunctions.php b/main/link/linkfunctions.php index 2669637e36..126bbf0a42 100644 --- a/main/link/linkfunctions.php +++ b/main/link/linkfunctions.php @@ -383,35 +383,35 @@ function showlinksofcategory($catid) $myrow[3] = text_filter($myrow[3]); if ($myrow['visibility'] == '1') { - echo "
    ", "", "\"".get_lang('Links')."\"/", "", "", htmlentities($myrow[2]), "\n", "
    ", $myrow[3], ""; + echo "
    ", "", "\"".get_lang('Links')."\"/", "", "", htmlentities($myrow[2]), "\n", "
    ", $myrow[3], ""; } else { if (api_is_allowed_to_edit()) { - echo "
    ", "", Display::return_icon('file_html_na.gif', get_lang('Links')),"", "", htmlentities($myrow[2]), "\n", "
    ", $myrow[3], ""; + echo "
    ", "", Display::return_icon('file_html_na.gif', get_lang('Links')),"", "", htmlentities($myrow[2]), "\n", "
    ", $myrow[3], ""; } } if (api_is_allowed_to_edit()) { - echo "
    ", "", "\"",", "", " ", "\"",", ""; + echo "
    ", "", "\"",", "", " ", "\"",", ""; // DISPLAY MOVE UP COMMAND only if it is not the top link if ($i != 1) { - echo "", "\"Up\"/", "\n"; + echo "", "\"Up\"/", "\n"; } // DISPLAY MOVE DOWN COMMAND only if it is not the bottom link if ($i < $numberoflinks) { - echo "", "\"Down\"/", "\n"; + echo "", "\"Down\"/", "\n"; } if ($myrow['visibility'] == "1") { - echo "".Display::return_icon('visible.gif').""; + echo "".Display::return_icon('visible.gif').""; } if ($myrow['visibility'] == "0") { - echo "".Display::return_icon('invisible.gif').""; + echo "".Display::return_icon('invisible.gif').""; } } @@ -431,17 +431,17 @@ function showcategoryadmintools($categoryid) global $aantalcategories; global $catcounter; - echo "", "\"",", " \n"; - echo "", "\"",", ""; + echo "", "\"",", " \n"; + echo "", "\"",", ""; // DISPLAY MOVE UP COMMAND only if it is not the top link if ($catcounter != 1) { - echo "", "\"Up\"/", "\n"; + echo "", "\"Up\"/", "\n"; } // DISPLAY MOVE DOWN COMMAND only if it is not the bottom link if ($catcounter < $aantalcategories) { - echo "", "\"Down\"/", "\n"; + echo "", "\"Down\"/", "\n"; } $catcounter ++; } diff --git a/main/newscorm/lp_list.php b/main/newscorm/lp_list.php index 17478813b8..7a5c7964de 100644 --- a/main/newscorm/lp_list.php +++ b/main/newscorm/lp_list.php @@ -103,14 +103,14 @@ if(api_is_allowed_to_edit()) } include('content_makers.inc.php'); - echo ''. + echo ''. 'scormbuilder '.get_lang('_add_learnpath'). '' . str_repeat(' ',3). - 'scormbuilder '.get_lang("UploadScorm").''; + 'scormbuilder '.get_lang("UploadScorm").''; if(api_get_setting('service_ppt2lp','active')==true) { - echo str_repeat(' ',3).'scormbuilder '.get_lang("PowerPointConvert").''; + echo str_repeat(' ',3).'scormbuilder '.get_lang("PowerPointConvert").''; } }