Merged master into ui-updates-1

util/db-upgrade-0.1.23-vs-0.1.24.sql

@@ -13,6 +13,8 @@ create unique index `entry` on retention_rule (`domain`,`from`,`to`,`subject`,`_
 drop view if exists `v_messages`;
 create view `v_messages` AS select `metadata`.`id` AS `id`,`metadata`.`piler_id` AS `piler_id`,`metadata`.`from` AS `from`,`metadata`.`fromdomain` AS `fromdomain`,`rcpt`.`to` AS `to`,`rcpt`.`todomain` AS `todomain`,`metadata`.`subject` AS `subject`, `metadata`.`size` AS `size`, `metadata`.`direction` AS `direction`, `metadata`.`sent` AS `sent`, `metadata`.`retained` AS `retained`, `metadata`.`arrived` AS `arrived`, `metadata`.`digest` AS `digest`, `metadata`.`bodydigest` AS `bodydigest` from (`metadata` join `rcpt`) where (`metadata`.`id` = `rcpt`.`id`);
 
+update user_settings set theme='mobile' where theme='orig';
+
 create table if not exists `ldap` (
    `id` int not null auto_increment primary key,
    `description` varchar(255) not null,

util/postinstall.sh

@@ -105,7 +105,7 @@ make_cron_entries() {
    echo "30   2 * * * $LIBEXECDIR/piler/indexer.main.sh" >> $CRON_TMP
    echo "*/15 * * * * $INDEXER --quiet tag1 --rotate" >> $CRON_TMP
    echo "*/15 * * * * $INDEXER --quiet note1 --rotate" >> $CRON_TMP
-   echo "30   6 * * * /usr/bin/php $LIBEXECDIR/piler/generate_stats.php $$DOCROOT" >> $CRON_TMP
+   echo "30   6 * * * /usr/bin/php $LIBEXECDIR/piler/generate_stats.php $DOCROOT" >> $CRON_TMP
 
    echo "### PILEREND" >> $CRON_TMP
 }

webui/config.php

@@ -17,6 +17,7 @@ $config['PILERGETD_PASSWORD'] = '';
 $config['BRANDING_TEXT'] = '';
 $config['BRANDING_URL'] = '';
 $config['BRANDING_LOGO'] = '';
+$config['BRANDING_FAVICON'] = '';
 $config['SUPPORT_LINK'] = '';
 
 $config['BOOTSTRAP_THEME'] = '-cosmo';
@@ -236,6 +237,10 @@ require_once 'config-site.php';
 
 if(isset($_SESSION['theme']) && preg_match("/^([a-zA-Z0-9\-\_]+)$/", $_SESSION['theme'])) { $config['THEME'] = $_SESSION['theme']; }
 
+include("system/helper/detectmobilebrowser.php");
+
+if(MOBILE_DEVICE == 1) { $config['THEME'] = 'mobile'; }
+
 // make sure auditors are restricted in a saas environment
 if($config['ENABLE_SAAS'] == 1) { $config['RESTRICTED_AUDITOR'] = 1; }
 if(isset($_SESSION['username']) && $_SESSION['username'] == 'auditor@local') { $config['RESTRICTED_AUDITOR'] = 0; }

webui/controller/group/email.php

@@ -17,7 +17,7 @@ class ControllerGroupEmail extends Controller {
 
       $this->load->model('group/group');
 
-      //$this->document->title = $language->get('text_group_management');
+      $this->document->title = '';
 
       $this->data['page'] = 0;
       $this->data['page_len'] = get_page_length();

webui/controller/login/login.php

@@ -32,7 +32,7 @@ class ControllerLoginLogin extends Controller {
          $this->load->model('saas/customer');
       }
 
-      $this->document->title = $this->data['text_login'];
+      $this->data['title'] = $this->data['text_login'];
 
       if($this->request->server['REQUEST_METHOD'] == 'POST' && $this->validate() == true) {
 

webui/model/audit/audit.php

@@ -39,7 +39,7 @@ class ModelAuditAudit extends Model {
          $where .= " AND ( " . $this->append_search_criteria("meta_id", $data['ref'], $arr) . " )";
       }
 
-      if(Registry::get('admin_user') == 0) {
+      if(Registry::get('admin_user') == 0 && RESTRICTED_AUDITOR == 1) {
          while(list($k, $v) = each($_SESSION['auditdomains'])) {
             if($q) { $q .= ","; }
             $q .= "?";

webui/model/policy/retention.php

@@ -47,7 +47,7 @@ class ModelPolicyRetention extends Model {
       $default_retention = DEFAULT_RETENTION * 86400;
 
       $delta = NOW + 86400 * $data['days'] - $default_retention;
-      $start_ts = NOW - $default_retention;
+      $start_ts = NOW - 2*$default_retention;
 
       $query = $this->db->query("UPDATE " . VIEW_MESSAGES . " SET retained=? WHERE arrived > ? AND (todomain=? OR fromdomain=?)", array($delta, $start_ts, $data['domain'], $data['domain']));
 

webui/system/controller.php

@@ -93,7 +93,8 @@ class Controller {
          $file = DIR_THEME . THEME . '/templates/' . $this->template;
       }
 
-  
+      if(MOBILE_DEVICE == 1) { $file = DIR_THEME . 'mobile' . '/templates/' . $this->template; }
+
       if(file_exists($file)){
 
          extract($this->data);

webui/system/helper/detectmobilebrowser.php

@@ -0,0 +1,7 @@
+<?php
+
+$useragent = $_SERVER['HTTP_USER_AGENT'];
+
+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($useragent,0,4))) { define('MOBILE_DEVICE', 1); } else { define('MOBILE_DEVICE', 0); }
+
+?>

webui/view/javascript/piler-in.js

@@ -633,7 +633,11 @@ var Piler =
         $('input#xbody').val('');
         $('input#xtag').val('');
         $('input#xnote').val('');
-        $('input#xhas_attachment')[0].checked = 0;
+        $('input#xhas_attachment_doc')[0].checked = 0;
+        $('input#xhas_attachment_xls')[0].checked = 0;
+        $('input#xhas_attachment_pdf')[0].checked = 0;
+        $('input#xhas_attachment_image')[0].checked = 0;
+        $('input#xhas_attachment_any')[0].checked = 0;
         $('input#date1').val('');
         $('input#date2').val('');
 
@@ -641,6 +645,29 @@ var Piler =
     },
 
 
+    /*
+     * when clicked on the "any" attachment type, clear the other types
+     */
+
+    clear_attachment_others: function()
+    {
+        $('input#xhas_attachment_doc')[0].checked = 0;
+        $('input#xhas_attachment_xls')[0].checked = 0;
+        $('input#xhas_attachment_pdf')[0].checked = 0;
+        $('input#xhas_attachment_image')[0].checked = 0;
+    },
+
+
+    /*
+     * when clicked on any of the named attachment types, clear the "any" type
+     */
+
+    clear_attachment_any: function()
+    {
+        $('input#xhas_attachment_any')[0].checked = 0;       
+    },
+
+
     /*
      * show a temporary message to the user
      */

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

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print DEFAULT_LANG; ?>" lang="<?php print DEFAULT_LANG; ?>">
 
 <head>
-    <title><?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?></title>
+    <title><?php print $title; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta http-equiv="Content-Language" content="en" />
     <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
@@ -30,7 +30,7 @@
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/view/theme/default/assets/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/view/theme/default/assets/ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="/view/theme/default/assets/ico/apple-touch-icon-57-precomposed.png">
-    <link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png">
+    <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
 </head>
 
 <body onload="Piler.add_shortcuts();">

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

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print DEFAULT_LANG; ?>" lang="<?php print DEFAULT_LANG; ?>">
 
 <head>
-   <title><?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?></title>
+   <title><?php print $title; ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
@@ -24,7 +24,7 @@
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/view/theme/default/assets/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/view/theme/default/assets/ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="/view/theme/default/assets/ico/apple-touch-icon-57-precomposed.png">
-    <link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png">
+    <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
 
    <script type="text/javascript">
 

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

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print DEFAULT_LANG; ?>" lang="<?php print DEFAULT_LANG; ?>">
 
 <head>
-   <title><?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?></title>
+   <title><?php print $title; ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="<?php print DEFAULT_LANG; ?>" />
    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
@@ -25,7 +25,7 @@
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/view/theme/default/assets/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/view/theme/default/assets/ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="/view/theme/default/assets/ico/apple-touch-icon-57-precomposed.png">
-    <link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png" />
+    <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
     
     <script type="text/javascript" src="/view/javascript/jquery.min.js"></script>
     <script type="text/javascript" src="/view/javascript/jquery-ui-custom.min.js"></script>

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

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print DEFAULT_LANG; ?>" lang="<?php print DEFAULT_LANG; ?>">
 
 <head>
-    <title><?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?></title>
+    <title><?php print $title; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta http-equiv="Content-Language" content="en" />
     <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
@@ -29,7 +29,7 @@
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/view/theme/default/assets/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/view/theme/default/assets/ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="/view/theme/default/assets/ico/apple-touch-icon-57-precomposed.png">
-    <link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png">
+    <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
 </head>
 
 <body<?php

webui/view/theme/default/templates/login/login.tpl

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title><?php print SITE_NAME; ?> | <?php print PROVIDED_BY; ?></title>
+    <title><?php print $title; ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
     <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
@@ -21,7 +21,7 @@
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/view/theme/default/assets/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/view/theme/default/assets/ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="/view/theme/default/assets/ico/apple-touch-icon-57-precomposed.png">
-    <link rel="shortcut icon" href="/view/theme/default/assets/ico/favicon.png">
+    <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
   </head>
 
   <body id="loginpage">

webui/view/theme/default/templates/search/popup.tpl

@@ -55,18 +55,11 @@
             <div class="control-group">
                 <label class="control-label" for="xhas_attachment"><?php print $text_attachment; ?>:</label>
                 <div class="controls">
-                  <input type="checkbox" name="xhas_attachment" id="xhas_attachment" <?php if(isset($has_attachment) && $has_attachment == 1) { ?>checked="checked"<?php } ?> />
+                    <img src="view/theme/default/assets/images/fileicons/doc.png" alt="Word" title="Word" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_doc" id="xhas_attachment_doc" <?php if(isset($has_attachment_doc) && $has_attachment_doc == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_any();" />
-                </div>
+                    <img src="view/theme/default/assets/images/fileicons/xls.png" alt="Excel" title="Excel" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_xls" id="xhas_attachment_xls" <?php if(isset($has_attachment_xls) && $has_attachment_xls == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_any();" />
-            </div> 
+                    <img src="view/theme/default/assets/images/fileicons/pdf.png" alt="PDF" title=PDF"" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_pdf" id="xhas_attachment_pdf" <?php if(isset($has_attachment_pdf) && $has_attachment_pdf == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_any();" />
-
+                    <img src="view/theme/default/assets/images/fileicons/image.png" alt="image" title="image" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_image" id="xhas_attachment_image" <?php if(isset($has_attachment_image) && $has_attachment_image == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_any();" />
-            <div class="control-group">
+                    <img src="view/theme/default/assets/images/fileicons/file.png" alt="any" title="any" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_any" id="xhas_attachment_any" <?php if(isset($has_attachment_any) && $has_attachment_any == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_others();" />
-                <label class="control-label" for="xhas_attachment"><?php print $text_attachment; ?>:</label>
-                <div class="controls">
-                    <img src="view/theme/default/assets/images/fileicons/doc.png" alt="Word" title="Word" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_doc" id="xhas_attachment_doc" <?php if(isset($has_attachment_doc) && $has_attachment_doc == 1) { ?>checked="checked"<?php } ?> />
-                    <img src="view/theme/default/assets/images/fileicons/xls.png" alt="Excel" title="Excel" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_xls" id="xhas_attachment_xls" <?php if(isset($has_attachment_xls) && $has_attachment_xls == 1) { ?>checked="checked"<?php } ?> />
-                    <img src="view/theme/default/assets/images/fileicons/pdf.png" alt="PDF" title=PDF"" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_pdf" id="xhas_attachment_pdf" <?php if(isset($has_attachment_pdf) && $has_attachment_pdf == 1) { ?>checked="checked"<?php } ?> />
-                    <img src="view/theme/default/assets/images/fileicons/image.png" alt="image" title="image" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_image" id="xhas_attachment_image" <?php if(isset($has_attachment_image) && $has_attachment_image == 1) { ?>checked="checked"<?php } ?> />
-                    <img src="view/theme/default/assets/images/fileicons/file.png" alt="any" title="any" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_any" id="xhas_attachment_any" <?php if(isset($has_attachment_any) && $has_attachment_any == 1) { ?>checked="checked"<?php } ?> />
                 </div>
             </div>
 

webui/view/theme/mobile/stylesheet/style-mobile.css

@@ -7,6 +7,13 @@
 
 	.mybody { background-color: #6D6D6D; color: #3d3d3d; }
 
+	.loginpage {background-color: #fcfcfc; padding-top: 40px; padding-bottom: 40px;}
+	#logo-lg {width: 300px; margin: 0 auto 20px;}
+	#compatibility { max-width: 300px; margin:0 auto; color:#444; text-align: justify; }
+	.form-signin{ max-width:300px; padding:19px 29px 29px; margin:0 auto 20px; background-color:#fff; border:1px solid #e5e5e5; -webkit-border-radius:5px; -moz-border-radius:5px; border-radius:5px; -webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05); box-shadow:0 1px 2px rgba(0, 0, 0, 0.05); }
+	.form-signin .form-signin-heading,.form-signin .checkbox{ margin-bottom: 10px; }
+	.form-signin input[type="text"], .form-signin input[type="password"]{ font-size:16px; height:auto; margin-bottom:15px; padding:7px 9px; }
+
 	#piler1 { width: 100%; height: 100%; background: #ffffff; border: 0px solid black; position: absolute; margin-left: auto; margin-right: auto; padding-top: 0px; }
 
 	#messagebox1 { position: absolute; top: 0px; left: 50%; border: 3px solid red; display: none; background: orange; color: #000000; font-weight: bold; padding: 15px; z-index: 1; }
@@ -160,7 +167,6 @@
 
 	.message_highlight { background: lightblue; }
 
-
 }
 
 

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

@@ -24,6 +24,8 @@
    <script type="text/javascript" src="/view/javascript/bootstrap.min.js"></script>
    <script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>
    <script type="text/javascript" src="/view/javascript/piler.js"></script>
+
+   <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
 </head>
 
 <body class="mybody" onload="Piler.add_shortcuts();">

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

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="hu" lang="hu">
 
 <head>
-   <title>piler<?php if(isset($title) && $title) { ?> | <?php print $title; } ?></title>
+   <title><?php print $title; ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
@@ -27,6 +27,8 @@
 
    </script>
 
+   <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
+
 </head>
 
 <body class="email">

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

@@ -24,6 +24,8 @@
    <script type="text/javascript" src="/view/javascript/bootstrap.min.js"></script>
    <script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>
    <script type="text/javascript" src="/view/javascript/piler.js"></script>
+
+   <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
 </head>
 
 <body class="mybody" onload="Piler.add_shortcuts();">

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

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="hu" lang="hu">
 
 <head>
-   <title>piler | <?php print $title; ?></title>
+   <title><?php print $title; ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
@@ -25,6 +25,8 @@
    <script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>
    <script type="text/javascript" src="/view/javascript/piler.js"></script>
 
+   <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
+
 </head>
 
 <body<?php

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

@@ -2,17 +2,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="hu" lang="hu">
 
 <head>
-   <title>piler | <?php print $title; ?></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="piler email archiver" />
+   <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
-   <meta name="description" content="piler email archiver" />
+   <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
+   <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
    <meta name="rating" content="general" />
    <meta name="robots" content="all" />
 
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-   <link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
+   <link href="/bootstrap/css/bootstrap<?php print BOOTSTRAP_THEME; ?>.min.css" rel="stylesheet" media="screen">
    <link href="/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
 
    <link rel="stylesheet" type="text/css" href="/view/theme/<?php print THEME; ?>/stylesheet/jquery-ui-custom.min.css" />
@@ -24,42 +25,40 @@
    <script type="text/javascript" src="/view/javascript/rc-splitter.js"></script>
    <script type="text/javascript" src="/view/javascript/piler.js"></script>
 
+   <?php if(BRANDING_FAVICON) { ?><link rel="shortcut icon" href="<?php print BRANDING_FAVICON; ?>" /><?php } ?>
 </head>
 
-<body class="mybody">
+<body class="loginpage">
-
+   
-<div id="piler1" class="container">
-
-
 <?php if(!isset($_SESSION['username'])){ ?>
 
-<div class="login">
+    <div id="logincontainer" class="container">
+        <div id="logo-lg"><img src="<?php print SITE_URL; ?><?php print SITE_LOGO_LG; ?>" alt="Archive Logo Image" title="<?php print $text_login; ?>" /></div>
 
-   <?php if(ENABLE_GOOGLE_LOGIN == 1) { ?>
+        <form name="login" action="login.php" method="post" class="form-signin">
-      <p><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></p>
+            <h2 class="form-signin-heading"><?php print $text_login; ?></h2>
-   <?php } else { ?>
+            <?php if(isset($x)){ ?><p class="alert alert-error lead"><?php print $x; ?></p><?php } ?>
+            <input type="hidden" name="relocation" value="<?php if(isset($_GET['route']) && !preg_match("/^login/", $_GET['route']) ) { if(isset($_SERVER['REDIRECT_URL'])) { print $_SERVER['REDIRECT_URL']; } else { print $_SERVER['QUERY_STRING']; } } ?>" />
 
-      <form name="login" action="login.php" method="post" class="form-inline">
+           <?php if(ENABLE_GOOGLE_LOGIN == 1) { ?>
-         <input type="text" class="input-medium" name="username" placeholder="<?php print $text_email; ?>" />
+                 <div class="info"><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></div>
-         <input type="password" class="input-medium" name="password" placeholder="<?php print $text_password; ?>" />
+        <?php } else { ?>
-         <input type="submit" class="btn btn-primary" value="<?php print $text_submit; ?>" />
+                <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">
-      </form>
+                <input type="password" class="input-block-level" name="password" placeholder="<?php print $text_password; ?>">
-   <?php } ?>
+                <button class="btn btn-large btn-primary" type="submit" value="<?php print $text_submit; ?>"><?php print $text_submit; ?></button>
+        <?php } ?>
 
+        </form>
 
-<?php if(isset($x)){ ?>
+        <div id="compatibility" class="well well-large"><?php print COMPATIBILITY; ?></div>
-    <p class="text-error bold"><?php print $x; ?></p>
-<?php } ?>
 
-
+   </div>
-</div>
 
 <?php } ?>
 
-
-</div>
-
 <!-- <?php print PILER_LOGIN_HELPER_PLACEHOLDER; ?> -->
 
+
+
 </body>
 </html>

webui/view/theme/mobile/templates/search/popup.tpl

@@ -48,11 +48,11 @@
          <div class="row">
             <div class="cell1"><?php print $text_attachment; ?>:</div>
             <div class="cell2 left">
-               <img src="view/theme/mobile/images/fileicons/doc.png" alt="Word" title="Word" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_doc" id="xhas_attachment_doc" <?php if(isset($has_attachment_doc) && $has_attachment_doc == 1) { ?>checked="checked"<?php } ?> />
+               <img src="view/theme/mobile/images/fileicons/doc.png" alt="Word" title="Word" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_doc" id="xhas_attachment_doc" <?php if(isset($has_attachment_doc) && $has_attachment_doc == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_any();" />
-               <img src="view/theme/mobile/images/fileicons/xls.png" alt="Excel" title="Excel" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_xls" id="xhas_attachment_xls" <?php if(isset($has_attachment_xls) && $has_attachment_xls == 1) { ?>checked="checked"<?php } ?> />
+               <img src="view/theme/mobile/images/fileicons/xls.png" alt="Excel" title="Excel" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_xls" id="xhas_attachment_xls" <?php if(isset($has_attachment_xls) && $has_attachment_xls == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_any();" />
-               <img src="view/theme/mobile/images/fileicons/pdf.png" alt="PDF" title=PDF"" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_pdf" id="xhas_attachment_pdf" <?php if(isset($has_attachment_pdf) && $has_attachment_pdf == 1) { ?>checked="checked"<?php } ?> />
+               <img src="view/theme/mobile/images/fileicons/pdf.png" alt="PDF" title=PDF"" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_pdf" id="xhas_attachment_pdf" <?php if(isset($has_attachment_pdf) && $has_attachment_pdf == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_any();" />
-               <img src="view/theme/mobile/images/fileicons/image.png" alt="image" title="image" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_image" id="xhas_attachment_image" <?php if(isset($has_attachment_image) && $has_attachment_image == 1) { ?>checked="checked"<?php } ?> />
+               <img src="view/theme/mobile/images/fileicons/image.png" alt="image" title="image" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_image" id="xhas_attachment_image" <?php if(isset($has_attachment_image) && $has_attachment_image == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_any();" />
-               <img src="view/theme/mobile/images/fileicons/file.png" alt="any" title="any" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_any" id="xhas_attachment_any" <?php if(isset($has_attachment_any) && $has_attachment_any == 1) { ?>checked="checked"<?php } ?> />
+               <img src="view/theme/mobile/images/fileicons/file.png" alt="any" title="any" /> <input type="checkbox" class="checkbox popup" name="xhas_attachment_any" id="xhas_attachment_any" <?php if(isset($has_attachment_any) && $has_attachment_any == 1) { ?>checked="checked"<?php } ?> onclick="Piler.clear_attachment_others();" />
             </div>
          </div>