mirror of
https://github.com/easy-wi/developer.git
synced 2025-02-20 11:23:28 +08:00
Add email template to add by selected language, Add Twitter tweet timeline Easy-Wi, Add Twitter Button in header
This commit is contained in:
parent
4ba5afbf48
commit
79b246aa18
@ -89,4 +89,7 @@ table form {
|
|||||||
}
|
}
|
||||||
.formmailfield{
|
.formmailfield{
|
||||||
width:50%;
|
width:50%;
|
||||||
|
}
|
||||||
|
.twitter-button-margin {
|
||||||
|
margin: 14px 5px 0;
|
||||||
}
|
}
|
@ -301,6 +301,7 @@ if ($currentStep == 2 and count($systemCheckError) == 0) {
|
|||||||
" . '$debug' . " = '0';
|
" . '$debug' . " = '0';
|
||||||
" . '$timezone' . " = 'Europe/Berlin';
|
" . '$timezone' . " = 'Europe/Berlin';
|
||||||
" . '$coloreddashboard' . " = false;
|
" . '$coloreddashboard' . " = false;
|
||||||
|
" . '$easywitweets' . " = true;
|
||||||
";
|
";
|
||||||
|
|
||||||
@fwrite($configFp, $configdata);
|
@fwrite($configFp, $configdata);
|
||||||
@ -789,6 +790,7 @@ if ($currentStep == 7 and count($systemCheckError) == 0) {
|
|||||||
" . '$debug' . " = '0';
|
" . '$debug' . " = '0';
|
||||||
" . '$timezone' . " = '" . $_POST['timezone'] . "';
|
" . '$timezone' . " = '" . $_POST['timezone'] . "';
|
||||||
" . '$coloreddashboard' . " = false;
|
" . '$coloreddashboard' . " = false;
|
||||||
|
" . '$easywitweets' . " = true;
|
||||||
";
|
";
|
||||||
|
|
||||||
@fwrite($configFp, $configdata);
|
@fwrite($configFp, $configdata);
|
||||||
|
@ -180,7 +180,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
|
|||||||
'vServer' => array('emailvrescue','emailvinstall'),
|
'vServer' => array('emailvrescue','emailvinstall'),
|
||||||
'Server' => array('emailbackup','emailbackuprestore','emailserverinstall','emailsecuritybreach','emaildown','emaildownrestart'),
|
'Server' => array('emailbackup','emailbackuprestore','emailserverinstall','emailsecuritybreach','emaildown','emaildownrestart'),
|
||||||
'Ticket' => array('emailnewticket'),
|
'Ticket' => array('emailnewticket'),
|
||||||
'General' => array('emailfooter','emailregards','emailuseradd','emailpwrecovery','emailregister'),
|
'General' => array('emailfooter','emailregards','emailuseradd','emailpwrecovery','emailregister', 'emaileasyupdate'),
|
||||||
'VoiceServer' => array('emailvoicemasterold'),
|
'VoiceServer' => array('emailvoicemasterold'),
|
||||||
'GameServer' => array('emailgserverupdate')
|
'GameServer' => array('emailgserverupdate')
|
||||||
);
|
);
|
||||||
|
@ -806,8 +806,14 @@ if (!function_exists('passwordgenerate')) {
|
|||||||
$noreply='(This is an automated mail. Please do not reply to it since the account is configured to send only.)';
|
$noreply='(This is an automated mail. Please do not reply to it since the account is configured to send only.)';
|
||||||
$emailfooter ='';
|
$emailfooter ='';
|
||||||
$emailregards ='';
|
$emailregards ='';
|
||||||
|
$ip = '';
|
||||||
|
$port = '';
|
||||||
|
if(isset($server)){
|
||||||
|
list($ip, $port) = explode(":", $server);
|
||||||
|
}
|
||||||
|
|
||||||
$keys = array('%emailfooter%','%emailregards%','%noreply%','%topic%','%id%','%creationTime%','%active%','%salutation%','%cname%','%fullname%','%name%','%vname%','%birthday%','%mail%','%email%','%phone%','%fax%','%handy%','%country%','%city%','%cityn%','%street%','%streetn%','%language%','%lastlogin%','%urlhost%','%password%','%server%','%username%','%date%','%shorten%','%ip%','%port%','%port2%','%port3%','%port4%','%port5%','%ports%');
|
$keys = array('%emailfooter%','%emailregards%','%noreply%','%topic%','%id%','%creationTime%','%active%','%salutation%','%cname%','%fullname%','%name%','%vname%','%birthday%','%mail%','%email%','%phone%','%fax%','%handy%','%country%','%city%','%cityn%','%street%','%streetn%','%language%','%lastlogin%','%urlhost%','%password%','%server%','%username%','%date%','%shorten%','%ip%','%port%','%port2%','%port3%','%port4%','%port5%','%ports%');
|
||||||
$replacements = array($emailfooter, $emailregards, $noreply, $topic, $email_id, $email_creationTime, $email_active, $salutation, $email_cname, $fullname, $email_name, $email_vname, $email_birthday, $email_mail, $email_mail, $email_phone, $email_fax, $email_handy, $email_country, $email_city, $email_cityn, $email_street, $email_streetn, $userLanguage, $email_lastlogin, $email_urlhost, $password, $server, $username, $maildate, $shorten);
|
$replacements = array($emailfooter, $emailregards, $noreply, $topic, $email_id, $email_creationTime, $email_active, $salutation, $email_cname, $fullname, $email_name, $email_vname, $email_birthday, $email_mail, $email_mail, $email_phone, $email_fax, $email_handy, $email_country, $email_city, $email_cityn, $email_street, $email_streetn, $userLanguage, $email_lastlogin, $email_urlhost, $password, $server, $username, $maildate, $shorten, $ip, $port);
|
||||||
|
|
||||||
//More IP Adress
|
//More IP Adress
|
||||||
if (is_array($connectInfo) and count($connectInfo) > 0 and isset($connectInfo['ip'])) {
|
if (is_array($connectInfo) and count($connectInfo) > 0 and isset($connectInfo['ip'])) {
|
||||||
|
@ -66,6 +66,10 @@
|
|||||||
|
|
||||||
<div class="navbar-custom-menu">
|
<div class="navbar-custom-menu">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
|
<li class="dropdown messages-menu hidden-xs twitter-button-margin">
|
||||||
|
<a href="https://twitter.com/easy_wi?ref_src=twsrc%5Etfw" class="twitter-follow-button" data-show-count="false">Follow @easy_wi</a>
|
||||||
|
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
|
||||||
|
</li>
|
||||||
<?php if(isset($toooldversion)){ ?>
|
<?php if(isset($toooldversion)){ ?>
|
||||||
<!-- Messages: style can be found in dropdown.less-->
|
<!-- Messages: style can be found in dropdown.less-->
|
||||||
<li class="dropdown messages-menu hidden-xs">
|
<li class="dropdown messages-menu hidden-xs">
|
||||||
|
@ -416,6 +416,17 @@
|
|||||||
</div>
|
</div>
|
||||||
<?php }?>
|
<?php }?>
|
||||||
|
|
||||||
|
<?php if(isset($easywitweets) && $easywitweets) { ?>
|
||||||
|
<hr>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6" >
|
||||||
|
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
|
||||||
|
<a class="twitter-timeline" href="https://twitter.com/easy_wi?ref_src=twsrc^tfw">Tweets by easy_wi</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
<?php if(count($feedArray)>0) { ?>
|
<?php if(count($feedArray)>0) { ?>
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user