Merge branch 'master' of github.com:HaschekSolutions/opentrashmail

This commit is contained in:
Chris 2019-10-03 19:20:06 +02:00
commit 91fc97874f
3 changed files with 9 additions and 4 deletions

View file

@ -124,7 +124,7 @@ if __name__ == '__main__':
else :
Config = ConfigParser.ConfigParser()
Config.read("../config.ini")
port = int(Config.get("MAILSERVER","PORT"))
port = int(Config.get("MAILSERVER","MAILPORT"))

View file

@ -74,7 +74,7 @@ switch($action)
}
}
if(is_array($emaillist))
ksort($emaillist);
krsort($emaillist);
$data = (count($emaillist)?$emaillist:array());
}

View file

@ -89,11 +89,16 @@ function updateEmailTable()
var admin=false;
if(data.type=="admin")
{
clearInterval(timer);
//clearInterval(timer);
admin = true;
$('#tableheader').children(':eq(1)').after('<th scope="col">To</th>');
// Do not add the To header if one with the "to" class already exists
if ( $('#tableheader').children(':eq(2)').hasClass("to") === false )
{
$('#tableheader').children(':eq(1)').after('<th scope="col" class="to">To</th>');
}
}
$("#emailtable tr").remove(); // Empty all <tr> from the table so we don't stack
if(Object.keys(data.emails).length>0)
for(em in data.emails)
{