orig theme renamed to mobile

webui/config.php

@@ -213,7 +213,7 @@ $langs = array(
 
 $themes = array(
                 'default',
-                'orig'
+                'mobile'
                );
 
 

webui/controller/search/remove.php

@@ -0,0 +1,28 @@
+<?php
+
+
+class ControllerSearchRemove extends Controller {
+   private $error = array();
+
+
+   public function index(){
+
+      $this->id = "content";
+      $this->template = "search/load.tpl";
+      $this->layout = "common/layout-empty";
+
+
+      $request = Registry::get('request');
+      $db = Registry::get('db');
+
+      $this->load->model('search/search');
+      $this->load->model('search/message');
+      $this->load->model('user/user');
+
+      $this->data['terms'] = $this->model_search_search->remove_search_terms();
+   }
+
+}
+
+
+?>

webui/model/search/search.php

@@ -759,7 +759,7 @@ class ModelSearchSearch extends Model {
 
    public function get_search_terms() {
 
-      $query = $this->db->query("SELECT term FROM " . TABLE_SEARCH . " where email=? ORDER BY ts DESC", array($_SESSION['email']));
+      $query = $this->db->query("SELECT term FROM " . TABLE_SEARCH . " WHERE email=? ORDER BY ts DESC", array($_SESSION['email']));
       if(isset($query->rows)) { return $query->rows; }
 
       return array();
@@ -792,6 +792,11 @@ class ModelSearchSearch extends Model {
    }
 
 
+   public function remove_search_terms() {
+      $query = $this->db->query("DELETE FROM " . TABLE_SEARCH . " WHERE email=?", array($_SESSION['email']));
+   }
+
+
    private function fixup_meta_characters($s = '') {
       if($s == '') { return $s; }
 

webui/view/javascript/piler-in.js

@@ -221,6 +221,20 @@ var Piler =
     },
 
 
+    remove_saved_search_terms:function(msg)
+    {
+        Piler.log("[load_saved_search_terms]");
+
+        jQuery.ajax('/index.php?route=search/remove', {})
+        .done(function(a) {
+            $('#mailcontframe').html(a);
+        })
+        .fail(function(a, b) { alert("Problem retrieving XML data:" + b) });
+
+        Piler.show_message('messagebox1', msg, 0.85);
+    },
+
+
     /*
      * load the selected message by position to preview area
      */

webui/view/theme/default/templates/common/layout-search.tpl

@@ -63,6 +63,7 @@
                     <ul class="dropdown-menu">
                         <li><a href="#" onclick="Piler.saved_search_terms('<?php print $text_saved; ?>');"><?php print $text_save; ?></a></li>
                         <li><a href="#" onclick="Piler.load_saved_search_terms();"><?php print $text_load; ?></a></li>
+                        <li><a href="#" onclick="Piler.remove_saved_search_terms('<?php print $text_successfully_removed; ?>');"><?php print $text_remove; ?></a></li>
                     </ul>
                 </div>
               </div>

webui/view/theme/mobile/templates/accounting/accounting.tpl

@@ -6,7 +6,6 @@
 </p>
 
 
-
 <?php if ( $accounting ) { ?>
 
     <div id="pagenav">
@@ -18,6 +17,7 @@
     </div>
 
     <div id="ss1" style="margin-top: 10px;">
+
         <div class="domainrow">
             <div class="domaincell">&nbsp;</div>
             <div class="domaincell">&nbsp;</div>
@@ -31,6 +31,9 @@
         </div>
         <div class="domainrow">
             <div class="domaincell"><?php echo $viewname; ?> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=item&amp;order=0"><i class="icon-chevron-up"></i></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=item&amp;order=1"><i class="icon-chevron-down"></i></a></div>
+        <?php if(ENABLE_SAAS == 1 && $view == 'domain') { ?>
+            <div class="domaincell"><?php print $text_users; ?></div>
+        <?php } ?>
             <div class="domaincell"><?php print $text_oldest_record; ?> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=oldest&amp;order=0"><i class="icon-chevron-up"></i></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=oldest&amp;order=1"><i class="icon-chevron-down"></i></a></div>
             <div class="domaincell"><?php print $text_newest_record; ?> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=newest&amp;order=0"><i class="icon-chevron-up"></i></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=newest&amp;order=1"><i class="icon-chevron-down"></i></a></div>
             <div class="domaincell"><?php print $text_items; ?> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=sent&amp;order=0"><i class="icon-chevron-up"></i></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=sent&amp;order=1"><i class="icon-chevron-down"></i></a></div>
@@ -41,9 +44,15 @@
             <div class="domaincell"><?php print $text_average_size; ?> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=recdavg&amp;order=0"><i class="icon-chevron-up"></i></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=recdavg&amp;order=1"><i class="icon-chevron-down"></i></a></div>
         </div>
 
+
         <?php foreach($accounting as $details) {?>
             <div class="domainrow">
                 <div class="domaincell"><?php echo $details['item']; ?></div>
+
+             <?php if(ENABLE_SAAS == 1 && $view == 'domain') { ?>
+                <div><a href="index.php?route=accounting/accounting&amp;view=accounts&amp;domain=<?php echo $details['item']; ?>"><?php echo count($accounts[$details['item']]); ?></a></div>
+             <?php } ?>
+
                 <div class="domaincell"><?php echo date("d M Y",$details['oldest']); ?></div>
                 <div class="domaincell"><?php echo date("d M Y",$details['newest']); ?></div>
                 <div class="domaincell">
@@ -66,7 +75,10 @@
                 </div>
             </div>
         <?php } ?>
+
     </div>
+
+
     <div id="pagenav">
         <?php if($page > 0){ ?><a href="index.php?route=accounting/accounting&amp;page=0&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &laquo; <?php if($page > 0){ ?></a><?php } ?>
         <?php if($page > 0){ ?><a href="index.php?route=accounting/accounting&amp;page=<?php print $prev_page; ?>&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &lsaquo; <?php if($page > 0){ ?></a><?php } ?>
@@ -77,3 +89,4 @@
 <?php } else { ?>
     <p><?php $s = 'text_no_' . $view . '_found'; print $$s; ?></p>
 <?php } ?>
+

webui/view/theme/mobile/templates/accounting/accounts.tpl

@@ -0,0 +1,32 @@
+
+<p>
+<?php if ($view == 'email') { echo '<strong>'.$text_accounting_email.'</strong>'; } else { echo '<a href="index.php?route=accounting/accounting&amp;view=email">'.$text_accounting_email.'</a>'; } ?> | 
+<?php if ($view == 'domain') { echo '<strong>'.$text_accounting_domain.'</strong>'; } else { echo '<a href="index.php?route=accounting/accounting&amp;view=domain">'.$text_accounting_domain.'</a>'; } ?>
+</p>
+
+<p><a href="index.php?route=accounting/accounting&amp;view=domain"><?php print $text_back; ?></a></p>
+
+<?php if(count($accounts) > 0) { ?>
+
+    <div id="ss1">
+
+        <div class="domainrow">
+            <div class="domaincell"><?php echo $text_email; ?> (@<?php print $domain; ?>) </div>
+        </div>
+        
+        <?php foreach($accounts as $a) {?>
+        <div class="domainrow">
+            <div class="domaincell"><?php echo $a['mail']; ?></div>
+        </div>
+        <?php } ?>
+    </div>
+    
+<?php } else { ?>
+<div class="domainrow">
+    <div class="domaincell"><?php print $text_no_email_found; ?></div>
+</div>
+<?php } ?>
+
+<p><a href="index.php?route=accounting/accounting&amp;view=domain"><?php print $text_back; ?></a></p>
+
+

webui/view/theme/mobile/templates/audit/helper.tpl

@@ -1,5 +1,5 @@
 
-<div id="auditresultscontainer"<?php if($n <= 0) { ?> class="empty"<?php } ?>>
+<div id="resultscontainer"<?php if($n <= 0) { ?> class="empty"<?php } ?>>
 
    <div id="results">
 
@@ -11,7 +11,7 @@
             <div class="auditcell ip"><?php print $message['ipaddr']; ?></div>
             <div class="auditcell action"><?php print $actions[$message['action']]; ?></div>
             <div class="auditcell description"><?php if($message['description'] != $message['shortdescription']) { ?><span title="<?php print $message['description']; ?>"><?php print $message['shortdescription']; ?></span><?php } else { print $message['description']; } ?></div>
-            <div class="auditcell ref"><?php print $message['id']; ?></div>
+            <div class="auditcell ref"><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?><a href="#" onclick="Piler.view_message(<?php print $message['id']; ?>);"><?php } ?><?php print $message['id']; ?><?php if(Registry::get('auditor_user') == 1 && $message['id'] > 0) { ?></a><?php } ?></div>
          </div>
 
 <?php } } else { ?>

webui/view/theme/mobile/templates/common/layout-audit.tpl

@@ -5,9 +5,9 @@
    <title><?php print $title; ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
-   <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
+   <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
-   <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
+   <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
-   <meta name="author" content="<?php print PROVIDED_BY; ?>" />
+   <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
    <meta name="rating" content="general" />
    <meta name="robots" content="all" />
 
@@ -49,9 +49,10 @@
          <input type="button" class="btn" onclick="Piler.cancel();" value="<?php print $text_cancel; ?>" />
 
          <div id="sspinner">
-            <img src="/view/theme/<?php print THEME; ?>/images/spinner.gif" id="spinner" alt="spinner" />
+            <div class="progress progress-striped active">
+               <div class="bar" style="width: 100%;"></div>
+            </div>
          </div>
-
 </div>
 
 <div id="resultsheader">
@@ -90,11 +91,10 @@
 
 
 <div id="mainscreen">
-
   <div id="mailleftcontainer">
   </div>
 
-  <div id="mailrightcontainer<?php if(ENABLE_FOLDER_RESTRICTIONS == 0) { ?>nofolder<?php } ?>">
+  <div id="mailrightcontainernofolder">
 
     <div id="mailrightcontent">
 
@@ -107,13 +107,38 @@
         </div>
       </div>
 
-  </div>
+<?php if(Registry::get('auditor_user') == 1) { ?>
+
+<script type="text/javascript">
+  var mailviewsplit = new rcube_splitter({id:'splitter2', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 205});
+  split.add_onload('mailviewsplit.init()');
+</script>
+
+      <div id="mailpreviewframe"></div>
+
+<?php } ?>
+
 
 
   </div>
 
 
+
 </div>
 
+
+</div>
+
+<?php if(Registry::get('auditor_user') == 1) { ?>
+
+<script type="text/javascript">
+$(document).ready(function(){
+   split.init();
+});
+</script>
+
+<?php } ?>
+
+
 </body>
 </html>

webui/view/theme/mobile/templates/common/layout-email.tpl

@@ -5,9 +5,9 @@
    <title>piler<?php if(isset($title) && $title) { ?> | <?php print $title; } ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
-   <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
+   <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
-   <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
+   <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
-   <meta name="author" content="<?php print PROVIDED_BY; ?>" />
+   <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
    <meta name="rating" content="general" />
    <meta name="robots" content="all" />
 

webui/view/theme/mobile/templates/common/layout-search.tpl

@@ -5,9 +5,9 @@
    <title><?php print $title; ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
-   <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
+   <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
-   <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
+   <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
-   <meta name="author" content="<?php print PROVIDED_BY; ?>" />
+   <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
    <meta name="rating" content="general" />
    <meta name="robots" content="all" />
 
@@ -53,7 +53,7 @@
          <button class="btn" onclick="Piler.cancel(); return false;"><?php print $text_cancel; ?></button>
          <button class="btn " onclick="Piler.saved_search_terms('<?php print $text_saved; ?>'); return false;"><?php print $text_save; ?></button>
          <button class="btn btn-inverse" onclick="Piler.load_saved_search_terms(); return false;"><?php print $text_load; ?></button>
-
+         <button class="btn btn-warning" onclick="Piler.remove_saved_search_terms('<?php print $text_successfully_removed; ?>'); return false;"><?php print $text_remove; ?></button>
 
          <?php print $popup; ?>
 
@@ -62,7 +62,6 @@
                <div class="bar" style="width: 100%;"></div>
             </div>
          </div>
-
 </div>
 
 

webui/view/theme/mobile/templates/common/layout.tpl

@@ -5,9 +5,9 @@
    <title>piler | <?php print $title; ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
-   <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
+   <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
-   <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
+   <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
-   <meta name="author" content="<?php print PROVIDED_BY; ?>" />
+   <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
    <meta name="rating" content="general" />
    <meta name="robots" content="all" />
 
@@ -27,7 +27,14 @@
 
 </head>
 
-<body class="mybody"<?php if(isset($this->request->get['route']) && $this->request->get['route'] == 'health/health') { ?> onload="Piler.load_health(); setInterval('Piler.load_health()', Piler.health_refresh * 1000);"<?php } ?>>
+<body<?php
+
+if(isset($this->request->get['route'])) {
+
+   if($this->request->get['route'] == 'health/health') { ?> onload="Piler.load_health(); setInterval('Piler.load_health()', Piler.health_refresh * 1000);"<?php }
+   if($this->request->get['route'] == 'stat/online') { ?> onload="setInterval('Piler.reload_page()', Piler.health_refresh * 1000);"<?php }
+
+} ?>>
 
 <div id="piler1" class="container">
 

webui/view/theme/mobile/templates/common/menu.tpl

@@ -1,11 +1,10 @@
 <?php if(Registry::get('username')) { ?>
 
     <div class="navbar">
-       <div class="navbar-inner">
+       <div class="navbar-inner"<?php if($settings['colour']) { ?> style="background: <?php print $settings['colour']; ?>;"<?php } ?>>
 
-       <?php if(BRANDING_TEXT) { ?>
+
-          <a class="brand" href="<?php if(BRANDING_URL) { print BRANDING_URL; } else { ?>#<?php } ?>"><?php print BRANDING_TEXT; ?></a>
+       <a class="brand" target="_blank" href="<?php print $settings['branding_url']; ?>" title="<?php print $settings['branding_text']; ?>"><?php if($settings['branding_logo']) { ?><img src="/images/<?php print $settings['branding_logo']; ?>" alt="<?php print $settings['branding_text']; ?>" /><?php } ?></a>
-       <?php } ?>
 
           <ul class="nav pull-left">
 
@@ -31,6 +30,10 @@
                     <li><a href="index.php?route=user/list"><?php print $text_users; ?></a></li>
                     <li><a href="index.php?route=group/list"><?php print $text_groups; ?></a></li>
                     <li><a href="index.php?route=domain/domain"><?php print $text_domain; ?></a></li>
+     <?php if(ENABLE_SAAS == 1) { ?>
+                    <li><a href="index.php?route=ldap/list"><i class="icon-key"></i>&nbsp;<?php print $text_ldap; ?></a></li>
+                    <li><a href="index.php?route=customer/list"><i class="icon-wrench"></i>&nbsp;<?php print $text_customers; ?></a></li>
+     <?php } ?>
                     <li><a href="index.php?route=policy/archiving"><?php print $text_archiving_rules; ?></a></li>
                     <li><a href="index.php?route=policy/retention"><?php print $text_retention_rules; ?></a></li>
                  </ul>
@@ -38,16 +41,28 @@
 
 <?php } else { ?>
 
-             <li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "search.php")){ ?> class="active"<?php } ?>><a href="search.php"><?php print $text_search; ?></a></li>
+             <li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "search.php")){ ?> class="active"<?php } ?>><a href="search.php"><i class="icon-search"></i>&nbsp;<?php print $text_search; ?></a></li>
+
           <?php if(ENABLE_FOLDER_RESTRICTIONS == 1) { ?>
              <li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "folders.php")){ ?> class="active"<?php } ?>><a href="folders.php"><?php print $text_folder; ?></a></li>
           <?php } ?>
 
+          <?php if(ENABLE_AUDIT == 1 && $auditor_user == 1) { ?>
+              <li><a href="index.php?route=audit/audit"><i class="icon-book"></i>&nbsp;<?php print $text_audit; ?></a></li>
+          <?php } ?>
+
+          <?php if($settings['support_link']) { ?>
+              <li><a href="<?php print $settings['support_link']; ?>"><?php print $text_contact_support; ?></a></li>
+          <?php } ?>
+
 <?php } ?>
 
           </ul>
 
           <ul class="nav pull-right">
+
+             <?php if($settings['branding_url']) { ?><li><a href="<?php print $settings['branding_url']; ?>" target="_blank"><i class="icon-phone"></i>&nbsp;<?php print $settings['branding_text']; ?></a></li><?php } ?>
+
              <li class="divider-vertical"></li>
              <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php print $_SESSION['realname']; ?> <i class="icon-user"></i> <b class="caret"></b></a>

webui/view/theme/mobile/templates/customer/list.tpl

@@ -0,0 +1,104 @@
+<h4><?php if(isset($a['domain'])) { print $text_edit_entry; } else { print $text_add_new_entry; } ?></h4>
+
+<?php if(isset($x)){ ?>
+    <div class="alert alert-info"><?php print $x; ?></div>
+<?php } ?>
+
+<form method="post" name="add1" action="index.php?route=customer/list" class="form-horizontal" enctype="multipart/form-data">
+
+ <?php if(isset($a['domain'])) { ?>
+    <input type="hidden" name="id" id="id" value="<?php print $id; ?>" />
+ <?php } ?>
+
+    <div class="control-group">
+       <label class="control-label" for="domain"><?php print $text_domain; ?>:</label>
+       <div class="controls">
+          <select name="domain" id="domain">
+       <?php foreach ($domains as $domain) { ?>
+          <option value="<?php print $domain; ?>"<?php if(isset($a['domain']) && $a['domain'] == $domain) { ?> selected="selected"<?php } ?>><?php print $domain; ?></option>
+       <?php } ?>
+          </select>
+       </div>
+    </div>
+    <div class="control-group">
+       <label class="control-label" for="branding_text"><?php print $text_branding_text; ?>:</label>
+       <div class="controls">
+          <input type="text" class="text" name="branding_text" id="branding_text" placeholder="" value="<?php if(isset($a['branding_text'])) { print $a['branding_text']; } ?>" />
+       </div>
+    </div>
+    <div class="control-group">
+       <label class="control-label" for="branding_url"><?php print $text_branding_url; ?>:</label>
+       <div class="controls">
+          <input type="text" class="text" name="branding_url" id="branding_url" placeholder="" value="<?php if(isset($a['branding_url'])) { print $a['branding_url']; } ?>" />
+       </div>
+    </div>
+    <div class="control-group">
+       <label class="control-label" for="branding_logo"><?php print $text_branding_logo; ?>:</label>
+       <div class="controls">
+          <input type="file" class="text" name="branding_logo" id="branding_logo" placeholder="" /> <?php if(isset($a['branding_logo'])) { ?><img src="/images/<?php print $a['branding_logo']; ?>" /><?php } ?>
+       </div>
+    </div>
+    <div class="control-group">
+       <label class="control-label" for="support_link"><?php print $text_support_link; ?>:</label>
+       <div class="controls">
+          <input type="text" class="text" name="support_link" id="support_link" placeholder="" value="<?php if(isset($a['support_link'])) { print $a['support_link']; } ?>" />
+       </div>
+    </div>
+    <div class="control-group">
+       <label class="control-label" for="colour"><?php print $text_colour; ?>:</label>
+       <div class="controls">
+          <input type="text" class="text" name="colour" id="colour" placeholder="" value="<?php if(isset($a['colour'])) { print $a['colour']; } ?>" />
+       </div>
+    </div>
+
+    <div class="form-actions">
+        <input type="submit" value="<?php if(isset($a['domain'])) { print $text_modify; } else { print $text_add; } ?>" class="btn btn-primary" />
+        <input type="reset" value="<?php print $text_clear; ?>" class="btn" onclick="Piler.clear_ldap_test();" />
+    </div>
+
+</form>
+
+<?php if($id == -1) { ?>
+
+<h4><?php print $text_existing_entries; ?></h4>
+
+<div class="listarea">
+
+<?php if(isset($entries)){ ?>
+
+   <id="ss1">
+      <div class="domainrow">
+         <div class="domaincell"><?php print $text_domain; ?></div>
+         <div class="domaincell"><?php print $text_branding_text; ?></div>
+         <div class="domaincell"><?php print $text_branding_url; ?></div>
+         <div class="domaincell"><?php print $text_branding_logo; ?></div>
+         <div class="domaincell"><?php print $text_colour; ?></div>
+         <div class="domaincell">&nbsp;</div>
+         <div class="domaincell">&nbsp;</div>
+      </div>
+
+<?php foreach($entries as $e) { ?>
+      <div class="domainrow">
+         <div class="domaincell"><?php print $e['domain']; ?></div>
+         <div class="domaincell"><?php print $e['branding_text']; ?></div>
+         <div class="domaincell"><?php print $e['branding_url']; ?></div>
+         <div class="domaincell"><?php if($e['branding_logo']) { ?><img src="/images/<?php print $e['branding_logo']; ?>" /><?php } ?></div>
+         <div class="domaincell"><?php print $e['colour']; ?></div>
+         <div class="domaincell"><a href="index.php?route=customer/list&amp;id=<?php print $e['id']; ?>"><?php print $text_edit; ?></a></div>
+         <div class="domaincell"><a href="index.php?route=customer/remove&amp;id=<?php print $e['id']; ?>&amp;domain=<?php print urlencode($e['domain']); ?>&amp;confirmed=1" onclick="if(confirm('<?php print $text_remove; ?>: ' + '\'<?php print $e['domain']; ?>\'')) return true; return false;"><?php print $text_remove; ?></a></div>
+      </div>
+<?php } ?>
+
+   </div>
+
+<?php } else { ?>
+    <div class="alert alert-error lead">
+    <?php print $text_not_found; ?>
+    </div>
+<?php } ?>
+
+<?php } ?>
+
+
+</div>
+

webui/view/theme/mobile/templates/customer/remove.tpl

@@ -0,0 +1,11 @@
+
+<p>
+
+<?php if($confirmed){ ?>
+
+<?php print $x; ?>. <a href="index.php?route=customer/list"><?php print $text_back; ?></a>
+
+<?php } ?>
+
+</p>
+

webui/view/theme/mobile/templates/domain/list.tpl

@@ -12,6 +12,20 @@
          <div class="domaincell"><?php print $text_mapped_domain; ?>:</div>
          <div class="domaincell"><input type="text" class="text" name="mapped" /></div>
       </div>
+<?php if(ENABLE_SAAS == 1) { ?>
+      <div class="row">
+         <div class="domaincell"><?php print $text_ldap; ?>:</div>
+         <div class="domaincell">
+            <select name="ldap_id" id="ldap_id">
+       <?php foreach ($ldap as $l) { ?>
+               <option value="<?php print $l['id']; ?>"><?php print $l['description']; ?></option>
+       <?php } ?>
+            </select>
+       </div>
+    </div>
+<?php } ?>
+
+
       <div class="row">
          <div class="domaincell">&nbsp;</div>
          <div class="domaincell"><input type="submit" class="btn btn-primary" value="<?php print $text_add; ?>" /> <input type="reset" class="btn" value="<?php print $text_cancel; ?>" /></div>
@@ -31,6 +45,9 @@
       <div class="domainrow">
          <div class="domaincell"><?php print $text_domain; ?></div>
          <div class="domaincell"><?php print $text_mapped_domain; ?></div>
+      <?php if(ENABLE_SAAS == 1) { ?>
+         <div class="domaincell"><?php print $text_ldap; ?></div>
+      <?php } ?>
          <div class="domaincell">&nbsp;</div>
       </div>
 
@@ -38,6 +55,9 @@
       <div class="domainrow">
          <div class="domaincell"><a href="index.php?route=user/list&search=@<?php print $domain['domain']; ?>"><?php print $domain['domain']; ?></a></div>
          <div class="domaincell"><?php print $domain['mapped']; ?></div>
+      <?php if(ENABLE_SAAS == 1) { ?>
+         <div class="domaincell"><?php print $domain['ldap']; ?></div>
+      <?php } ?>
          <div class="domaincell"><a href="index.php?route=domain/remove&amp;confirmed=1&amp;domain=<?php print urlencode($domain['domain']); ?>" onclick="if(confirm('<?php print $text_remove_domain; ?>: ' + '\'<?php print $domain['domain']; ?>\'')) return true; return false;"><?php print $text_remove; ?></a></div>
       </div>
 <?php } ?>