github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 21:34:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:serghey-rodin/vesta

Browse source
This commit is contained in:
Serghey Rodin 2019-02-27 13:56:14 +02:00
commit 090875a173
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-add-letsencrypt-domain
View file

@ -190,7 +190,7 @@ for auth in $authz; do
nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n')
status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ') status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ')
if [[ "$status" -ne 200 ]]; then if [[ "$status" -ne 200 ]]; then
check_result $E_CONNECT "Let's Encrypt vvalidation status $status" check_result $E_CONNECT "Let's Encrypt validation status $status"
fi fi
i=$((i + 1)) i=$((i + 1))

2
web/inc/i18n/de.php
View file

@ -214,7 +214,7 @@ $LANG['de'] = array(
'Quota' => 'Kontingent', 'Quota' => 'Kontingent',
'Autoreply' => 'Autoreply', 'Autoreply' => 'Autoreply',
'Forward to' => 'Weiterleiten zu', 'Forward to' => 'Weiterleiten zu',
'Do not store forwarded mail' => 'Weiterleitungs Adresse nicht speichern', 'Do not store forwarded mail' => 'Weitergeleitete E-Mails nicht speichern',
'IMAP hostname' => 'IMAP hostname', 'IMAP hostname' => 'IMAP hostname',
'IMAP port' => 'IMAP port', 'IMAP port' => 'IMAP port',
'IMAP security' => 'IMAP security', 'IMAP security' => 'IMAP security',

6
web/templates/admin/edit_server.html
View file

@ -790,7 +790,7 @@
<a href="https://vestacp.com/checkout/2co.php?product_id=6&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Licence').' 3$/'.__('month').'</a> <a href="https://vestacp.com/checkout/2co.php?product_id=6&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Licence').' 3$/'.__('month').'</a>
</li> </li>
<li> <li>
<a href="https://vestacp.com/checkout/2co.php?product_id=9&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Lifetime License').' 18$</a> <a href="https://vestacp.com/checkout/2co.php?product_id=9&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Lifetime License').' 21$</a>
</li> </li>
</ul> </ul>
<span class="twoco">2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.</span>'; <span class="twoco">2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.</span>';
@ -835,10 +835,10 @@
</div> </div>
<ul> <ul>
<li> <li>
<a href="https://vestacp.com/checkout/2co.php?product_id=7&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Licence').' 5$/'.__('month').'</a> <a href="https://vestacp.com/checkout/2co.php?product_id=7&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Licence').' 3$/'.__('month').'</a>
</li> </li>
<li> <li>
<a href="https://vestacp.com/checkout/2co.php?product_id=8&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Lifetime License').' 50$</a> <a href="https://vestacp.com/checkout/2co.php?product_id=8&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Lifetime License').' 28$</a>
</li> </li>
</ul> </ul>
<span class="twoco">2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.</span>'; <span class="twoco">2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.</span>';