Index: theme/preview.php =================================================================== RCS file: /cvsroot/moodle/moodle/theme/preview.php,v retrieving revision 1.10 diff -u -r1.10 preview.php --- theme/preview.php 29 Jun 2009 03:10:06 -0000 1.10 +++ theme/preview.php 30 Jun 2009 12:57:53 -0000 @@ -1,41 +1,49 @@ -. + +/** + * This page alows you to preview an arbitrary theme before selecting it. + */ + +require_once("../config.php"); + +$preview = optional_param('preview','standard',PARAM_FILE); // which theme to show + +if (!file_exists($CFG->themedir .'/'. $preview)) { + $preview = 'standard'; +} + +require_login(); + +require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)); + +$PAGE->force_theme($preview); + +$strthemes = get_string('themes'); +$strpreview = get_string('preview'); + +$navlinks = array(); +$navlinks[] = array('name' => $strthemes, 'link' => null, 'type' => 'misc'); +$navlinks[] = array('name' => $strpreview, 'link' => null, 'type' => 'misc'); +$navigation = build_navigation($navlinks); +print_header("$SITE->shortname: $strpreview", $SITE->fullname, $navigation); + +print_box_start(); +print_heading($preview); +print_box_end(); - $preview = optional_param('preview','standard',PARAM_FILE); // which theme to show - - if (!file_exists($CFG->themedir .'/'. $preview)) { - $preview = 'standard'; - } - - if (!$site = get_site()) { - print_error('siteisnotdefined', 'debug'); - } - - require_login(); - - require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)); - - $CFG->theme = $preview; - - theme_setup($CFG->theme, array('forceconfig='.$CFG->theme)); - - $stradministration = get_string("administration"); - $strconfiguration = get_string("configuration"); - $strthemes = get_string("themes"); - $strpreview = get_string("preview"); - $strsavechanges = get_string("savechanges"); - $strtheme = get_string("theme"); - $strthemesaved = get_string("themesaved"); - - $navlinks = array(); - $navlinks[] = array('name' => $strthemes, 'link' => null, 'type' => 'misc'); - $navlinks[] = array('name' => $strpreview, 'link' => null, 'type' => 'misc'); - $navigation = build_navigation($navlinks); - print_header("$site->shortname: $strpreview", $site->fullname, $navigation); - - print_box_start(); - print_heading($preview); - print_box_end(); - - print_footer(); +print_footer(); \ No newline at end of file Index: theme/index.php =================================================================== RCS file: /cvsroot/moodle/moodle/theme/index.php,v retrieving revision 1.45 diff -u -r1.45 index.php --- theme/index.php 26 Jun 2009 10:29:56 -0000 1.45 +++ theme/index.php 30 Jun 2009 12:57:53 -0000 @@ -1,144 +1,162 @@ -libdir.'/adminlib.php'); - - $choose = optional_param("choose",'',PARAM_FILE); // set this theme as default - - admin_externalpage_setup('themeselector'); +// This file is part of Moodle - http://moodle.org/ +// +// Moodle is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Moodle is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Moodle. If not, see . + +/** + * This page prvides the Administration -> ... -> Theme selector UI. + */ + +require_once("../config.php"); +require_once($CFG->libdir.'/adminlib.php'); + +$choose = optional_param("choose",'',PARAM_FILE); // set this theme as default + +admin_externalpage_setup('themeselector'); + +unset($SESSION->theme); + +$stradministration = get_string("administration"); +$strconfiguration = get_string("configuration"); +$strthemes = get_string("themes"); +$strpreview = get_string("preview"); +$strchoose = get_string("choose"); +$strinfo = get_string("info"); +$strtheme = get_string("theme"); +$strthemesaved = get_string("themesaved"); +$strscreenshot = get_string("screenshot"); +$stroldtheme = get_string("oldtheme"); + + +if ($choose and confirm_sesskey()) { + if (!is_dir($CFG->themedir .'/'. $choose)) { + print_error('themenotinstall'); + } + if (set_config("theme", $choose)) { + admin_externalpage_print_header(); + print_heading(get_string("themesaved")); + + if (file_exists("$choose/README.html")) { + print_box_start(); + readfile("$choose/README.html"); + print_box_end(); + + } else if (file_exists("$choose/README.txt")) { + print_box_start("center"); + $file = file("$choose/README.txt"); + echo format_text(implode('', $file), FORMAT_MOODLE); + print_box_end(); + } + + print_continue("$CFG->wwwroot/"); + + admin_externalpage_print_footer(); + exit; + } else { + print_error('cannotsettheme'); + } +} - unset($SESSION->theme); +admin_externalpage_print_header('themeselector'); - $stradministration = get_string("administration"); - $strconfiguration = get_string("configuration"); - $strthemes = get_string("themes"); - $strpreview = get_string("preview"); - $strchoose = get_string("choose"); - $strinfo = get_string("info"); - $strtheme = get_string("theme"); - $strthemesaved = get_string("themesaved"); - $strscreenshot = get_string("screenshot"); - $stroldtheme = get_string("oldtheme"); +print_heading($strthemes); - if ($choose and confirm_sesskey()) { - if (!is_dir($CFG->themedir .'/'. $choose)) { - print_error('themenotinstall'); - } - if (set_config("theme", $choose)) { - theme_setup($choose); - admin_externalpage_print_header(); - print_heading(get_string("themesaved")); - - if (file_exists("$choose/README.html")) { - print_box_start(); - readfile("$choose/README.html"); - print_box_end(); - - } else if (file_exists("$choose/README.txt")) { - print_box_start("center"); - $file = file("$choose/README.txt"); - echo format_text(implode('', $file), FORMAT_MOODLE); - print_box_end(); - } - - print_continue("$CFG->wwwroot/"); - - admin_externalpage_print_footer(); - exit; - } else { - print_error('cannotsettheme'); - } - } +$themes = get_plugin_list("theme"); +$sesskey = sesskey(); - admin_externalpage_print_header('themeselector'); +echo "\n"; +if (!$USER->screenreader) { + echo "\t\n\t\t\n"; + echo "\t\t\n\t\n"; +} - print_heading($strthemes); +$original_theme = fullclone($THEME); - $themes = get_plugin_list("theme"); - $sesskey = sesskey(); +foreach ($themes as $theme => $themedir) { - echo "
$strtheme$strinfo
\n"; + unset($THEME); - if (!$USER->screenreader) { - echo "\t\n\t\t\n"; - echo "\t\t\n\t\n"; + if (!file_exists($themedir.'/config.php')) { // bad folder + continue; } - $original_theme = fullclone($THEME); + include($themedir.'/config.php'); - foreach ($themes as $theme => $themedir) { + $readme = ''; + $screenshot = ''; + $screenshotpath = ''; + + if (file_exists("$theme/README.html")) { + $readme = "\t\t\t\t
  • ". + link_to_popup_window($CFG->themewww .'/'. $theme .'/README.html', $theme, $strinfo, 400, 500, '', 'none', true)."
    • \n"; + } else if (file_exists("$theme/README.txt")) { + $readme = "\t\t\t\t
  • ". + link_to_popup_window($CFG->themewww .'/'. $theme .'/README.txt', $theme, $strinfo, 400, 500, '', 'none', true)."
    • \n"; + } + if (file_exists("$theme/screenshot.png")) { + $screenshotpath = "$theme/screenshot.png"; + } else if (file_exists("$theme/screenshot.jpg")) { + $screenshotpath = "$theme/screenshot.jpg"; + } - unset($THEME); + echo "\t\n"; - if (!file_exists($themedir.'/config.php')) { // bad folder - continue; + // no point showing this if user is using screen reader + if (!$USER->screenreader) { + echo "\t\t\n"; + } else { + echo "\t\t\t$theme\n\t\t\n"; } + } - include($themedir.'/config.php'); - - $readme = ''; - $screenshot = ''; - $screenshotpath = ''; - - if (file_exists("$theme/README.html")) { - $readme = "\t\t\t\t
  • ". - link_to_popup_window($CFG->themewww .'/'. $theme .'/README.html', $theme, $strinfo, 400, 500, '', 'none', true)."
    • \n"; - } else if (file_exists("$theme/README.txt")) { - $readme = "\t\t\t\t
  • ". - link_to_popup_window($CFG->themewww .'/'. $theme .'/README.txt', $theme, $strinfo, 400, 500, '', 'none', true)."
    • \n"; - } - if (file_exists("$theme/screenshot.png")) { - $screenshotpath = "$theme/screenshot.png"; - } else if (file_exists("$theme/screenshot.jpg")) { - $screenshotpath = "$theme/screenshot.jpg"; - } + if ($CFG->theme == $theme) { + echo "\t\t" . '\n"; + if (isset($THEME->sheets)) { + echo "\t\t\t" . '

    '.$theme.'

    '."\n"; + } else { + echo "\t\t\t" . '

    '.$theme.' (Moodle 1.4)

    '."\n"; + } - // no point showing this if user is using screen reader + if ($screenshot or $readme) { + echo "\t\t\t\n"; - } else { - echo "\t\t\t$theme\n\t\t\n"; - } - } - - if ($CFG->theme == $theme) { - echo "\t\t" . '\n"; - echo "\t\n"; + echo $screenshot.$readme; + echo "\t\t\t\n"; } - echo "
    $strtheme$strinfo
    \n"; + if ($screenshotpath) { + $screenshot = "\t\t\t\t
  • $strscreenshot
    • \n"; + echo "\t\t\t$theme\n\t\t    		'."\n"; + } else { + echo "\t\t" . ''."\n"; + } - echo "\t
    \n"; - if ($screenshotpath) { - $screenshot = "\t\t\t\t
  • $strscreenshot
    • \n"; - echo "\t\t\t$theme\n\t\t    		'."\n"; - } else { - echo "\t\t" . ''."\n"; + echo "\t\t\t\t
  • $strpreview
    • \n"; } - - if (isset($THEME->sheets)) { - echo "\t\t\t" . '

    '.$theme.'

    '."\n"; - } else { - echo "\t\t\t" . '

    '.$theme.' (Moodle 1.4)

    '."\n"; - } - - if ($screenshot or $readme) { - echo "\t\t\t
      \n"; - if (!$USER->screenreader) { - echo "\t\t\t\t
    • $strpreview
      • \n"; - } - echo $screenshot.$readme; - echo "\t\t\t
    \n"; - } - - $options = null; - $options['choose'] = $theme; - $options['sesskey'] = $sesskey; - echo "\t\t\t" . print_single_button('index.php', $options, $strchoose, 'get', null, true) . "\n"; - echo "\t\t
    \n"; - $THEME = $original_theme; + $options = null; + $options['choose'] = $theme; + $options['sesskey'] = $sesskey; + echo "\t\t\t" . print_single_button('index.php', $options, $strchoose, 'get', null, true) . "\n"; + echo "\t\t\n"; + echo "\t\n"; +} +echo "\n"; + +$THEME = $original_theme; - admin_externalpage_print_footer(); +admin_externalpage_print_footer(); ?> Index: lib/weblib.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v retrieving revision 1.1281 diff -u -r1.1281 weblib.php --- lib/weblib.php 29 Jun 2009 08:17:31 -0000 1.1281 +++ lib/weblib.php 30 Jun 2009 12:57:53 -0000 @@ -2358,256 +2358,6 @@ } /** - * Print a standard header - * - * @param string $title Appears at the top of the window - * @param string $heading Appears at the top of the page - * @param string $navigation Array of $navlinks arrays (keys: name, link, type) for use as breadcrumbs links - * @param string $focus Indicates form element to get cursor focus on load eg inputform.password - * @param string $meta Meta tags to be added to the header - * @param boolean $cache Should this page be cacheable? - * @param string $button HTML code for a button (usually for module editing) - * @param string $menu HTML code for a popup menu - * @param boolean $usexml use XML for this page - * @param string $bodytags This text will be included verbatim in the tag (useful for onload() etc) - * @param bool $return If true, return the visible elements of the header instead of echoing them. - * @return string|void If return=true then string else void - */ -function print_header_old($title='', $heading='', $navigation='', $focus='', - $meta='', $cache=true, $button=' ', $menu='', - $usexml=false, $bodytags='', $return=false) { - - global $USER, $CFG, $THEME, $SESSION, $ME, $SITE, $COURSE, $PAGE; - - if (gettype($navigation) == 'string' && strlen($navigation) != 0 && $navigation != 'home') { - debugging("print_header() was sent a string as 3rd ($navigation) parameter. " - . "This is deprecated in favour of an array built by build_navigation(). Please upgrade your code.", DEBUG_DEVELOPER); - } - - $PAGE->set_state(moodle_page::STATE_PRINTING_HEADER); - - $heading = format_string($heading); // Fix for MDL-8582 - - if (CLI_SCRIPT) { - $output = $heading."\n"; - if ($return) { - return $output; - } else { - echo $output; - return; - } - } - -/// Add the required stylesheets - $stylesheetshtml = ''; - foreach ($CFG->stylesheets as $stylesheet) { - $stylesheetshtml .= ''."\n"; - } - $meta = $stylesheetshtml.$meta; - - -/// Add the meta page from the themes if any were requested - - $metapage = ''; - - if (!isset($THEME->standardmetainclude) || $THEME->standardmetainclude) { - ob_start(); - include_once($CFG->dirroot.'/theme/standard/meta.php'); - $metapage .= ob_get_contents(); - ob_end_clean(); - } - - if ($THEME->parent && (!isset($THEME->parentmetainclude) || $THEME->parentmetainclude)) { - if (file_exists($CFG->dirroot.'/theme/'.$THEME->parent.'/meta.php')) { - ob_start(); - include_once($CFG->dirroot.'/theme/'.$THEME->parent.'/meta.php'); - $metapage .= ob_get_contents(); - ob_end_clean(); - } - } - - if (!isset($THEME->metainclude) || $THEME->metainclude) { - if (file_exists($CFG->dirroot.'/theme/'.current_theme().'/meta.php')) { - ob_start(); - include_once($CFG->dirroot.'/theme/'.current_theme().'/meta.php'); - $metapage .= ob_get_contents(); - ob_end_clean(); - } - } - - $meta = $meta."\n".$metapage; - $meta .= $PAGE->requires->get_head_code(); - -/// Set up some navigation variables - - if (is_newnav($navigation)){ - $home = false; - } else { - if ($navigation == 'home') { - $home = true; - $navigation = ''; - } else { - $home = false; - } - } - -/// This is another ugly hack to make navigation elements available to print_footer later - $THEME->title = $title; - $THEME->heading = $heading; - $THEME->navigation = $navigation; - $THEME->button = $button; - $THEME->menu = $menu; - $navmenulist = isset($THEME->navmenulist) ? $THEME->navmenulist : ''; - - if ($button == '') { - $button = ' '; - } - - if (!empty($CFG->maintenance_enabled)) { - $button = ''.get_string('maintenancemode', 'admin').' '.$button; - if(!empty($title)) { - $title .= ' - '; - } - $title .= get_string('maintenancemode', 'admin'); - } - - if (!$menu and $navigation) { - if (empty($CFG->loginhttps)) { - $wwwroot = $CFG->wwwroot; - } else { - $wwwroot = str_replace('http:','https:',$CFG->wwwroot); - } - $menu = user_login_string($COURSE); - } - - if (isset($SESSION->justloggedin)) { - unset($SESSION->justloggedin); - if (!empty($CFG->displayloginfailures)) { - if (!empty($USER->username) and $USER->username != 'guest') { - if ($count = count_login_failures($CFG->displayloginfailures, $USER->username, $USER->lastlogin)) { - $menu .= ' '; - if (empty($count->accounts)) { - $menu .= get_string('failedloginattempts', '', $count); - } else { - $menu .= get_string('failedloginattemptsall', '', $count); - } - if (has_capability('coursereport/log:view', get_context_instance(CONTEXT_SYSTEM))) { - $menu .= ' ('.get_string('logs').')'; - } - $menu .= ''; - } - } - } - } - - - $meta = '' . - "\n" . $meta . "\n"; - if (!$usexml) { - @header('Content-Type: text/html; charset=utf-8'); - } - @header('Content-Script-Type: text/javascript'); - @header('Content-Style-Type: text/css'); - - //Accessibility: added the 'lang' attribute to $direction, used in theme tag. - $direction = get_html_lang($dir=true); - - if ($cache) { // Allow caching on "back" (but not on normal clicks) - @header('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); - @header('Pragma: no-cache'); - @header('Expires: '); - } else { // Do everything we can to always prevent clients and proxies caching - @header('Cache-Control: no-store, no-cache, must-revalidate'); - @header('Cache-Control: post-check=0, pre-check=0', false); - @header('Pragma: no-cache'); - @header('Expires: Mon, 20 Aug 1969 09:23:00 GMT'); - @header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); - - $meta .= "\n"; - $meta .= "\n"; - } - @header('Accept-Ranges: none'); - - $currentlanguage = current_language(); - - if (empty($usexml)) { - $direction = ' xmlns="http://www.w3.org/1999/xhtml"'. $direction; // See debug_header - } else { - $mathplayer = preg_match("/MathPlayer/i", $_SERVER['HTTP_USER_AGENT']); - if(!$mathplayer) { - header('Content-Type: application/xhtml+xml'); - } - echo ''."\n"; - if (!empty($CFG->xml_stylesheets)) { - $stylesheets = explode(';', $CFG->xml_stylesheets); - foreach ($stylesheets as $stylesheet) { - echo 'wwwroot .'/'. $stylesheet .'" ?>' . "\n"; - } - } - echo 'xml_doctype_extra)) { - echo ' plus '. $CFG->xml_doctype_extra; - } - echo '//' . strtoupper($currentlanguage) . '" "'. $CFG->xml_dtd .'">'."\n"; - $direction = " xmlns=\"http://www.w3.org/1999/xhtml\" - xmlns:math=\"http://www.w3.org/1998/Math/MathML\" - xmlns:xlink=\"http://www.w3.org/1999/xlink\" - $direction"; - if($mathplayer) { - $meta .= '' . "\n"; - $meta .= ''."\n"; - $meta .= ''."\n"; - $meta .= '' . "\n"; - } - } - - // Clean up the title - - $title = format_string($title); // fix for MDL-8582 - $title = str_replace('"', '"', $title); - - // Create class and id for this page - $pageid = $PAGE->pagetype; - $pageclass = $PAGE->bodyclasses; - $bodytags .= ' class="'.$pageclass.'" id="'.$pageid.'"'; - - ob_start(); - include($CFG->header); - $output = ob_get_contents(); - ob_end_clean(); - - // container debugging info - $THEME->open_header_containers = open_containers(); - - // Skip to main content, see skip_main_destination(). - if ($pageid=='course-view' or $pageid=='site-index' or $pageid=='course-index') { - $skiplink = ''; - if (! preg_match('/(.*]+id="page"[^>]*>)(.*)/s', $output, $matches)) { - preg_match('/(.*)(.*)/s', $output, $matches); - } - $output = $matches[1]."\n". $skiplink .$matches[2]; - } - - $output = force_strict_header($output); - - if (!empty($CFG->messaging)) { - $output .= message_popup_window(); - } - - // Add in any extra JavaScript libraries that occurred during the header - $output .= $PAGE->requires->get_top_of_body_code(); - - $PAGE->set_state(moodle_page::STATE_IN_BODY); - - if ($return) { - return $output; - } else { - echo $output; - } -} - -/** * This version of print_header is simpler because the course name does not have to be * provided explicitly in the strings. It can be used on the site page as in courses * Eventually all print_header could be replaced by print_header_simple @@ -2656,569 +2406,6 @@ } } - -/** - * Can provide a course object to make the footer contain a link to - * to the course home page, otherwise the link will go to the site home - * - * @global object - * @global object - * @global object - * @global object Apparently not used in this function - * @global string - * @global object - * @param mixed $course course object, used for course link button or - * 'none' means no user link, only docs link - * 'empty' means nothing printed in footer - * 'home' special frontpage footer - * @param object $usercourse course used in user link - * @param boolean $return output as string - * @return mixed string or void - */ -function print_footer_old($course=NULL, $usercourse=NULL, $return=false) { - global $USER, $CFG, $THEME, $COURSE, $SITE, $PAGE; - - if (defined('ADMIN_EXT_HEADER_PRINTED') and !defined('ADMIN_EXT_FOOTER_PRINTED')) { - admin_externalpage_print_footer(); - return; - } - - $PAGE->set_state(moodle_page::STATE_PRINTING_FOOTER); - -/// Course links or special footer - if ($course) { - if ($course === 'empty') { - // special hack - sometimes we do not want even the docs link in footer - $output = ''; - if (!empty($THEME->open_header_containers)) { - for ($i=0; $i<$THEME->open_header_containers; $i++) { - $output .= print_container_end_all(); // containers opened from header - } - } else { - //1.8 theme compatibility - $output .= "\n"; // content div - } - $output .= "\n\n" . $PAGE->requires->get_end_code() . "\n"; // close page div started in header - if ($return) { - return $output; - } else { - echo $output; - return; - } - - } else if ($course === 'none') { // Don't print any links etc - $homelink = ''; - $loggedinas = ''; - $home = false; - - } else if ($course === 'home') { // special case for site home page - please do not remove - $course = $SITE; - $homelink = '
    '. - ''. - 'moodlelogo
    '; - $home = true; - - } else if ($course === 'upgrade') { - $home = false; - $loggedinas = ''; - $homelink = '
    '. - ''. - 'moodlelogo
    '; - - } else { - $homelink = '
    frametarget.' href="'.$CFG->wwwroot. - '/course/view.php?id='.$course->id.'">'.format_string($course->shortname).'
    '; - $home = false; - } - - } else { - $course = $SITE; // Set course as site course by default - $homelink = '
    frametarget.' href="'.$CFG->wwwroot.'/">'.get_string('home').'
    '; - $home = false; - } - -/// Set up some other navigation links (passed from print_header by ugly hack) - $menu = isset($THEME->menu) ? str_replace('navmenu', 'navmenufooter', $THEME->menu) : ''; - $title = isset($THEME->title) ? $THEME->title : ''; - $button = isset($THEME->button) ? $THEME->button : ''; - $heading = isset($THEME->heading) ? $THEME->heading : ''; - $navigation = isset($THEME->navigation) ? $THEME->navigation : ''; - $navmenulist = isset($THEME->navmenulist) ? $THEME->navmenulist : ''; - - -/// Set the user link if necessary - if (!$usercourse and is_object($course)) { - $usercourse = $course; - } - - if (!isset($loggedinas)) { - $loggedinas = user_login_string($usercourse, $USER); - } - - if ($loggedinas == $menu) { - $menu = ''; - } - -/// there should be exactly the same number of open containers as after the header - if ($THEME->open_header_containers != open_containers()) { - debugging('Unexpected number of open containers: '.open_containers().', expecting '.$THEME->open_header_containers, DEBUG_DEVELOPER); - } - -/// Provide some performance info if required - $performanceinfo = ''; - if (defined('MDL_PERF') || (!empty($CFG->perfdebug) and $CFG->perfdebug > 7)) { - $perf = get_performance_info(); - if (defined('MDL_PERFTOLOG') && !function_exists('register_shutdown_function')) { - error_log("PERF: " . $perf['txt']); - } - if (defined('MDL_PERFTOFOOT') || debugging() || $CFG->perfdebug > 7) { - $performanceinfo = $perf['html']; - } - } - -/// Include the actual footer file - - ob_start(); - include($CFG->footer); - $output = ob_get_contents(); - ob_end_clean(); - - // Put the end of page