Project

General

Profile

« Previous | Next » 

Revision 2001

Added by Dietmar about 11 years ago

14 Nov-2013 Build 2001 Dietmar Woellbrink (Luisehahne)
! /framework/class.wb.php::ShowMaintainScreen add locked maintenance message
  1. /framework/initialize.php::readConfiguration taken back last change (Revision 1996)

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
14 Nov-2013 Build 2001 Dietmar Woellbrink (Luisehahne)
15
! /framework/class.wb.php::ShowMaintainScreen add locked maintenance message
16
# /framework/initialize.php::readConfiguration taken back last change (Revision 1996)
14 17
14 Nov-2013 Build 2000 Manuela v.d.Decken(DarkViper)
15 18
! WbAdaptor::getWbConstants() now on import skip constants holding database settings
16 19
14 Nov-2013 Build 1999 Manuela v.d.Decken(DarkViper)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '2000');
54
if(!defined('REVISION')) define('REVISION', '2001');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/framework/initialize.php
115 115
		if(is_readable($sSetupFile)) {
116 116
			$aCfg = parse_ini_file($sSetupFile, true);
117 117
			foreach($aCfg['Constants'] as $key=>$value) {
118
				switch(strtoupper($key)):
118
				switch($key):
119 119
					case 'DEBUG':
120 120
						$value = filter_var($value, FILTER_VALIDATE_BOOLEAN);
121 121
						if(!defined('DEBUG')) { define('DEBUG', $value); }
branches/2.8.x/wb/framework/class.wb.php
549 549
	public function ShowMaintainScreen($type = 'locked')
550 550
	{
551 551
		global $database, $MESSAGE;
552
		$CHECK_BACK = $MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'];
553
		$BE_PATIENT = '';
554 552
		$LANGUAGE   = strtolower((isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : LANGUAGE ));
555

  
553
		$PAGE_TITLE = $MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'];
554
		$PAGE_ICON  = 'negative';
556 555
		$show_screen = false;
557 556
		if($type == 'locked')
558 557
		{
......
581 580
		// delete the session itself
582 581
				session_destroy();
583 582
				$PAGE_TITLE = $MESSAGE['GENERIC_WEBSITE_LOCKED'];
584
				$BE_PATIENT = $MESSAGE['GENERIC_BE_PATIENT'];
585 583
				$PAGE_ICON  = 'system';
586 584
				$show_screen = true;
587 585
			}
588 586
		} else {
589 587
			header($_SERVER['SERVER_PROTOCOL'].' 503 Service Unavailable');
590
			$PAGE_TITLE = $MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'];
591
			$PAGE_ICON  = 'negative';
592 588
			$show_screen = true;
593 589
		}
594 590
		if($show_screen)
......
606 602
    			} else {
607 603
    				$charset='utf-8';
608 604
    			}
609
    		    $tpl->set_var( 'PAGE_TITLE', $MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] );
605
    		    $tpl->set_var( 'PAGE_TITLE', $PAGE_TITLE );
610 606
    	 	    $tpl->set_var( 'CHECK_BACK', $MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'] );
611 607
    	 	    $tpl->set_var( 'CHARSET', $charset );
612 608
    	 	    $tpl->set_var( 'WB_URL', WB_URL );
613
    	 	    $tpl->set_var( 'BE_PATIENT', $BE_PATIENT );
609
    	 	    $tpl->set_var( 'BE_PATIENT', $MESSAGE['GENERIC_BE_PATIENT'] );
614 610
    	 	    $tpl->set_var( 'THEME_URL', THEME_URL );
615 611
    			$tpl->set_var( 'PAGE_ICON', $PAGE_ICON);
616
    			$tpl->set_var( 'LANGUAGE', strtolower(LANGUAGE));
612
    			$tpl->set_var( 'LANGUAGE', $LANGUAGE);
617 613
    		    $tpl->parse( 'main', 'main_block', false );
618 614
    		    $tpl->pparse( 'output', 'page' );
619 615
                exit();

Also available in: Unified diff