From cc55883b359c26c24f891dd48889d58c1fa9a4ae Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Tue, 18 Dec 2012 15:58:14 +0100
Subject: [PATCH] webui code cleanup

---
 webui/controller/folder/list.php                  | 10 ----------
 webui/model/search/message.php                    | 10 ----------
 .../theme/default/stylesheet/style-default.css    |  3 +++
 .../theme/default/templates/common/layout-new.tpl | 15 ++++-----------
 .../theme/default/templates/common/layout.tpl     |  6 +++---
 .../view/theme/default/templates/common/menu.tpl  |  6 +++---
 .../view/theme/default/templates/folder/list.tpl  |  2 +-
 .../theme/default/templates/message/headers.tpl   |  2 +-
 .../theme/default/templates/message/restore.tpl   |  2 +-
 .../view/theme/default/templates/message/view.tpl |  2 +-
 .../theme/default/templates/user/settings.tpl     |  2 +-
 11 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/webui/controller/folder/list.php b/webui/controller/folder/list.php
index 480471d0..1f6f00d5 100644
--- a/webui/controller/folder/list.php
+++ b/webui/controller/folder/list.php
@@ -33,16 +33,6 @@ class ControllerFolderList extends Controller {
          return;
       }
 
-      /*if($this->request->server['REQUEST_METHOD'] == 'POST' && PASSWORD_CHANGE_ENABLED == 1 && $this->validate() == true) {
-
-         if($this->model_user_auth->change_password(Registry::get('username'), $this->request->post['password']) == 1) {
-            $this->data['x'] = $this->data['text_password_changed'];
-         }
-         else {
-            $this->data['x'] = $this->data['text_failed_to_change_password'];
-         }
-      }*/
-
 
       $this->data['page_len'] = get_page_length();
 
diff --git a/webui/model/search/message.php b/webui/model/search/message.php
index fd129614..1971234f 100644
--- a/webui/model/search/message.php
+++ b/webui/model/search/message.php
@@ -3,16 +3,6 @@
 class ModelSearchMessage extends Model {
 
 
-   public function get_store_path($id = '') {
-
-      if($id == '') { return ''; }
-
-      $len = strlen($id);
-
-      return DIR_STORE . "/" . substr($id, $len-6, 2) . "/" . substr($id, $len-4, 2) . "/" . substr($id, $len-2, 2) . "/" . $id;
-   }
-
-
    public function verify_message($id = '') {
       if($id == '') { return 0; }
 
diff --git a/webui/view/theme/default/stylesheet/style-default.css b/webui/view/theme/default/stylesheet/style-default.css
index d7cf2dc5..02738581 100644
--- a/webui/view/theme/default/stylesheet/style-default.css
+++ b/webui/view/theme/default/stylesheet/style-default.css
@@ -140,6 +140,8 @@
 	.advselect2 { width: 205px; font: bold 12px Arial, sans-serif; padding: 0; margin:0;}
 	.ruleselect { width: 40px; font: bold 12px Arial, sans-serif; padding: 0; margin:0;}
 
+        .restore_to_mailbox { font: normal 12px Arial, sans-serif; color: #850505; padding: 0; margin:0; height: 18px; border: 0px; background: #eee; vertical-align: middle; }
+
 	button { margin: 0; background-color:gray; font: bold 12px Arial, sans-serif; width:40%; height: 40px; margin-left: 5%; margin-right: 5%; }
 	button.active { background-color: #850505; color:white; }
 
@@ -152,6 +154,7 @@
 	input[type=button].short { margin: 0; background-color:#eee; color: gray; font: bold 12px Arial, sans-serif; width: 50px;}
 	input[type=button].tag { margin: 0; background-color:#eee; color: gray; font: normal 10px Arial, sans-serif; }
 	input[type=button].restore { margin: 0; background-color:yellow; color: black; font: normal 10px Arial, sans-serif; }
+	input[type=button].restore_to_mailbox_button { margin: 0; background-color:#eee; color: black; font: bold 12px Arial, sans-serif; }
 
 	input[type=checkbox].attachmenttype { margin: 0; vertical-align: middle; }
 	input[type=checkbox].restorebox { margin: 0; vertical-align: middle; }
diff --git a/webui/view/theme/default/templates/common/layout-new.tpl b/webui/view/theme/default/templates/common/layout-new.tpl
index d309d5aa..11ef44d7 100644
--- a/webui/view/theme/default/templates/common/layout-new.tpl
+++ b/webui/view/theme/default/templates/common/layout-new.tpl
@@ -23,10 +23,10 @@
    <script type="text/javascript">
       var current_message_id = 0;
       var piler_ui_lang = '<?php if(LANG == 'en') { ?>en-GB<?php } else { print LANG; } ?>';
-      var email_search_url = '<?php print SITE_URL; ?>/index.php?route=group/email&';
-      var group_search_url = '<?php print SITE_URL; ?>/index.php?route=group/group&';
-      var folder_search_url = '<?php print SITE_URL; ?>/index.php?route=folder/folder&';
-      var folder_copy_url = '<?php print SITE_URL; ?>/index.php?route=folder/copy';
+      var email_search_url = '<?php print SITE_URL; ?>index.php?route=group/email&';
+      var group_search_url = '<?php print SITE_URL; ?>index.php?route=group/group&';
+      var folder_search_url = '<?php print SITE_URL; ?>index.php?route=folder/folder&';
+      var folder_copy_url = '<?php print SITE_URL; ?>index.php?route=folder/copy';
       var message_loader_url = '<?php print SITE_URL; ?>message.php/';
    </script>
 
@@ -37,13 +37,6 @@
 
    <script type="text/javascript" src="/view/javascript/shortcut.js"></script>
 
-   <style type="text/css">
-      /*#mailcontframe { height: 341px; }
-      #mailpreviewframe { top: 351px; }
-      #mailleftcontainer { width: 160px; }
-      #mailrightcontainer { left: 170px; min-height: 200px; }*/
-   </style>
-
    <script type="text/javascript">
       var split = new rcube_webmail();
 
diff --git a/webui/view/theme/default/templates/common/layout.tpl b/webui/view/theme/default/templates/common/layout.tpl
index f07104d0..550692f6 100644
--- a/webui/view/theme/default/templates/common/layout.tpl
+++ b/webui/view/theme/default/templates/common/layout.tpl
@@ -19,9 +19,9 @@
 
    <script type="text/javascript">
       var piler_ui_lang = '<?php if(LANG == 'en') { ?>en-GB<?php } else { print LANG; } ?>';
-      var email_search_url = '<?php print SITE_URL; ?>/index.php?route=group/email&';
-      var group_search_url = '<?php print SITE_URL; ?>/index.php?route=group/group&';
-      var folder_search_url = '<?php print SITE_URL; ?>/index.php?route=folder/folder&';
+      var email_search_url = '<?php print SITE_URL; ?>index.php?route=group/email&';
+      var group_search_url = '<?php print SITE_URL; ?>index.php?route=group/group&';
+      var folder_search_url = '<?php print SITE_URL; ?>index.php?route=folder/folder&';
       var health_worker_url = "<?php print HEALTH_WORKER_URL; ?>";
    </script>
 
diff --git a/webui/view/theme/default/templates/common/menu.tpl b/webui/view/theme/default/templates/common/menu.tpl
index 452ffbc8..b30ff36e 100644
--- a/webui/view/theme/default/templates/common/menu.tpl
+++ b/webui/view/theme/default/templates/common/menu.tpl
@@ -3,14 +3,14 @@
          <div class="logout22">
             <a href="search.php"<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "search.php")){ ?> id="active"<?php } ?>><?php print $text_search; ?></a> | 
          <?php if(ENABLE_FOLDER_RESTRICTIONS == 1) { ?>
-            <a href="/folders.php"<?php if(strstr($_SERVER['REQUEST_URI'], "folders.php")){ ?> id="active"<?php } ?>><?php print $text_folders; ?></a> | 
+            <a href="folders.php"<?php if(strstr($_SERVER['REQUEST_URI'], "folders.php")){ ?> id="active"<?php } ?>><?php print $text_folders; ?></a> | 
          <?php } ?>
-            <a href="/settings.php"<?php if(strstr($_SERVER['REQUEST_URI'], "settings.php")){ ?> id="active"<?php } ?>><?php print $text_settings; ?></a> | 
+            <a href="settings.php"<?php if(strstr($_SERVER['REQUEST_URI'], "settings.php")){ ?> id="active"<?php } ?>><?php print $text_settings; ?></a> | 
          <?php if(HELPER_URL) { ?>
             <a href="<?php print HELPER_URL; ?>"><?php print $text_help; ?></a> |
          <?php } ?>
             <?php if(isset($_SESSION['realname'])) { print $text_realname; ?>: <?php print $_SESSION['realname']; ?> | <?php } ?>
-            <a href="/logout.php"<?php if(strstr($_SERVER['QUERY_STRING'], "login/logout")){ ?> id="active"<?php } ?>><?php print $text_logout; ?></a>
+            <a href="logout.php"<?php if(strstr($_SERVER['QUERY_STRING'], "login/logout")){ ?> id="active"<?php } ?>><?php print $text_logout; ?></a>
          </div>
 
 <?php } ?>
diff --git a/webui/view/theme/default/templates/folder/list.tpl b/webui/view/theme/default/templates/folder/list.tpl
index cad4da87..f64082d3 100644
--- a/webui/view/theme/default/templates/folder/list.tpl
+++ b/webui/view/theme/default/templates/folder/list.tpl
@@ -3,7 +3,7 @@
 
 <?php if(ENABLE_FOLDER_RESTRICTIONS == 1) { ?>
 
-<form action="/folders.php" method="post" name="extra_folders">
+<form action="folders.php" method="post" name="extra_folders">
 
    <div id="search">
 
diff --git a/webui/view/theme/default/templates/message/headers.tpl b/webui/view/theme/default/templates/message/headers.tpl
index b0d7381c..b21d455d 100644
--- a/webui/view/theme/default/templates/message/headers.tpl
+++ b/webui/view/theme/default/templates/message/headers.tpl
@@ -8,7 +8,7 @@
 <div id="messagepopup">
 
 <p>
-   <a class="messagelink" href="/index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
+   <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
    <a class="messagelink" href="#" onclick="script:load_url_with_get('<?php print SITE_URL; ?>index.php?route=message/restore&amp;id=<?php print $id; ?>', 'mailpreviewframe'); return false;"><?php print $text_restore_to_mailbox; ?></a> |
    <a class="messagelink" href="#" onclick="script:load_url_with_get('<?php print SITE_URL; ?>message.php/<?php print $id; ?>', 'mailpreviewframe'); return false;"><?php print $text_view_message; ?></a>
 </p>
diff --git a/webui/view/theme/default/templates/message/restore.tpl b/webui/view/theme/default/templates/message/restore.tpl
index 5faf7fb4..a7ed1b6d 100644
--- a/webui/view/theme/default/templates/message/restore.tpl
+++ b/webui/view/theme/default/templates/message/restore.tpl
@@ -8,7 +8,7 @@
 <div id="messagepopup">
 
 <p>
-   <a class="messagelink" href="/index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
+   <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
    <a class="messagelink" href="#" onclick="script:load_url_with_get('<?php print SITE_URL; ?>message.php/<?php print $id; ?>', 'mailpreviewframe'); return false;"><?php print $text_view_message; ?></a> |
    <a class="messagelink" href="#" onclick="script:load_url_with_get('<?php print SITE_URL; ?>/index.php?route=message/headers&amp;id=<?php print $id; ?>', 'mailpreviewframe'); return false;"><?php print $text_view_headers; ?></a>
 </p>
diff --git a/webui/view/theme/default/templates/message/view.tpl b/webui/view/theme/default/templates/message/view.tpl
index 3d53ac2e..59874b2f 100644
--- a/webui/view/theme/default/templates/message/view.tpl
+++ b/webui/view/theme/default/templates/message/view.tpl
@@ -1,6 +1,6 @@
 
 <p>
-   <a class="messagelink" href="/index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
+   <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
    <a class="messagelink" href="#" onclick="script:load_url_with_get('<?php print SITE_URL; ?>/index.php?route=message/restore&amp;id=<?php print $id; ?>', 'mailpreviewframe'); return false;"><?php print $text_restore_to_mailbox; ?></a> |
    <a class="messagelink" href="#" onclick="script:load_url_with_get('<?php print SITE_URL; ?>/index.php?route=message/headers&amp;id=<?php print $id; ?>', 'mailpreviewframe'); return false;"><?php print $text_view_headers; ?></a>
 </p>
diff --git a/webui/view/theme/default/templates/user/settings.tpl b/webui/view/theme/default/templates/user/settings.tpl
index fdd6f74c..1caac01c 100644
--- a/webui/view/theme/default/templates/user/settings.tpl
+++ b/webui/view/theme/default/templates/user/settings.tpl
@@ -1,7 +1,7 @@
 
 <?php if(!isset($x)){ ?>
 
-<form action="/settings.php" method="post" name="setpagelen">
+<form action="settings.php" method="post" name="setpagelen">
 
    <div id="search">