0ct0pu5/b1gMail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add favicon notify, small fixes

Browse source
This commit is contained in:
Sebijk 2022-03-07 01:27:12 +01:00
parent 7f49816a79
commit b49753067c
7 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/clientlib/favico.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
src/plugins/templates/openfire.plugin.prefs.tpl
View file

@ -34,4 +34,4 @@
</form>
</fieldset>
<center><p /><font size="1">b1gMail Openfire-Integration &copy; 2007 - 2008, <a href="http://www.sebijk.com" target="_blank">Home of the Sebijk.com</a></font></center>
<center><p /><font size="1">b1gMail Openfire-Integration &copy; <a href="http://www.sebijk.com" target="_blank" rel="noreferrer">Home of the Sebijk.com</a></font></center>

12
src/serverlib/payment.class.php
View file

@ -130,6 +130,8 @@ class BMPayment
$pf['plz'] = $userRow['plz'];
$pf['ort'] = $userRow['ort'];
$pf['land'] = $userRow['land'];
$pf['company'] = $userRow['company'];
$pf['taxid'] = $userRow['taxid'];
$tpl->assign('_pf', $pf);
}
@ -629,6 +631,8 @@ class BMPayment
$pf['ort'] = $_POST['ort'];
$pf['land'] = $_POST['land'];
$pf['paymentMethod'] = $_POST['paymentMethod'];
$pf['company'] = $_POST['company'];
$pf['taxid'] = $_POST['taxid'];
$pf['invalidFields'] = $invalidFields;
$pf['dateFields'] = $dateFields;
@ -647,8 +651,8 @@ class BMPayment
else
$vkCode = '';
$db->Query('INSERT INTO {pre}orders(`userid`,`vkcode`,`cart`,`paymethod`,`paymethod_params`,`amount`,`tax`,`inv_firstname`,`inv_lastname`,`inv_street`,`inv_no`,`inv_zip`,`inv_city`,`inv_country`,`created`,`status`) VALUES '
. '(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
$db->Query('INSERT INTO {pre}orders(`userid`,`vkcode`,`cart`,`paymethod`,`paymethod_params`,`amount`,`tax`,`inv_firstname`,`inv_lastname`,`inv_street`,`inv_no`,`inv_zip`,`inv_city`,`inv_country`,`inv_firma`,`inv_taxid`,`created`,`status`) VALUES '
. '(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
$userID,
$vkCode,
serialize($cart),
@ -663,6 +667,8 @@ class BMPayment
$bm_prefs['sendrg'] == 'yes' ? $_POST['plz'] : '',
$bm_prefs['sendrg'] == 'yes' ? $_POST['ort'] : '',
$_POST['land'],
$bm_prefs['sendrg'] == 'yes' ? $_POST['company'] : '',
$bm_prefs['sendrg'] == 'yes' ? $_POST['taxid'] : '',
time(),
ORDER_STATUS_CREATED);
$orderId = $db->InsertId();
@ -814,6 +820,8 @@ class BMPayment
$rgTpl->assign('land', isset($countryList[$orderRow['inv_country']])
? $countryList[$orderRow['inv_country']]
: '');
$rgTpl->assign('company', $orderRow['inv_company']);
$rgTpl->assign('taxid', $orderRow['inv_taxid']);
// bank account info
$rgTpl->assign('ktonr', $bm_prefs['vk_kto_nr']);

7
src/serverlib/user.class.php
View file

@ -2833,6 +2833,8 @@ class BMUser
'mail2sms_nummer' => $this->_row['mail2sms_nummer'],
'altmail' => $this->_row['altmail'],
'profilfelder' => $this->_row['profilfelder'],
'company' => $this->_row['company'],
'taxid' => $this->_row['taxid'],
'changeDate' => time()
);
$contactHistory = serialize($contactHistory);
@ -2859,7 +2861,7 @@ class BMUser
}
// store data
$db->Query('UPDATE {pre}users SET vorname=?, nachname=?, strasse=?, hnr=?, plz=?, ort=?, land=?, tel=?, fax=?, mail2sms_nummer=?, altmail=?, profilfelder=?, passwort=?, contactHistory=?, sms_validation=?, anrede=? WHERE id=?',
$db->Query('UPDATE {pre}users SET vorname=?, nachname=?, strasse=?, hnr=?, plz=?, ort=?, land=?, tel=?, fax=?, mail2sms_nummer=?, altmail=?, profilfelder=?, passwort=?, company=?, taxid=?, contactHistory=?, sms_validation=?, anrede=? WHERE id=?',
$userRow['vorname'],
$userRow['nachname'],
$userRow['strasse'],
@ -2873,6 +2875,8 @@ class BMUser
$userRow['altmail'],
serialize($profileFields),
$userRow['passwort'],
$userRow['company'],
$userRow['taxid'],
$contactHistory,
$userID != 0
? 0
@ -2962,6 +2966,7 @@ class BMUser
'tel' => $this->_row['tel'],
'fax' => $this->_row['fax'],
'handy' => $this->_row['mail2sms_nummer'],
'firma' => $this->_row['company'],
'email' => ExtractMailAddress($this->GetDefaultSender())
);

2
src/serverlib/version.default.inc.php
View file

@ -1,3 +1,3 @@
<?php
define('B1GMAIL_VERSION', $b1gmail_version = '7.4.1-Beta2');
define('B1GMAIL_VERSION', $b1gmail_version = '7.4.1-Beta3');

2
src/templates/modern/js/loggedin.js
View file

@ -86,6 +86,7 @@ function setNotificationCount(count)
EBID('notifyCount').innerHTML = (count > 99) ? '99' : count;
EBID('notifyCount').style.display = '';
notificationCount = count;
favicon.badge(count);
if(newNotifications)
{
@ -100,6 +101,7 @@ function setNotificationCount(count)
else
{
notificationCount = 0;
favicon.badge(0);
EBID('notifyCount').style.display = 'none';
EBID('notifyIcon').className = EBID('notifyIcon').className.replace(' animated', '');

11
src/templates/modern/li/index.tpl
View file

@ -29,6 +29,15 @@
<script src="clientlib/dtree.js?{fileDateSig file="../../clientlib/dtree.js"}" type="text/javascript"></script>
<script src="clientlib/overlay.js?{fileDateSig file="../../clientlib/overlay.js"}" type="text/javascript"></script>
<script src="clientlib/autocomplete.js?{fileDateSig file="../../clientlib/autocomplete.js"}" type="text/javascript"></script>
<script src="clientlib/favicon.min.js?{fileDateSig file="../../clientlib/favicon.min.js"}" type="text/javascript"></script>
<script type="text/javascript">
{literal}
var favicon=new Favico({
animation:'fade'
});
{/literal}
{if $bmUnreadNotifications!=0}favicon.badge({number value=$bmUnreadNotifications min=0 max=99});{/if}
</script>
<!--[if lt IE 9]>
<script defer type="text/javascript" src="clientlib/IE9.js"></script>
<![endif]-->
@ -146,7 +155,7 @@
<td width="22" height="26" align="right"><i id="searchSpinner" style="display:none;" class="fa fa-spinner fa-pulse fa-fw"></i></td>
<td align="right" width="70">{lng p="search"}: &nbsp;</td>
<td align="center">
<input id="searchField" name="searchField" style="width:90%" onkeypress="searchFieldKeyPress(event,{if $searchDetailsDefault}true{else}false{/if})" />
<input type="search" id="searchField" name="searchField" style="width:90%" onkeypress="searchFieldKeyPress(event,{if $searchDetailsDefault}true{else}false{/if})" />
</td>
</tr>
</table>