From 85f399bde8f81cc086079fd08d34df516fe892f7 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 26 Feb 2008 18:08:19 +0000
Subject: Add SMTP test to installer script

git-svn-id: https://svn.roundcube.net/trunk@1142 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/installer/rcube_install.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'roundcubemail/installer/rcube_install.php')

diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index f2ab394a1..8ff220357 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/installer/rcube_install.php
@@ -27,6 +27,7 @@ class rcube_install
   var $failures = 0;
   var $config = array();
   var $last_error = null;
+  var $email_pattern = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9])';
   
   /**
    * Constructor
@@ -88,16 +89,17 @@ class rcube_install
    * Getter for a certain config property
    *
    * @param string Property name
+   * @param string Default value
    * @return string The property value
    */
-  function getprop($name)
+  function getprop($name, $default = null)
   {
     $value = isset($_REQUEST["_$name"]) ? $_REQUEST["_$name"] : $this->config[$name];
     
     if ($name == 'des_key' && !isset($_REQUEST["_$name"]))
       $value = self::random_key(24);
     
-    return $value;
+    return $value !== null ? $value : $default;
   }
   
   
-- 
cgit v1.2.3