Merge branch 'beta-3-3-fixes' into 'develop'

Till Brehm · Till Brehm · commit a3274a93e079 · 2025-04-21T18:01:59.000Z
Various fixes for 3.3 beta

Closes #6848

See merge request ispconfig/ispconfig3!2005
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
@@ -1937,7 +1937,7 @@ CREATE TABLE `web_database` (
   `sys_perm_other` varchar(5) DEFAULT NULL,
   `server_id` int(11) unsigned NOT NULL DEFAULT '0',
   `parent_domain_id` int(11) unsigned NOT NULL DEFAULT  '0',
-  `type` varchar(16) NOT NULL DEFAULT 'y',
+  `type` varchar(16) NOT NULL DEFAULT 'mysql',
   `database_name` varchar(64) DEFAULT NULL,
   `database_name_prefix` varchar(50) NOT NULL default '',
   `database_quota` int(11) DEFAULT NULL,
diff --git a/interface/web/admin/extension_edit.php b/interface/web/admin/extension_edit.php
@@ -179,6 +179,10 @@
 		if(!empty($extension['postinstall_info'])) {
 			$app->tpl->setVar('postinstall_info', $extension['postinstall_info']);
 		}
+		// show free limits
+		if(!empty($extension['free_limits'])) {
+			$app->tpl->setVar('free_limits', $extension['free_limits']);
+		}
         break;
     case 'install':
         $app->tpl->setInclude('content_tpl', 'templates/extension_install.htm');
diff --git a/interface/web/admin/lib/lang/ar_extension_install_list.lng b/interface/web/admin/lib/lang/ar_extension_install_list.lng
@@ -43,4 +43,5 @@ $wb['license_txt'] = 'مفتاح الترخيص';
 $wb['repo_version_txt'] = 'إصدار المستودع';
 $wb['no_records_txt'] = 'لا توجد إضافات';
 $wb['postinstall_info_txt'] = 'معلومات';
+$wb['free_limits_txt'] = 'حدود الاستخدام المجاني';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_extension_install_list.lng b/interface/web/admin/lib/lang/bg_extension_install_list.lng
@@ -43,4 +43,5 @@ $wb['license_txt'] = 'Лицензионен ключ';
 $wb['repo_version_txt'] = 'Версия в хранилището';
 $wb['no_records_txt'] = 'Не са намерени разширения';
 $wb['postinstall_info_txt'] = 'Информация';
+$wb['free_limits_txt'] = 'Ограничения за безплатно ползване';
 ?>
diff --git a/interface/web/admin/lib/lang/br_extension_install_list.lng b/interface/web/admin/lib/lang/br_extension_install_list.lng
@@ -43,4 +43,5 @@ $wb['license_txt'] = 'Chave de licença';
 $wb['repo_version_txt'] = 'Versão do Repositório';
 $wb['no_records_txt'] = 'Nenhuma extensão encontrada';
 $wb['postinstall_info_txt'] = 'Informação';
+$wb['free_limits_txt'] = 'Limites de uso gratuito';
 ?>
diff --git a/interface/web/admin/lib/lang/ca_extension_install_list.lng b/interface/web/admin/lib/lang/ca_extension_install_list.lng
@@ -43,4 +43,5 @@ $wb['license_txt'] = 'Clau de llicència';
 $wb['repo_version_txt'] = 'Versió del Repositori';
 $wb['no_records_txt'] = 'No s\'han trobat extensions';
 $wb['postinstall_info_txt'] = 'Informació';
+$wb['free_limits_txt'] = 'Límits d\'ús gratuït';
 ?>
diff --git a/interface/web/admin/lib/lang/cn_extension_install_list.lng b/interface/web/admin/lib/lang/cn_extension_install_list.lng
@@ -43,4 +43,5 @@ $wb['license_txt'] = '许可证密钥';
 $wb['repo_version_txt'] = '存储库版本';
 $wb['no_records_txt'] = '未找到扩展';
 $wb['postinstall_info_txt'] = '信息';
+$wb['free_limits_txt'] = '免费使用限制';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_extension_install_list.lng b/interface/web/admin/lib/lang/cz_extension_install_list.lng
@@ -43,4 +43,5 @@ $wb['license_txt'] = 'Licenční klíč';
 $wb['repo_version_txt'] = 'Verze v repozitáři';
 $wb['no_records_txt'] = 'Nebyly nalezeny žádné rozšíření';
 $wb['postinstall_info_txt'] = 'Informace';
+$wb['free_limits_txt'] = 'Limity bezplatného používání';
 ?>
diff --git a/interface/web/admin/lib/lang/de_extension_install_list.lng b/interface/web/admin/lib/lang/de_extension_install_list.lng
@@ -9,4 +9,5 @@ $wb['install_extension_txt'] = 'Installieren';
 $wb['server_id_txt'] = 'Server ID';
 $wb['no_records_txt'] = 'Keine Erweiterungen gefunden';
 $wb['postinstall_info_txt'] = 'Info';
+$wb['free_limits_txt'] = 'Einschränkungen für kostenlose Nutzung';
 ?>
diff --git a/interface/web/admin/lib/lang/dk_extension_install_list.lng b/interface/web/admin/lib/lang/dk_extension_install_list.lng
@@ -43,4 +43,5 @@ $wb['license_txt'] = 'Licensnøgle';
 $wb['repo_version_txt'] = 'Repository Version';
 $wb['no_records_txt'] = 'Ingen udvidelser fundet';
 $wb['postinstall_info_txt'] = 'Info';
+$wb['free_limits_txt'] = 'Gratis-brug begrænsninger';
 ?>
diff --git a/interface/web/admin/lib/lang/en_extension_install_list.lng b/interface/web/admin/lib/lang/en_extension_install_list.lng
@@ -50,4 +50,5 @@ $wb['btn_save_txt'] = 'Save';
 $wb['invalid_license_txt'] = 'Invalid license key';
 $wb['no_records_txt'] = 'No extensions found';
 $wb['postinstall_info_txt'] = 'Info';
+$wb['free_limits_txt'] = 'Conditions for free use';
 ?>
diff --git a/interface/web/admin/lib/lang/es_extension_install_list.lng b/interface/web/admin/lib/lang/es_extension_install_list.lng
@@ -43,4 +43,5 @@ $wb['license_txt'] = 'Clave de licencia';
 $wb['repo_version_txt'] = 'Versión del Repositorio';
 $wb['no_records_txt'] = 'No se encontraron extensiones';
 $wb['postinstall_info_txt'] = 'Información';
+$wb['free_limits_txt'] = 'Límites de uso gratuito';
 ?>
diff --git a/interface/web/admin/templates/extension_edit.htm b/interface/web/admin/templates/extension_edit.htm
@@ -83,7 +83,16 @@ <h1>
             <div class="col-sm-9">
                 <input type="checkbox" name="active" id="active" value="1" {tmpl_if name='active'} checked="checked"{/tmpl_if} />
             </div>
-        </div>   
+        </div>
+        <!-- -------------------------- -->
+        <tmpl_if name="free_limits">
+            <div class="form-group">
+            <label class="col-sm-3 control-label">{tmpl_var name='free_limits_txt'}</label>
+            <div class="col-sm-9">
+                <p style="margin-top: 8px;">{tmpl_var name='free_limits'}</p>
+            </div>
+        </div>
+        </tmpl_if>
         <!-- -------------------------- -->
         <tmpl_if name="postinstall_info">
         <div class="form-group">
diff --git a/interface/web/dns/dns_edit_base.php b/interface/web/dns/dns_edit_base.php
@@ -129,9 +129,9 @@ function onSubmit() {
 
 		if($this->checkDuplicate()) $app->tform->errorMessage .= $app->tform->lng("data_error_duplicate")."<br>";
 
-		// Remove accidental quotes around a record.
+		// Remove accidental quotes around a record
 		$matches = array();
-		if(preg_match('/^"(.*)"$/', $this->dataRecord["data"], $matches)) {
+		if(substr_count($this->dataRecord["data"], '"') == 2 && preg_match('/^"(.*)"$/', $this->dataRecord["data"], $matches)) {
 			$this->dataRecord["data"] = $matches[1];
 		}
 
diff --git a/interface/web/nav.php b/interface/web/nav.php
@@ -74,7 +74,7 @@
 						if($vm_servers['cnt'] == 0) continue;
 					}
 
-					if(isset($module)) unset($module);
+					if(isset($module['icon'])) unset($module['icon']);
 					include_once $mt.'/lib/module.conf.php';
 					$language = $app->functions->check_language((isset($_SESSION['s']['user']['language']))?$_SESSION['s']['user']['language']:$conf['language']);
 					$app->load_language_file('web/'.$mt.'/lib/'.$language.'.lng');
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
@@ -166,3 +166,36 @@
         resultBoxPosition: ''
     });
 </script>
+
+<script type="text/javascript">
+    jQuery(document).ready(function() {
+        // Function to toggle backup_interval and database_quota visibility based on database type
+        function togglePostgresqlFields() {
+            var dbType = jQuery('#type').val();
+            if (dbType === 'postgresql') {
+                jQuery('#backup_interval').closest('.form-group').hide();
+                jQuery('#quota').closest('.form-group').hide();
+            } else {
+                jQuery('#backup_interval').closest('.form-group').show();
+                jQuery('#quota').closest('.form-group').show();
+            }
+        }
+
+        // Check on page load
+        togglePostgresqlFields();
+
+        // Check when type changes
+        jQuery('#type').change(function() {
+            togglePostgresqlFields();
+        });
+
+        // For the case when type is disabled and using hidden input
+        if (jQuery('#type').length === 0 && jQuery('input[name="type"]').length > 0) {
+            var hiddenType = jQuery('input[name="type"]').val();
+            if (hiddenType === 'postgresql') {
+                jQuery('#backup_interval').closest('.form-group').hide();
+                jQuery('#quota').closest('.form-group').hide();
+            }
+        }
+    });
+</script>
diff --git a/server/lib/classes/backup.inc.php b/server/lib/classes/backup.inc.php
@@ -1749,7 +1749,7 @@ protected static function make_database_backup($web_domain, $backup_job)
         if (empty($backup_job))
             $backup_job = "auto";
 
-        $records = $app->dbmaster->queryAllRecords("SELECT * FROM web_database WHERE server_id = ? AND parent_domain_id = ?", $server_id, $domain_id);
+        $records = $app->dbmaster->queryAllRecords("SELECT * FROM web_database WHERE type = 'mysql' AND server_id = ? AND parent_domain_id = ?", $server_id, $domain_id);
         if (empty($records)){
             $app->log('Skipping database backup for domain ' . $web_domain['domain_id'] . ', because no related databases found.', LOGLEVEL_DEBUG);
             return true;
diff --git a/server/lib/classes/extension_installer.inc.php b/server/lib/classes/extension_installer.inc.php
@@ -589,6 +589,53 @@ public function load_install_sql($name) {
 		return true;
 	}
 
+	/**
+	 * Run uninstall.sql file in the database
+	 */
+	public function run_uninstall_sql($name) {
+		global $app, $conf;
+
+		// check name validity
+		if(!preg_match('/^[a-zA-Z0-9_]{1,64}$/',$name)) {
+			$app->log('Invalid extension name: '.$name, LOGLEVEL_WARN);
+			$this->addError('Invalid extension name: '.$name);
+			return false;
+		}
+
+		$ext_dir = $this->extension_basedir.'/'.$name;
+
+		// Check if the extension has already been downloaded
+		if(!is_dir($ext_dir)) {
+			$app->log('Loading install.sql for extension'.$name.'failed. No such directory.',LOGLEVEL_WARN);
+			$this->addError('No such directory: '.$ext_dir);
+			return false;
+		}
+
+		// Check if we have a uninstall.sql
+		$uninstall_sql_path = $ext_dir.'/install/uninstall.sql';
+		if(!file_exists($uninstall_sql_path)) {
+			$app->log('The extension '.$name.' has no uninstall.sql.',LOGLEVEL_DEBUG);
+			//$this->errors[] = 'No uninstall.sql: '.$uninstall_sql_path;
+			return false;
+		}
+		
+		// Run uninstall.sql using mysql command with login details from $conf
+		exec('mysql -u '.escapeshellarg($conf['mysql']['user']).' -p'.escapeshellarg($conf['mysql']['password']).' -D '.escapeshellarg($conf['mysql']['db_name']).' < '.escapeshellarg($uninstall_sql_path), $output, $return_var);
+		
+		// check if execcommand was successful
+		if($return_var != 0) {
+			$app->log('Failed to run uninstall.sql for extension '.$name, LOGLEVEL_WARN);
+			$this->addError('Failed to run uninstall.sql: '.$uninstall_sql_path);
+			return false;
+		}
+		
+
+		// log success
+		$app->log('Run uninstall.sql for extension '.$name, LOGLEVEL_INFO);
+		
+		return true;
+	}
+
 	public function scan_extensions() {
         global $app, $conf;
 
@@ -810,6 +857,9 @@ public function uninstall_extension($name) {
 		// Uninstall extension
 		$installer->uninstall($name);
 
+		// Run uninstall.sql
+		$this->run_uninstall_sql($name);
+
 		// Remove extension directory
         if(!empty($this->extension_basedir.'/'.$name) && is_dir($this->extension_basedir.'/'.$name)) {
             exec('rm -rf '.escapeshellarg($this->extension_basedir.'/'.$name));
