Fixed: FS#2245 - Unable to move from the state "Installation Failed" of an app

Author: tbrehm

interface/web/admin/software_package_del.php

@@ -0,0 +1,53 @@
+<?php
+
+/*
+Copyright (c) 2012, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require_once('../../lib/config.inc.php');
+require_once('../../lib/app.inc.php');
+
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
+
+$software_update_inst_id = intval($_GET['software_update_inst_id']);
+
+if($software_update_inst_id > 0) {	
+	$app->db->datalogDelete('software_update_inst', 'software_update_inst_id', $software_update_inst_id);
+	//header('Location: admin/software_package_list.php');
+	die('HEADER_REDIRECT: admin/software_package_list.php');
+} else {
+	die('Invalid ID');
+}
+
+
+
+
+
+
+?>

interface/web/admin/software_package_list.php

@@ -169,6 +169,7 @@
 				}
 			}
 		}
+		$packages[$key]['software_update_inst_id'] = $inst['software_update_inst_id'];
 		$packages[$key]['installed'] = $installed_txt;
 	}
 }

interface/web/admin/templates/software_package_list.htm

@@ -22,6 +22,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
                         <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
                         <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
                         <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
+						<th class="tbl_col_buttons" scope="col">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -31,12 +32,15 @@ <h2><tmpl_var name="list_head_txt"></h2>
                             <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
                             <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
                             <td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
+							<td class="tbl_col_buttons">
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name="software_update_inst_id"}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </td>
                         </tr>
                     </tmpl_loop>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td class="tbl_footer tbl_paging" colspan="4"></td>
+                        <td class="tbl_footer tbl_paging" colspan="5"></td>
                     </tr>
                 </tfoot>
             </table>