Changeset 163

Timestamp:

08/29/07 20:50:40 (17 months ago)

Author:

jonas

Message:

Fixed: domain_add: default postmaster forwarding (#26)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• includes/sites/domain_add.php (modified) (1 diff)
• includes/sites/main.php (modified) (3 diffs)
• sql_upgrades (modified) (1 diff)
• system_scripts/runScripts.sh (modified) (1 diff)

trunk/ChangeLog

@@ -1 +1 @@
 CpVES 0.05 YYYY-MM-DD - Jonas Genannt - <jonas.genannt@brachium-system.net>
         o Fixed: repaired listmailer.pl for access tinyint(1) column (T. Genannt)
+        o Fixed: domain_add: default postmaster forwarding (#26)
         o Improved: Default config now in extra file (copy to config.inc.php / mail_config.conf) (T. Genannt)
 CpVES 0.04 2007-08-25 - Jonas Genannt - <jonas.genannt@brachium-system.net>

trunk/includes/sites/domain_add.php

@@ -79 +79 @@
                         $data=$res->fetchrow(DB_FETCHMODE_ASSOC);
                         $to='postmaster@'.$dnsname;
-                        $sql=sprintf("INSERT INTO forwardings SET domainid='%s', efrom='%s', eto='%s', access='y'",
+                        $sql=sprintf("INSERT INTO forwardings SET domainid='%s', efrom='%s', eto='%s', access='1'",
                                 $db->escapeSimple($data['id']),
                                 $db->escapeSimple($to),

trunk/includes/sites/main.php

@@ -73 +73 @@
 } 
 }
+/*
 //check for spam:
-$test='n';
 if (isset($_SESSION['superadmin']) && $_SESSION['superadmin']=='y'&& $test=='y')
 {
@@ -98 +98 @@
 
 } // SPAM CHECK ENDE
-
+*/
 
 //email user part:
@@ -114 +114 @@
         $smarty->assign('full_name', $_SESSION['full_name']);
         $smarty->assign('email', $_SESSION['email']);
-        if (isset($_POST['u_submit']))
-        {
-                if (!isset($_POST['new_passwd1']) || empty($_POST['new_passwd1']) ||
-                    !isset($_POST['new_passwd2']) || empty($_POST['new_passwd2']))
-                {
-                        $smarty->assign('error_msg','y');
-                        $smarty->assign('if_error_password_empty','y');
-                }
-                else if (check_passwd_length($_POST['new_passwd2']) ==false)
-                {
-                        $smarty->assign('error_msg','y');
-                        $smarty->assign('if_error_password_long', 'y');
-
-                }
-                else if($_POST['new_passwd1'] !=$_POST['new_passwd2'] )
-                {
-                        $smarty->assign('error_msg','y');
-                        $smarty->assign('if_new_passwd_not_same', 'y');
-                }
-                else if(decrypt_passwd($_SESSION['cpasswd']) != $_POST['old_passwd'])
-                {
-                        $smarty->assign('error_msg','y');
-                        $smarty->assign('if_error_password_old_wrong','y');
-                }
-                else
-                {
-                        if ($config['cleartext_passwd']==1) {
-                                $cleartext=$_POST['new_passwd1'];
-                        }
-                        else
-                        {
-                                $cleartext="";
-                        }
-                        $sql=sprintf("UPDATE users SET passwd='%s',cpasswd='%s' WHERE id='%d'",
-                                $db->escapeSimple($cleartext),
-                                $db->escapeSimple(crypt($_POST['new_passwd1'])),
-                                $db->escapeSimple($_SESSION['uid']));
-                        $res=&$db->query($sql);
-                        
-                        $smarty->assign('passwd_changed', 'y');
-                        $smarty->assign('success_msg','y');
-                        $smarty->assign('if_password_changed', 'y');
-                        $_SESSION['cpasswd']=encrypt_passwd($_POST['new_passwd1']);
-                }
-        }
 }
 $smarty->assign('table_data', $table_data);

trunk/sql_upgrades

@@ -120 +120 @@
 ALTER TABLE `users` ADD `p_webinterface` TINYINT( 1 ) DEFAULT '1' NOT NULL;
 
+
+Version 0.04 to 0.05
 ALTER TABLE `lists` modify column `access` TINYINT( 1 ) DEFAULT '1' NOT NULL;

trunk/system_scripts/runScripts.sh

@@ -2 +2 @@
 
 ################################
-SCRIPTDIR="/etc/cpves"
+SCRIPTDIR="/usr/local/cpves"
 ################################
 $SCRIPTDIR/create_mailboxes.pl