theme fixes

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,

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';

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/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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -12,7 +12,7 @@
 
    <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 +24,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>