Changeset 166

Timestamp:

07/02/07 11:45:50 (2 years ago)

Author:

shupp

Message:

changed robot defines to variables that can be overridden in config.xml

Files:

• trunk/Framework/Site/Default/config.xml (modified) (2 diffs)
• trunk/Framework/User/toasterAdmin.php (modified) (1 diff)
• trunk/Vpopmail/Main.php (modified) (5 diffs)

trunk/Framework/Site/Default/config.xml

@@ -2 +2 @@
-<framework>
-    <!-- set to 1 to send debug info to logFile -->
-1
+0
-    <vpopmaildHost>home.shupp.org</vpopmaildHost>
-    <vpopmaildPort>89</vpopmaildPort>
@@ -9 +9 @@
-    <mcryptKey>My Secret Key</mcryptKey>
-    <maxPerPage>10</maxPerPage>
-
+
+
+
-    <logFile>/tmp/framework.log</logFile>
-    <user>

trunk/Framework/User/toasterAdmin.php

@@ -34 +34 @@
-        $this->port = (string)Framework::$site->config->vpopmaildPort;
-        $this->logFile = (string)Framework::$site->config->logFile;
-
-
+
+
+
-        parent::__construct();
-        $in = $this->sockRead();

trunk/Vpopmail/Main.php

@@ -10 +10 @@
- * @license PHP 3.01  {@link http://www.php.net/license/3_01.txt}
- */
-
-/**
- *  VPOPMAIL_ROBOT_TIME
- *  
- *  define VPOPMAIL_ROBOT_TIME
- * @package ToasterAdmin
- */
-define('VPOPMAIL_ROBOT_TIME', 86400);
-/**
- *  VPOPMAIL_ROBOT_NUMBER
- *  
- *  define VPOPMAIL_ROBOT_NUMBER
- * @package ToasterAdmin
- */
-define('VPOPMAIL_ROBOT_NUMBER', 3);
-
-/**
@@ -37 +22 @@
-class Vpopmail_Main extends Vpopmail_Base {
-
+    /**
+     * vpopmail_robot_program 
+     * 
+     * @var string
+     * @access public
+     */
+    public $vpopmail_robot_program = '/usr/bin/autorespond';
+    /**
+     * vpopmail_robot_time 
+     * 
+     * @var float
+     * @access public
+     */
+    public $vpopmail_robot_time = 1000;
+    /**
+     * vpopmail_robot_number 
+     * 
+     * @var float
+     * @access public
+     */
+    public $vpopmail_robot_number = 3;
-    /**
-     * clogin 
@@ -319 +325 @@
-     * @return mixed true on success, PEAR_Error on failure
-     */
-
-
+
+
+
+
-        $robotDir = strtoupper($user);
-        $dotQmailName = ".qmail-$user";
@@ -330 +338 @@
-
-        $messagePath = "$robotPath/message";
-VPOPMAIL_ROBOT_PROGRAM
+$this->vpopmail_robot_program
-        #  Build the dot qmail file
-        $dotQmail = array("|$program $time $number $messagePath $robotPath");
@@ -371 +379 @@
-        if (count($dotQmail['Program']) > 1)  #  Too many programs
-            return PEAR::raiseError('ERR - too many programs in robot dotqmail file');
-VPOPMAIL_ROBOT_PROGRAM
+$this->vpopmail_robot_program
-            return PEAR::raiseError('ERR - Mail Robot program not found');
-        list($Program, $Time, $Number, $MessageFile, $RobotPath) = explode(' ', $dotQmail['Program'][0]);