Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

florian030

2014-02-25 cce9d63279d9078dd0292dd015be497600ac5f32

 interface/web/mail/mail_user_list.php

@@ -1,6 +1,6 @@
<?php
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';

/******************************************
* Begin Form configuration
@@ -19,26 +19,33 @@


class list_action extends listform_actions {
	

   function onShow() {
      global $app,$conf;
		
      global $app, $conf;

      $app->uses('getconf');
      $global_config = $app->getconf->get_global_config('mail');
		

      if($global_config['mailboxlist_webmail_link'] == 'y') {
         $app->tpl->setVar('mailboxlist_webmail_link',1);
         $app->tpl->setVar('mailboxlist_webmail_link', 1);
      } else {
         $app->tpl->setVar('mailboxlist_webmail_link',0);
         $app->tpl->setVar('mailboxlist_webmail_link', 0);
      }
		

      if($global_config["enable_custom_login"] == "y") {
         $app->tpl->setVar("enable_custom_login", 1);
      } else {
         $app->tpl->setVar("enable_custom_login", 0);
      }

      parent::onShow();
   }
	

}

$list = new list_action;
$list->SQLOrderBy = 'ORDER BY mail_user.email';
$list->onLoad();


?>
?>