gui enhancements

2024-11-08 00:31:58 +01:00 · 2013-08-22 11:24:54 +02:00 · 2013-08-22 11:24:54 +02:00 · 760a76121a
commit 760a76121a
parent a9050a9f44
23 changed files with 67 additions and 15 deletions
--- a/webui/config.php
+++ b/webui/config.php
@ -33,6 +33,7 @@ $config['SITE_NAME'] = 'piler.yourdomain.com';
 $config['SITE_URL'] = 'http://piler.yourdomain.com/';

 $config['ENABLE_SAAS'] = 0;
+$config['ENABLE_TABLE_RESIZE'] = 0;
 $config['DEMO_MODE'] = 0;

 $config['TIMEZONE'] = 'Europe/Budapest';
--- a/webui/controller/group/email.php
+++ b/webui/controller/group/email.php
@ -16,6 +16,7 @@ class ControllerGroupEmail extends Controller {
      $language = Registry::get('language');

      $this->load->model('group/group');
+      $this->load->model('user/auth');

      $this->document->title = '';

@ -50,7 +51,7 @@ class ControllerGroupEmail extends Controller {

            foreach($emails as $email) {
               $i++;
-               $s .= '{ "id": "' . $i . '", "value": "' . $email['email'] . '" },';
+               $s .= '{ "id": "' . $i . '", "value": "' . $email . '" },';
            }

            $s = preg_replace("/,$/", "", $s) . " ]";
--- a/webui/controller/group/group.php
+++ b/webui/controller/group/group.php
@ -16,6 +16,7 @@ class ControllerGroupGroup extends Controller {
      $language = Registry::get('language');

      $this->load->model('group/group');
+      $this->load->model('user/auth');


      $this->data['term'] = '';
--- a/webui/controller/group/list.php
+++ b/webui/controller/group/list.php
@ -16,6 +16,7 @@ class ControllerGroupList extends Controller {
      $language = Registry::get('language');

      $this->load->model('group/group');
+      $this->load->model('user/auth');

      $this->document->title = $language->get('text_group_management');

--- a/webui/language/de/messages.php
+++ b/webui/language/de/messages.php
@ -1,5 +1,7 @@
 <?php

+$_['text_60_minutes'] = "60 Minuten";
+
 $_['text_action'] = "Aktion";
 $_['text_active_incoming_queue'] = "Aktive + Eingangswarteschlange";
 $_['text_active_incoming_queue_sender'] = "Aktive + Eingangswarteschlange zu Absender";
--- a/webui/language/en/messages.php
+++ b/webui/language/en/messages.php
@ -1,5 +1,7 @@
 <?php

+$_['text_60_minutes'] = "60 mins";
+
 $_['text_action'] = "Action";
 $_['text_active_incoming_queue'] = "active + incoming queue";
 $_['text_active_incoming_queue_sender'] = "active + incoming queue vs. sender";
--- a/webui/language/hu/messages.iso-8859-2.php
+++ b/webui/language/hu/messages.iso-8859-2.php
@ -1,5 +1,7 @@
 <?php

+$_['text_60_minutes'] = "60 perc";
+
 $_['text_action'] = "Mûvelet";
 $_['text_active_incoming_queue'] = "aktív + bejövõ üzenetsor";
 $_['text_active_incoming_queue_sender'] = "aktív + bejövõ üzenetsor (feladó szerint)";
--- a/webui/language/hu/messages.php
+++ b/webui/language/hu/messages.php
@ -1,5 +1,7 @@
 <?php

+$_['text_60_minutes'] = "60 perc";
+
 $_['text_action'] = "Művelet";
 $_['text_active_incoming_queue'] = "aktív + bejövő üzenetsor";
 $_['text_active_incoming_queue_sender'] = "aktív + bejövő üzenetsor (feladó szerint)";
--- a/webui/language/pt/messages.php
+++ b/webui/language/pt/messages.php
@ -1,5 +1,7 @@
 <?php

+$_['text_60_minutes'] = "60 mins";
+
 $_['text_action'] = "Ação";
 $_['text_active_incoming_queue'] = "fila activo + incoming";
 $_['text_active_incoming_queue_sender'] = "fila activo + incoming queue x remetentes";
--- a/webui/model/group/group.php
+++ b/webui/model/group/group.php
@ -141,15 +141,34 @@ class ModelGroupGroup extends Model {


   public function get_emails_by_string($s = '', $page = 0, $page_len = PAGE_LEN) {
+      $emails = array();
+
      $from = (int)$page * (int)$page_len;

      if(strlen($s) < 1) { return array(); }

+      if(ENABLE_LDAP_AUTH == 1) {
+         $ldap = new LDAP(LDAP_HOST, LDAP_HELPER_DN, LDAP_HELPER_PASSWORD);
+         if($ldap->is_bind_ok()) {
+
+            $query = $ldap->query(LDAP_BASE_DN, "(&(objectClass=" . LDAP_ACCOUNT_OBJECTCLASS . ")(" . LDAP_MAIL_ATTR . "=" . $s . "*))", array());
+
+            if(isset($query->rows)) {
+               $emails = $this->model_user_auth->get_email_array_from_ldap_attr($query->rows);
+            }
+         }
+      }
+
+
      $query = $this->db->query("SELECT email FROM `" . TABLE_EMAIL . "` WHERE email LIKE ? ORDER BY email ASC  LIMIT " . (int)$from . ", " . (int)$page_len, array($s . "%") );

-       if(isset($query->rows)) { return $query->rows; }
+      if(isset($query->rows)) {
+         foreach($query->rows as $q) {
+            array_push($emails, $q['email']);
+         }
+      }

-       return array();
+      return $emails;
   }


--- a/webui/model/health/health.php
+++ b/webui/model/health/health.php
@ -38,6 +38,10 @@ class ModelHealthHealth extends Model {
      $today = $last_7_days = $last_30_days = 0;
      $now = time();

+      $ts = $now - 3600;
+      $query = $this->db->query("select count(*) as count from " . TABLE_META . " where arrived > $ts");
+      if(isset($query->row['count'])) { $last_60_mins = $query->row['count']; }
+
      $ts = $now - 86400;
      $query = $this->db->query("select count(*) as count from " . TABLE_META . " where arrived > $ts");
      if(isset($query->row['count'])) { $today = $query->row['count']; }
@ -50,7 +54,7 @@ class ModelHealthHealth extends Model {
      $query = $this->db->query("select count(*) as count from " . TABLE_META . " where arrived > $ts");
      if(isset($query->row['count'])) { $last_30_days = $query->row['count']; }

-      return array($today, $last_7_days, $last_30_days);
+      return array($last_60_mins, $today, $last_7_days, $last_30_days);
   }


--- a/webui/model/user/auth.php
+++ b/webui/model/user/auth.php
@ -157,7 +157,7 @@ class ModelUserAuth extends Model {
   }


-   private function get_email_array_from_ldap_attr($e = array()) {
+   public function get_email_array_from_ldap_attr($e = array()) {
      $data = array();

      foreach($e as $a) {
--- a/webui/system/helper/detectmobilebrowser.php
+++ b/webui/system/helper/detectmobilebrowser.php
@ -4,7 +4,7 @@ function is_mobile_device() {

   if(!isset($_SERVER['HTTP_USER_AGENT'])) { return 0; }

-   if(preg_match('/(android|ipad|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$useragent)||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($_SERVER['HTTP_USER_AGENT'],0,4))) { return 1; }
+   if(preg_match('/(android|ipad|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$_SERVER['HTTP_USER_AGENT'])||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($_SERVER['HTTP_USER_AGENT'],0,4))) { return 1; }

   return 0;
 }
--- a/webui/view/javascript/piler-in.js
+++ b/webui/view/javascript/piler-in.js
@ -149,9 +149,14 @@ var Piler =
            Piler.spinner('stop');
            $('#resultsheader').show();

-            /*$("table").resizableColumns({
+<?php if(ENABLE_TABLE_RESIZE == 1) { ?>
+
+            $("table").resizableColumns({
               store: store
-            });*/
+            });
+
+<?php } ?>
+
        })
        .fail(function( a, b )// jqXHR, textStatus, errorThrown
        {
--- a/webui/view/theme/default/templates/common/menu.tpl
+++ b/webui/view/theme/default/templates/common/menu.tpl
@ -43,6 +43,10 @@
                        </ul>
                    </li>

+        <?php if(LDAP_ADMIN_MEMBER_DN) { ?>
+                    <li><a href="search.php" <?php if($settings['text_colour']) { ?> style="color: <?php print $settings['text_colour']; ?>;"<?php } ?>><i class="icon-search"></i>&nbsp;<?php print $text_search; ?></a></li>
+        <?php } ?>
+
    <?php } else { ?>

                    <li><a href="search.php" <?php if($settings['text_colour']) { ?> style="color: <?php print $settings['text_colour']; ?>;"<?php } ?>><i class="icon-search"></i>&nbsp;<?php print $text_search; ?></a></li>
--- a/webui/view/theme/default/templates/group/email.tpl
+++ b/webui/view/theme/default/templates/group/email.tpl
@ -1,6 +1,6 @@
 <table class="table table-striped table-condensed">
 <?php foreach($emails as $email) { ?>
-   <tr><td><a href="#" onclick="append_value_from_slider('email', '<?php print $email['email']; ?>');"><?php print $email['email']; ?></a></td></tr>
+   <tr><td><a href="#" onclick="append_value_from_slider('email', '<?php print $email; ?>');"><?php print $email; ?></a></td></tr>
 <?php } ?>
 </table>

--- a/webui/view/theme/default/templates/health/worker.tpl
+++ b/webui/view/theme/default/templates/health/worker.tpl
@ -95,7 +95,7 @@
                                </tr>                
 				<tr>
 					<td><?php print $text_processed_emails; ?></td>
-					<td><?php print $processed_emails[0]; ?> (<?php print $text_24_hours; ?>)<br /><?php print $processed_emails[1]; ?> (<?php print $text_1_week; ?>)<br /><?php print $processed_emails[2]; ?> (<?php print $text_30_days; ?>)</td>
+					<td><?php print $processed_emails[0]; ?> (<?php print $text_60_minutes; ?>)<br /><?php print $processed_emails[1]; ?> (<?php print $text_24_hours; ?>)<br /><?php print $processed_emails[2]; ?> (<?php print $text_1_week; ?>)<br /><?php print $processed_emails[3]; ?> (<?php print $text_30_days; ?>)</td>
 				</tr>
 				<tr>
 					<th colspan="2">Message Disposition</th>
--- a/webui/view/theme/default/templates/search/helper.tpl
+++ b/webui/view/theme/default/templates/search/helper.tpl
@ -49,7 +49,7 @@
            <td id="c3_r<?php print $i; ?>" class="resultcell date"><?php print $message['date']; ?></td>
            <td id="c4_r<?php print $i; ?>" class="resultcell from"><?php if($message['from'] != $message['shortfrom']) { ?><span title="<?php print $message['from']; ?>"><?php print $message['shortfrom']; ?></span><?php } else { print $message['from']; } ?></td>
            <td id="c5_r<?php print $i; ?>" class="resultcell to"><?php if($message['to'] != $message['shortto']) { ?><span title="<?php print $message['to']; ?>"><?php print $message['shortto']; ?>&nbsp;<i class=" muted icon-group"></i></span><?php } else { print $message['to']; } ?></td>
-            <td id="c6_r<?php print $i; ?>" class="resultcell subject"><?php if($message['subject'] != $message['shortsubject']) { print $message['shortsubject']; } else { print $message['subject']; } ?> <?php if($message['reference']) { ?> <a href="#" title="<?php print $text_conversation_available; ?>" onclick="$('#ref').val('<?php print $message['reference']; ?>'); Piler.expert(this);">[+]</span></a><?php } ?></td>
+            <td id="c6_r<?php print $i; ?>" class="resultcell subject"><?php if($message['subject'] != $message['shortsubject']) { print $message['subject']; } else { print $message['subject']; } ?> <?php if($message['reference']) { ?> <a href="#" title="<?php print $text_conversation_available; ?>" onclick="$('#ref').val('<?php print $message['reference']; ?>'); Piler.expert(this);">[+]</span></a><?php } ?></td>
            <td id="c7_r<?php print $i; ?>" class="resultcell size"><?php print $message['size']; ?></td>
            <td id="c8_r<?php print $i; ?>" class="resultcell end"><?php if($message['spam'] == 1) { ?><i class="spam icon-warning-sign icon-large" title="<?php print $text_spam_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
            <td id="c9_r<?php print $i; ?>" class="resultcell end"><?php if($message['attachments'] > 0) { ?><i class="attachment icon-paper-clip icon-large" title="<?php print $text_attachment_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
--- a/webui/view/theme/mobile/templates/common/layout-search.tpl
+++ b/webui/view/theme/mobile/templates/common/layout-search.tpl
@ -24,8 +24,10 @@
   <script type="text/javascript" src="/view/javascript/bootstrap.min.js"></script>
   <script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>

+<?php if(ENABLE_TABLE_RESIZE == 1) { ?>
   <script type="text/javascript" src="/view/javascript/store.js"></script>
   <script type="text/javascript" src="/view/javascript/jquery.resizableColumns.min.js"></script>
+<?php } ?>

   <script type="text/javascript" src="/view/javascript/piler.js"></script>

--- a/webui/view/theme/mobile/templates/common/menu.tpl
+++ b/webui/view/theme/mobile/templates/common/menu.tpl
@ -39,6 +39,10 @@
                 </ul>
             </li>

+     <?php if(LDAP_ADMIN_MEMBER_DN) { ?>
+             <li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "search.php")){ ?> class="active"<?php } ?>><a href="search.php" <?php if($settings['text_colour']) { ?> style="color: <?php print $settings['text_colour']; ?>;"<?php } ?>><i class="icon-search icon-white"></i>&nbsp;<?php print $text_search; ?></a></li>
+     <?php } ?>
+
 <?php } else { ?>

             <li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "search.php")){ ?> class="active"<?php } ?>><a href="search.php" <?php if($settings['text_colour']) { ?> style="color: <?php print $settings['text_colour']; ?>;"<?php } ?>><i class="icon-search icon-white"></i>&nbsp;<?php print $text_search; ?></a></li>
--- a/webui/view/theme/mobile/templates/group/email.tpl
+++ b/webui/view/theme/mobile/templates/group/email.tpl
@ -1,6 +1,6 @@

 <?php foreach($emails as $email) { ?>
-   <a href="#" onclick="append_value_from_slider('email', '<?php print $email['email']; ?>');"><?php print $email['email']; ?></a><br />
+   <a href="#" onclick="append_value_from_slider('email', '<?php print $email; ?>');"><?php print $email; ?></a><br />
 <?php } ?>


--- a/webui/view/theme/mobile/templates/health/worker.tpl
+++ b/webui/view/theme/mobile/templates/health/worker.tpl
@ -52,7 +52,7 @@

         <div class="row">
            <div class="cellhealthleft"><?php print $text_processed_emails; ?></div>
-            <div class="cellhealthright"><?php print $processed_emails[0]; ?> (<?php print $text_24_hours; ?>)<br /><?php print $processed_emails[1]; ?> (<?php print $text_1_week; ?>)<br /><?php print $processed_emails[2]; ?> (<?php print $text_30_days; ?>)</div>
+            <div class="cellhealthright"><?php print $processed_emails[0]; ?> (<?php print $text_60_minutes; ?>)<br /><?php print $processed_emails[1]; ?> (<?php print $text_24_hours; ?>)<br /><?php print $processed_emails[2]; ?> (<?php print $text_1_week; ?>)<br /><?php print $processed_emails[3]; ?> (<?php print $text_30_days; ?>)</div>
         </div>

         <div class="row">
--- a/webui/view/theme/mobile/templates/search/helper.tpl
+++ b/webui/view/theme/mobile/templates/search/helper.tpl
@ -5,7 +5,7 @@

 <?php if($n > 0) { ?>

-       <table class="table table-condensed" data-resizable-columns-id="search-table">
+       <table class="table table-condensed<?php if(ENABLE_TABLE_RESIZE == 1) { ?> table-bordered<?php } ?>" data-resizable-columns-id="search-table">

          <thead>