diff --git a/admin/login/login.php b/admin/login/login.php index 34bea01..103175c 100644 --- a/admin/login/login.php +++ b/admin/login/login.php @@ -73,9 +73,13 @@ function html_login_form() {
' : '
' . $_G['member']['username'] . '
' . $_G['member']['email'] . '
'; $sid = getglobal('sid'); $avatarstatus=getglobal('avatarstatus','member'); - if(!$uid ){ - $sitelogo=$_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png'; - $avastar=''; + if(!$uid){ + if(!$_G['setting']['bbclosed']){ + $sitelogo=$_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png'; + }else{ + $sitelogo = 'static/image/common/logo.png'; + } + $avastar=''; }else{ $avastar = avatar_block($uid); } diff --git a/core/function/function_mail.php b/core/function/function_mail.php index 5747dfa..a0f2555 100644 --- a/core/function/function_mail.php +++ b/core/function/function_mail.php @@ -23,9 +23,13 @@ function sendmail($toemail, $subject, $message, $from = '') { } } $sitename=$_G['setting']['sitename']; - $sitecopyright=replacesitevar($_G['setting']['sitecopyright']); - $sitelogo=IO::getFileUri('attach::'.$_G['setting']['sitelogo']); - $message = << diff --git a/core/template/default/common/adminlogin.htm b/core/template/default/common/adminlogin.htm index edb090c..626ee0c 100644 --- a/core/template/default/common/adminlogin.htm +++ b/core/template/default/common/adminlogin.htm @@ -116,7 +116,7 @@

-

logo

+

logo

$_G[setting][loginset][subtitle]

$_G[setting][metadescription]

diff --git a/core/template/default/common/header_left.htm b/core/template/default/common/header_left.htm index ca4d47c..02ecd0f 100644 --- a/core/template/default/common/header_left.htm +++ b/core/template/default/common/header_left.htm @@ -1,4 +1,4 @@ - + $_G['setting']['sitename'] \ No newline at end of file diff --git a/core/template/default/common/header_right.htm b/core/template/default/common/header_right.htm index 0572ac3..b235850 100644 --- a/core/template/default/common/header_right.htm +++ b/core/template/default/common/header_right.htm @@ -111,18 +111,20 @@ - +
    • + + +
  •  
    • -
  • @@ -131,20 +133,18 @@
  • - + {lang login}
    • +
  • - {lang login} -
    • - -
  • - - {lang register} - -
    • - + + {lang register} + + +
  • - {lang about} -
    • - + {lang about} + + + \ No newline at end of file diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm index 6b931ae..76806d1 100644 --- a/core/template/default/common/showmessage.htm +++ b/core/template/default/common/showmessage.htm @@ -42,7 +42,7 @@
    - +

    $show_message

    diff --git a/dzz/index/template/header_left.htm b/dzz/index/template/header_left.htm index 6a49e12..cd5954c 100644 --- a/dzz/index/template/header_left.htm +++ b/dzz/index/template/header_left.htm @@ -1,4 +1,4 @@ - + $_G['setting']['sitename'] \ No newline at end of file diff --git a/dzz/shares/template/header_left.htm b/dzz/shares/template/header_left.htm index 99b76d0..15bb16f 100644 --- a/dzz/shares/template/header_left.htm +++ b/dzz/shares/template/header_left.htm @@ -1,3 +1,3 @@ - + {$share[username]}{lang de}{lang file_share} \ No newline at end of file diff --git a/dzz/system/notification.php b/dzz/system/notification.php index 6caaf6b..e7a6fbd 100644 --- a/dzz/system/notification.php +++ b/dzz/system/notification.php @@ -45,7 +45,11 @@ if($filter=='new'){//列出所有新通知 foreach(DB::fetch_all("select distinct(from_id) from %t where uid = %d",array('notification',$_G['uid'])) as $v){ $searchappid[] = $v['from_id']; } - $sitelogo=$_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png'; + if(!$_G['setting']['bbclosed']){ + $sitelogo=$_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png'; + }else{ + $sitelogo = 'static/image/common/logo.png'; + } $searchcats = array(); if(in_array(0,$searchappid)){ $systemindex = array_search(0,$searchappid); diff --git a/user/login/logging/lostpasswd.php b/user/login/logging/lostpasswd.php index 67ce486..22241c0 100644 --- a/user/login/logging/lostpasswd.php +++ b/user/login/logging/lostpasswd.php @@ -34,7 +34,11 @@ elseif(isset($_GET['lostpwsubmit'])) { $idstring = random(6); $sitename=$_G['setting']['sitename']; - $sitelogo=IO::getFileUri('attach::'.$_G['setting']['sitelogo']); + if(!$_G['setting']['bbclosed']){ + $sitelogo=$_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png'; + }else{ + $sitelogo = 'static/image/common/logo.png'; + } C::t('user')->update($member['uid'], array('authstr' => "$_G[timestamp]\t1\t$idstring")); //require_once libfile('function/mail'); $get_passwd_message = <<
    - light year admin + light year admin

    {lang getpassword}

    diff --git a/user/login/template/getpasswd2.htm b/user/login/template/getpasswd2.htm index 7b27340..037a317 100644 --- a/user/login/template/getpasswd2.htm +++ b/user/login/template/getpasswd2.htm @@ -39,7 +39,7 @@
    - light year admin + light year admin

    {lang getpassword}