Merge pull request #8 from poblabs/momentjs
Use moment.js for date formatting
This commit is contained in:
commit
f93063b4da
|
@ -25,17 +25,27 @@ echo ' [+] Setting up config.ini'
|
||||||
echo "[GENERAL]" > /var/www/opentrashmail/config.ini
|
echo "[GENERAL]" > /var/www/opentrashmail/config.ini
|
||||||
if [ "$DOMAINS" != "" ]; then
|
if [ "$DOMAINS" != "" ]; then
|
||||||
echo "DOMAINS=$DOMAINS" >> /var/www/opentrashmail/config.ini
|
echo "DOMAINS=$DOMAINS" >> /var/www/opentrashmail/config.ini
|
||||||
echo " [i] Active Domain(s): $DOMAINS"
|
echo " [i] Active Domain(s): $DOMAINS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$ADMIN" != "" ]; then
|
if [ "$ADMIN" != "" ]; then
|
||||||
echo "ADMIN=$ADMIN" >> /var/www/opentrashmail/config.ini
|
echo "ADMIN=$ADMIN" >> /var/www/opentrashmail/config.ini
|
||||||
echo " [i] Set admin to: $ADMIN"
|
echo " [i] Set admin to: $ADMIN"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "[MAILSERVER]" >> /var/www/opentrashmail/config.ini
|
echo "[MAILSERVER]" >> /var/www/opentrashmail/config.ini
|
||||||
echo "MAILPORT=25" >> /var/www/opentrashmail/config.ini
|
echo "MAILPORT=25" >> /var/www/opentrashmail/config.ini
|
||||||
|
|
||||||
|
echo "[DATETIME]" >> /var/www/opentrashmail/config.ini
|
||||||
|
if [ "$DATEFORMAT" != "" ]; then
|
||||||
|
echo "DATEFORMAT=$DATEFORMAT" >> /var/www/opentrashmail/config.ini
|
||||||
|
echo " [i] Setting up dateformat to: $DATEFORMAT"
|
||||||
|
else
|
||||||
|
echo "DATEFORMAT='D.M.YYYY HH:mm'" >> /var/www/opentrashmail/config.ini
|
||||||
|
echo " [i] Using default dateformat"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
cd /var/www/opentrashmail/python
|
cd /var/www/opentrashmail/python
|
||||||
|
|
||||||
echo ' [+] Starting Mailserver'
|
echo ' [+] Starting Mailserver'
|
||||||
|
|
|
@ -10,4 +10,7 @@ DOMAINS=yourdomain,sub.yourdomain
|
||||||
|
|
||||||
[MAILSERVER]
|
[MAILSERVER]
|
||||||
; Port that the Mailserver will run on (default 25 but that needs root)
|
; Port that the Mailserver will run on (default 25 but that needs root)
|
||||||
MAILPORT=25
|
MAILPORT=25
|
||||||
|
[DATETIME]
|
||||||
|
; The moment.js format you'd like your date to be formatted in
|
||||||
|
DATEFORMAT="D.M.YYYY HH:mm"
|
|
@ -60,6 +60,7 @@ switch($action)
|
||||||
{
|
{
|
||||||
$o['status'] = 'ok';
|
$o['status'] = 'ok';
|
||||||
$o['type'] = 'admin';
|
$o['type'] = 'admin';
|
||||||
|
$o['dateformat'] = $settings['DATEFORMAT'];
|
||||||
$emails = listEmailAdresses();
|
$emails = listEmailAdresses();
|
||||||
$emaillist = array();
|
$emaillist = array();
|
||||||
|
|
||||||
|
|
|
@ -42,5 +42,6 @@
|
||||||
<script src="js/namegenerator.js"></script>
|
<script src="js/namegenerator.js"></script>
|
||||||
<script src="js/opentrashmail.js"></script>
|
<script src="js/opentrashmail.js"></script>
|
||||||
<script src="js/bootstrap.bundle.min.js"></script>
|
<script src="js/bootstrap.bundle.min.js"></script>
|
||||||
|
<script src="js/moment-with-locales.min.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
1
web/js/moment-with-locales.min.js
vendored
Normal file
1
web/js/moment-with-locales.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -111,8 +111,10 @@ function updateEmailTable()
|
||||||
}
|
}
|
||||||
else dateofemail = em;
|
else dateofemail = em;
|
||||||
if(em>lastid) lastid = em;
|
if(em>lastid) lastid = em;
|
||||||
var date = new Date(parseInt(dateofemail))
|
|
||||||
var datestring = date.getDate()+"."+date.getMonth()+"."+date.getFullYear()+" "+date.getHours()+":"+date.getMinutes();
|
//var date = new Date(parseInt(dateofemail))
|
||||||
|
//var datestring = date.getDate()+"."+date.getMonth()+"."+date.getFullYear()+" "+date.getHours()+":"+date.getMinutes();
|
||||||
|
var datestring = moment.unix(parseInt(dateofemail/1000)).format(data.dateformat); // Use moment.js formatting
|
||||||
var ed = data.emails[em]
|
var ed = data.emails[em]
|
||||||
$("#emailtable").append('\
|
$("#emailtable").append('\
|
||||||
<tr class="anemail" onClick="loadMail(\''+email+'\','+dateofemail+');">\
|
<tr class="anemail" onClick="loadMail(\''+email+'\','+dateofemail+');">\
|
||||||
|
|
Loading…
Reference in a new issue