*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
		
					parent
					
						
							
								c43389f79a
							
						
					
				
			
			
				commit
				
					
						884f44ce94
					
				
			
		
					 108 changed files with 407 additions and 437 deletions
				
			
		| 
						 | 
				
			
			@ -36,8 +36,7 @@ function lostpass_post(&$a) {
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
	$sitename = $a->config['sitename'];
 | 
			
		||||
	$siteurl = $a->get_baseurl();
 | 
			
		||||
	$resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password;
 | 
			
		||||
	$resetlink = App::get_baseurl() . '/lostpass?verify=' . $new_password;
 | 
			
		||||
 | 
			
		||||
	$preamble = deindent(t('
 | 
			
		||||
		Dear %1$s,
 | 
			
		||||
| 
						 | 
				
			
			@ -64,7 +63,7 @@ function lostpass_post(&$a) {
 | 
			
		|||
		Login Name:	%3$s'));
 | 
			
		||||
 | 
			
		||||
	$preamble = sprintf($preamble, $username, $sitename);
 | 
			
		||||
	$body = sprintf($body, $resetlink, $siteurl, $email);
 | 
			
		||||
	$body = sprintf($body, $resetlink, App::get_baseurl(), $email);
 | 
			
		||||
 | 
			
		||||
	notification(array(
 | 
			
		||||
		'type' => "SYSTEM_EMAIL",
 | 
			
		||||
| 
						 | 
				
			
			@ -110,17 +109,16 @@ function lostpass_content(&$a) {
 | 
			
		|||
				'$lbl2' => t('Your password has been reset as requested.'),
 | 
			
		||||
				'$lbl3' => t('Your new password is'),
 | 
			
		||||
				'$lbl4' => t('Save or copy your new password - and then'),
 | 
			
		||||
				'$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
 | 
			
		||||
				'$lbl5' => '<a href="' . App::get_baseurl() . '">' . t('click here to login') . '</a>.',
 | 
			
		||||
				'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
 | 
			
		||||
				'$newpass' => $new_password,
 | 
			
		||||
				'$baseurl' => $a->get_baseurl()
 | 
			
		||||
				'$baseurl' => App::get_baseurl()
 | 
			
		||||
 | 
			
		||||
			));
 | 
			
		||||
				info("Your password has been reset." . EOL);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
			$sitename = $a->config['sitename'];
 | 
			
		||||
			$siteurl = $a->get_baseurl();
 | 
			
		||||
			// $username, $email, $new_password
 | 
			
		||||
			$preamble = deindent(t('
 | 
			
		||||
				Dear %1$s,
 | 
			
		||||
| 
						 | 
				
			
			@ -139,7 +137,7 @@ function lostpass_content(&$a) {
 | 
			
		|||
			'));
 | 
			
		||||
 | 
			
		||||
			$preamble = sprintf($preamble, $username);
 | 
			
		||||
			$body = sprintf($body, $siteurl, $email, $new_password);
 | 
			
		||||
			$body = sprintf($body, App::get_baseurl(), $email, $new_password);
 | 
			
		||||
 | 
			
		||||
			notification(array(
 | 
			
		||||
				'type' => "SYSTEM_EMAIL",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue