Merge pull request hestiacp#2819 from jaapmarcus/fix/2815-email-does-not-include-password

2815 [Bug] - Notification mail account dont include Password when creating

Author: ScIT-Raphael

bin/v-update-sys-hestia-git

@@ -122,6 +122,13 @@ fork=$1
 branch=$2
 install=$3
 
+# Allow the use of username:branch instead of username branch
+# Both fork and branch names can't contain a : anyway 
+if [ -z "$branch" ]; then 
+    branch=$(echo "$fork" | cut -d ":" -f2)
+    fork=$(echo "$fork" | cut -d ":" -f1)
+fi
+
 # Set Version for compiling
 BUILD_VER=$(curl -s https://raw.githubusercontent.com/$fork/hestiacp/$branch/src/deb/hestia/control | grep "Version:" | cut -d' ' -f2)
 HESTIA_V="${BUILD_VER}_${BUILD_ARCH}"

install/common/roundcube/db.inc.php

@@ -103,5 +103,4 @@
 $config['smtp_host'] = 'localhost:587';
 
 // Log session authentication errors to <log_dir>/session or to syslog
-$config['log_session'] = true;
-?>
+$config['log_session'] = true;

install/common/roundcube/main.inc.php

@@ -53,6 +53,4 @@
   's7z' => 'application/x-7z-compressed',
   'vcf' => 'text/vcard',
   'ics' => 'text/calendar',
-);
-
-?>
+);

install/common/roundcube/mimetypes.php

@@ -68,7 +68,7 @@ if [ "$HAS_DOVECOT_SIEVE_INSTALLED" = "0" ]; then
     # roundcube install
     mkdir -p $RC_CONFIG_DIR/plugins/managesieve
 
-    cp -f $HESTIA_INSTALL_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
+    cp -f $HESTIA_COMMON_DIR/roundcube/plugins/config_managesieve.inc.php $RC_CONFIG_DIR/plugins/managesieve/config.inc.php
         ln -s $RC_CONFIG_DIR/plugins/managesieve/config.inc.php $RC_INSTALL_DIR/plugins/managesieve/config.inc.php
 
     # permission changes

install/upgrade/manual/install_sieve.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version unknow
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+####### Pass through information to the end user in case of a issue or problem  #######
+#######                                                                         #######
+####### Use add_upgrade_message "My message here" to include a message          #######
+####### in the upgrade notification email. Example:                             #######
+#######                                                                         #######
+####### add_upgrade_message "My message here"                                   #######
+#######                                                                         #######
+####### You can use \n within the string to create new lines.                   #######
+#######################################################################################
+
+upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'no'
+upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
+upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
+
+# make sure to sync install qouteshellarg
+$HESTIA/bin/v-add-sys-phpmailer
+if [ "$FILE_MANAGER" = "true" ]; then
+    # Sync up filemanger
+    $HESTIA/bin/v-delete-sys-filemanger
+    $HESTIA/bin/v-add-sys-filemanger        
+fi
+
+# Sync up config files #2819
+if [ -f "/etc/roundcube/config.inc.php" ]; then
+    sed -i "s/?>//" /etc/roundcube/config.inc.php
+    sed -i "s/?>//" /etc/roundcube/mimetypes.php    
+fi

install/upgrade/versions/unreleased.sh

@@ -114,7 +114,7 @@
     if ((!empty($v_db_email)) && (empty($_SESSION['error_msg']))) {
         $to = $v_db_email;
         $subject = _("Database Credentials");
-        $hostname = exec('hostname');
+        $hostname = get_hostname();
         $from = "noreply@".$hostname;
         $from_name = _('Hestia Control Panel');
         $mailtext = sprintf(_('DATABASE_READY'), $user_plain."_".$_POST['v_database'], $user_plain."_".$_POST['v_dbuser'], $_POST['v_password'], $db_admin_link);

web/add/db/index.php

@@ -287,7 +287,7 @@
     if ((!empty($v_send_email)) && (empty($_SESSION['error_msg']))) {
         $to = $v_send_email;
         $subject = _("Email Credentials");
-        $hostname = exec('hostname');
+        $hostname = get_hostname();
         $from = "noreply@".$hostname;
         $from_name = _('Hestia Control Panel');
         $mailtext = $v_credentials;

web/add/mail/index.php

@@ -112,7 +112,7 @@
         putenv("LANGUAGE=".$_POST['v_language']);
 
         $subject = _("Welcome to Hestia Control Panel");
-        $hostname = exec('hostname');
+        $hostname = get_hostname();
         unset($output);
         $from = "noreply@".$hostname;
         $from_name = _('Hestia Control Panel');

web/add/user/index.php

@@ -652,7 +652,7 @@
     if ((!empty($v_send_email)) && (empty($_SESSION['error_msg']))) {
         $to = $v_send_email;
         $subject = _("Email Credentials");
-        $hostname = exec('hostname');
+        $hostname = get_hostname();
         $from = "noreply@".$hostname;
         $from_name = _('Hestia Control Panel');
         $mailtext = $v_credentials;