|  | @@ -8868,8 +8868,10 @@ function install_webmail {
 | 
	
		
			
			| 8868 | 8868 |      repair_databases_script
 | 
	
		
			
			| 8869 | 8869 |  
 | 
	
		
			
			| 8870 | 8870 |      apt-get -y install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
 | 
	
		
			
			| 8871 |  | -    apt-get -y install php5-dev imagemagick php5-imagick
 | 
	
		
			
			| 8872 |  | -
 | 
	
		
			
			|  | 8871 | +    apt-get -y install php5-dev imagemagick php5-imagick php5-sqlite php-auth-sasl php-net-smtp php-mime-type
 | 
	
		
			
			|  | 8872 | +    apt-get -y install php-mail-mime php-mail-mimedecode php-net-ldap3
 | 
	
		
			
			|  | 8873 | +    pear install Net_IDNA2
 | 
	
		
			
			|  | 8874 | +    
 | 
	
		
			
			| 8873 | 8875 |      if [ ! -f $WEBMAIL_PATH/index.php ]; then
 | 
	
		
			
			| 8874 | 8876 |          cd $WEB_PATH
 | 
	
		
			
			| 8875 | 8877 |          git_clone $WEBMAIL_REPO webmail
 | 
	
	
		
			
			|  | @@ -8880,7 +8882,6 @@ function install_webmail {
 | 
	
		
			
			| 8880 | 8882 |          else
 | 
	
		
			
			| 8881 | 8883 |              sed -i "s/Webmail commit.*/Webmail commit:$WEBMAIL_COMMIT/g" $COMPLETION_FILE
 | 
	
		
			
			| 8882 | 8884 |          fi
 | 
	
		
			
			| 8883 |  | -        chown -R www-data:www-data $WEBMAIL_PATH
 | 
	
		
			
			| 8884 | 8885 |      fi
 | 
	
		
			
			| 8885 | 8886 |      if [ ! -f $WEBMAIL_PATH/index.php ]; then
 | 
	
		
			
			| 8886 | 8887 |          echo $'Did not clone webmail repo'
 | 
	
	
		
			
			|  | @@ -8904,6 +8905,21 @@ function install_webmail {
 | 
	
		
			
			| 8904 | 8905 |          mkdir -p /var/www/$DEFAULT_DOMAIN_NAME/htdocs
 | 
	
		
			
			| 8905 | 8906 |      fi  
 | 
	
		
			
			| 8906 | 8907 |      ln -s $WEBMAIL_PATH /var/www/$DEFAULT_DOMAIN_NAME/htdocs/webmail
 | 
	
		
			
			|  | 8908 | +
 | 
	
		
			
			|  | 8909 | +    if [ ! -f /var/www/webmail/config/config.inc.php ]; then
 | 
	
		
			
			|  | 8910 | +        # generate the configuration
 | 
	
		
			
			|  | 8911 | +        echo '<?php' > /var/www/webmail/config/config.inc.php
 | 
	
		
			
			|  | 8912 | +        echo "\$config['db_dsnw'] = 'mysql://webmailadmin:${WEBMAIL_ADMIN_PASSWORD}@localhost/webmail';" >> /var/www/webmail/config/config.inc.php
 | 
	
		
			
			|  | 8913 | +        echo "\$config['default_host'] = 'localhost';" >> /var/www/webmail/config/config.inc.php
 | 
	
		
			
			|  | 8914 | +        echo "\$config['support_url'] = '';" >> /var/www/webmail/config/config.inc.php
 | 
	
		
			
			|  | 8915 | +        WEBMAIL_DES_KEY="$(openssl rand -base64 32 | cut -c1-25)"
 | 
	
		
			
			|  | 8916 | +        echo "\$config['des_key'] = '${WEBMAIL_DES_KEY}';" >> /var/www/webmail/config/config.inc.php
 | 
	
		
			
			|  | 8917 | +        echo "\$config['product_name'] = '${PROJECT_NAME}';" >> /var/www/webmail/config/config.inc.php
 | 
	
		
			
			|  | 8918 | +        echo "$config['plugins'] = array('enigma');" >> /var/www/webmail/config/config.inc.php
 | 
	
		
			
			|  | 8919 | +        echo "$config['mime_param_folding'] = 0;" >> /var/www/webmail/config/config.inc.php
 | 
	
		
			
			|  | 8920 | +    fi
 | 
	
		
			
			|  | 8921 | +    
 | 
	
		
			
			|  | 8922 | +    chown -R www-data:www-data $WEBMAIL_PATH
 | 
	
		
			
			| 8907 | 8923 |      
 | 
	
		
			
			| 8908 | 8924 |      if ! grep -q "Webmail" /home/$MY_USERNAME/README; then
 | 
	
		
			
			| 8909 | 8925 |          echo '' >> /home/$MY_USERNAME/README
 |