Project

General

Profile

« Previous | Next » 

Revision 333

Added by stefan over 18 years ago

Fixed ticket #143. Charset setting is now used in admin login and forgot pages.

View differences:

trunk/wb/admin/login/forgot/index.php
158 158 
}
159 159 
$template->set_var('INTERFACE_URL', ADMIN_URL.'/interface');
160 160 

  		




  
  161
  
    
if(defined('DEFAULT_CHARSET')) {


  		




  
  162
  
    
	$charset=DEFAULT_CHARSET;


  		




  
  163
  
    
} else {


  		




  
  164
  
    
	$charset='utf-8';


  		




  
  165
  
    
}


  		




  
  166
  
    

  		




  
  167
  
    
$template->set_var('CHARSET', $charset);	


  		




  
  168
  
    

  		




  161
  169
  
    
$template->parse('main', 'main_block', false);


  		




  162
  170
  
    
$template->pparse('output', 'page');


  		




  163
  171
  
    

  		












  

    
      trunk/wb/admin/login/forgot/template.html
    
  





  3
  3
  
    
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">


  		




  4
  4
  
    
<head>


  		




  5
  5
  
    
<title>Retrieve Login Details</title>


  		




  6
  
  
    
<meta http-equiv="content-type" content="text/html; charset=utf-8" />


  		




  
  6
  
    
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />


  		




  7
  7
  
    
<link href="{INTERFACE_URL}/stylesheet.css" rel="stylesheet" type="text/css">


  		




  8
  8
  
    
</head>


  		




  9
  9
  
    
<body onload="document.forgot_pass.email.focus();">


  		












  

    
      trunk/wb/admin/login/template.html
    
  





  3
  3
  
    
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">


  		




  4
  4
  
    
<head>


  		




  5
  5
  
    
<title>{TEXT_LOGIN}</title>


  		




  6
  
  
    
<meta http-equiv="content-type" content="text/html; charset=utf-8" />


  		




  
  6
  
    
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />


  		




  7
  7
  
    
<link href="{INTERFACE_DIR_URL}/stylesheet.css" rel="stylesheet" type="text/css">


  		




  8
  8
  
    
</head>


  		




  9
  9
  
    
<body onload="document.login.{USERNAME_FIELDNAME}.focus();">


  		












  

    
      trunk/wb/framework/class.login.php
    
  





  357
  357
  
    
											'SECTION_LOGIN' => $MENU['LOGIN']


  		




  358
  358
  
    
											)


  		




  359
  359
  
    
									);


  		




  
  360
  
    
			if(defined('DEFAULT_CHARSET')) {


  		




  
  361
  
    
				$charset=DEFAULT_CHARSET;


  		




  
  362
  
    
			} else {


  		




  
  363
  
    
				$charset='utf-8';


  		




  
  364
  
    
			}


  		




  
  365
  
    
			


  		




  
  366
  
    
			$template->set_var('CHARSET', $charset);	


  		




  
  367
  
    
									


  		




  
  368
  
    
									


  		




  360
  369
  
    
			$template->parse('main', 'mainBlock', false);


  		




  361
  370
  
    
			$template->pparse('output', 'page');


  		




  362
  371
  
    
		}


  		












Also available in:  Unified diff