Changeset 203

Timestamp:

09/15/07 23:41:59 (16 months ago)

Author:

jonas

Message:

done 0.09

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• contrib/installService.sh (modified) (1 diff)
• includes/config.inc.default.php (modified) (2 diffs)
• includes/func.inc.php (modified) (1 diff)
• includes/sites/main.php (modified) (1 diff)
• mail_system.sql (modified) (1 diff)
• system_scripts/runScripts.sh (modified) (1 diff)

trunk/ChangeLog

@@ -1 @@
-CpVES 0.09 YYYY-MM-DD - Jonas Genannt - <jonas.genannt@brachium-system.net>
-
+CpVES 0.09 2007-09-15 - Jonas Genannt - <jonas.genannt@brachium-system.net>
+        o Improved: runScripts.sh create_fetchmail.pl should not run on trigger
+        o Improved: trigger backendscript marked as stable
+        o Removed: all rbl checking code (never used)
+        o Fixed: defect mail_system.sql again
 CpVES 0.08 2007-09-15 - Jonas Genannt - <jonas.genannt@brachium-system.net>
         o Added: policyd-weight per user/domain configuration

trunk/contrib/installService.sh

@@ -3 +3 @@
 echo "service mailcontrol
 {
-        disable         = yes
+        disable         = no
         socket_type     = stream
         protocol        = tcp

trunk/includes/config.inc.default.php

@@ -60 +60 @@
 $config['recipient_classes_grey']=0;
 
-$ar_spam=array("cbl.abuseat.org","multi.surbl.org","sbl-xbl.spamhaus.org");
-
 // use CpVES mailinglist feature 
 $config['mailinglists'] = '1';
 
-//Run Systemscript via xinetd Service 
-$config['service_enabled'] = 'n'; // Development, please don't use!
-$config['service_port'] = 7928; // Development, please don't use!
+//Trigger system_scripts via webinterface for faster backend:
+$config['trigger_service_enabled'] = 0;
+$config['trigger_service_host'] = "localhost";
+$config['trigger_service_port'] = 7928;
 
 $options = array(
@@ -85 +84 @@
          "autoresponder_send", "email_options","fetchmail",
          "mailarchive","mailfilter","spamassassin","spamassassin_learn","autoresponder_xheader");
-$config['cpves_version']="0.09-SVN";
+$config['cpves_version']="0.09";
 require_once(ROOT . '/includes/func.inc.php');
 ?>

trunk/includes/func.inc.php

@@ -428 +428 @@
 function run_systemscripts() {
         global $config;
-        if( $config['service_enabled'] == 'y' ) {
+        if( $config['trigger_service_enabled'] == 1 ) {
                 $socket = @socket_create (AF_INET, SOCK_STREAM, 0);
-                $result = @socket_connect ($socket, '127.0.0.1', 
-                        $config['service_port']);
+                $result = @socket_connect ($socket, $config['trigger_service_host'],
+                        $config['trigger_service_port']);
                 @socket_close ($socket);
         }

trunk/includes/sites/main.php

@@ -88 +88 @@
 } 
 }
-/*
-//check for spam:
-if (isset($_SESSION['superadmin']) && $_SESSION['superadmin']=='y'&& $test=='y')
-{
-
-require_once 'Net/DNSBL.php';
-$dnsbl = new Net_DNSBL();
-
-$table_spam=array();
-while (list($key, $value) = each($ar_spam))
-//foreach($ar_spam as $value)
-{
-        $dnsbl->setBlacklists($value);
-        if ($dnsbl->isListed($config['server_ip']))
-        {
-                $smarty->assign('if_blacklist_listet', 'y');
-                array_push($table_spam, array('spam' => $value));
-        }
-        
-}
-
-$smarty->assign('ipaddr',$config['server_ip'] ); 
-$smarty->assign('table_spam', $table_spam);
-
-} // SPAM CHECK ENDE
-*/
 
 //email user part:

trunk/mail_system.sql

@@ -368 +368 @@
 INSERT INTO `adm_users` ( `id` , `username` , `passwd` , `access` , `manager` , `full_name` , `cpasswd` , `web_lang` )
 VALUES (
-NULL , 'admin', '$1$Ekjbn5PV$lTKL1k2IkDKzpneppf6Wx0', '1', '1', NULL , '', ''
+NULL , 'admin', '', '1', '1', NULL , '$1$Ekjbn5PV$lTKL1k2IkDKzpneppf6Wx0', ''
 );
 

trunk/system_scripts/runScripts.sh

@@ -6 +6 @@
 $SCRIPTDIR/create_mailboxes.pl
 $SCRIPTDIR/create_mailfilters.pl
-$SCRIPTDIR/create_fetchmail.pl
 $SCRIPTDIR/delete_mailbox.pl