postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!

SF.net SVN: postfixadmin: [103] trunk/templates/header.tpl

[<Gin...@us...>]

Revision: 103
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=103&view=rev
Author:   GingerDog
Date:     2007-09-28 12:29:10 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
templates/header.tpl: basic flash messaging, basic capability for info and error messages; needs css styling

Modified Paths:
--------------
    trunk/templates/header.tpl

Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl	2007-09-28 19:28:24 UTC (rev 102)
+++ trunk/templates/header.tpl	2007-09-28 19:29:10 UTC (rev 103)
@@ -38,3 +38,23 @@
 }
 ?>
 </div>
+
+<?php
+if(isset($_SESSION['flash'])) {
+    if(isset($_SESSION['flash']['info'])) {
+        echo '<ul class="flash-info">';
+        foreach($_SESSION['flash']['info'] as $msg) {
+            echo "<li>$msg</li>";
+        }
+        echo '</ul>';
+    }
+    if(isset($_SESSION['flash']['error'])) {
+        echo '<ul class="flash-error">';
+        foreach($_SESSION['flash']['error'] as $msg) {
+            echo "<li>$msg</li>";
+        }
+        echo '</ul>';
+    }
+    /* nuke it from orbit. It's the only way to be sure. */
+    $_SESSION['flash'] = array(); 
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [102] trunk/common.php

[<Gin...@us...>]

Revision: 102
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=102&view=rev
Author:   GingerDog
Date:     2007-09-28 12:28:24 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
common.php: magic quotes stuff

Modified Paths:
--------------
    trunk/common.php

Modified: trunk/common.php
===================================================================
--- trunk/common.php	2007-09-28 19:27:51 UTC (rev 101)
+++ trunk/common.php	2007-09-28 19:28:24 UTC (rev 102)
@@ -14,6 +14,8 @@
 // 
 
 $incpath = dirname(__FILE__);
+(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1');
+(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1');
 
 require_once("$incpath/variables.inc.php");
 if(!is_file("$incpath/config.inc.php")) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [101] trunk/functions.inc.php

[<Gin...@us...>]

Revision: 101
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=101&view=rev
Author:   GingerDog
Date:     2007-09-28 12:27:51 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
functions.inc.php: fix escape_string to handle arrays, move magic_quotes stuff to common.php; add flash message stuff (See also header.php)

Modified Paths:
--------------
    trunk/functions.inc.php

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2007-09-27 23:46:59 UTC (rev 100)
+++ trunk/functions.inc.php	2007-09-28 19:27:51 UTC (rev 101)
@@ -98,6 +98,39 @@
 }
 
 
+/**
+ * Add an error message for display on the next page that is rendered.
+ * @param String message to show. 
+ *
+ * Stores string in session. Flushed through header template.
+ * @see _flash_string()
+ */
+function flash_error($string) {
+   _flash_string('error', $string);
+}
+
+/**
+ * Used to display an info message on successful update.
+ * @param String $string
+ * Stores data in sessio.
+ * @see _flash_string()
+ */
+function flash_info($string) {
+   _flash_string('info', $string);
+}
+/**
+ * 'Private' method used for flash_info() and flash_error().
+ */
+function _flash_string($type, $string) {
+   if(!isset($_SESSION['flash'])) {
+      $_SESSION['flash'] = array();
+   }
+   if(!isset($_SESSION['flash'][$type])) {
+      $_SESSION['flash'][$type] = array();
+   }
+   $_SESSION['flash'][$type][] = $string;
+}
+
 //
 // check_language
 // Action: checks what language the browser uses
@@ -232,16 +265,26 @@
 
 
 
-//
-// escape_string
-// Action: Escape a string
-// Call: escape_string (string string)
-//
-(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1');
-(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1');
+/**
+ * Clean a string, escaping any meta characters that could be
+ * used to disrupt an SQL string. i.e. "'" => "\'" etc.
+ *
+ * @param String (or Array) 
+ * @return String (or Array) of cleaned data, suitable for use within an SQL
+ *    statement.
+ */
 function escape_string ($string)
 {
    global $CONF;
+   // if the string is actually an array, do a recursive cleaning.
+   // Note, the array keys are not cleaned.
+   if(is_array($string)) {
+      $clean = array();
+      foreach($string as $row) {
+         $clean[] = escape_string($row);  
+      }
+      return $clean;
+   }
    if (get_magic_quotes_gpc ())
    {
       $string = stripslashes($string);
@@ -619,23 +662,38 @@
 }
 
 
-
-//
-// list_domains_for_admin
-// Action: Lists all the domains for an admin.
-// Call: list_domains_for_admin (string admin)
-//
+/**
+ * List domains for an admin user. If $username is empty, it returns all
+ * available damains for a user.
+ * Otherwise, it returns only those domains for a particular user.
+ * @param String $username
+ * @return array of domain names.
+ */
 function list_domains_for_admin ($username)
 {
    global $CONF;
    global $table_domain, $table_domain_admins;
    $list = array ();
 
-   $query = "SELECT $table_domain.domain FROM $table_domain LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain WHERE $table_domain_admins.username='$username' AND $table_domain.active='1' AND $table_domain.backupmx='0' ORDER BY $table_domain_admins.domain";
-   if ('pgsql'==$CONF['database_type'])
-   {
-      $query = "SELECT $table_domain.domain FROM $table_domain LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain WHERE $table_domain_admins.username='$username' AND $table_domain.active=true AND $table_domain.backupmx=false ORDER BY $table_domain_admins.domain";
+   $username_sql = '';
+   $active_sql = db_get_boolean(True);
+   $backupmx_sql = db_get_boolean(False);
+   if($username != '') {
+      $query = "SELECT $table_domain.domain, $table_domain_admins.username FROM $table_domain 
+         LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain 
+         WHERE $table_domain_admins.username='$username' 
+         AND $table_domain.active=$active_sql 
+         AND $table_domain.backupmx=$backupmx_sql 
+         ORDER BY $table_domain_admins.domain";
    }
+   else {
+      $query = "SELECT $table_domain.domain FROM $table_domain 
+         LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain 
+         WHERE $table_domain.active=$active_sql 
+         AND $table_domain.backupmx=$backupmx_sql 
+         ORDER BY $table_domain_admins.domain";
+   }
+
    $result = db_query ($query);
    if ($result['rows'] > 0)
    {
@@ -1233,7 +1291,7 @@
       if (function_exists ("pg_pconnect"))
       {
          $connect_string = "host=" . $CONF['database_host'] . " dbname=" . $CONF['database_name'] . " user=" . $CONF['database_user'] . " password=" . $CONF['database_password'];
-         $link = @pg_pconnect ($connect_string) or die ("<p />DEBUG INFORMATION:<br />Connect: " .  pg_last_error($link) . "$DEBUG_TEXT");
+         $link = @pg_pconnect ($connect_string) or die ("<p />DEBUG INFORMATION:<br />Connect: failed to connect to database. $DEBUG_TEXT");
          pg_set_client_encoding($link, 'UNICODE');
       }
       else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [100] trunk/templates/search.tpl

[<chr...@us...>]

Revision: 100
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=100&view=rev
Author:   christian_boltz
Date:     2007-09-27 16:46:59 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
- fix: edit links contained <span ...>...</span> from search highlighting.
  (see forum post: https://sourceforge.net/forum/message.php?msg_id=4540915)
  Now using separate variables for highlighting in strings that end up in links.

Modified Paths:
--------------
    trunk/templates/search.tpl

Modified: trunk/templates/search.tpl
===================================================================
--- trunk/templates/search.tpl	2007-09-27 23:24:48 UTC (rev 99)
+++ trunk/templates/search.tpl	2007-09-27 23:46:59 UTC (rev 100)
@@ -61,13 +61,14 @@
       {
          print "   <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
          //highlight search string
-         if (stristr($tAlias[$i]['address'],$fSearch))
+         $tAlias[$i]['display_address'] = $tAlias[$i]['address'];
+         if (stristr($tAlias[$i]['display_address'],$fSearch))
          {
            $new_address = str_ireplace($fSearch, "<span style='background-color: lightgreen'>" .
-               $fSearch . "</span>", $tAlias[$i]['address']);
-           $tAlias[$i]['address'] = $new_address;
+               $fSearch . "</span>", $tAlias[$i]['display_address']);
+           $tAlias[$i]['display_address'] = $new_address;
          }
-         print "      <td>" . $tAlias[$i]['address'] . "</td>\n";
+         print "      <td>" . $tAlias[$i]['display_address'] . "</td>\n";
          if (stristr($tAlias[$i]['goto'],$fSearch))
          {
            $new_goto = str_ireplace($fSearch, "<span style='background-color: lightgreen'>" .
@@ -137,13 +138,14 @@
       if ((is_array ($tMailbox) and sizeof ($tMailbox) > 0))
       {
          print "   <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
-         if (stristr($tMailbox[$i]['username'],$fSearch))
+         $tMailbox[$i]['display_username'] = $tMailbox[$i]['username'];
+         if (stristr($tMailbox[$i]['display_username'],$fSearch))
          {
            $new_name = str_ireplace($fSearch, "<span style='background-color: lightgreen'>" .
-               $fSearch . "</span>", $tMailbox[$i]['username']);
-           $tMailbox[$i]['username'] = $new_name;
+               $fSearch . "</span>", $tMailbox[$i]['display_username']);
+           $tMailbox[$i]['display_username'] = $new_name;
          }
-         print "      <td>" . $tMailbox[$i]['username'] . "</td>\n";
+         print "      <td>" . $tMailbox[$i]['display_username'] . "</td>\n";
          if (stristr($tMailbox[$i]['name'],$fSearch))
          {
            $new_name = str_ireplace($fSearch, "<span style='background-color: lightgreen'>" .


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [99] trunk/functions.inc.php

[<chr...@us...>]

Revision: 99
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=99&view=rev
Author:   christian_boltz
Date:     2007-09-27 16:24:48 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
- fix: added edit_mailbox as allowed log action

Modified Paths:
--------------
    trunk/functions.inc.php

Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php	2007-09-25 20:07:00 UTC (rev 98)
+++ trunk/functions.inc.php	2007-09-27 23:24:48 UTC (rev 99)
@@ -1423,7 +1423,7 @@
    global $table_log;
    $REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
 
-   $action_list = array('create_alias', 'delete_alias', 'edit_alias', 'create_mailbox', 'delete_mailbox', 'edit_alias_state', 'edit_mailbox_state', 'edit_password');
+   $action_list = array('create_alias', 'delete_alias', 'edit_alias', 'create_mailbox', 'delete_mailbox', 'edit_mailbox', 'edit_alias_state', 'edit_mailbox_state', 'edit_password');
 
    if(!in_array($action, $action_list)) {
       die("Invalid log action : $action");   // could do with something better?


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [98] trunk/admin/edit-domain.php

[<Gin...@us...>]

Revision: 98
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=98&view=rev
Author:   GingerDog
Date:     2007-09-25 13:07:00 -0700 (Tue, 25 Sep 2007)

Log Message:
-----------
admin/edit-domain.php: sql refactoring

Modified Paths:
--------------
    trunk/admin/edit-domain.php

Modified: trunk/admin/edit-domain.php
===================================================================
--- trunk/admin/edit-domain.php	2007-09-25 20:06:28 UTC (rev 97)
+++ trunk/admin/edit-domain.php	2007-09-25 20:07:00 UTC (rev 98)
@@ -74,17 +74,21 @@
       $fMailboxes = -1;
       $fMaxquota = -1;
       $fBackupmx = 1;
-      $sqlBackupmx = ('pgsql'==$CONF['database_type']) ? 'true' : 1;
+      $sqlBackupmx = db_get_boolean(True);
    }
    else
    {
       $fBackupmx = 0;
-      $sqlBackupmx = ('pgsql'==$CONF['database_type']) ? 'false' : 0;
+      $sqlBackupmx = db_get_boolean(False);
    }
 
-   if ($fActive == "on") { $fActive = 1; }
-   $sqlActive=$fActive;
-   if ('pgsql'==$CONF['database_type']) $sqlActive = $fActive ? 'true':'false';
+   if ($fActive == "on") { 
+      $sqlActive = db_get_boolean(True);
+   }
+   else {
+      $sqlActive = db_get_boolean(False);
+   }
+
  
 	$result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,transport='$fTransport',backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
 	if ($result['rows'] == 1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [97] trunk/users/login.php

[<Gin...@us...>]

Revision: 97
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=97&view=rev
Author:   GingerDog
Date:     2007-09-25 13:06:28 -0700 (Tue, 25 Sep 2007)

Log Message:
-----------
users/login.php: sql refactoring

Modified Paths:
--------------
    trunk/users/login.php

Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php	2007-09-25 19:54:03 UTC (rev 96)
+++ trunk/users/login.php	2007-09-25 20:06:28 UTC (rev 97)
@@ -35,22 +35,17 @@
    $fUsername = escape_string ($_POST['fUsername']);
    $fPassword = escape_string ($_POST['fPassword']);
 
-   $query = "SELECT password FROM $table_mailbox WHERE username='$fUsername' AND active='1'";
-   if ('pgsql'==$CONF['database_type'])
-   {
-      $query = "SELECT password FROM $table_mailbox WHERE username='$fUsername' AND active=true";
-   }
+   $active = db_get_boolean(True);
+   $query = "SELECT password FROM $table_mailbox WHERE username='$fUsername' AND active=$active";
+
    $result = db_query ($query);
    if ($result['rows'] == 1)
    {
       $row = db_array ($result['result']);
       $password = pacrypt ($fPassword, $row['password']);
 
-      $query = "SELECT * FROM $table_mailbox WHERE username='$fUsername' AND password='$password' AND active='1'";
-      if ('pgsql'==$CONF['database_type'])
-      {
-         $query = "SELECT * FROM $table_mailbox WHERE username='$fUsername' AND password='$password' AND active=true";
-      }
+      $query = "SELECT * FROM $table_mailbox WHERE username='$fUsername' AND password='$password' AND active=$active";
+
       $result = db_query ($query);
       if ($result['rows'] != 1)
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: postfixadmin: [96] trunk/DOCUMENTS

[<Gin...@us...>]

Revision: 96
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=96&view=rev
Author:   GingerDog
Date:     2007-09-25 12:54:03 -0700 (Tue, 25 Sep 2007)

Log Message:
-----------
screenshots: adding

Added Paths:
-----------
    trunk/DOCUMENTS/screenshots/
    trunk/DOCUMENTS/screenshots/README.txt
    trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-alias.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-domain.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-mailbox.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-admin-domain-list.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-admin-virtual-list.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-inital-welcome.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-mail-admin-login.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-user-change-forward.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-user-overview.jpg
    trunk/DOCUMENTS/screenshots/postfixadmin-user-vacation.jpg

Added: trunk/DOCUMENTS/screenshots/README.txt
===================================================================
--- trunk/DOCUMENTS/screenshots/README.txt	                        (rev 0)
+++ trunk/DOCUMENTS/screenshots/README.txt	2007-09-25 19:54:03 UTC (rev 96)
@@ -0,0 +1,2 @@
+Random Screenshots taken on 2007/09/25, using a version of Postfixadmin from subversion.
+

Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-alias.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-alias.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-domain.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-domain.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-mailbox.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-mailbox.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-domain-list.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-domain-list.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-virtual-list.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-virtual-list.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-inital-welcome.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-inital-welcome.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-mail-admin-login.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-mail-admin-login.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-user-change-forward.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-user-change-forward.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-user-overview.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-user-overview.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/DOCUMENTS/screenshots/postfixadmin-user-vacation.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-user-vacation.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Postfixadmin-svn] SF.net SVN: postfixadmin: [95] trunk/templates/search.tpl

[<chr...@us...>]

Revision: 95
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=95&view=rev
Author:   christian_boltz
Date:     2007-09-24 16:24:18 -0700 (Mon, 24 Sep 2007)

Log Message:
-----------
- removed forgotten TODO

Modified Paths:
--------------
    trunk/templates/search.tpl

Modified: trunk/templates/search.tpl
===================================================================
--- trunk/templates/search.tpl	2007-09-24 22:01:09 UTC (rev 94)
+++ trunk/templates/search.tpl	2007-09-24 23:24:18 UTC (rev 95)
@@ -26,7 +26,6 @@
 </select>
 <?php
 if (authentication_has_role('global-admin')) {
-   # TODO: make "Return to" translatable
    ?>
    <input class="button" type="submit" name="fGo" value="<?php print $PALANG['pReturn_to'] . ' ' . $PALANG['pAdminMenu_list_virtual']; ?>" /></td>
    <?php 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.