Added missing empty directories from svn import

Marius Cramer

2013-10-14 d9bcf68e395d6156645a7974b1a992aa6e6c00aa

 interface/web/sites/aps_installedpackages_list.php

@@ -52,7 +52,8 @@
if(!$is_admin)

{

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

    $client_ext = ' AND aps_instances.customer_id = '.$cid['client_id'];

    //$client_ext = ' AND aps_instances.customer_id = '.$cid['client_id'];

   $client_ext = ' AND '.$app->tform->getAuthSQL('r', 'aps_instances');

}

$app->listform_actions->SQLExtWhere = 'aps_instances.package_id = aps_packages.id'.$client_ext;

$app->listform_actions->SQLOrderBy = 'ORDER BY package_name';

@@ -82,17 +83,31 @@
$limit_sql = $app->listform->getPagingSQL($sql_where);

$app->tpl->setVar('paging', $app->listform->pagingHTML);



if(!$is_admin) {

// Our query over multiple tables

$query = "SELECT aps_instances.id AS id, aps_instances.package_id AS package_id, 

                 aps_instances.customer_id AS customer_id, client.username AS customer_name, 

                 aps_instances.instance_status AS instance_status, aps_packages.name AS package_name, 

                 aps_packages.version AS package_version, aps_packages.release AS package_release, 

                 aps_packages.package_status AS package_status, 

              CONCAT ((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id), 
              CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id), 
                 '/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id)) 

                  AS install_location  

          FROM aps_instances, aps_packages, client 

          WHERE client.client_id = aps_instances.Customer_id AND ".$sql_where." ".$app->listform_actions->SQLOrderBy." ".$limit_sql;

          WHERE client.client_id = aps_instances.customer_id AND ".$sql_where." ".$app->listform_actions->SQLOrderBy." ".$limit_sql;

} else {

$query = "SELECT aps_instances.id AS id, aps_instances.package_id AS package_id,  
                 aps_instances.customer_id AS customer_id, sys_group.name AS customer_name,

             aps_instances.instance_status AS instance_status, aps_packages.name AS package_name, 
                 aps_packages.version AS package_version, aps_packages.release AS package_release, 
                 aps_packages.package_status AS package_status, 
              CONCAT((SELECT value FROM aps_instances_settings WHERE name='main_domain' AND instance_id = aps_instances.id), 
                 '/', (SELECT value FROM aps_instances_settings WHERE name='main_location' AND instance_id = aps_instances.id)) 
                  AS install_location  
          FROM aps_instances, aps_packages, sys_group 
          WHERE sys_group.client_id = aps_instances.customer_id AND ".$sql_where." ".$app->listform_actions->SQLOrderBy." ".$limit_sql;



}	  


$records = $app->db->queryAllRecords($query);

$app->listform_actions->DataRowColor = '#FFFFFF';