From 1495c70f96fdf1884d2aac2e3671f9b6a52385a2 Mon Sep 17 00:00:00 2001 From: "usman@cyberpersons.com" Date: Sat, 4 Feb 2023 19:46:36 +0500 Subject: [PATCH] bug fix: https://github.com/the-djmaze/snappymail/issues/907 --- plogical/mailUtilities.py | 4 +- plogical/upgrade.py | 130 ++++++++++++++++++++------------------ 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py index dd214d572..2954cfc09 100755 --- a/plogical/mailUtilities.py +++ b/plogical/mailUtilities.py @@ -248,8 +248,8 @@ class mailUtilities: # f"'/home/vmail/{domain}/{userName}/Maildir/.Junk E-mail'" # ProcessUtilities.executioner(command, 'vmail') - if not os.path.exists('/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect'): - mailUtilities.InstallMailBoxFoldersPlugin() + #if not os.path.exists('/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect'): + # mailUtilities.InstallMailBoxFoldersPlugin() print("1,None") return 1,"None" diff --git a/plogical/upgrade.py b/plogical/upgrade.py index a090836da..6b4613b1e 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -523,20 +523,20 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout'; includeFileOldPath = '/usr/local/CyberCP/public/snappymail/_include.php' includeFileNewPath = '/usr/local/CyberCP/public/snappymail/include.php' - if os.path.exists(includeFileOldPath): - writeToFile = open(includeFileOldPath, 'a') - writeToFile.write("\ndefine('APP_DATA_FOLDER_PATH', '/usr/local/lscp/cyberpanel/rainloop/data/');\n") - writeToFile.close() + # if os.path.exists(includeFileOldPath): + # writeToFile = open(includeFileOldPath, 'a') + # writeToFile.write("\ndefine('APP_DATA_FOLDER_PATH', '/usr/local/lscp/cyberpanel/rainloop/data/');\n") + # writeToFile.close() - command = 'mv %s %s' % (includeFileOldPath, includeFileNewPath) - Upgrade.executioner(command, 'mkdir snappymail configs', 0) + # command = 'mv %s %s' % (includeFileOldPath, includeFileNewPath) + # Upgrade.executioner(command, 'mkdir snappymail configs', 0) ## take care of auto create folders ## Disable local cert verification - command = "sed -i 's|verify_certificate = On|verify_certificate = Off|g' %s" % (labsPath) - Upgrade.executioner(command, 'verify certificate', 0) + #command = "sed -i 's|verify_certificate = On|verify_certificate = Off|g' %s" % (labsPath) + #Upgrade.executioner(command, 'verify certificate', 0) # labsData = open(labsPath, 'r').read() @@ -571,62 +571,68 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout'; ### now download and install actual plugin - command = f'mkdir /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect' +# command = f'mkdir /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect' +# Upgrade.executioner(command, 'verify certificate', 0) +# +# command = f'chmod 700 /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect' +# Upgrade.executioner(command, 'verify certificate', 0) +# +# command = f'chown lscpd:lscpd /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect' +# Upgrade.executioner(command, 'verify certificate', 0) +# +# command = f'wget -O /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect/index.php https://raw.githubusercontent.com/the-djmaze/snappymail/master/plugins/mailbox-detect/index.php' +# Upgrade.executioner(command, 'verify certificate', 0) +# +# command = f'chmod 644 /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect/index.php' +# Upgrade.executioner(command, 'verify certificate', 0) +# +# command = f'chown lscpd:lscpd /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect/index.php' +# Upgrade.executioner(command, 'verify certificate', 0) +# +# ### Enable plugins and enable mailbox creation plugin +# +# labsDataLines = open(labsPath, 'r').readlines() +# PluginsActivator = 0 +# WriteToFile = open(labsPath, 'w') +# +# +# for lines in labsDataLines: +# if lines.find('[plugins]') > -1: +# PluginsActivator = 1 +# WriteToFile.write(lines) +# elif PluginsActivator and lines.find('enable = ') > -1: +# WriteToFile.write(f'enable = On\n') +# elif PluginsActivator and lines.find('enabled_list = ') > -1: +# WriteToFile.write(f'enabled_list = "mailbox-detect"\n') +# elif PluginsActivator == 1 and lines.find('[defaults]') > -1: +# PluginsActivator = 0 +# WriteToFile.write(lines) +# else: +# WriteToFile.write(lines) +# WriteToFile.close() +# +# ## enable auto create in the enabled plugin +# PluginsFilePath = '/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/configs/plugin-mailbox-detect.json' +# +# WriteToFile = open(PluginsFilePath, 'w') +# WriteToFile.write("""{ +# "plugin": { +# "autocreate_system_folders": true +# } +# } +# """) +# WriteToFile.close() +# +# command = f'chown lscpd:lscpd {PluginsFilePath}' +# Upgrade.executioner(command, 'verify certificate', 0) +# +# command = f'chmod 600 {PluginsFilePath}' +# Upgrade.executioner(command, 'verify certificate', 0) + + command = f'wget -O /usr/local/CyberCP/snappymail_cyberpanel.php https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/cyberpanel/install.php' Upgrade.executioner(command, 'verify certificate', 0) - command = f'chmod 700 /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect' - Upgrade.executioner(command, 'verify certificate', 0) - - command = f'chown lscpd:lscpd /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect' - Upgrade.executioner(command, 'verify certificate', 0) - - command = f'wget -O /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect/index.php https://raw.githubusercontent.com/the-djmaze/snappymail/master/plugins/mailbox-detect/index.php' - Upgrade.executioner(command, 'verify certificate', 0) - - command = f'chmod 644 /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect/index.php' - Upgrade.executioner(command, 'verify certificate', 0) - - command = f'chown lscpd:lscpd /usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/plugins/mailbox-detect/index.php' - Upgrade.executioner(command, 'verify certificate', 0) - - ### Enable plugins and enable mailbox creation plugin - - labsDataLines = open(labsPath, 'r').readlines() - PluginsActivator = 0 - WriteToFile = open(labsPath, 'w') - - - for lines in labsDataLines: - if lines.find('[plugins]') > -1: - PluginsActivator = 1 - WriteToFile.write(lines) - elif PluginsActivator and lines.find('enable = ') > -1: - WriteToFile.write(f'enable = On\n') - elif PluginsActivator and lines.find('enabled_list = ') > -1: - WriteToFile.write(f'enabled_list = "mailbox-detect"\n') - elif PluginsActivator == 1 and lines.find('[defaults]') > -1: - PluginsActivator = 0 - WriteToFile.write(lines) - else: - WriteToFile.write(lines) - WriteToFile.close() - - ## enable auto create in the enabled plugin - PluginsFilePath = '/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/configs/plugin-mailbox-detect.json' - - WriteToFile = open(PluginsFilePath, 'w') - WriteToFile.write("""{ - "plugin": { - "autocreate_system_folders": true - } -} -""") - WriteToFile.close() - - command = f'chown lscpd:lscpd {PluginsFilePath}' - Upgrade.executioner(command, 'verify certificate', 0) - - command = f'chmod 600 {PluginsFilePath}' + command = f'/usr/local/lsws/lsphp74/bin/php /usr/local/CyberCP/snappymail_cyberpanel.php' Upgrade.executioner(command, 'verify certificate', 0)