From eb0500bbfa00c1c03c6660ef0e714109e698d9a6 Mon Sep 17 00:00:00 2001
From: whitelilis <liu.zhe@admaster.com.cn>
Date: Fri, 7 Apr 2017 09:14:39 +0800
Subject: [PATCH] $oj-name changed to $oj_name

---
 uoj/1/app/controllers/forgot_pw.php           | 10 +++++-----
 uoj/1/app/controllers/problem_data_manage.php |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/uoj/1/app/controllers/forgot_pw.php b/uoj/1/app/controllers/forgot_pw.php
index a0b7c92..b50c5ea 100644
--- a/uoj/1/app/controllers/forgot_pw.php
+++ b/uoj/1/app/controllers/forgot_pw.php
@@ -19,17 +19,17 @@
 		$user = $vdata['user'];
 		$password = $user["password"];
 		
-		$oj-name = UOJConfig::$data['profile']['oj-name'];
-		$oj-name-short = UOJConfig::$data['profile']['oj-name-short'];
+		$oj_name = UOJConfig::$data['profile']['oj-name'];
+		$oj_name-short = UOJConfig::$data['profile']['oj-name-short'];
 		$sufs = base64url_encode($user['username'] . "." . md5($user['username'] . "+" . $password));
 		$url = HTML::url("/reset-password", array('params' => array('p' => $sufs)));
 		$html = <<<EOD
 <base target="_blank" />
 
 <p>{$user['username']}您好，</p>
-<p>您刚刚启用了{$oj-name-short}密码找回功能，请进入下面的链接重设您的密码：</p>
+<p>您刚刚启用了{$oj_name-short}密码找回功能，请进入下面的链接重设您的密码：</p>
 <p><a href="$url">$url</a></p>
-<p>{$oj-name}</p>
+<p>{$oj_name}</p>
 
 <style type="text/css">
 body{font-size:14px;font-family:arial,verdana,sans-serif;line-height:1.666;padding:0;margin:0;overflow:auto;white-space:normal;word-wrap:break-word;min-height:100px}
@@ -39,7 +39,7 @@ EOD;
 		
 		$mailer = UOJMail::noreply();
 		$mailer->addAddress($user['email'], $user['username']);
-		$mailer->Subject = $oj-name-short."密码找回";
+		$mailer->Subject = $oj_name-short."密码找回";
 		$mailer->msgHTML($html);
 		if (!$mailer->send()) {  
 			error_log($mailer->ErrorInfo);
diff --git a/uoj/1/app/controllers/problem_data_manage.php b/uoj/1/app/controllers/problem_data_manage.php
index f760a85..89d9d47 100644
--- a/uoj/1/app/controllers/problem_data_manage.php
+++ b/uoj/1/app/controllers/problem_data_manage.php
@@ -11,7 +11,7 @@
 		become403Page();
 	}
 	
-	$oj-name = UOJConfig::$data['profile']['oj-name'];
+	$oj_name = UOJConfig::$data['profile']['oj-name'];
 	$problem_extra_config = getProblemExtraConfig($problem);
 
 	if (isset($_POST['getsvn'])) {
@@ -21,7 +21,7 @@
 
 <p>{$myUser['username']}您好，</p>
 <p>您的svn密码是：{$myUser['svn_password']}</p>
-<p>{$oj-name}</p>
+<p>{$oj_name}</p>
 
 <style type="text/css">
 body{font-size:14px;font-family:arial,verdana,sans-serif;line-height:1.666;padding:0;margin:0;overflow:auto;white-space:normal;word-wrap:break-word;min-height:100px}
@@ -873,4 +873,4 @@ EOD
 	<?php //dhxh end ?>
 
 </div>
-<?php echoUOJPageFooter() ?>
\ No newline at end of file
+<?php echoUOJPageFooter() ?>