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

Till Brehm · Till Brehm · commit a54517c2819c · 2025-03-31T18:47:01.000Z
Extension installer fixes for ISPConfig 3.3 beta.

See merge request ispconfig/ispconfig3!2004
diff --git a/interface/web/admin/extension_edit.php b/interface/web/admin/extension_edit.php
@@ -175,6 +175,10 @@
 		} else {
 			$app->tpl->setVar('show_update', false);
 		}
+		// show postinstall_info
+		if(!empty($extension['postinstall_info'])) {
+			$app->tpl->setVar('postinstall_info', $extension['postinstall_info']);
+		}
         break;
     case 'install':
         $app->tpl->setInclude('content_tpl', 'templates/extension_install.htm');
diff --git a/interface/web/admin/extension_install_list.php b/interface/web/admin/extension_install_list.php
@@ -56,7 +56,7 @@
 unset($records);
 
 $app->tpl->setLoop('records', $records_out);
-$app->tpl->setVar('show_extensions', !empty($records_out));
+$app->tpl->setVar('has_records', !empty($records_out));
 
 //* load language file
 $lng_file = 'lib/lang/'.$app->functions->check_language($_SESSION['s']['language']).'_extension_install_list.lng';
diff --git a/interface/web/admin/lib/lang/ar_extension_install_list.lng b/interface/web/admin/lib/lang/ar_extension_install_list.lng
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = 'الإضافة';
 $wb['extension_edit_desc_txt'] = 'تتيح لك هذه الصفحة تحرير إضافات ISPConfig.';
 $wb['license_txt'] = 'مفتاح الترخيص';
 $wb['repo_version_txt'] = 'إصدار المستودع';
+$wb['no_records_txt'] = 'لا توجد إضافات';
+$wb['postinstall_info_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
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = 'Разширение';
 $wb['extension_edit_desc_txt'] = 'Тази страница ви позволява да редактирате разширения за ISPConfig.';
 $wb['license_txt'] = 'Лицензионен ключ';
 $wb['repo_version_txt'] = 'Версия в хранилището';
+$wb['no_records_txt'] = 'Не са намерени разширения';
+$wb['postinstall_info_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
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = 'Extensão';
 $wb['extension_edit_desc_txt'] = 'Esta página permite editar extensões do ISPConfig.';
 $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';
 ?>
diff --git a/interface/web/admin/lib/lang/ca_extension_install_list.lng b/interface/web/admin/lib/lang/ca_extension_install_list.lng
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = 'Extensió';
 $wb['extension_edit_desc_txt'] = 'Aquesta pàgina us permet editar extensions d\'ISPConfig.';
 $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ó';
 ?>
diff --git a/interface/web/admin/lib/lang/cn_extension_install_list.lng b/interface/web/admin/lib/lang/cn_extension_install_list.lng
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = '扩展';
 $wb['extension_edit_desc_txt'] = '此页面允许您编辑ISPConfig扩展。';
 $wb['license_txt'] = '许可证密钥';
 $wb['repo_version_txt'] = '存储库版本';
+$wb['no_records_txt'] = '未找到扩展';
+$wb['postinstall_info_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
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = 'Rozšíření';
 $wb['extension_edit_desc_txt'] = 'Tato stránka umožňuje upravovat rozšíření ISPConfig.';
 $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';
 ?>
diff --git a/interface/web/admin/lib/lang/de_extension_install_list.lng b/interface/web/admin/lib/lang/de_extension_install_list.lng
@@ -7,4 +7,6 @@ $wb['delete_confirmation'] = 'Sind Sie sicher, dass Sie diese Extension löschen
 $wb['update_extension_txt'] = 'Update';
 $wb['install_extension_txt'] = 'Installieren';
 $wb['server_id_txt'] = 'Server ID';
+$wb['no_records_txt'] = 'Keine Erweiterungen gefunden';
+$wb['postinstall_info_txt'] = 'Info';
 ?>
diff --git a/interface/web/admin/lib/lang/dk_extension_install_list.lng b/interface/web/admin/lib/lang/dk_extension_install_list.lng
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = 'Udvidelse';
 $wb['extension_edit_desc_txt'] = 'Denne side giver dig mulighed for at redigere ISPConfig udvidelser.';
 $wb['license_txt'] = 'Licensnøgle';
 $wb['repo_version_txt'] = 'Repository Version';
+$wb['no_records_txt'] = 'Ingen udvidelser fundet';
+$wb['postinstall_info_txt'] = 'Info';
 ?>
diff --git a/interface/web/admin/lib/lang/en_extension_install_list.lng b/interface/web/admin/lib/lang/en_extension_install_list.lng
@@ -48,4 +48,6 @@ $wb['repo_version_txt'] = 'Repository Version';
 $wb['update_extension_txt'] = 'Update Extension';
 $wb['btn_save_txt'] = 'Save';
 $wb['invalid_license_txt'] = 'Invalid license key';
+$wb['no_records_txt'] = 'No extensions found';
+$wb['postinstall_info_txt'] = 'Info';
 ?>
diff --git a/interface/web/admin/lib/lang/es_extension_install_list.lng b/interface/web/admin/lib/lang/es_extension_install_list.lng
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = 'Extensión';
 $wb['extension_edit_desc_txt'] = 'Esta página le permite editar extensiones de ISPConfig.';
 $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';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_extension_install_list.lng b/interface/web/admin/lib/lang/fr_extension_install_list.lng
@@ -41,4 +41,6 @@ $wb['extension_edit_heading_txt'] = 'Extension';
 $wb['extension_edit_desc_txt'] = 'Cette page vous permet d\'éditer des extensions ISPConfig.';
 $wb['license_txt'] = 'Clé de licence';
 $wb['repo_version_txt'] = 'Version du Dépôt';
+$wb['no_records_txt'] = 'Aucune extension trouvée';
+$wb['postinstall_info_txt'] = 'Info';
 ?>
diff --git a/interface/web/admin/templates/extension_edit.htm b/interface/web/admin/templates/extension_edit.htm
@@ -85,6 +85,15 @@ <h1>
             </div>
         </div>   
         <!-- -------------------------- -->
+        <tmpl_if name="postinstall_info">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">{tmpl_var name='postinstall_info_txt'}</label>
+            <div class="col-sm-9">
+                <p style="margin-top: 8px;">{tmpl_var name='postinstall_info'}</p>
+            </div>
+        </div>
+        </tmpl_if>
+        <!-- -------------------------- -->
         <input type="hidden" name="action" value="edit" />
                 
         <div class="clear">
diff --git a/interface/web/admin/templates/extension_install_list.htm b/interface/web/admin/templates/extension_install_list.htm
@@ -18,18 +18,9 @@ <h1><tmpl_var name="install_list_head_txt"></h1>
                 <th data-column="title"><tmpl_var name="title_txt"></th>
                 <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
             </tr>
-            <!--
-            <tr>
-                <td><select class="form-control" name="search_name">{tmpl_var name='search_name'}</select></td>
-                <td><select class="form-control" name="search_version">{tmpl_var name='search_version'}</select></td>
-                <td><input class="form-control" type="text" name="search_title" value="{tmpl_var name='search_title'}" /></td>
-                <td class="text-right">
-                    <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/firewall_list.php"><span class="icon icon-filter"></span></button>
-                </td>
-            </tr>
-            -->
         </thead>
         <tbody>
+            <tmpl_if name="has_records">
             <tmpl_loop name="records">
                 <tr>
                     <td><a href="#" data-load-content="admin/extension_edit.php?name={tmpl_var name='name'}&action=edit&server_id={tmpl_var name='server_id'}">{tmpl_var name="active"}</a></td>
@@ -42,19 +33,12 @@ <h1><tmpl_var name="install_list_head_txt"></h1>
                     </td>
                 </tr>
             </tmpl_loop>
-            <tmpl_unless name="records">
-                <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                    <td colspan="6">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+            <tmpl_else>
+                <tr>
+                    <td colspan="6" class="text-center"><tmpl_var name="no_records_txt"></td>
                 </tr>
-            </tmpl_unless>
+            </tmpl_if>
         </tbody>
-        <!--
-        <tfoot>
-            <tr>
-                <td colspan="6"><tmpl_var name="paging"></td>
-            </tr>
-        </tfoot>
-        -->
     </table>
 </div>
         
diff --git a/server/lib/classes/extension_installer.inc.php b/server/lib/classes/extension_installer.inc.php
@@ -655,7 +655,11 @@ public function scan_extensions() {
 				"'" . 'ok' . "'" .
 				')';
 				$app->dbmaster->query($sql);
-			}
+			} 
+		} else {
+			// Delete monitor_data record
+			$sql = 'DELETE FROM `monitor_data` WHERE `type` = ? and `server_id` = ?';
+			$app->dbmaster->query($sql, 'extensions', $conf['server_id']);
 		}
 
         return $extensions;
