|
[-]
[+]
|
Added |
postfixadmin.changes
|
|
|
|
[-]
[+]
|
Changed |
postfixadmin.spec
^
|
|
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/CHANGELOG.TXT
^
|
| @@ -8,7 +8,16 @@
# http://www.postfixadmin.com or http://postfixadmin.sf.net
#
# Last update:
-# $Id: CHANGELOG.TXT 1335 2012-01-15 12:10:59Z christian_boltz $
+# $Id: CHANGELOG.TXT 1417 2013-01-02 21:19:52Z christian_boltz $
+
+Version 2.3.6 - 2013/01/02 - SVN r1417 (postfixadmin-2.3 branch)
+----------------------------------------------------------------
+
+ - display domain and mailbox description with correct encoding
+ - fix footer link
+ - focus username input field in login form
+ - fix double inclusion of config.inc.php in setup.php
+ - fix bool and date handling in fetchmail
Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch)
----------------------------------------------------------------
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/debian/changelog
^
|
| @@ -1,7 +1,13 @@
+postfixadmin (2.3.6-1) unstable; urgency=low
+
+ * New upstream release (v2.3.6)
+
+ -- David Goodwin (PalePurple) <david@palepurple.co.uk> Wed, 2 Jan 2013 21:20:00 +0100
+
postfixadmin (2.3.5-1) unstable; urgency=low
* Initial Debian release (Closes: #247225)
- * Changed email address from normes to myself for signing purposes.
+ * Changed from normes to me, for signing/building purposes.
- -- David Goodwin (PalePurple) <david@palepurple.co.uk> Wed, 25 Jan 2012 12:27:28 +0100
+ -- David Goodwin (PalePurple) <david@palepurple.co.uk> Sun, 15 Jan 2012 12:27:28 +0100
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/fetchmail.php
^
|
| @@ -9,13 +9,13 @@
* Further details on the project are available at :
* http://www.postfixadmin.com or http://postfixadmin.sf.net
*
- * @version $Id: fetchmail.php 604 2009-03-26 23:07:45Z christian_boltz $
+ * @version $Id: fetchmail.php 1411 2012-10-31 00:04:31Z christian_boltz $
* @license GNU GPL v2 or later.
*
* File: fetchmail.php
* Responsible for setting up fetchmail
*
- * @version $Id: fetchmail.php 604 2009-03-26 23:07:45Z christian_boltz $
+ * @version $Id: fetchmail.php 1411 2012-10-31 00:04:31Z christian_boltz $
* @license GNU GPL v2 or later.
*
* Template Variables:
@@ -210,6 +210,11 @@
} elseif ($edit) { # edit entry form
$formvars = $edit_row;
$formvars['src_password'] = '';
+ if ('pgsql'==$CONF['database_type']) {
+ $formvars['fetchall']=('t'==$formvars['fetchall']) ? 1 : 0;
+ $formvars['keep']=('t'==$formvars['keep']) ? 1 : 0;
+ $formvars['usessl']=('t'==$formvars['usessl']) ? 1 : 0;
+ }
} elseif ($new) { # create entry form
foreach (array_keys($fm_struct) as $value) {
if (isset($fm_defaults[$value])) {
@@ -226,6 +231,15 @@
$res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE mailbox IN ($user_mailboxes_sql) ORDER BY mailbox,src_server,src_user");
if ($res['rows'] > 0) {
while ($row = db_array ($res['result'])) {
+ if ('pgsql'==$CONF['database_type']) {
+ //. at least in my database, $row['modified'] already looks like : 2009-04-11 21:38:10.75586+01,
+ // while gmstrftime expects an integer value. strtotime seems happy though.
+ //$row['date']=gmstrftime('%c %Z',$row['date']);
+ $row['date'] = date('Y-m-d H:i:s', strtotime($row['date']));
+ $row['fetchall']=('t'==$row['fetchall']) ? 1 : 0;
+ $row['keep']=('t'==$row['keep']) ? 1 : 0;
+ $row['usessl']=('t'==$row['usessl']) ? 1 : 0;
+ }
$tFmail[] = $row;
}
}
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/functions.inc.php
^
|
| @@ -9,14 +9,14 @@
* Further details on the project are available at :
* http://www.postfixadmin.com or http://postfixadmin.sf.net
*
- * @version $Id: functions.inc.php 1335 2012-01-15 12:10:59Z christian_boltz $
+ * @version $Id: functions.inc.php 1417 2013-01-02 21:19:52Z christian_boltz $
* @license GNU GPL v2 or later.
*
* File: functions.inc.php
* Contains re-usable code.
*/
-$version = '2.3.5';
+$version = '2.3.6';
/**
* check_session
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/setup.php
^
|
| @@ -9,7 +9,7 @@
* Further details on the project are available at :
* http://www.postfixadmin.com or http://postfixadmin.sf.net
*
- * @version $Id: setup.php 969 2011-02-19 20:10:22Z christian_boltz $
+ * @version $Id: setup.php 1405 2012-06-30 11:07:57Z christian_boltz $
* @license GNU GPL v2 or later.
*
* File: setup.php
@@ -123,7 +123,6 @@
require_once($incpath.'/config.inc.php');
$config_loaded = 1;
- require($incpath.'/config.inc.php');
if(isset($CONF['configured'])) {
if($CONF['configured'] === TRUE) {
print "<li>Checking \$CONF['configured'] - OK\n";
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/templates/admin_list-domain.php
^
|
| @@ -50,7 +50,7 @@
{
print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
print "<td><a href=\"list-virtual.php?domain=" . $domain_properties[$i]['domain'] . "\">" . $domain_properties[$i]['domain'] . "</a></td>";
- print "<td>" . htmlentities($domain_properties[$i]['description']) . "</td>";
+ print "<td>" . htmlentities($domain_properties[$i]['description'], ENT_QUOTES, 'UTF-8') . "</td>";
print "<td>" . $domain_properties[$i]['alias_count'] . " / " . $domain_properties[$i]['aliases'] . "</td>";
print "<td>" . $domain_properties[$i]['mailbox_count'] . " / " . $domain_properties[$i]['mailboxes'] . "</td>";
if ($CONF['quota'] == 'YES')
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/templates/list-virtual.php
^
|
| @@ -314,7 +314,7 @@
}
- print " <td>" . htmlentities($tMailbox[$i]['name']) . "</td>\n";
+ print " <td>" . htmlentities($tMailbox[$i]['name'], ENT_QUOTES, 'UTF-8') . "</td>\n";
if ($CONF['quota'] == 'YES')
{
print " <td>";
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/templates/login.php
^
|
| @@ -30,7 +30,7 @@
</table>
</form>
-<script tyle="text/javascript"><!--
+<script type="text/javascript"><!--
document.login.fUsername.focus();
// -->
</script>
|
|
[-]
[+]
|
Changed |
postfixadmin-2.3.6.tar.bz2/templates/users_login.php
^
|
| @@ -26,4 +26,9 @@
</tr>
</table>
</form>
+<script type="text/javascript"><!--
+ document.login.fUsername.focus();
+// -->
+</script>
+
</div>
|
