webui code cleanup

This commit is contained in:
SJ 2012-12-18 15:58:14 +01:00
parent d77579e761
commit cc55883b35
11 changed files with 18 additions and 42 deletions

View File

@ -33,16 +33,6 @@ class ControllerFolderList extends Controller {
return; 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(); $this->data['page_len'] = get_page_length();

View File

@ -3,16 +3,6 @@
class ModelSearchMessage extends Model { 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 = '') { public function verify_message($id = '') {
if($id == '') { return 0; } if($id == '') { return 0; }

View File

@ -140,6 +140,8 @@
.advselect2 { width: 205px; font: bold 12px Arial, sans-serif; padding: 0; margin:0;} .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;} .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 { 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; } 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].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].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 { 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].attachmenttype { margin: 0; vertical-align: middle; }
input[type=checkbox].restorebox { margin: 0; vertical-align: middle; } input[type=checkbox].restorebox { margin: 0; vertical-align: middle; }

View File

@ -23,10 +23,10 @@
<script type="text/javascript"> <script type="text/javascript">
var current_message_id = 0; var current_message_id = 0;
var piler_ui_lang = '<?php if(LANG == 'en') { ?>en-GB<?php } else { print LANG; } ?>'; 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 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 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_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 folder_copy_url = '<?php print SITE_URL; ?>index.php?route=folder/copy';
var message_loader_url = '<?php print SITE_URL; ?>message.php/'; var message_loader_url = '<?php print SITE_URL; ?>message.php/';
</script> </script>
@ -37,13 +37,6 @@
<script type="text/javascript" src="/view/javascript/shortcut.js"></script> <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"> <script type="text/javascript">
var split = new rcube_webmail(); var split = new rcube_webmail();

View File

@ -19,9 +19,9 @@
<script type="text/javascript"> <script type="text/javascript">
var piler_ui_lang = '<?php if(LANG == 'en') { ?>en-GB<?php } else { print LANG; } ?>'; 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 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 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_search_url = '<?php print SITE_URL; ?>index.php?route=folder/folder&';
var health_worker_url = "<?php print HEALTH_WORKER_URL; ?>"; var health_worker_url = "<?php print HEALTH_WORKER_URL; ?>";
</script> </script>

View File

@ -3,14 +3,14 @@
<div class="logout22"> <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> | <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) { ?> <?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 } ?> <?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) { ?> <?php if(HELPER_URL) { ?>
<a href="<?php print HELPER_URL; ?>"><?php print $text_help; ?></a> | <a href="<?php print HELPER_URL; ?>"><?php print $text_help; ?></a> |
<?php } ?> <?php } ?>
<?php if(isset($_SESSION['realname'])) { print $text_realname; ?>: <?php print $_SESSION['realname']; ?> | <?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> </div>
<?php } ?> <?php } ?>

View File

@ -3,7 +3,7 @@
<?php if(ENABLE_FOLDER_RESTRICTIONS == 1) { ?> <?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"> <div id="search">

View File

@ -8,7 +8,7 @@
<div id="messagepopup"> <div id="messagepopup">
<p> <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/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> <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> </p>

View File

@ -8,7 +8,7 @@
<div id="messagepopup"> <div id="messagepopup">
<p> <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; ?>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> <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> </p>

View File

@ -1,6 +1,6 @@
<p> <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/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> <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> </p>

View File

@ -1,7 +1,7 @@
<?php if(!isset($x)){ ?> <?php if(!isset($x)){ ?>
<form action="/settings.php" method="post" name="setpagelen"> <form action="settings.php" method="post" name="setpagelen">
<div id="search"> <div id="search">