Fixed: FS#2489 - APS installer uninstallation problem Fixed: FS#2446 - APS ...

tbrehm

2012-10-19 78c462c99fcb49eff01b7a78e3a98521a61e1493

Fixed: FS#2489 - APS installer uninstallation problem
Fixed: FS#2446 - APS Installer - Uninstall doesn't work

 interface/lib/classes/aps_guicontroller.inc.php

@@ -306,7 +306,8 @@
     */

    public function deleteInstance($instanceid)

    {

        /*

        global $app;

        /*

        $this->db->query("UPDATE aps_instances SET instance_status = ".INSTANCE_REMOVE." WHERE id = ".$instanceid.";");

        

        $webserver_id = $this->getInstanceDataForDatalog($instanceid);

@@ -325,7 +326,8 @@
        $tmp = $this->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_database` WHERE `database_user_id` = '" . $app->functions->intval($database_user) . "' OR `database_ro_user_id` = '" . $app->functions->intval($database_user) . "'");

        if($tmp['cnt'] < 1) $this->db->datalogDelete('web_database_user', 'database_user_id', $database_user);

        

        $this->db->datalogUpdate('aps_instances', "instance_status = ".INSTANCE_REMOVE, 'id', $instanceid);

        $app->db->datalogUpdate('aps_instances', "instance_status = ".INSTANCE_REMOVE, 'id', $instanceid);



    }

    

    /**


 interface/web/sites/aps_do_operation.php

@@ -27,7 +27,7 @@
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');

$app->load('aps_guicontroller');

@@ -72,6 +72,7 @@
        $cid = $app->db->queryOneRecord("SELECT client_id FROM client WHERE username = '".$app->db->quote($_SESSION['s']['user']['username'])."';");

        $client_id = $cid['client_id'];

    }

	
    // Assume that the given instance belongs to the currently calling client_id. Unimportant if status is admin

    if(!$gui->isValidInstanceID($_GET['id'], $client_id, $is_admin)) die($app->lng('Invalid ID'));

    

@@ -79,8 +80,7 @@
    $check = $app->db->queryOneRecord("SELECT id FROM aps_instances 

        WHERE id = ".$app->db->quote($_GET['id'])." AND 

        (instance_status = ".INSTANCE_SUCCESS." OR instance_status = ".INSTANCE_ERROR.");");

    if(!empty($check)) $gui->deleteInstance($_GET['id']);

    
    if($check['id'] > 0) $gui->deleteInstance($_GET['id']);

    echo $app->lng('Installation_remove');

}

else if($_GET['action'] == 'reinstall_instance')


 interface/web/sites/templates/aps_instances_list.htm

@@ -41,10 +41,10 @@
                            <td class="tbl_col_instancestatus"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>

                            <td class="tbl_col_buttons">

                                <tmpl_if name='delete_possible'>

                                    <a class="button icons16 icoDelete" href="javascript:if(window.confirm('{tmpl_var name='pkg_delete_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='delete_txt'}</span></a>

                                    <a class="button icons16 icoDelete" href="javascript: del_record('sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}','{tmpl_var name='pkg_delete_confirmation'}')"><span>{tmpl_var name='delete_txt'}</span></a>

                                </tmpl_if>

                                <tmpl_if name='reinstall_possible'>

                                    <a class="button icons16 icoEdit" href="javascript:if(window.confirm('{tmpl_var name='pkg_reinstall_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='reinstall_txt'}</span></a>

                                    <a class="button icons16 icoEdit" href="javascript: del_record('sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}','{tmpl_var name='pkg_delete_confirmation'}')"><span>{tmpl_var name='reinstall_txt'}</span></a>

                                </tmpl_if>

                            </td>        

                        </tr>