Merge branch 'master' into 'master'

Marius Cramer

2014-01-24 b50d36a340f2cb3a54f7fa29699ec5d0f064f31c

 interface/web/sites/list/web_vhost_domain.list.php

File was renamed from interface/web/sites/list/web_domain.list.php
@@ -10,13 +10,22 @@
   - DATE
*/

$vhostdomain_type = 'domain';

if(isset($_SESSION['s']['var']['vhostdomain_type'])) {
   if($_SESSION['s']['var']['vhostdomain_type'] == 'subdomain') {
      $vhostdomain_type = 'subdomain';
   } elseif($_SESSION['s']['var']['vhostdomain_type'] == 'aliasdomain') {
      $vhostdomain_type = 'aliasdomain';
   }
}


// Name of the list
if($_SESSION['s']['user']['typ'] == 'admin') {
   $liste["name"]     = "web_domain_admin";
   $liste["name"]     = "web_vhost_domain_admin";
} else {
   $liste["name"]     = "web_domain";
   $liste["name"]     = "web_vhost_domain";
}

// Database table
@@ -32,13 +41,13 @@
$liste["records_per_page"]  = "15";

// Script File of the list
$liste["file"]    = "web_domain_list.php";
$liste["file"]    = "web_vhost_domain_list.php";

// Script file of the edit form
$liste["edit_file"]   = "web_domain_edit.php";
$liste["edit_file"]   = "web_vhost_domain_edit.php";

// Script File of the delete script
$liste["delete_file"]  = "web_domain_del.php";
$liste["delete_file"]  = "web_vhost_domain_del.php";

// Paging Template
$liste["paging_tpl"]  = "templates/paging.tpl.htm";
@@ -51,15 +60,16 @@
* Suchfelder
*****************************************************/

$liste["item"][] = array( 'field'  => "domain_id",
   'datatype' => "INTEGER",
   'formtype' => "TEXT",
   'op'  => "=",
   'prefix' => "",
   'suffix' => "",
   'width'  => "",
   'value'  => "");

if($vhostdomain_type == 'domain') {
   $liste["item"][] = array( 'field'  => "domain_id",
      'datatype' => "INTEGER",
      'formtype' => "TEXT",
      'op'  => "=",
      'prefix' => "",
      'suffix' => "",
      'width'  => "",
      'value'  => "");
}

$liste["item"][] = array( 'field'  => "active",
   'datatype' => "VARCHAR",
@@ -70,7 +80,7 @@
   'width'  => "",
   'value'  => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));

if($_SESSION['s']['user']['typ'] == 'admin') {
if($_SESSION['s']['user']['typ'] == 'admin' && $vhostdomain_type == 'domain') {
   $liste["item"][] = array( 'field'  => "sys_groupid",
      'datatype' => "INTEGER",
      'formtype' => "SELECT",
@@ -100,6 +110,26 @@
   'width'  => "",
   'value'  => "");

if($vhostdomain_type != 'domain') {
   $liste["item"][] = array( 'field'  => "parent_domain_id",
      'datatype' => "VARCHAR",
      'filters'   => array( 0 => array( 'event' => 'SHOW',
            'type' => 'IDNTOUTF8')
      ),
      'formtype' => "SELECT",
      'op'  => "=",
      'prefix' => "",
      'suffix' => "",
      'datasource' => array (  'type' => 'SQL',
         'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
         'keyfield'=> 'domain_id',
         'valuefield'=> 'domain'
      ),
      'width'  => "",
      'value'  => "");

}

$liste["item"][] = array( 'field'  => "domain",
   'datatype' => "VARCHAR",
   'filters'   => array( 0 => array( 'event' => 'SHOW',