diff --git a/webui/config.php b/webui/config.php index 0767c3e3..fca3385c 100644 --- 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'; diff --git a/webui/controller/group/email.php b/webui/controller/group/email.php index 636617c3..cb660155 100644 --- 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) . " ]"; diff --git a/webui/controller/group/group.php b/webui/controller/group/group.php index 013c3782..03751c74 100644 --- 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'] = ''; diff --git a/webui/controller/group/list.php b/webui/controller/group/list.php index 71539d30..b5c164ac 100644 --- 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'); diff --git a/webui/language/de/messages.php b/webui/language/de/messages.php index 8d3745c4..55fe0890 100644 --- a/webui/language/de/messages.php +++ b/webui/language/de/messages.php @@ -1,5 +1,7 @@ db->query("SELECT email FROM `" . TABLE_EMAIL . "` WHERE email LIKE ? ORDER BY email ASC LIMIT " . (int)$from . ", " . (int)$page_len, array($s . "%") ); + if(ENABLE_LDAP_AUTH == 1) { + $ldap = new LDAP(LDAP_HOST, LDAP_HELPER_DN, LDAP_HELPER_PASSWORD); + if($ldap->is_bind_ok()) { - if(isset($query->rows)) { return $query->rows; } + $query = $ldap->query(LDAP_BASE_DN, "(&(objectClass=" . LDAP_ACCOUNT_OBJECTCLASS . ")(" . LDAP_MAIL_ATTR . "=" . $s . "*))", array()); - return 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)) { + foreach($query->rows as $q) { + array_push($emails, $q['email']); + } + } + + return $emails; } diff --git a/webui/model/health/health.php b/webui/model/health/health.php index d0314300..08635aa7 100644 --- 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); } diff --git a/webui/model/user/auth.php b/webui/model/user/auth.php index 37cdc444..de400668 100644 --- 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) { diff --git a/webui/system/helper/detectmobilebrowser.php b/webui/system/helper/detectmobilebrowser.php index ef23b5aa..77761117 100644 --- 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; } diff --git a/webui/view/javascript/piler-in.js b/webui/view/javascript/piler-in.js index ee0dc756..370ddee2 100644 --- 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({ + + + $("table").resizableColumns({ store: store - });*/ + }); + + + }) .fail(function( a, b )// jqXHR, textStatus, errorThrown { diff --git a/webui/view/theme/default/templates/common/menu.tpl b/webui/view/theme/default/templates/common/menu.tpl index 8535352e..9dd0d819 100644 --- a/webui/view/theme/default/templates/common/menu.tpl +++ b/webui/view/theme/default/templates/common/menu.tpl @@ -43,6 +43,10 @@ + +
  • style="color: ;"> 
    • + +
  • style="color: ;"> 
    • diff --git a/webui/view/theme/default/templates/group/email.tpl b/webui/view/theme/default/templates/group/email.tpl index 72da6bb6..99833377 100644 --- a/webui/view/theme/default/templates/group/email.tpl +++ b/webui/view/theme/default/templates/group/email.tpl @@ -1,6 +1,6 @@ - +
    diff --git a/webui/view/theme/default/templates/health/worker.tpl b/webui/view/theme/default/templates/health/worker.tpl index ad5fab7f..9e085257 100644 --- a/webui/view/theme/default/templates/health/worker.tpl +++ b/webui/view/theme/default/templates/health/worker.tpl @@ -95,7 +95,7 @@ - ()
    ()
    () + ()
    ()
    ()
    () Message Disposition diff --git a/webui/view/theme/default/templates/search/helper.tpl b/webui/view/theme/default/templates/search/helper.tpl index 0e729647..968c2e89 100644 --- a/webui/view/theme/default/templates/search/helper.tpl +++ b/webui/view/theme/default/templates/search/helper.tpl @@ -49,7 +49,7 @@   - [+] + [+]   0) { ?>  diff --git a/webui/view/theme/mobile/templates/common/layout-search.tpl b/webui/view/theme/mobile/templates/common/layout-search.tpl index 53f74601..f7a8065e 100644 --- a/webui/view/theme/mobile/templates/common/layout-search.tpl +++ b/webui/view/theme/mobile/templates/common/layout-search.tpl @@ -24,8 +24,10 @@ + + diff --git a/webui/view/theme/mobile/templates/common/menu.tpl b/webui/view/theme/mobile/templates/common/menu.tpl index a553b4ef..02b64ae0 100644 --- a/webui/view/theme/mobile/templates/common/menu.tpl +++ b/webui/view/theme/mobile/templates/common/menu.tpl @@ -39,6 +39,10 @@ + + class="active"> style="color: ;">  + + class="active"> style="color: ;">  diff --git a/webui/view/theme/mobile/templates/group/email.tpl b/webui/view/theme/mobile/templates/group/email.tpl index f7f41f53..1ee86533 100644 --- a/webui/view/theme/mobile/templates/group/email.tpl +++ b/webui/view/theme/mobile/templates/group/email.tpl @@ -1,6 +1,6 @@ -
    +
    diff --git a/webui/view/theme/mobile/templates/health/worker.tpl b/webui/view/theme/mobile/templates/health/worker.tpl index 605ce844..fd3e29d5 100644 --- a/webui/view/theme/mobile/templates/health/worker.tpl +++ b/webui/view/theme/mobile/templates/health/worker.tpl @@ -52,7 +52,7 @@
    -
    ()
    ()
    ()
    +
    ()
    ()
    ()
    ()
    diff --git a/webui/view/theme/mobile/templates/search/helper.tpl b/webui/view/theme/mobile/templates/search/helper.tpl index 621adb5c..d51fe4e9 100644 --- a/webui/view/theme/mobile/templates/search/helper.tpl +++ b/webui/view/theme/mobile/templates/search/helper.tpl @@ -5,7 +5,7 @@ 0) { ?> - +