[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail Changelog addressbook.php index.php ...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] felamimail Changelog addressbook.php index.php ... |
|
Date: |
Mon, 18 Dec 2006 20:03:34 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Sigurd Nes <sigurdne> 06/12/18 20:03:33
Modified files:
. : Changelog addressbook.php index.php
help : index.php
help/EN : felamimail.php
inc : class.bocaching.inc.php class.bocompose.inc.php
class.bofelamimail.inc.php
class.bofilter.inc.php
class.bopreferences.inc.php
class.phpmailer.inc.php class.sieve.inc.php
class.smtp.php class.socaching.inc.php
class.sofelamimail.inc.php
class.transformdate.inc.php
class.uicompose.inc.php class.uidisplay.inc.php
class.uifelamimail.inc.php
class.uifilter.inc.php
class.uipreferences.inc.php
class.uisieve.inc.php hook_admin.inc.php
hook_home.inc.php hook_manual.inc.php
hook_preferences.inc.php hook_settings.inc.php
setup : phpgw_de.lang phpgw_en.lang phpgw_fi.lang
phpgw_fr.lang phpgw_ja.lang phpgw_pl.lang
phpgw_pt.lang phpgw_tr.lang setup.inc.php
tables_baseline.inc.php tables_current.inc.php
tables_update.inc.php
templates/base : addressbook.tpl composeForm.tpl config.tpl
filterForm.tpl mainscreen.tpl
preferences_manage_folder.tpl sieveForm.tpl
view_message.tpl
templates/linux-at-work.de: composeForm.tpl mainscreen.tpl
Added files:
templates/linux-at-work.de/images: attach.gif down_pointer.gif
down_pointer.png navbar.gif
navbar.png sm_envelope.gif
sm_envelope.png
sm_important.png sm_read.png
sm_unimportant.png
sm_unread.png sort_none.gif
sort_none.png up_pointer.gif
up_pointer.png
Log message:
Update to the most recent version - which proved to be found in the
Version-0_9_16-branch
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/Changelog?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/addressbook.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/felamimail/index.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/help/index.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/help/EN/felamimail.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bocaching.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bocompose.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofilter.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bopreferences.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.phpmailer.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.sieve.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.smtp.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.socaching.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.sofelamimail.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.transformdate.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uidisplay.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uifelamimail.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uifilter.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uipreferences.inc.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uisieve.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_manual.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_settings.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/phpgw_de.lang?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/phpgw_en.lang?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/phpgw_fi.lang?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/phpgw_fr.lang?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/phpgw_ja.lang?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/phpgw_pl.lang?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/phpgw_pt.lang?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/phpgw_tr.lang?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/tables_baseline.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/tables_current.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/felamimail/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/addressbook.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/composeForm.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/config.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/filterForm.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/mainscreen.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/preferences_manage_folder.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/sieveForm.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/view_message.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/composeForm.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/mainscreen.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/attach.gif?cvsroot=phpgroupware&rev=1.4
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/down_pointer.gif?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/down_pointer.png?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/navbar.gif?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/navbar.png?cvsroot=phpgroupware&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/sm_envelope.gif?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/sm_envelope.png?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/sm_important.png?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/sm_read.png?cvsroot=phpgroupware&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/sm_unimportant.png?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/sm_unread.png?cvsroot=phpgroupware&rev=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/sort_none.gif?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/sort_none.png?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/up_pointer.gif?cvsroot=phpgroupware&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/linux-at-work.de/images/up_pointer.png?cvsroot=phpgroupware&rev=1.3
Patches:
Index: Changelog
===================================================================
RCS file: /sources/phpgroupware/felamimail/Changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Changelog 24 Nov 2002 00:36:06 -0000 1.2
+++ Changelog 18 Dec 2006 20:03:31 -0000 1.3
@@ -1,16 +1,29 @@
-Version 0.9.3
+Version 0.9.5
+
+- improved mime type handling
+- also forward attachments
+- support üöä... in folder names
+- support html emails(most evil tags get removed)
+- code cleanup
+- added Sidebox for Idots
+- added user defined EMail accounts again, can be deactivated by admin
+
+Version 0.9.3/0.9.4
- added usefull error messsages, if login to imap server fails
- imaps support(encryption only and encryption with authentication)
+- added smtp auth support
- print function; displays the page without the phpgw navbar, so will
print only the email
- removed old Squirrelmail code again
-- the code to display emails is now writen new too, it's all based
+- the code to display emails is rewriten too, it's all based
on phpGW now
-
+- rewrote folder management
+- removed images, they where not always helpfull
- filter dialog improved again
- you can store multiple filters now
+ - added quicksearch
- integration of sieve-php
- you can manage sieve scripts on a sieve enables imap server
@@ -21,6 +34,14 @@
- you can define a refresh time for the mailbox message list
- fixed a nasty bug, when replying to emails which contain " or , in the
to,cc or bcc fields
+- fixed quoted printable en/decoding in the
+ headers/subject(it was time to read the rfc's :) )
+- highlithing of web and email urls
+- enabled vmailmgr login again
+- don't halt smtp error messages anymore, but display the error
+ and go back to the compose window
+- display the organization when showing the mail
+- fixed download/save of attachment under IE and SSL
Version 0.9.2
Index: addressbook.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/addressbook.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- addressbook.php 16 Dec 2006 21:55:56 -0000 1.5
+++ addressbook.php 18 Dec 2006 20:03:32 -0000 1.6
@@ -9,9 +9,9 @@
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
- /* $Id: addressbook.php,v 1.5 2006/12/16 21:55:56 sigurdne Exp $ */
+ /* $Id: addressbook.php,v 1.6 2006/12/18 20:03:32 sigurdne Exp $ */
- $GLOBALS['phpgw_info']['flags'] = array(
+ $phpgw_info["flags"] = array(
'noheader' => True,
'nonavbar' => True,
'currentapp' => 'felamimail',
@@ -26,59 +26,49 @@
'addressbook_list' => 'addressbook.tpl'
));
$t->set_block('addressbook_list_t','addressbook_list','list');
- $t->set_block('addressbook_list_t', 'theme_stylesheet');
+
$d = CreateObject('phpgwapi.contacts');
$c = CreateObject('phpgwapi.categories');
$c->app_name = 'addressbook';
- $charset = 'UTF8';
+ $charset = $phpgw->translation->translate("charset");
$t->set_var('charset',$charset);
-
$t->set_var('title',(isset($GLOBALS['phpgw_info']['site_title'])?$GLOBALS['phpgw_info']['site_title']:''));
-// $t->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
+ $t->set_var('title',$phpgw_info["site_title"]);
+ $t->set_var('bg_color',$phpgw_info["theme"]["bg_color"]);
$t->set_var('lang_addressbook_action',lang('Address book'));
-// $t->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
+ $t->set_var('font',$phpgw_info["theme"]["font"]);
$t->set_var('lang_search',lang('Search'));
-
$t->set_var('search_action',$phpgw->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php'));
+
$t->set_var('search_action',$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/addressbook.php'));
$t->set_var('lang_select_cats',lang('Select category'));
- $start = get_var('start',array('POST','GET'));
- $query = get_var('query',array('POST','GET'));
- $sort = get_var('sort',array('POST','GET'));
- $order = get_var('order',array('POST','GET'));
- $filter = get_var('filter',array('POST','GET'));
- $cat_id = get_var('cat_id',array('POST','GET'));
-
- if (!isset($start) || ! $start)
- {
- $start = 0;
- }
+ if (! $start) { $start = 0; }
- if (!isset($filter) || !$filter) { $filter = 'none'; }
+ if (!$filter) { $filter = 'none'; }
- if (!isset($cat_id) || !$cat_id)
+ if (!$cat_id)
{
- if (isset($filter) && $filter == 'none') { $qfilter = 'tid=n';
}
- elseif (isset($filter) && $filter == 'private') { $qfilter =
'tid=n,owner='.$GLOBALS['phpgw_info']['user']['account_id']; }
+ if ($filter == 'none') { $qfilter = 'tid=n'; }
+ elseif ($filter == 'private') { $qfilter =
'tid=n,owner='.$phpgw_info["user"]["account_id"]; }
else { $qfilter = 'tid=n,owner='.$filter; }
}
else
{
- if (isset($filter) && $filter == 'none') { $qfilter =
'tid=n,cat_id='.$cat_id; }
- elseif (isset($filter) && $filter == 'private') { $qfilter =
'tid=n,owner='.$GLOBALS['phpgw_info']['user']['account_id'].',cat_id='.$cat_id;
}
+ if ($filter == 'none') { $qfilter = 'tid=n,cat_id='.$cat_id; }
+ elseif ($filter == 'private') { $qfilter =
'tid=n,owner='.$phpgw_info["user"]["account_id"].',cat_id='.$cat_id; }
else { $qfilter = 'tid=n,owner='.$filter.'cat_id='.$cat_id; }
}
- if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
&& $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
+ if($phpgw_info["user"]["preferences"]["common"]["maxmatchs"] &&
$phpgw_info["user"]["preferences"]["common"]["maxmatchs"] > 0)
{
- $offset =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ $offset =
$phpgw_info["user"]["preferences"]["common"]["maxmatchs"];
}
else
{
$offset = 15;
}
- $account_id = $GLOBALS['phpgw_info']['user']['account_id'];
+ $account_id = $phpgw_info['user']['account_id'];
$cols = array (
'n_given' => 'n_given',
@@ -87,38 +77,17 @@
'email_home' => 'email_home'
);
-// $entries =
$d->read($start,$offset,$cols,$query,$qfilter,$sort,$order,$account_id);
-
- $fields = array ('contact_id', 'per_first_name', 'per_last_name',
'email', 'email_home','n_given','n_family');
-
- if($query)
- {
- $criteria_search[] =
sql_criteria::token_begin('per_first_name', $query);
- $criteria_search[] = sql_criteria::token_begin('per_last_name',
$query);
- $criteria_search[] = sql_criteria::token_has('email', $query);
- $criteria[] = sql_criteria::_append_or($criteria_search);
- }
-
- $criteria[] = $d->criteria_for_index((int)
$GLOBALS['phpgw_info']['user']['account_id']);
-
- if ($cat_id)
- {
- $criteria[] = sql_criteria::_equal('cat_id', $cat_id);
- }
-
- $criteria_token = sql_criteria::_append_and($criteria);
- $entries = $d->get_persons($fields, 0, 0, 'per_first_name,
per_last_name', 'ASC', '', $criteria_token);
-
+ $entries =
$d->read($start,$offset,$cols,$query,$qfilter,$sort,$order,$account_id);
//------------------------------------------- nextmatch
--------------------------------------------
- $left =
$phpgw->nextmatchs->left('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query");
- $right =
$phpgw->nextmatchs->right('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query");
+ $left =
$phpgw->nextmatchs->left('/'.$phpgw_info['flags']['currentapp'].'/addressbook.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query");
+ $right =
$phpgw->nextmatchs->right('/'.$phpgw_info['flags']['currentapp'].'/addressbook.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query");
$t->set_var('left',$left);
$t->set_var('right',$right);
- if ($d->total_records >
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
+ if ($d->total_records >
$phpgw_info["user"]["preferences"]["common"]["maxmatchs"])
{
- $t->set_var('lang_showing',lang("showing %1 - %2 of %3",($start
+ 1),($start +
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']),$d->total_records));
+ $t->set_var('lang_showing',lang("showing %1 - %2 of %3",($start
+ 1),($start +
$phpgw_info["user"]["preferences"]["common"]["maxmatchs"]),$d->total_records));
}
else
{
@@ -127,50 +96,26 @@
// --------------------------------------- end nextmatch
------------------------------------------
// ------------------- list header variable template-declaration
-----------------------
-
- $template_set =
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'];
-
- if(file_exists(PHPGW_SERVER_ROOT .
'/phpgwapi/templates/{$template_set}/css/' . $template_set . '.css'))
- {
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/{$template_set}/css/{$template_set}.css";
- }
- if(file_exists(PHPGW_SERVER_ROOT .
"/phpgwapi/templates/{$template_set}/css/styles.css"))
- {
- $theme_styles[] =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/{$template_set}/css/styles.css";
- }
-
- if(isset($theme_styles) && is_array($theme_styles))
- {
- foreach ( $theme_styles as $style )
- {
- $t->set_var('theme_style', $style);
- $t->parse('theme_stylesheets', 'theme_stylesheet',
true);
- }
- }
-
-
-
-// $t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
-
$t->set_var('sort_firstname',$phpgw->nextmatchs->show_sort_order($sort,'n_given',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Firstname')));
-
$t->set_var('sort_lastname',$phpgw->nextmatchs->show_sort_order($sort,'n_family',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Lastname')));
+ $t->set_var('th_bg',$phpgw_info["theme"]["th_bg"]);
+
$t->set_var('sort_firstname',$phpgw->nextmatchs->show_sort_order($sort,'n_given',$order,'/'.$phpgw_info['flags']['currentapp'].'/addressbook.php',lang('Firstname')));
+
$t->set_var('sort_lastname',$phpgw->nextmatchs->show_sort_order($sort,'n_family',$order,'/'.$phpgw_info['flags']['currentapp'].'/addressbook.php',lang('Lastname')));
$t->set_var('lang_email',lang('Select work email address'));
$t->set_var('lang_hemail',lang('Select home email address'));
-
$t->set_var('cats_action',$phpgw->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',array('sort'=>$sort,'order'=>$order,'filter'=>$filter,'start'=>$start,'query'=>$query,'cat_id'=>$cat_id)));
+
$t->set_var('cats_action',$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/addressbook.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
$t->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
$t->set_var('lang_select',lang('Select'));
// --------------------------- end header declaration
----------------------------------
-
- $tr_class = 'row_on';
for ($i=0;$i<count($entries);$i++)
{
- $tr_class = $phpgw->nextmatchs->alternate_row_class($tr_class);
- $t->set_var('tr_class',$tr_class);
+ $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+ $t->set_var(tr_color,$tr_color);
$firstname = $entries[$i]['n_given'];
if (!$firstname) { $firstname = ' '; }
$lastname = $entries[$i]['n_family'];
if (!$lastname) { $lastname = ' '; }
-// $id = $entries[$i]['id']; // not used
+ $fullname = trim($firstname." ".$lastname);
+ $id = $entries[$i]['id'];
$email = $entries[$i]['email'];
$hemail = $entries[$i]['email_home'];
// --------------------- template declaration for list records
--------------------------
@@ -179,9 +124,10 @@
'lastname' => $lastname
));
-// $t->set_var('id',$id);
+ $t->set_var('id',$id);
$t->set_var('email',$email);
$t->set_var('hemail',$hemail);
+ $t->set_var('realName',$fullname);
$t->parse('list','addressbook_list',True);
}
Index: index.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- index.php 24 Nov 2002 00:32:13 -0000 1.4
+++ index.php 18 Dec 2006 20:03:32 -0000 1.5
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: index.php,v 1.4 2002/11/24 00:32:13 lkneschke Exp $ */
+ /* $Id: index.php,v 1.5 2006/12/18 20:03:32 sigurdne Exp $ */
$phpgw_info['flags'] = array
(
Index: help/index.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/help/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- help/index.php 24 Nov 2002 00:36:06 -0000 1.2
+++ help/index.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: index.php,v 1.2 2002/11/24 00:36:06 lkneschke Exp $ */
+ /* $Id: index.php,v 1.3 2006/12/18 20:03:32 sigurdne Exp $ */
$phpgw_flags = Array(
'currentapp' => 'manual'
Index: help/EN/felamimail.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/help/EN/felamimail.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- help/EN/felamimail.php 24 Nov 2002 00:36:06 -0000 1.2
+++ help/EN/felamimail.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: felamimail.php,v 1.2 2002/11/24 00:36:06 lkneschke Exp $ */
+ /* $Id: felamimail.php,v 1.3 2006/12/18 20:03:32 sigurdne Exp $ */
$phpgw_flags = Array(
'currentapp' => 'manual'
Index: inc/class.bocaching.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bocaching.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.bocaching.inc.php 24 Nov 2002 00:32:13 -0000 1.4
+++ inc/class.bocaching.inc.php 18 Dec 2006 20:03:32 -0000 1.5
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bocaching.inc.php,v 1.4 2002/11/24 00:32:13 lkneschke Exp
$ */
+ /* $Id: class.bocaching.inc.php,v 1.5 2006/12/18 20:03:32 sigurdne Exp
$ */
class bocaching
{
@@ -102,10 +102,16 @@
return $this->socaching->getMessageCounter($_filter);
}
+ function getNextMessage($_uid, $_sort, $_filter)
+ {
+ return $this->socaching->getNextMessage($_uid, $_sort,
$_filter);
+ }
+
function removeFromCache($_uid)
{
$this->socaching->removeFromCache($_uid);
}
+
// expects the result from imap_status ($mbox,
"{".$imapServerAddress.":$imapPort}$mailbox", SA_ALL);
function updateImapStatus($_status)
{
Index: inc/class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.bocompose.inc.php 24 Nov 2002 00:32:13 -0000 1.4
+++ inc/class.bocompose.inc.php 18 Dec 2006 20:03:32 -0000 1.5
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bocompose.inc.php,v 1.4 2002/11/24 00:32:13 lkneschke Exp
$ */
+ /* $Id: class.bocompose.inc.php,v 1.5 2006/12/18 20:03:32 sigurdne Exp
$ */
class bocompose
{
@@ -86,8 +86,7 @@
$GLOBALS['phpgw_info']['user']['account_id'].
$this->composeID.
basename($_formData['file']);
-
- copy($_formData['file'],$tmpFileName);
+
move_uploaded_file($_FILES['attachfile']['tmp_name'],$tmpFileName);
$this->sessionData['attachments'][]=array
(
@@ -118,6 +117,17 @@
return $this->composeID;
}
+ function getErrorInfo()
+ {
+ if(isset($this->errorInfo))
+ {
+ $errorInfo = $this->errorInfo;
+ unset($this->errorInfo);
+ return $errorInfo;
+ }
+ return false;
+ }
+
function getForwardData($_uid)
{
$bofelamimail =
CreateObject('felamimail.bofelamimail');
@@ -129,12 +139,12 @@
// check for Re: in subject header
$this->sessionData['subject'] = "[FWD: " .
$bofelamimail->decode_header($headers->Subject)."]";
- $structure =
$bofelamimail->getMessageStructure($_uid, ST_UID);
- if(sizeof($structure->parts) > 1)
- {
- $sections = $bofelamimail->parse($structure);
- $attachments =
$bofelamimail->get_attachments($sections);
- }
+ #$structure =
$bofelamimail->getMessageStructure($_uid, ST_UID);
+ #if(sizeof($structure->parts) > 1)
+ #{
+ # $sections = $bofelamimail->parse($structure);
+ # $attachments =
$bofelamimail->get_attachments($sections);
+ #}
$this->sessionData['body'] = "
-----------Originalnachricht-----------\n\n";
$this->sessionData['body'] .= "Betreff:
".$bofelamimail->decode_header($headers->Subject)."\n";
@@ -143,30 +153,62 @@
// iterate through message parts
// get the body
- $bodyParts = $bofelamimail->getMessageBody($_uid);
+ $bodyParts = $bofelamimail->getMessageBody($_uid,
'only_if_no_text');
for($i=0; $i<count($bodyParts); $i++)
{
- $this->sessionData['body'] .=
$bodyParts[$i];
+ $this->sessionData['body'] .=
$bodyParts[$i]['body'];
}
-/* if(is_array($sections))
+
+ $this->sessionData['body'] .= "\n\n
-----------Originalnachricht-----------\n\n";
+
+ $attachments =
$bofelamimail->getMessageAttachments($_uid);
+ if(is_array($attachments))
{
- for($x=0; $x<sizeof($sections); $x++)
+ // ensure existance of PHPGROUPWARE temp dir
+ // note: this is different from apache temp
dir,
+ // and different from any other temp file
location set in php.ini
+ if
(!file_exists($GLOBALS['phpgw_info']['server']['temp_dir']))
{
- // if text type, display
- if($sections[$x]["type"] ==
"text/plain" && $sections[$x]["disposition"]
- != "attachment")
+
@mkdir($GLOBALS['phpgw_info']['server']['temp_dir'],0700);
+ }
+
+ // if we were NOT able to create this temp
directory, then make an ERROR report
+ if
(!file_exists($GLOBALS['phpgw_info']['server']['temp_dir']))
{
- $bodyPart =
$bofelamimail->getMessageBody($_uid, $sections[$x]["pid"], ST_UID);
- $this->sessionData['body'] .=
quoted_printable_decode($bodyPart);
+ $alert_msg .= 'Error:'.'<br>'
+ .'Server is unable to access
phpgw tmp directory'.'<br>'
+
.$phpgw_info['server']['temp_dir'].'<br>'
+ .'Please check your
configuration'.'<br>'
+ .'<br>';
}
+
+ while(list($partID, $partData) =
each($attachments))
+ {
+ $attachmentData =
$bofelamimail->getAttachment($_uid, $partID);
+ #_debug_array($attachmentData);
+
+ $tmpFileName =
$GLOBALS['phpgw_info']['server']['temp_dir'].
+ SEP.
+
$GLOBALS['phpgw_info']['user']['account_id'].
+ $this->composeID.
+
basename($attachmentData['filename']);
+
+ if ($handle = fopen($tmpFileName, 'w'))
+ {
+ fwrite($handle,
$attachmentData['attachment']);
+ fclose($handle);
+
+
$this->sessionData['attachments'][]=array
+ (
+ 'name' =>
$attachmentData['filename'],
+ 'type' =>
$attachmentData['type'],
+ 'file' => $tmpFileName,
+ 'size' =>
filesize($tmpFileName)
+ );
+
}
}
- else
- {
- $this->sessionData['body'] .=
$bofelamimail->getMessageBody($_uid, '', ST_UID);
}
-*/
- $this->sessionData['body'] .= "\n\n
-----------Originalnachricht-----------\n\n";
$bofelamimail->closeConnection();
@@ -269,23 +311,23 @@
$this->sessionData['subject'] = "Re: " .
$bofelamimail->decode_header($headers->Subject);
}
- $structure = $bofelamimail->getMessageStructure($_uid);
- if(sizeof($structure->parts) > 1)
- {
- $sections = $bofelamimail->parse($structure);
- $attachments =
$bofelamimail->get_attachments($sections);
- }
+ #$structure = $bofelamimail->getMessageStructure($_uid);
+ #if(sizeof($structure->parts) > 1)
+ #{
+ # $sections = $bofelamimail->parse($structure);
+ # $attachments =
$bofelamimail->get_attachments($sections);
+ #}
- $this->sessionData['body'] = lang("on")." " .
$headers->Date . ", ".lang("you wrote").": \n>";
+ $this->sessionData['body'] =
$bofelamimail->decode_header($headers->fromaddress) . " ".lang("wrote").": \n>";
// get the body
- $bodyParts = $bofelamimail->getMessageBody($_uid);
+ $bodyParts = $bofelamimail->getMessageBody($_uid,
'only_if_no_text');
for($i=0; $i<count($bodyParts); $i++)
{
if(!empty($this->sessionData['body']))
$$this->sessionData['body'] .= "\n\n";
// add line breaks to $bodyParts
- $newBody = explode("\n",$bodyParts[$i]);
+ $newBody =
explode("\n",$bodyParts[$i]['body']);
// create it new, with good line breaks
reset($newBody);
@@ -357,6 +399,8 @@
function send($_formData)
{
+ $bofelamimail =
CreateObject('felamimail.bofelamimail');
+
$this->sessionData['to'] = $_formData['to'];
$this->sessionData['cc'] = $_formData['cc'];
$this->sessionData['bcc'] = $_formData['bcc'];
@@ -379,11 +423,14 @@
$mail->IsSMTP();
$mail->From = $this->preferences['emailAddress'];
- $mail->FromName = $this->preferences['realname'];
+ $mail->FromName =
$bofelamimail->encodeHeader($this->preferences['realname']);
$mail->Host =
$this->preferences['smtpServerAddress'];
$mail->Priority = $this->sessionData['priority'];
$mail->Encoding = '8bit';
$mail->PluginDir = PHPGW_SERVER_ROOT."/felamimail/inc/";
+ $mail->AddCustomHeader("X-Mailer: FeLaMiMail version
0.9.4");
+ if(isset($this->preferences['organizationName']))
+ $mail->AddCustomHeader("Organization:
".$this->preferences['organizationName']);
if (!empty($this->sessionData['to']))
{
@@ -393,7 +440,7 @@
for($i=0;$i<count($address_array);$i++)
{
$emailAddress =
$address_array[$i]->mailbox."@".$address_array[$i]->host;
- $emailName =
$address_array[$i]->personal;
+ $emailName =
$bofelamimail->encodeHeader($address_array[$i]->personal);
$mail->AddAddress($emailAddress,$emailName);
}
}
@@ -407,7 +454,7 @@
for($i=0;$i<count($address_array);$i++)
{
$emailAddress =
$address_array[$i]->mailbox."@".$address_array[$i]->host;
- $emailName =
$address_array[$i]->personal;
+ $emailName =
$bofelamimail->encodeHeader($address_array[$i]->personal);
$mail->AddCC($emailAddress,$emailName);
}
}
@@ -421,7 +468,7 @@
for($i=0;$i<count($address_array);$i++)
{
$emailAddress =
$address_array[$i]->mailbox."@".$address_array[$i]->host;
- $emailName =
$address_array[$i]->personal;
+ $emailName =
$bofelamimail->encodeHeader($address_array[$i]->personal);
$mail->AddBCC($emailAddress,$emailName);
}
}
@@ -433,13 +480,13 @@
if(count($address_array)>0)
{
$emailAddress =
$address_array[0]->mailbox."@".$address_array[0]->host;
- $emailName =
$address_array[0]->personal;
+ $emailName =
$bofelamimail->encodeHeader($address_array[0]->personal);
$mail->AddReplyTo($emailAddress,$emailName);
}
}
$mail->WordWrap = 76;
- $mail->Subject =
"=?iso-8859-1?Q?".imap_8bit($this->sessionData['subject'])."?=";
+ $mail->Subject =
$bofelamimail->encodeHeader($this->sessionData['subject'],'q');
$mail->IsHTML(false);
$mail->Body = $this->sessionData['body'];
if (!empty($this->sessionData['signature']))
@@ -462,19 +509,29 @@
}
#$mail->AltBody = $this->sessionData['body'];
+ // SMTP Auth??
+ if($this->preferences['smtpAuth'] == 'yes')
+ {
+ $mail->SMTPAuth = true;
+ $mail->Username =
$this->preferences['username'];
+ $mail->Password = $this->preferences['key'];
+ }
+
+ // set a higher timeout for big messages
+ @set_time_limit(120);
+ #$mail->SMTPDebug = 10;
if(!$mail->Send())
{
- echo "Message could not be sent. <p>";
- echo "Mailer Error: " . $mail->ErrorInfo;
- exit;
+ $this->errorInfo = $mail->ErrorInfo;
+ return false;
}
- if ($this->preferences['move_to_sent'] == "true")
+ if (isset($this->preferences['sentFolder']))
{
// mark message as answered
- $bofelamimail =
CreateObject('felamimail.bofelamimail',$this->sessionData['folder']);
- $bofelamimail->openConnection();
-
$bofelamimail->appendMessage($this->preferences['sent_folder'],$mail->header,$mail->body);
+ $bofelamimail =
CreateObject('felamimail.bofelamimail');
+
$bofelamimail->openConnection($this->preferences['sentFolder']);
+
$bofelamimail->appendMessage($this->preferences['sentFolder'],$mail->sentHeader,$mail->sentBody);
$bofelamimail->closeConnection();
}
@@ -487,14 +544,20 @@
$bofelamimail->closeConnection();
}
+ if(is_array($this->sessionData['attachments']))
+ {
+ reset($this->sessionData['attachments']);
while(list($key,$value) =
@each($this->sessionData['attachments']))
{
- #print "$key: $value<br>";
- unlink($value['file']);
+ #print "$key: ".$value['file']."<br>";
+ @unlink($value['file']);
+ }
}
$this->sessionData = '';
$this->saveSessionData();
+
+ return true;
}
function setDefaults()
Index: inc/class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/class.bofelamimail.inc.php 18 Dec 2006 14:43:28 -0000 1.9
+++ inc/class.bofelamimail.inc.php 18 Dec 2006 20:03:32 -0000 1.10
@@ -11,13 +11,12 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bofelamimail.inc.php,v 1.9 2006/12/18 14:43:28 sigurdne
Exp $ */
+ /* $Id: class.bofelamimail.inc.php,v 1.10 2006/12/18 20:03:32 sigurdne
Exp $ */
class bofelamimail
{
var $public_functions = array
(
- 'updateImapStatus' => True,
'flagMessages' => True
);
@@ -30,6 +29,12 @@
// message encodings
var $encoding = array("7bit", "8bit", "binary", "base64",
"quoted-printable", "other");
+ // set to true, if php is compiled with multi byte string
support
+ var $mbAvailable = FALSE;
+
+ // what type of mimeTypes do we want from the body(text/html,
text/plain)
+ var $htmlOptions;
+
function bofelamimail()
{
$this->restoreSessionData();
@@ -45,6 +50,8 @@
$this->sessionData['mailbox'] =
"INBOX";
// default start message
$this->sessionData['startMessage'] = 1;
+ // default mailbox for preferences pages
+ $this->sessionData['preferences']['mailbox']
= "INBOX";
// default sorting
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['sortOrder']))
{
@@ -66,16 +73,57 @@
$this->mailPreferences =
$this->bopreferences->getPreferences();
$this->imapBaseDir = '';
+ if (function_exists('mb_convert_encoding'))
$this->mbAvailable = TRUE;
+
+ $this->htmlOptions =
$this->mailPreferences['htmlOptions'];
+
}
function appendMessage($_folder, $_header, $_body)
{
- imap_append($this->mbox, $_folder, $_header.$_body);
+ #print "<pre>$_header.$_body</pre>";
+ $mailboxString = $this->createMailboxString($_folder);
+ $header = str_replace("\n","\r\n",$_header);
+ $body = str_replace("\n","\r\n",$_body);
+ #$result = @imap_append($this->mbox, $mailboxString,
"$header"."$_body");
+ $result = @imap_append($this->mbox, $mailboxString,
"$header"."$body");
+ #print imap_last_error();
+ return $result;
}
function closeConnection()
{
- imap_close($this->mbox);
+ @imap_close($this->mbox);
+ }
+
+ // creates the mailbox string needed for the various imap
functions
+ function createMailboxString($_folderName='')
+ {
+ switch($this->mailPreferences['imap_server_type'])
+ {
+ case "imap":
+ $mailboxString = sprintf("{%s:%s}%s",
+
$this->mailPreferences['imapServerAddress'],
+
$this->mailPreferences['imapPort'],
+ $_folderName);
+ break;
+
+ case "imaps-encr-only":
+ $mailboxString =
sprintf("{%s:%s/ssl/novalidate-cert}%s",
+
$this->mailPreferences['imapServerAddress'],
+
$this->mailPreferences['imapPort'],
+ $_folderName);
+ break;
+
+ case "imaps-encr-auth":
+ $mailboxString =
sprintf("{%s:%s/ssl}%s",
+
$this->mailPreferences['imapServerAddress'],
+
$this->mailPreferences['imapPort'],
+ $_folderName);
+ break;
+ }
+
+ return $this->encodeFolderName($mailboxString);
}
function compressFolder()
@@ -88,10 +136,11 @@
if($this->sessionData['mailbox'] == $trashFolder &&
$deleteOptions == "move_to_trash")
{
// delete all messages in the trash folder
- $mailboxString = sprintf("{%s:%s}%s",
-
$this->mailPreferences['imapServerAddress'],
-
$this->mailPreferences['imapPort'],
-
imap_utf7_encode($this->sessionData['mailbox']));
+ #$mailboxString = sprintf("{%s:%s}%s",
+ #
$this->mailPreferences['imapServerAddress'],
+ #
$this->mailPreferences['imapPort'],
+ #
imap_utf7_encode($this->sessionData['mailbox']));
+ $mailboxString =
$this->createMailboxString($this->sessionData['mailbox']);
$status = imap_status ($this->mbox,
$mailboxString, SA_ALL);
$numberOfMessages = $status->messages;
$msgList = "1:$numberOfMessages";
@@ -105,25 +154,51 @@
}
}
- function decode_header2($_charset, $_string)
+ function decodeFolderName($_folderName)
{
- $_string = str_replace('_', ' ', $_string);
- $string = quoted_printable_decode($_string);
- return $string;
+ if($this->mbAvailable)
+ {
+ return mb_convert_encoding( $_folderName,
"ISO_8859-1", "UTF7-IMAP");
+ }
+
+ // if not
+ return imap_utf7_decode($_folderName);
}
function decode_header($string)
{
- /* Decode from qp or base64 form */
- if (preg_match("/\=\?(.*?)\?b\?/i", $string))
+ /* Decode from base64 form */
+ if (preg_match_all("/\=\?(.*?)\?b\?(.*?)\?\=/i",
$string, $matches, PREG_SET_ORDER))
{
- $string = ereg_replace("'", "\'", $string);
- $string =
preg_replace("/\=\?(.*?)\?b\?(.*?)\?\=/ieU","base64_decode('\\2')",$string);
+ for($i=0; $i < count($matches); $i++)
+ {
+ #print "Match
0:".$matches[$i][0]."<br>";
+ #print "Match
1:".$matches[$i][1]."<br>";
+ #print "Match
2:".$matches[$i][2]."<br>";
+ $string =
str_replace($matches[$i][0],base64_decode($matches[$i][2]),$string);
+ }
return $string;
}
- if (preg_match("/\=\?(.*?)\?q\?/i", $string))
+ /* Decode from qouted printable */
+ elseif (preg_match_all("/\=\?(.*?)\?q\?(.*?)\?\=/i",
$string, $matches, PREG_SET_ORDER))
+ {
+ for($i=0; $i < count($matches); $i++)
{
- $string =
preg_replace("/\=\?(.*?)\?q\?(.*?)\?\=/ie","\$this->decode_header2('\\1','\\2')",$string);
+ #print "Match
0:".$matches[$i][0]."<br>";
+ #print "Match
1:".$matches[$i][1]."<br>";
+ #print "Match
2:".$matches[$i][2]."<br>";
+ // replace any _ with " ". You define "
" as " " or "_" in qouted printable
+ $matches[$i][2] = str_replace("_","
",$matches[$i][2]);
+ switch($matches[$i][1])
+ {
+ case 'utf-8':
+ $string =
str_replace($matches[$i][0],utf8_decode(imap_qprint($matches[$i][2])),$string);
+ break;
+ default:
+ $string =
str_replace($matches[$i][0],imap_qprint($matches[$i][2]),$string);
+ break;
+ }
+ }
return $string;
}
return $string;
@@ -137,8 +212,6 @@
$this->sessionData['mailbox']);
reset($_messageUID);
-
- $msglist = false;
while(list($key, $value) = each($_messageUID))
{
if(!empty($msglist)) $msglist .= ",";
@@ -160,7 +233,7 @@
case "move_to_trash":
if(!empty($trashFolder))
{
- if (imap_mail_move
($this->mbox, $msglist, imap_utf7_encode($trashFolder), CP_UID))
+ if (imap_mail_move
($this->mbox, $msglist, $this->encodeFolderName($trashFolder), CP_UID))
{
imap_expunge($this->mbox);
reset($_messageUID);
@@ -192,6 +265,46 @@
}
}
+ function encodeFolderName($_folderName)
+ {
+ if($this->mbAvailable)
+ {
+ return mb_convert_encoding( $_folderName,
"UTF7-IMAP", "ISO_8859-1" );
+ }
+
+ // if not
+ return imap_utf7_encode($_folderName);
+ }
+
+ function encodeHeader($_string, $_encoding="q")
+ {
+ switch($_encoding)
+ {
+ case "q":
+
if(!preg_match("/[\x80-\xFF]/",$_string))
+ {
+ // nothing to quote, only 7 bit
ascii
+ return $_string;
+ }
+
+ $string = imap_8bit($_string);
+ $stringParts = explode("=\r\n",$string);
+ while(list($key,$value) =
each($stringParts))
+ {
+ if(!empty($retString))
$retString .= " ";
+ $value = str_replace("
","_",$value);
+ // imap_8bit does not convert
"?"
+ // it does not need, but it
should
+ $value =
str_replace("?","=3F",$value);
+ $retString .=
"=?ISO-8859-1?Q?".$value."?=";
+ }
+ #exit;
+ return $retString;
+ break;
+ default:
+ return $_string;
+ }
+ }
function flagMessages($_flag, $_messageUID)
{
reset($_messageUID);
@@ -232,21 +345,11 @@
{
// parse message structure
$structure = imap_fetchstructure($this->mbox, $_uid,
FT_UID);
- $this->structure = array();
- $this->parse2($structure);
- $sections = $this->structure;
-
- // look for specified part
- while(list($key,$value) = each($sections))
- {
- #print $value["pid"]." ".$_partID."<br>";
- if($value["pid"] == $_partID)
- {
- $type = $value["type"];
- $encoding = $value["encoding"];
- $filename = $value["name"];
- }
- }
+ $sections = $this->parseMessage($structure);
+
+ $type =
$sections['attachment'][$_partID]["mimeType"];
+ $encoding =
$sections['attachment'][$_partID]["encoding"];
+ $filename =
$sections['attachment'][$_partID]["name"];
$attachment = imap_fetchbody($this->mbox, $_uid,
$_partID, FT_UID);
@@ -275,31 +378,10 @@
);
}
- // this function is based on a on "Building A PHP-Based Mail
Client"
- // http://www.devshed.com
- // iterate through object returned by parse()
- // create a new array holding information only on message
attachments
- function get_attachments($arr)
- {
- $ret = false;
- reset($arr);
- while(list($key,$value) = @each($arr))
- {
- if((isset($value["disposition"]) &&
(strtolower($value["disposition"]) == "attachment" ||
- strtolower($value["disposition"])
== "inline")) ||
- ($value["type"] != "text/plain" &&
substr($value["type"],0,9) != "multipart"))
- {
- $ret[] = $value;
- }
- }
-
- return $ret;
- }
-
function getFolderStatus($_folderName)
{
// now we have the keys as values
- $subscribedFolders =
array_flip($this->getFolderList(true));
+ $subscribedFolders = $this->getFolderList(true);
#print_r($subscribedFolders);
#print $subscribedFolders[$_folderName]." -
$_folderName<br>";
if(isset($subscribedFolders[$_folderName]))
@@ -316,33 +398,56 @@
function getFolderList($_subscribedOnly=false)
{
- $mailboxString = sprintf("{%s:%s}%s",
-
$this->mailPreferences['imapServerAddress'],
- $this->mailPreferences['imapPort'],
- imap_utf7_encode($this->imapBaseDir));
+ $mailboxString =
$this->createMailboxString($this->imapBaseDir);
if($_subscribedOnly == 'true')
{
- $list =
imap_getsubscribed($this->mbox,$mailboxString,"*");
+ $list =
@imap_getsubscribed($this->mbox,$mailboxString,"*");
}
else
{
- $list =
imap_getmailboxes($this->mbox,$mailboxString,"*");
+ $list =
@imap_getmailboxes($this->mbox,$mailboxString,"*");
}
+
if(is_array($list))
{
+ // return always the inbox
+ $folders['INBOX'] = 'INBOX';
reset($list);
while (list($key, $val) = each($list))
{
- $folders[] =
preg_replace("/{.*}/","",$val->name);
- #$folders[] = $val->name;
+ // remove the {host:port/imap/...} part
+ $folderNameIMAP =
$this->decodeFolderName(preg_replace("/{.*}/","",$val->name));
+ $folderParts =
explode(".",$folderNameIMAP);
+ reset($folderParts);
+ $displayName = "";
+ #print_r($folderParts);print"<br>";
+ for($i=0; $i<count($folderParts); $i++)
+ {
+ if($i+1 == count($folderParts))
+ {
+ $displayName .=
$folderParts[$i];
+ }
+ else
+ {
+ $displayName .= ". . ";
+ }
}
- sort($folders,SORT_STRING);
+ $folders["$folderNameIMAP"] =
$displayName;
+ }
+ #exit;
+ ksort($folders,SORT_STRING);
reset($folders);
return $folders;
}
else
{
+ if($_subscribedOnly == 'true' &&
+
is_array(@imap_list($this->mbox,$mailboxString,'INBOX')))
+ {
+ $folders['INBOX'] = 'INBOX';
+ return $folders;
+ }
return false;
}
}
@@ -359,10 +464,7 @@
$bofilter = CreateObject('felamimail.bofilter');
$transformdate =
CreateObject('felamimail.transformdate');
- $mailboxString = sprintf("{%s:%s}%s",
-
$this->mailPreferences['imapServerAddress'],
- $this->mailPreferences['imapPort'],
-
imap_utf7_encode($this->sessionData['mailbox']));
+ $mailboxString =
$this->createMailboxString($this->sessionData['mailbox']);
$status = imap_status ($this->mbox, $mailboxString,
SA_ALL);
$cachedStatus = $caching->getImapStatus();
@@ -381,29 +483,18 @@
// parse structure to see if
attachments exist
// display icon if so
$structure =
imap_fetchstructure($this->mbox, $i);
- $sections = $this->parse($structure);
- $attachments =
$this->get_attachments($sections);
-
- if (isset($header->date))
- {
- $header->date = ereg_replace('
', ' ', $header->date);
- $tmpdate = explode(' ',
trim($header->date));
- }
- else
- {
- $tmpdate = $date =
array("","","","","","");
- }
- $messageData['date'] =
date("Y-m-d H:i:s",$transformdate->getTimeStamp($tmpdate));
+ $sections =
$this->parseMessage($structure);
+ $messageData['date'] =
$header->udate;
$messageData['subject'] =
$header->subject;
- $messageData['to_name'] =
(isset($header->to[0]->personal)?$header->to[0]->personal:'');
+ $messageData['to_name'] =
$header->to[0]->personal;
$messageData['to_address'] =
$header->to[0]->mailbox."@".$header->to[0]->host;
$messageData['sender_name'] =
$header->from[0]->personal;
$messageData['sender_address'] =
$header->from[0]->mailbox."@".$header->from[0]->host;
$messageData['size'] =
$header->Size;
$messageData['attachments'] =
"false";
- if (is_array($attachments))
+ if (is_array($sections['attachment']))
{
$messageData['attachments']
= "true";
}
@@ -433,29 +524,18 @@
// parse structure to see if
attachments exist
// display icon if so
$structure =
imap_fetchstructure($this->mbox, $newHeaders[$i]->msgno);
- $sections = $this->parse($structure);
- $attachments =
$this->get_attachments($sections);
-
- if (isset($header->date))
- {
- $header->date = ereg_replace('
', ' ', $header->date);
- $tmpdate = explode(' ',
trim($header->date));
- }
- else
- {
- $tmpdate = $date =
array("","","","","","");
- }
- $messageData['date'] =
date("Y-m-d H:i:s",$transformdate->getTimeStamp($tmpdate));
+ $sections =
$this->parseMessage($structure);
+ $messageData['date'] =
$header->udate;
$messageData['subject'] =
$header->subject;
- $messageData['to_name'] =
(isset($header->to[0]->personal) ? $header->to[0]->personal:'');
+ $messageData['to_name'] =
$header->to[0]->personal;
$messageData['to_address'] =
$header->to[0]->mailbox."@".$header->to[0]->host;
$messageData['sender_name'] =
$header->from[0]->personal;
$messageData['sender_address'] =
$header->from[0]->mailbox."@".$header->from[0]->host;
$messageData['size'] =
$header->Size;
$messageData['attachments'] =
"false";
- if (is_array($attachments))
+ if (is_array($sections['attachment']))
{
$messageData['attachments']
= "true";
}
@@ -477,7 +557,6 @@
$displayHeaders = $caching->getHeaders();
if (count($displayHeaders) > $status->messages)
{
- $removedMessages = 0;
$messagesToRemove = count($displayHeaders) -
$status->messages;
reset($displayHeaders);
for($i=0; $i<count($displayHeaders); $i++)
@@ -494,7 +573,7 @@
// now lets gets the important messages
$filterList = $bofilter->getFilterList();
- $activeFilter = $this->sessionData['activeFilter'];
+ $activeFilter = $bofilter->getActiveFilter();
$filter = $filterList[$activeFilter];
$displayHeaders = $caching->getHeaders($_startMessage,
$_numberOfMessages, $_sort, $filter);
@@ -502,6 +581,9 @@
for ($i=0;$i<count($displayHeaders);$i++)
{
$header =
imap_fetch_overview($this->mbox,$displayHeaders[$i]['uid'],FT_UID);
+ #print $header[0]->date;print "<br>";
+ #print_r($displayHeaders[$i]);print "<br>";
+ #print_r($header);exit;
#$rawHeader =
imap_fetchheader($this->mbox,$displayHeaders[$i]['uid'],FT_UID);
#$headers =
$this->sofelamimail->fetchheader($rawHeader);
@@ -513,17 +595,8 @@
$retValue['header'][$count]['to_address']
= $this->decode_header($displayHeaders[$i]['to_address']);
$retValue['header'][$count]['attachments']
= $displayHeaders[$i]['attachments'];
$retValue['header'][$count]['size']
= $header[0]->size;
- if (isset($header[0]->date))
- {
- $header[0]->date = ereg_replace(' ', '
', $header[0]->date);
- $tmpdate = explode(' ',
trim($header[0]->date));
- }
- else
- {
- $tmpdate = $date =
array("","","","","","");
- }
- $timestamp =
$transformdate->getTimeStamp($tmpdate);
+ $timestamp = $displayHeaders[$i]['date'];
$timestamp7DaysAgo =
mktime(date("H"), date("i"), date("s"),
date("m"), date("d")-7, date("Y"));
$timestampNow =
@@ -543,6 +616,7 @@
{
$retValue['header'][$count]['date'] =
lang(date("l",$timestamp));
#$retValue['header'][$count]['date'] =
date("Y-m-d H:i:s",$timestamp7DaysAgo)." - ".date("Y-m-d",$timestamp);
+ $retValue['header'][$count]['date'] =
date("H:i:s",$timestamp)."(".lang(date("D",$timestamp)).")";
}
else
{
@@ -575,47 +649,46 @@
}
}
+ function getMailPreferences()
+ {
+ return $this->mailPreferences;
+ }
+
function getMessageAttachments($_uid)
{
$structure = imap_fetchstructure($this->mbox, $_uid,
FT_UID);
- if(sizeof($structure->parts) > 0 &&
is_array($structure->parts))
+ $structure = $this->parseMessage($structure);
+ if(isset($structure['attachment']) &&
is_array($structure['attachment']))
{
- $this->structure = array();
- $this->parse2($structure);
- $sections = $this->structure;
- #$sections = $this->parse($structure);
- return $this->get_attachments($sections);
+ #_debug_array($structure['attachment']);
+ return $structure['attachment'];
}
+
+ return false;
+
}
- function getMessageBody($_uid)
+ function getMessageBody($_uid, $_htmlOptions = '')
{
+ if($_htmlOptions != '')
+ $this->htmlOptions = $_htmlOptions;
+ #'only_if_no_text';
+
$structure = imap_fetchstructure($this->mbox, $_uid,
FT_UID);
- if(sizeof($structure->parts) > 0 &&
is_array($structure->parts))
- {
- #print
"<pre>";print_r($structure);print"</pre>";
- $this->structure = array();
- $this->parse2($structure);
- $sections = $this->structure;
- #print
"<hr><pre>";print_r($this->structure);print"</pre>";
- }
+ $sections = $this->parseMessage($structure);
- if(is_array($sections))
+ if(is_array($sections['body']) &&
!isset($sections['body']['0']))
{
- reset($sections);
- while(list($key,$value) = each($sections))
- #for($x=0; $x<sizeof($sections); $x++)
+ reset($sections['body']);
+ while(list($key,$value) =
each($sections['body']))
{
unset($newPart);
- if(($value["type"] == "text/plain" ||
- $value["type"] ==
"message/rfc822") &&
- (!isset($value["disposition"])
|| strtolower($value["disposition"]) != "attachment"))
- {
- $newPart =
stripslashes(trim(imap_fetchbody($this->mbox, $_uid, $value["pid"], FT_UID)));
- }
+ #if(($value["mimeType"] ==
$wantedMimeType ))
+ #{
+ #$newPart =
stripslashes(trim(imap_fetchbody($this->mbox, $_uid, $value["partID"],
FT_UID)));
+ $newPart =
imap_fetchbody($this->mbox, $_uid, $value["partID"], FT_UID);
- if(isset($newPart))
- {
+ #print $value['charset']."<br>";
switch ($value['encoding'])
{
case ENCBASE64:
@@ -624,43 +697,70 @@
break;
case ENCQUOTEDPRINTABLE:
// use imap_qprint to
decode
+
switch(strtolower($value['charset']))
+ {
+ case
'utf-8':
+
$newPart = utf8_decode(imap_qprint($newPart));
+
break;
+ default:
$newPart =
imap_qprint($newPart);
break;
+ }
+ break;
case ENCOTHER:
// not sure if this
needs decoding at all
break;
default:
// it is either not
encoded or we don't know about it
}
- $bodyPart[] = $newPart;
- }
+
+ $bodyPart[] = array('body' =>
$newPart,
+ 'mimeType'
=> $value['mimeType']);
+ #}
}
}
else
{
- $newPart =
stripslashes(trim(imap_body($this->mbox, $_uid, FT_UID)));
+ #print imap_body($this->mbox, $_uid, FT_UID);
+ #_debug_array($structure);
switch ($structure->encoding)
{
case ENCBASE64:
// use imap_base64 to decode
+ $newPart =
stripslashes(trim(imap_body($this->mbox, $_uid, FT_UID)));
$newPart =
imap_base64($newPart);
break;
case ENCQUOTEDPRINTABLE:
// use imap_qprint to decode
- $newPart =
imap_qprint($newPart);
+ $newPart =
imap_body($this->mbox, $_uid, FT_UID);
+ $newPart =
quoted_printable_decode($newPart);
break;
case ENCOTHER:
+ $newPart =
stripslashes(trim(imap_body($this->mbox, $_uid, FT_UID)));
// not sure if this needs
decoding at all
break;
default:
+ $newPart =
stripslashes(trim(imap_body($this->mbox, $_uid, FT_UID)));
+ $newPart =
imap_body($this->mbox, $_uid, FT_UID);
// it is either not encoded or
we don't know about it
}
- $bodyPart[] = $newPart;
+ if(strtolower($structure->subtype) == 'html')
+ {
+ $mimeType = 'text/html';
+ }
+ else
+ {
+ $mimeType = 'text/plain';
+ }
+
+ $bodyPart[] = array('body' => $newPart,
+ 'mimeType' => $mimeType);
}
return $bodyPart;
}
+
function getMessageHeader($_uid)
{
$msgno = imap_msgno($this->mbox, $_uid);
@@ -677,6 +777,94 @@
return imap_fetchstructure($this->mbox, $_uid, FT_UID);
}
+ // return the qouta of the users INBOX
+ function getQuotaRoot()
+ {
+ if(is_array($this->storageQuota))
+ {
+ return $this->storageQuota;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ function imap_createmailbox($_folderName, $_subscribe = False)
+ {
+ $mailboxString =
$this->createMailboxString($_folderName);
+
+ $result =
@imap_createmailbox($this->mbox,$mailboxString);
+
+ if($_subscribe)
+ {
+ return
@imap_subscribe($this->mbox,$mailboxString);
+ }
+
+ return $result;
+ }
+
+ function imap_deletemailbox($_folderName)
+ {
+ $mailboxString =
$this->createMailboxString($_folderName);
+
+ $result = imap_deletemailbox($this->mbox,
$mailboxString);
+
+ #print imap_last_error();
+
+ return $result;
+ }
+
+ function imapGetQuota($_username)
+ {
+ $quota_value = @imap_get_quota($this->mbox,
"user.".$_username);
+
+ if(is_array($quota_value) && count($quota_value) > 0)
+ {
+ return array('limit' =>
$quota_value['limit']/1024);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ function imap_get_quotaroot($_folderName)
+ {
+ return @imap_get_quotaroot($this->mbox, $_folderName);
+ }
+
+ function imap_renamemailbox($_oldMailboxName, $_newMailboxName)
+ {
+ if(strcasecmp("inbox",$_oldMailboxName) == 0 ||
strcasecmp("inbox",$_newMailboxName) == 0)
+ {
+ return False;
+ }
+
+ $oldMailboxName =
$this->createMailboxString($_oldMailboxName);
+ $newMailboxName =
$this->createMailboxString($_newMailboxName);
+
+ $result =
@imap_renamemailbox($this->mbox,$oldMailboxName, $newMailboxName);
+
+ #print imap_last_error();
+
+ return $result;
+ }
+
+ function imapSetQuota($_username, $_quotaLimit)
+ {
+ if(is_numeric($_quotaLimit) && $_quotaLimit >= 0)
+ {
+ // enable quota
+ $quota_value = imap_set_quota($this->mbox,
"user.".$_username, $_quotaLimit*1024);
+ }
+ else
+ {
+ // disable quota
+ $quota_value = imap_set_quota($this->mbox,
"user.".$_username, -1);
+ }
+ }
+
function moveMessages($_foldername, $_messageUID)
{
$caching = CreateObject('felamimail.bocaching',
@@ -693,9 +881,9 @@
}
#print $msglist."<br>";
- #print "destination folder:
".imap_utf7_encode($_foldername)."<br>";
+ #print "destination folder($_folderName):
".$this->encodeFolderName($_foldername)."<br>";
- if (imap_mail_move ($this->mbox, $msglist,
imap_utf7_encode($_foldername), CP_UID))
+ if (imap_mail_move ($this->mbox, $msglist,
$this->encodeFolderName($_foldername), CP_UID))
{
#print "allet ok<br>";
if($deleteOptions != "mark_as_deleted")
@@ -715,342 +903,299 @@
}
- function openConnection($_folderName='',$_options=0)
- {
- switch($this->mailPreferences['imap_server_type'])
+ function openConnection($_folderName='', $_options=0,
$_adminConnection=false)
{
- case "imap":
- $mailboxString = sprintf("{%s:%s}%s",
-
$this->mailPreferences['imapServerAddress'],
-
$this->mailPreferences['imapPort'],
-
imap_utf7_encode($this->sessionData['mailbox']));
- break;
- case "imaps-encr-only":
- $mailboxString =
sprintf("{%s:%s/ssl/novalidate-cert}%s",
-
$this->mailPreferences['imapServerAddress'],
-
$this->mailPreferences['imapPort'],
-
imap_utf7_encode($this->sessionData['mailbox']));
- break;
-
- case "imaps-encr-auth":
- $mailboxString =
sprintf("{%s:%s/ssl}%s",
-
$this->mailPreferences['imapServerAddress'],
-
$this->mailPreferences['imapPort'],
-
imap_utf7_encode($this->sessionData['mailbox']));
- break;
- }
-
- if(!function_exists('imap_open'))
+ if($_folderName == '')
{
- echo '<b> You need imap-support to use
felamimail</b>';
+ $_folderName = $this->sessionData['mailbox'];
}
- if(!$this->mbox = @imap_open ($mailboxString,
- $this->mailPreferences['username'],
$this->mailPreferences['key'], $_options))
+ if($_adminConnection)
{
- return imap_last_error();
+ $config =
CreateObject('phpgwapi.config','qmailldap');
+ $config->read_repository();
+ $qmailldapConfig = $config->config_data;
+
+ $folderName = '';
+ $username =
$qmailldapConfig['imapAdminUser'];
+ $password =
$qmailldapConfig['imapAdminPassword'];
+ $options = '';
}
else
{
- return True;
- }
-
+ $folderName = $_folderName;
+ $username =
$this->mailPreferences['username'];
+ $password = $this->mailPreferences['key'];
+ $options = $_options;
}
- // this function is based on a on "Building A PHP-Based Mail
Client"
- // http://www.devshed.com
- function parse($structure)
- {
- // create an array to hold message sections
- $ret = array();
-
- // split structure into parts
- $parts = (isset($structure->parts) ? $structure->parts
:'');
+ $mailboxString =
$this->createMailboxString($_folderName);
- for($x=0; $x<sizeof($parts); $x++)
+ if(!$this->mbox = @imap_open ($mailboxString,
$username, $password, $options))
{
- $ret[$x]["pid"] = ($x+1);
-
- $part = $parts[$x];
-
- // default to text
- if ($part->type == "") { $part->type = 0; }
-
- $ret[$x]["type"] = $this->type[$part->type] .
"/" . strtolower($part->subtype);
-
- // default to 7bit
- if ($part->encoding == "") { $part->encoding =
0; }
- $ret[$x]["encoding"] =
$this->encoding[$part->encoding];
- $ret[$x]["Encoding"] = $part->encoding;
-
- $ret[$x]["size"] = strtolower($part->bytes);
-
- $ret[$x]["disposition"] =
strtolower((isset($part->disposition)?$part->disposition:''));
-
- if (isset($part->disposition) &&
strtolower($part->disposition) == "attachment")
+ return imap_last_error();
+ }
+ else
{
-
- $params = $part->dparameters;
- foreach ($params as $p)
+ // get the quota for this mailboxbox
+ if (function_exists('imap_get_quotaroot'))
{
- if($p->attribute == "FILENAME")
+ $quota =
@imap_get_quotaroot($this->mbox, $_folderName);
+ if(is_array($quota['STORAGE']))
{
- $ret[$x]["name"] =
$p->value;
- break;
- }
+ $storage = $this->storageQuota
= $quota['STORAGE'];
}
}
+ return True;
}
- return $ret;
}
-
- // this function is based on
- //
http://www.bitsense.com/PHPNotes/IMAP/imap_fetchstructure.asp/
- function parse2($this_part,$part_no="")
- {
- if ($this_part->ifdisposition &&
strtolower($this_part->disposition) == "attachment")
+ function parseMessage($_structure, $_partID = '')
{
- // See if it has a disposition
- // The only thing I know of that this
- // would be used for would be an
attachment
- // Lets check anyway
- if (strtolower($this_part->disposition)
== "attachment" ||
-
strtolower($this_part->disposition) == "inline" )
- {
-
$this->structure[$part_no]['encoding'] = $this_part->encoding;
-
$this->structure[$part_no]['size'] = $this_part->bytes;
-
$this->structure[$part_no]['disposition'] = $this_part->disposition;
-
$this->structure[$part_no]['pid'] = $part_no;
-
$this->structure[$part_no]["type"] = $mime_type."/".
strtolower($this_part->subtype);
- // If it is an attachment, then
we let people download it
- // First see if they sent a
filename
- $att_name = lang("unknown");
- if($this_part->ifparameters)
+ #if ($_partID == '') _debug_array($_structure);
+
+ switch ($_structure->type)
{
- for ($lcv = 0; $lcv <
count($this_part->parameters); $lcv++)
+ case TYPETEXT:
+ #print "found text $_partID<br>";
+ $mime_type = "text";
+ $data['encoding'] =
$_structure->encoding;
+ $data['size'] =
$_structure->bytes;
+ $data['partID'] = $_partID;
+ $data["mimeType"] =
$mime_type."/". strtolower($_structure->subtype);
+ $data["name"] =
lang("unknown");
+ for ($lcv = 0; $lcv <
count($_structure->parameters); $lcv++)
{
- $param =
$this_part->parameters[$lcv];
- if
(strtolower($param->attribute) == "name")
+ $param =
$_structure->parameters[$lcv];
+
switch(strtolower($param->attribute))
{
-
$this->structure[$part_no]["name"] = $param->value;
+ case 'name':
+ $data["name"] =
$param->value;
break;
- }
- }
- }
- if($this_part->ifdparameters)
- {
- for ($lcv = 0; $lcv <
count($this_part->dparameters); $lcv++)
- {
- $param =
$this_part->dparameters[$lcv];
- if
(strtolower($param->attribute) == "filename")
- {
-
$this->structure[$part_no]["name"] = $param->value;
+ case 'charset':
+
$data["charset"] = $param->value;
break;
}
+
}
+
+ // set this to zero, when we have a
plaintext message
+ // if partID[0] is set, we have no
attachments
+ if($_partID == '') $_partID = '0';
+
+ if
(strtolower($_structure->disposition) == "attachment" ||
+ $data["name"] !=
lang("unknown"))
+ {
+ #print "found a attachment<br>";
+ // must be a attachment
+
$retData['attachment'][$_partID] = $data;
}
- // You could give a link to
download the attachment here....
- switch ($this_part->type)
+ else
{
- case TYPETEXT:
- $mime_type =
"text";
+ #print "found a body part
$_partID<br>";
+ // must be a body part
+ $retData['body']["$_partID"] =
$data;
+
$retData['body']["$_partID"]['name'] = lang('body part')." $_partID";
+ }
+ #print "<hr>";
+ #_debug_array($retData);
+ #print "<hr>";
break;
+
case TYPEMULTIPART:
- $mime_type =
"multipart";
- break;
- case TYPEMESSAGE:
- $mime_type =
"message";
- break;
- case TYPEAPPLICATION:
- $mime_type =
"application";
- break;
- case TYPEAUDIO:
- $mime_type =
"audio";
- break;
- case TYPEIMAGE:
- $mime_type =
"image";
- break;
- case TYPEVIDEO:
- $mime_type =
"video";
- break;
- case TYPEMODEL:
- $mime_type =
"model";
+ #print "found multipart $_partID<br>";
+ // lets cycle trough all parts
+ if($_partID != '') $_partID .= '.';
+ $lastPartID = 0;
+ for($i = 0; $i <
count($_structure->parts); $i++)
+ {
+
+ $structureData =
$this->parseMessage($_structure->parts[$i], $_partID.($i+1));
+
if(is_array($structureData['body']))
+ {
+
reset($structureData['body']);
+
while(list($partID,$partData) = each($structureData['body']))
+ {
+
if(strtolower($_structure->subtype) == 'alternative')
+ {
+
switch($this->htmlOptions)
+ {
+
case 'always_display':
+
$allowedMimeType =
+
array('text/plain' => 1,
+
'text/html' => 1);
+
$orderOfMimeType =
+
array('text/html' => 2,
+
'text/plain' => 1);
+
break;
+
+
case 'only_if_no_text':
+
$allowedMimeType =
+
array('text/plain' => 1,
+
'text/html' => 1);
+
$orderOfMimeType =
+
array('text/plain' => 2,
+
'text/html' => 1);
break;
+
default:
- $mime_type =
"unknown";
- // hmmm....
+
$allowedMimeType =
+
array("text/plain" => 1);
+
$orderOfMimeType =
+
array("text/plain" => 1);
+
break;
+ }
+ // add
only allowed mime types to the list
+
if($allowedMimeType[$partData['mimeType']])
+ {
+
// now let only the prefered part one survive
+
#print $orderOfMimeType[$partData['mimeType']]."<br>".
+
#$partData['mimeType']."<br>".
+
#$lastPartID."<br>";
+
if($orderOfMimeType[$partData['mimeType']] > $lastPartID)
+
{
+
unset($retData['body'][$lastPartID]);
+
$retData['body'][$partID] = $partData;
+
$lastPartID = $partID;
+
}
}
-
$this->structure[$part_no]["type"] = $mime_type."/".
strtolower($this_part->subtype);
}
else
{
- // disposition can also be used
for images in HTML (Inline)
+
$retData['body'][$partID] = $partData;
}
}
- else
- {
- // Not an attachment, lets see what
this part is...
- #print "Type: ".$this_part->type."<br>";
- switch ($this_part->type)
- {
- case TYPETEXT:
- $mime_type = "text";
-
$this->structure[$part_no]['encoding'] = $this_part->encoding;
-
$this->structure[$part_no]['size'] = $this_part->bytes;
-
$this->structure[$part_no]['pid'] = $part_no;
-
$this->structure[$part_no]["type"] = $mime_type."/".
strtolower($this_part->subtype);
-
$this->structure[$part_no]["name"] = lang("unknown");
- for ($lcv = 0; $lcv <
count($this_part->parameters); $lcv++)
+ }
+
if(is_array($structureData['attachment']))
{
- $param =
$this_part->parameters[$lcv];
- if
(strtolower($param->attribute) == "name")
+
reset($structureData['attachment']);
+
while(list($partID,$partData) = each($structureData['attachment']))
{
-
$this->structure[$part_no]["name"] = $param->value;
- break;
+
$retData['attachment'][$partID] = $partData;
}
}
- break;
-
- case TYPEMULTIPART:
- $mime_type =
"multipart";
- #print "found
$mime_type<br>";
- // Hey, why not use
this function to deal with all the parts
- // of this multipart
part :)
- for ($i = 0; $i <
count($this_part->parts); $i++)
- {
- if ($part_no !=
"")
- {
-
$part_no = $part_no.".";
- }
-
$this->structure[$part_no.($i + 1)]['encoding'] = $this_part->encoding;
-
$this->structure[$part_no.($i + 1)]['size'] =
(isset($this_part->bytes)?$this_part->bytes:'');
-
$this->structure[$part_no.($i + 1)]['pid'] = $part_no.($i + 1);
-
$this->structure[$part_no.($i + 1)]["type"] = $mime_type."/".
strtolower($this_part->subtype);
- for ($i = 0; $i
< count($this_part->parts); $i++)
- {
-
$this->parse2($this_part->parts[$i], $part_no.($i + 1));
- }
}
break;
+
case TYPEMESSAGE:
+ #print "found message $_partID<br>";
$mime_type = "message";
-
$this->structure[$part_no]['encoding'] = $this_part->encoding;
-
$this->structure[$part_no]['size'] = $this_part->bytes;
-
$this->structure[$part_no]['pid'] = $part_no;
-
$this->structure[$part_no]["type"] = $mime_type."/".
strtolower($this_part->subtype);
- $att_name = "unknown";
- for ($lcv = 0; $lcv <
count($this_part->parameters); $lcv++)
- {
- $param =
$this_part->parameters[$lcv];
- if
($param->attribute == "NAME" ||
-
$param->attribute == "name")
+
$retData['attachment'][$_partID]['encoding'] = $_structure->encoding;
+
$retData['attachment'][$_partID]['size'] = $_structure->bytes;
+
$retData['attachment'][$_partID]['partID'] = $_partID;
+
$retData['attachment'][$_partID]["mimeType"] = $mime_type."/".
strtolower($_structure->subtype);
+
$retData['attachment'][$_partID]["name"] = lang("unknown");
+ if(!empty($_structure->description))
{
-
$this->structure[$part_no]["name"] = $param->value;
- break;
- }
+
$retData['attachment'][$_partID]["name"] = lang($_structure->description);
}
break;
+
case TYPEAPPLICATION:
$mime_type =
"application";
-
$this->structure[$part_no]['encoding'] = $this_part->encoding;
-
$this->structure[$part_no]['size'] = $this_part->bytes;
-
$this->structure[$part_no]['pid'] = $part_no;
-
$this->structure[$part_no]["type"] = $mime_type."/".
strtolower($this_part->subtype);
- $att_name = "unknown";
- for ($lcv = 0; $lcv <
count($this_part->parameters); $lcv++)
- {
- $param =
$this_part->parameters[$lcv];
- if
($param->attribute == "NAME" ||
-
$param->attribute == "name")
+
$retData['attachment'][$_partID]['encoding'] = $_structure->encoding;
+
$retData['attachment'][$_partID]['size'] = $_structure->bytes;
+
$retData['attachment'][$_partID]['partID'] = $_partID;
+
$retData['attachment'][$_partID]["mimeType"] = $mime_type."/".
strtolower($_structure->subtype);
+
$retData['attachment'][$_partID]["name"] = lang("unknown");
+ for ($lcv = 0; $lcv <
count($_structure->dparameters); $lcv++)
+ {
+ $param =
$_structure->dparameters[$lcv];
+
switch(strtolower($param->attribute))
{
-
$this->structure[$part_no]["name"] = $param->value;
+ case 'filename':
+
$retData['attachment'][$_partID]["name"] = $param->value;
break;
}
}
break;
+
case TYPEAUDIO:
$mime_type = "audio";
-
$this->structure[$part_no]['encoding'] = $this_part->encoding;
-
$this->structure[$part_no]['size'] = $this_part->bytes;
-
$this->structure[$part_no]['pid'] = $part_no;
-
$this->structure[$part_no]["type"] = $mime_type."/".
strtolower($this_part->subtype);
- $att_name = "unknown";
- for ($lcv = 0; $lcv <
count($this_part->parameters); $lcv++)
- {
- $param =
$this_part->parameters[$lcv];
- if
($param->attribute == "NAME" ||
-
$param->attribute == "name")
+
$retData['attachment'][$_partID]['encoding'] = $_structure->encoding;
+
$retData['attachment'][$_partID]['size'] = $_structure->bytes;
+
$retData['attachment'][$_partID]['partID'] = $_partID;
+
$retData['attachment'][$_partID]["mimeType"] = $mime_type."/".
strtolower($_structure->subtype);
+
$retData['attachment'][$_partID]["name"] = lang("unknown");
+ for ($lcv = 0; $lcv <
count($_structure->dparameters); $lcv++)
+ {
+ $param =
$_structure->dparameters[$lcv];
+
switch(strtolower($param->attribute))
{
-
$this->structure[$part_no]["name"] = $param->value;
+ case 'filename':
+
$retData['attachment'][$_partID]["name"] = $param->value;
break;
}
}
break;
+
case TYPEIMAGE:
+ #print "found image $_partID<br>";
$mime_type = "image";
-
$this->structure[$part_no]['encoding'] = $this_part->encoding;
-
$this->structure[$part_no]['size'] = $this_part->bytes;
-
$this->structure[$part_no]['pid'] = $part_no;
-
$this->structure[$part_no]["type"] = $mime_type."/".
strtolower($this_part->subtype);
- $att_name = "unknown";
- for ($lcv = 0; $lcv <
count($this_part->parameters); $lcv++)
- {
- $param =
$this_part->parameters[$lcv];
- if
($param->attribute == "NAME" ||
-
$param->attribute == "name")
+
$retData['attachment'][$_partID]['encoding'] = $_structure->encoding;
+
$retData['attachment'][$_partID]['size'] = $_structure->bytes;
+
$retData['attachment'][$_partID]['partID'] = $_partID;
+
$retData['attachment'][$_partID]["mimeType"] = $mime_type."/".
strtolower($_structure->subtype);
+
$retData['attachment'][$_partID]["name"] = lang("unknown");
+ for ($lcv = 0; $lcv <
count($_structure->dparameters); $lcv++)
+ {
+ $param =
$_structure->dparameters[$lcv];
+
switch(strtolower($param->attribute))
{
-
$this->structure[$part_no]["name"] = $param->value;
+ case 'filename':
+
$retData['attachment'][$_partID]["name"] = $param->value;
break;
}
}
break;
+
case TYPEVIDEO:
$mime_type = "video";
-
$this->structure[$part_no]['encoding'] = $this_part->encoding;
-
$this->structure[$part_no]['size'] = $this_part->bytes;
-
$this->structure[$part_no]['pid'] = $part_no;
-
$this->structure[$part_no]["type"] = $mime_type."/".
strtolower($this_part->subtype);
- $att_name = "unknown";
- for ($lcv = 0; $lcv <
count($this_part->parameters); $lcv++)
- {
- $param =
$this_part->parameters[$lcv];
- if
($param->attribute == "NAME" ||
-
$param->attribute == "name")
+
$retData['attachment'][$_partID]['encoding'] = $_structure->encoding;
+
$retData['attachment'][$_partID]['size'] = $_structure->bytes;
+
$retData['attachment'][$_partID]['partID'] = $_partID;
+
$retData['attachment'][$_partID]["mimeType"] = $mime_type."/".
strtolower($_structure->subtype);
+
$retData['attachment'][$_partID]["name"] = lang("unknown");
+ for ($lcv = 0; $lcv <
count($_structure->dparameters); $lcv++)
{
-
$this->structure[$part_no]["name"] = $param->value;
+ $param =
$_structure->dparameters[$lcv];
+
switch(strtolower($param->attribute))
+ {
+ case 'filename':
+
$retData['attachment'][$_partID]["name"] = $param->value;
break;
}
}
break;
+
case TYPEMODEL:
$mime_type = "model";
- break;
- default:
- $mime_type = "unknown";
- // hmmm....
- }
- $full_mime_type =
$mime_type."/".$this_part->subtype;
-
- // Decide what you what to do with this
part
- // If you want to show it, figure out
the encoding and echo away
- switch ($this_part->encoding)
+
$retData['attachment'][$_partID]['encoding'] = $_structure->encoding;
+
$retData['attachment'][$_partID]['size'] = $_structure->bytes;
+
$retData['attachment'][$_partID]['partID'] = $_partID;
+
$retData['attachment'][$_partID]["mimeType"] = $mime_type."/".
strtolower($_structure->subtype);
+
$retData['attachment'][$_partID]["name"] = lang("unknown");
+ for ($lcv = 0; $lcv <
count($_structure->dparameters); $lcv++)
{
- case ENCBASE64:
- // use imap_base64 to
decode
- break;
- case ENCQUOTEDPRINTABLE:
- // use imap_qprint to
decode
+ $param =
$_structure->dparameters[$lcv];
+
switch(strtolower($param->attribute))
+ {
+ case 'filename':
+
$retData['attachment'][$_partID]["name"] = $param->value;
break;
- case ENCOTHER:
- // not sure if this
needs decoding at all
+ }
+ }
break;
+
default:
- // it is either not
encoded or we don't know about it
- }
+ break;
}
+
+ #if ($_partID == '') _debug_array($retData);
+
+ return $retData;
}
function restoreSessionData()
@@ -1085,7 +1230,7 @@
#$this->mailPreferences['imapServerAddress']
#$this->mailPreferences['imapPort'],
- $folderName = imap_utf7_encode($_folderName);
+ $folderName = $this->encodeFolderName($_folderName);
$folderName =
"{".$this->mailPreferences['imapServerAddress'].":".$this->mailPreferences['imapPort']."}".$folderName;
if($_status == 'unsubscribe')
Index: inc/class.bofilter.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofilter.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/class.bofilter.inc.php 16 Dec 2006 21:52:00 -0000 1.3
+++ inc/class.bofilter.inc.php 18 Dec 2006 20:03:32 -0000 1.4
@@ -11,13 +11,13 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bofilter.inc.php,v 1.3 2006/12/16 21:52:00 sigurdne Exp $
*/
+ /* $Id: class.bofilter.inc.php,v 1.4 2006/12/18 20:03:32 sigurdne Exp $
*/
class bofilter
{
var $public_functions = array
(
- 'updateImapStatus' => True,
+ 'getActiveFilter' => True,
'flagMessages' => True
);
@@ -27,10 +27,20 @@
$this->bopreferences =
CreateObject('felamimail.bopreferences');
$this->sofelamimail =
CreateObject('felamimail.sofelamimail');
+ $this->sofilter =
CreateObject('felamimail.sofilter');
$this->mailPreferences =
$this->bopreferences->getPreferences();
+ $this->sessionData['activeFilter'] = "-1";
$this->restoreSessionData();
+
+ if(!is_array($this->sessionData['filter']))
+ {
+ $this->sessionData['filter'][0]['filterName'] =
lang('Quicksearch');
+ $this->saveSessionData();
+ }
+ if(!isset($this->sessionData['activeFilter']))
+ $this->sessionData['activeFilter'] = "-1";
}
function deleteFilter($_filterID)
@@ -39,14 +49,52 @@
$this->saveSessionData();
}
+ function getActiveFilter()
+ {
+ return $this->sessionData['activeFilter'];
+ }
+
function getFilterList()
{
- return
(isset($this->sessionData['filter'])?$this->sessionData['filter']:false);
+ return $this->sessionData['filter'];
}
function restoreSessionData()
{
- $this->sessionData =
$GLOBALS['phpgw']->session->appsession('session_data');
+ $arrayFunctions =
CreateObject('phpgwapi.arrayfunctions');
+
+ $this->sessionData =
$GLOBALS['phpgw']->session->appsession('filter_session_data');
+
+ // sort the filter list
+ $unsortedFilter = $this->sofilter->restoreFilter();
+
+ // save the quicksearchfilter
+ // must always have id=0
+ if(is_array($unsortedFilter[0]))
+ {
+ $quickSearchFilter[0] = $unsortedFilter[0];
+ unset($unsortedFilter[0]);
+ }
+ // or create the array
+ else
+ {
+ $quickSearchFilter[0] = array('filterName' =>
lang('quicksearch'));
+ }
+
+ // _debug_array($this->sessionData['filter']);
+ // the first one is always the quicksearch filter
+ if(count($unsortedFilter) > 0)
+ {
+ $sortedFilter =
$arrayFunctions->arfsort($unsortedFilter, array('filterName'));
+ $sortedFilter = array_merge($quickSearchFilter,
$sortedFilter);
+ }
+ else
+ {
+ $sortedFilter = $quickSearchFilter;
+ }
+ #_debug_array($sortedFilter);
+
+ $this->sessionData['filter'] = $sortedFilter;
}
function saveFilter($_formData, $_filterID='')
@@ -59,11 +107,17 @@
$data['to'] = $_formData['to'];
if(!empty($_formData['subject']))
$data['subject']= $_formData['subject'];
- if(isset($_formData['filterActive']) &&
$_formData['filterActive'] == "true")
+ if($_formData['filterActive'] == "true")
{
$data['filterActive']= "true";
}
+ if(!is_array($this->sessionData['filter']))
+ {
+ print "<font color=\"red\">reset
array</font><br>";
+ $this->sessionData['filter'] = array();
+ }
+
if($_filterID == '')
{
$this->sessionData['filter'][] = $data;
@@ -72,24 +126,49 @@
{
$this->sessionData['filter'][$_filterID] =
$data;
}
+
$this->saveSessionData();
+
+
$this->sofilter->saveFilter($this->sessionData['filter']);
}
+
function saveSessionData()
{
-
$GLOBALS['phpgw']->session->appsession('session_data','',$this->sessionData);
+
$GLOBALS['phpgw']->session->appsession('filter_session_data','',$this->sessionData);
}
- function toggleFilter()
+ function setActiveFilter($_filter)
{
- if($this->sessionData['filter']['filterActive'] ==
'true')
+ $this->sessionData['activeFilter'] = "$_filter";
+ $this->saveSessionData();
+ }
+
+ function updateFilter($_data)
+ {
+ $filter = $this->getFilterList();
+ $activeFilter = $this->getActiveFilter();
+
+ // check for new quickfilter
+ if($activeFilter == $_data['filter'] &&
isset($_data['quickSearch']))
{
- $this->sessionData['filter']['filterActive'] =
'false';
+ #print " new Quickfilter
$_quickSearch<br>";
+ if($_data['quickSearch'] == '')
+ {
+ $this->setActiveFilter("-1");
}
else
{
- $this->sessionData['filter']['filterActive'] =
'true';
+ $this->setActiveFilter("0");
+ $data['filterName'] =
lang('Quicksearch');
+ $data['subject'] =
$_data['quickSearch'];
+ $data['from'] =
$_data['quickSearch'];
+ $this->saveFilter($data, '0');
+ }
+ }
+ else
+ {
+ $this->setActiveFilter($_data['filter']);
}
- $this->saveSessionData();
}
}
Index: inc/class.bopreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.bopreferences.inc.php 16 Dec 2006 21:52:00 -0000 1.6
+++ inc/class.bopreferences.inc.php 18 Dec 2006 20:03:32 -0000 1.7
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bopreferences.inc.php,v 1.6 2006/12/16 21:52:00 sigurdne
Exp $ */
+ /* $Id: class.bopreferences.inc.php,v 1.7 2006/12/18 20:03:32 sigurdne
Exp $ */
class bopreferences
{
@@ -23,7 +23,6 @@
function bopreferences()
{
- #$this->bocompose =
CreateObject('felamimail.bocompose');
}
function getPreferences()
@@ -44,32 +43,27 @@
$config = CreateObject('phpgwapi.config','felamimail');
$config->read_repository();
$felamimailConfig = $config->config_data;
+ #_debug_array($felamimailConfig);
unset($config);
- #_debug_array($felamimailConfig);
+ $felamimailUserPrefs =
$GLOBALS['phpgw_info']['user']['preferences']['felamimail'];
+
+ #_debug_array($GLOBALS['phpgw_info']['user']);
#print "<hr>";
// set values to the global values
$data['imapServerAddress'] =
$GLOBALS['phpgw_info']['server']['mail_server'];
$data['key'] =
$GLOBALS['phpgw_info']['user']['passwd'];
+ if ($felamimailConfig["mailLoginType"] == 'vmailmgr')
+ $data['username'] =
$GLOBALS['phpgw_info']['user']['userid']."@".$felamimailConfig["mailSuffix"];
+ else
$data['username'] =
$GLOBALS['phpgw_info']['user']['userid'];
- $data['imap_server_type'] =
(isset($felamimailConfig['imapServerMode'])?strtolower($felamimailConfig['imapServerMode']):'');
+ $data['imap_server_type'] =
strtolower($felamimailConfig["imapServerMode"]);
$data['realname'] =
$GLOBALS['phpgw_info']['user']['fullname'];
$data['defaultDomainname'] =
$GLOBALS['phpgw_info']["server"]["mail_suffix"];
- $data['smtpServerAddress'] =
$GLOBALS['phpgw_info']['server']['smtp_server'];
- $data['smtpPort'] =
(isset($GLOBALS['phpgw_info']['server']['smtp_port'])?$GLOBALS['phpgw_info']['server']['smtp_port']:'');
-
- switch($data['imap_server_type'])
- {
- case "imaps-encr-only":
- case "imaps-encr-auth":
- $data['imapPort'] = 993;
- break;
- default:
- $data['imapPort'] = 143;
- break;
- }
+ $data['smtpServerAddress'] =
$GLOBALS['phpgw_info']["server"]["smtp_server"];
+ $data['smtpPort'] =
$GLOBALS['phpgw_info']["server"]["smtp_port"];
// check for felamimail specific settings
if(!empty($felamimailConfig['imapServer']))
@@ -84,7 +78,11 @@
if(!empty($felamimailConfig['mailSuffix']))
$data['defaultDomainname'] =
$felamimailConfig['mailSuffix'];
+ if(!empty($felamimailConfig['organizationName']))
+ $data['organizationName'] =
$felamimailConfig['organizationName'];
+
$data['emailAddress'] =
$data['username']."@".$data['defaultDomainname'];
+ $data['smtpAuth'] =
$felamimailConfig['smtpAuth'];
if($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')
{
@@ -114,51 +112,70 @@
}
// check for user specific settings
- if
($GLOBALS['phpgw_info']['user']['preferences']['email']['use_custom_settings']
== 'True')
+ #_debug_array($felamimailUserPrefs);
+ if ($felamimailConfig['userDefinedAccounts'] == 'yes' &&
+ $felamimailUserPrefs['use_custom_settings'] ==
'yes')
{
-
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['userid']))
- $data['username'] =
$GLOBALS['phpgw_info']['user']['preferences']['email']['userid'];
+ if(!empty($felamimailUserPrefs['username']))
+ $data['username'] =
$felamimailUserPrefs['username'];
-
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['passwd']))
- $data['key'] =
$GLOBALS['phpgw_info']['user']['preferences']['email']['passwd'];
+ if(!empty($felamimailUserPrefs['key']))
+ $data['key'] =
$felamimailUserPrefs['key'];
-
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['address']))
- $data['emailAddress'] =
$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
+ if(!empty($felamimailUserPrefs['emailAddress']))
+ $data['emailAddress'] =
$felamimailUserPrefs['emailAddress'];
-
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server']))
- $data['imapServerAddress'] =
$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server'];
+
if(!empty($felamimailUserPrefs['imapServerAddress']))
+ $data['imapServerAddress'] =
$felamimailUserPrefs['imapServerAddress'];
-
if(!empty($GLOBALS['phpgw_info']['user']['preferences']['email']['imap_server_type']))
- $data['imap_server_type'] =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type']);
+
if(!empty($felamimailUserPrefs['imap_server_type']))
+ $data['imap_server_type'] =
strtolower($felamimailUserPrefs['imap_server_type']);
}
- // preferences
- $data['deleteOptions'] =
(isset($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['deleteOptions'])?$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['deleteOptions']:'');
- if(empty($data['deleteOptions']))
+ switch($data['imap_server_type'])
{
- $data['deleteOptions'] = 'remove_immediately';
+ case "imaps-encr-only":
+ case "imaps-encr-auth":
+ $data['imapPort'] = 993;
+ break;
+ default:
+ $data['imapPort'] = 143;
+ break;
}
- $data['trash_folder'] =
(isset($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['trashFolder'])?$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['trashFolder']:'');
- if(empty($data['trash_folder']))
+ #_debug_array($data);
+
+ $GLOBALS['phpgw']->preferences->read_repository();
+ $userPrefs =
$GLOBALS['phpgw_info']['user']['preferences'];
+
+ // how to handle deleted messages
+ if(isset($userPrefs['felamimail']['deleteOptions']))
+ {
+ $data['deleteOptions'] =
$userPrefs['felamimail']['deleteOptions'];
+ }
+ else
{
- $data['trash_folder'] = 'INBOX.Trash';
+ $data['deleteOptions'] = 'mark_as_deleted';
}
- $data['sent_folder'] =
(isset($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['sent_folder'])?$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['sent_folder']:'');
+ $data['htmlOptions'] =
$userPrefs['felamimail']['htmlOptions'];
- if (empty($data['sent_folder']))
+ // where is the trash folder
+ $data['trash_folder'] =
$userPrefs['felamimail']['trashFolder'];
+ if(!empty($userPrefs['felamimail']['sentFolder']))
{
- $data['sent_folder'] = 'INBOX.Sent';
+ $data['sent_folder'] =
$userPrefs['felamimail']['sentFolder'];
+ $data['sentFolder'] =
$userPrefs['felamimail']['sentFolder'];
}
+ $data['refreshTime'] =
$userPrefs['felamimail']['refreshTime'];
if (!empty($data['trash_folder']))
$data['move_to_trash'] = True;
if (!empty($data['sent_folder']))
$data['move_to_sent'] = True;
- $data['signature'] =
(isset($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['email_sig'])?$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['email_sig']:'');
+ $data['signature'] =
$userPrefs['felamimail']['email_sig'];
- // _debug_array($data);
+ #_debug_array($data);
return $data;
}
}
Index: inc/class.phpmailer.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.phpmailer.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/class.phpmailer.inc.php 24 Nov 2002 00:32:13 -0000 1.2
+++ inc/class.phpmailer.inc.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -2,7 +2,7 @@
////////////////////////////////////////////////////
// phpmailer - PHP email class
//
-// Version 1.62, Created 06/26/2002
+// Version 1.65, Created 08/09/2002
//
// Class for sending email using either
// sendmail, PHP mail(), or SMTP. Methods are
@@ -149,7 +149,7 @@
* @access public
* @var string
*/
- var $Version = "1.62";
+ var $Version = "1.65";
/**
* Sets the email address that a reading confirmation will be sent.
@@ -165,6 +165,15 @@
*/
var $LE = "\n";
+ /**
+ * Sets the hostname to use in Message-Id and Received headers
+ * and as default HELO string. If empty, the value returned
+ * by SERVER_NAME is used or 'localhost.localdomain'.
+ * @access public
+ * @var string
+ */
+ var $Hostname = "";
+
/////////////////////////////////////////////////
// SMTP VARIABLES
@@ -174,7 +183,7 @@
* Sets the SMTP hosts. All hosts must be separated by a
* semicolon. You can also specify a different port
* for each host by using this format: [hostname:port]
- * (e.g. "smtp1.domain.com:25;smtp2.domain.com").
+ * (e.g. "smtp1.example.com:25;smtp2.example.com").
* Hosts will be tried in order.
* @access public
* @var string
@@ -189,11 +198,11 @@
var $Port = 25;
/**
- * Sets the SMTP HELO of the message.
+ * Sets the SMTP HELO of the message (Default is $Hostname).
* @access public
* @var string
*/
- var $Helo = "localhost.localdomain";
+ var $Helo = "";
/**
* Sets SMTP authentication. Utilizes the Username and Password variables.
@@ -462,10 +471,11 @@
return false;
}
- $this->header = $header;
- $this->body = $body;
+ $this->sentHeader = $header;
+ $this->sentBody = $body;
return true;
+
}
/**
@@ -627,11 +637,11 @@
{
// The fifth parameter to mail is only available in PHP >= 4.0.5
$params = sprintf("-oi -f %s", $this->Sender);
- $rt = @mail($to, $this->Subject, $body, $header, $params);
+ $rt = @mail($to, $this->encode_header($this->Subject), $body,
$header, $params);
}
else
{
- $rt = @mail($to, $this->Subject, $body, $header);
+ $rt = @mail($to, $this->encode_header($this->Subject), $body,
$header);
}
if (isset($old_from))
@@ -692,7 +702,10 @@
}
// Must perform HELO before authentication
+ if ($this->Helo != '')
$smtp->Hello($this->Helo);
+ else
+ $smtp->Hello($this->get_server_hostname());
// If user requests SMTP authentication
if($this->SMTPAuth)
@@ -755,6 +768,7 @@
return false;
}
$smtp->Quit();
+ $smtp->Close();
return true;
}
@@ -812,7 +826,7 @@
if(empty($addr[1]))
$formatted = $addr[0];
else
- $formatted = sprintf('"%s" <%s>', addslashes($addr[1]), $addr[0]);
+ $formatted = sprintf('%s <%s>', $this->encode_header($addr[1],
'phrase'), $addr[0]);
return $formatted;
}
@@ -938,11 +952,19 @@
$this->boundary[2] = "b2_" . $uniq_id;
// To be created automatically by mail()
- if(($this->Mailer != "mail") && (count($this->to) > 0))
+ if($this->Mailer != "mail")
+ {
+ if(count($this->to) > 0)
$header[] = $this->addr_append("To", $this->to);
+ else if (count($this->cc) == 0)
+ $header[] = "To: undisclosed-recipients:;".$this->LE;
+ }
+
+ $from = array();
+ $from[0][0] = trim($this->From);
+ $from[0][1] = $this->FromName;
+ $header[] = $this->addr_append("From", $from);
- $header[] = sprintf("From: \"%s\" <%s>%s",
addslashes($this->FromName),
- trim($this->From), $this->LE);
if(count($this->cc) > 0)
$header[] = $this->addr_append("Cc", $this->cc);
@@ -955,11 +977,15 @@
// mail() sets the subject itself
if($this->Mailer != "mail")
- $header[] = sprintf("Subject: %s%s", trim($this->Subject),
$this->LE);
+ $header[] = sprintf("Subject: %s%s",
$this->encode_header(trim($this->Subject)), $this->LE);
+ $header[] = sprintf("Message-ID: <address@hidden>%s", $uniq_id,
$this->get_server_hostname(), $this->LE);
$header[] = sprintf("X-Priority: %d%s", $this->Priority, $this->LE);
$header[] = sprintf("X-Mailer: phpmailer [version %s]%s",
$this->Version, $this->LE);
+ if($this->Sender == "")
$header[] = sprintf("Return-Path: %s%s", trim($this->From), $this->LE);
+ else
+ $header[] = sprintf("Return-Path: %s%s", trim($this->Sender),
$this->LE);
if($this->ConfirmReadingTo != "")
$header[] = sprintf("Disposition-Notification-To: <%s>%s",
@@ -967,7 +993,7 @@
// Add custom headers
for($index = 0; $index < count($this->CustomHeader); $index++)
- $header[] = sprintf("%s%s", $this->CustomHeader[$index],
$this->LE);
+ $header[] = sprintf("%s: %s%s",
trim($this->CustomHeader[$index][0]),
$this->encode_header(trim($this->CustomHeader[$index][1])), $this->LE);
if($this->UseMSMailHeaders)
$header[] = $this->AddMSMailHeaders();
@@ -992,7 +1018,7 @@
case "plain":
$header[] = sprintf("Content-Transfer-Encoding: %s%s",
$this->Encoding, $this->LE);
- $header[] = sprintf("Content-Type: %s; charset = \"%s\"",
+ $header[] = sprintf("Content-Type: %s; charset=\"%s\"",
$this->ContentType, $this->CharSet);
break;
case "attachments":
@@ -1044,7 +1070,8 @@
$bndry->Encoding = $this->Encoding;
$body[] = $bndry->GetSource();
- $body[] = sprintf("%s%s", $this->AltBody, $this->LE.$this->LE);
+ $body[] = $this->encode_string($this->AltBody,
$this->Encoding);
+ $body[] = $this->LE.$this->LE;
$bndry = new Boundary($this->boundary[1]);
$bndry->CharSet = $this->CharSet;
@@ -1052,22 +1079,24 @@
$bndry->Encoding = $this->Encoding;
$body[] = $bndry->GetSource();
- $body[] = sprintf("%s%s", $this->Body, $this->LE.$this->LE);
+ $body[] = $this->encode_string($this->Body, $this->Encoding);
+ $body[] = $this->LE.$this->LE;
// End the boundary
$body[] = sprintf("%s--%s--%s", $this->LE,
$this->boundary[1], $this->LE.$this->LE);
break;
case "plain":
- $body[] = $this->Body;
+ $body[] = $this->encode_string($this->Body, $this->Encoding);
break;
case "attachments":
$bndry = new Boundary($this->boundary[1]);
$bndry->CharSet = $this->CharSet;
$bndry->ContentType = $this->ContentType;
$bndry->Encoding = $this->Encoding;
- $body[] = sprintf("%s%s%s%s", $bndry->GetSource(false),
$this->LE,
- $this->Body, $this->LE);
+ $body[] = $bndry->GetSource(false) . $this->LE;
+ $body[] = $this->encode_string($this->Body, $this->Encoding);
+ $body[] = $this->LE;
if(!$body[] = $this->attach_all())
return false;
@@ -1086,7 +1115,8 @@
$bndry->Encoding = $this->Encoding;
$body[] = $bndry->GetSource() . $this->LE;
- $body[] = sprintf("%s%s", $this->AltBody, $this->LE.$this->LE);
+ $body[] = $this->encode_string($this->AltBody,
$this->Encoding);
+ $body[] = $this->LE.$this->LE;
// Create the HTML body
$bndry = new Boundary($this->boundary[2]);
@@ -1095,7 +1125,8 @@
$bndry->Encoding = $this->Encoding;
$body[] = $bndry->GetSource() . $this->LE;
- $body[] = sprintf("%s%s", $this->Body, $this->LE.$this->LE);
+ $body[] = $this->encode_string($this->Body, $this->Encoding);
+ $body[] = $this->LE.$this->LE;
$body[] = sprintf("%s--%s--%s", $this->LE,
$this->boundary[2], $this->LE.$this->LE);
@@ -1104,9 +1135,7 @@
return false;
break;
}
- // Add the encode string code here
$sBody = join("", $body);
- $sBody = $this->encode_string($sBody, $this->Encoding);
return $sBody;
}
@@ -1186,8 +1215,6 @@
if($disposition == "inline")
$mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
- else
- $mime[] = sprintf("Content-ID: <%s>%s", $name, $this->LE);
$mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s",
$disposition, $name, $this->LE.$this->LE);
@@ -1267,6 +1294,60 @@
}
/**
+ * Encode a header string to best of Q, B, quoted or none. Returns a
string.
+ * @access private
+ * @return string
+ */
+ function encode_header ($str, $position = 'text') {
+ $x = 0;
+
+ switch (strtolower($position)) {
+ case 'phrase':
+ if (preg_match_all('/[\200-\377]/', $str, $matches) == 0) {
+ // Can't use addslashes as we don't know what value has
magic_quotes_sybase.
+ $encoded = addcslashes($str, '\000-\037\177');
+ $encoded = preg_replace('/([\"])/', '\\"', $encoded);
+
+ if (($str == $encoded) &&
(preg_match_all('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str, $matches) == 0))
+ return ($encoded);
+ else
+ return ("\"$encoded\"");
+ }
+ $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str,
$matches);
+ break;
+ case 'comment':
+ $x = preg_match_all('/[()"]/', $str, $matches);
+ // Fall-through
+ case 'text':
+ default:
+ $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/',
$str, $matches);
+ break;
+ }
+
+ if ($x == 0)
+ return ($str);
+
+ $maxlen = 75 - 7 - strlen($this->CharSet);
+ // Try to select the encoding which should produce the shortest output
+ if (strlen($str)/3 < $x) {
+ $encoding = 'B';
+ $encoded = base64_encode($str);
+ $maxlen -= $maxlen % 4;
+ $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+ } else {
+ $encoding = 'Q';
+ $encoded = $this->encode_q($str, $position);
+ $encoded = $this->word_wrap($encoded, $maxlen, true);
+ $encoded = str_replace("=".$this->LE, "\n", trim($encoded));
+ }
+
+ $encoded = preg_replace('/^(.*)$/m', "
=?".$this->CharSet."?$encoding?\\1?=", $encoded);
+ $encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+ return($encoded);
+ }
+
+ /**
* Encode string to quoted-printable. Returns a string.
* @access private
* @return string
@@ -1277,7 +1358,7 @@
$encoded .= $this->LE;
// Replace every high ascii, control and = characters
- $encoded =
preg_replace("/([\001-\010\013\014\016-\037\075\177-\377])/e",
+ $encoded =
preg_replace('/([\000-\010\013\014\016-\037\075\177-\377])/e',
"'='.sprintf('%02X', ord('\\1'))", $encoded);
// Replace every spaces and tabs when it's the last character on a line
$encoded = preg_replace("/([\011\040])".$this->LE."/e",
@@ -1290,6 +1371,36 @@
}
/**
+ * Encode string to q encoding. Returns a string.
+ * @access private
+ * @return string
+ */
+ function encode_q ($str, $position = 'text') {
+ // There should not be any EOL in the string
+ $encoded = preg_replace("[\r\n]", "", $str);
+
+ switch (strtolower($position)) {
+ case 'phrase':
+ $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e",
"'='.sprintf('%02X', ord('\\1'))", $encoded);
+ break;
+ case 'comment':
+ $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X',
ord('\\1'))", $encoded);
+ // Fall-through
+ case 'text':
+ default:
+ // Replace every high ascii, control =, ? and _ characters
+ $encoded =
preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+ "'='.sprintf('%02X', ord('\\1'))", $encoded);
+ break;
+ }
+
+ // Replace every spaces to _ (more readable than =20)
+ $encoded = str_replace(" ", "_", $encoded);
+
+ return $encoded;
+ }
+
+ /**
* Adds a string or binary attachment (non-filesystem) to the list.
* This method can be used to attach ascii or binary data,
* such as a BLOB record from a database.
@@ -1468,10 +1579,28 @@
// Check for vars because they might not exist. Possibly
// write a small retrieval function (that mailer can use too!)
- $str = sprintf("Received: from phpmailer ([%s]) by %s " .
- "with HTTP;%s\t %s%s",
- $this->get_server_var("REMOTE_ADDR"),
- $this->get_server_var("SERVER_NAME"),
+ if ($this->get_server_var('SERVER_NAME') != '')
+ {
+ $protocol = ($this->get_server_var('HTTPS') == 'on') ? 'HTTPS' :
'HTTP';
+ $remote = $this->get_server_var('REMOTE_HOST');
+ if ($remote == '')
+ $remote = 'phpmailer';
+ $remote .= ' (['.$this->get_server_var('REMOTE_ADDR').'])';
+ }
+ else
+ {
+ $protocol = 'local';
+ $remote = $this->get_server_var('USER');
+ if ($remote == '')
+ $remote = 'phpmailer';
+ }
+
+ $str = sprintf("Received: from %s %s\tby %s " .
+ "with %s (phpmailer);%s\t%s%s",
+ $remote,
+ $this->LE,
+ $this->get_server_hostname(),
+ $protocol,
$this->LE,
$this->rfc_date(),
$this->LE);
@@ -1504,6 +1633,20 @@
}
/**
+ * Returns the server hostname or 'localhost.localdomain' if unknown.
+ * @access private
+ * @return string
+ */
+ function get_server_hostname() {
+ if ($this->Hostname != '')
+ return $this->Hostname;
+ elseif ($this->get_server_var('SERVER_NAME') != '')
+ return $this->get_server_var('SERVER_NAME');
+ else
+ return 'localhost.localdomain';
+ }
+
+ /**
* Changes every end of line from CR or LF to CRLF. Returns string.
* @access private
* @return string
@@ -1521,7 +1664,8 @@
* @return void
*/
function AddCustomHeader($custom_header) {
- $this->CustomHeader[] = $custom_header;
+ // Append to $custom_header array
+ $this->CustomHeader[] = explode(":", $custom_header, 2);
}
/**
@@ -1615,18 +1759,18 @@
* @return string
*/
function GetSource($bLineEnding = true) {
- $ret = array();
+ $mime = array();
$mime[] = sprintf("--%s%s", $this->ID, $this->LE);
$mime[] = sprintf("Content-Type: %s; charset = \"%s\"%s",
$this->ContentType, $this->CharSet, $this->LE);
- //$mime[] = sprintf("Content-Transfer-Encoding: %s%s",
$this->Encoding,
- // $this->LE);
+ $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $this->Encoding,
+ $this->LE);
if(strlen($this->Disposition) > 0)
{
$mime[] = sprintf("Content-Disposition: %s;");
if(strlen($this->FileName) > 0)
- $mime[] = sprinf("filename=\"%s\"", $this->$this->FileName);
+ $mime[] = sprinf("filename=\"%s\"", $this->FileName);
}
if($bLineEnding)
Index: inc/class.sieve.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.sieve.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/class.sieve.inc.php 24 Nov 2002 00:36:06 -0000 1.2
+++ inc/class.sieve.inc.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -1,7 +1,7 @@
<?
/*
- * $Id: class.sieve.inc.php,v 1.2 2002/11/24 00:36:06 lkneschke Exp $
+ * $Id: class.sieve.inc.php,v 1.3 2006/12/18 20:03:32 sigurdne Exp $
*
* Copyright 2001 Dan Ellis <address@hidden>
*
Index: inc/class.smtp.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.smtp.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/class.smtp.php 24 Nov 2002 00:32:13 -0000 1.2
+++ inc/class.smtp.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -1,29 +1,27 @@
<?php
- /*
- * File: smtp.php
- *
- * Description: Define an SMTP class that can be used to connect
- * and communicate with any SMTP server. It implements
- * all the SMTP functions defined in RFC821 except TURN.
- *
- * Creator: Chris Ryan <address@hidden>
- * Created: 03/26/2001
- *
- * TODO:
- * - Move all the duplicate code to a utility function
- * Most of the functions have the first lines of
- * code do the same processing. If this can be moved
- * into a utility function then it would reduce the
- * overall size of the code significantly.
- */
+////////////////////////////////////////////////////
+// SMTP - PHP SMTP class
+//
+// Version 1.02
+//
+// Define an SMTP class that can be used to connect
+// and communicate with any SMTP server. It implements
+// all the SMTP functions defined in RFC821 except TURN.
+//
+// Author: Chris Ryan
+//
+// License: LGPL, see LICENSE
+////////////////////////////////////////////////////
- /*
+/**
* STMP is rfc 821 compliant and implements all the rfc 821 SMTP
* commands except TURN which will always return a not implemented
* error. SMTP also provides some utility methods for sending mail
* to an SMTP server.
+ * @author Chris Ryan
*/
- class SMTP {
+class SMTP
+{
var $SMTP_PORT = 25; # the default SMTP PORT
var $CRLF = "\r\n"; # CRLF pair
@@ -33,10 +31,10 @@
var $do_debug; # the level of debug to perform
- /*
- * SMTP()
- *
+ /**
* Initialize the class so that the data is in a known state.
+ * @access public
+ * @return void
*/
function SMTP() {
$this->smtp_conn = 0;
@@ -46,13 +44,11 @@
$this->do_debug = 0;
}
- /************************************************************
+ /*************************************************************
* CONNECTION FUNCTIONS *
***********************************************************/
- /*
- * Connect($host, $port=0, $tval=30)
- *
+ /**
* Connect to the server specified on the port specified.
* If the port is not specified use the default SMTP_PORT.
* If tval is specified then a connection will try and be
@@ -62,6 +58,8 @@
*
* SMTP CODE SUCCESS: 220
* SMTP CODE FAILURE: 421
+ * @access public
+ * @return bool
*/
function Connect($host,$port=0,$tval=30) {
# set the error val to null so there is no confusion
@@ -119,11 +117,11 @@
return true;
}
- /*
- * Authenticate()
- *
+ /**
* Performs SMTP authentication. Must be run after running the
* Hello() method. Returns true if successfully authenticated.
+ * @access public
+ * @return bool
*/
function Authenticate($username, $password) {
// Start authentication
@@ -183,10 +181,10 @@
return true;
}
- /*
- * Connected()
- *
+ /**
* Returns true if connected to a server otherwise false
+ * @access private
+ * @return bool
*/
function Connected() {
if(!empty($this->smtp_conn)) {
@@ -206,12 +204,12 @@
return false;
}
- /*
- * Close()
- *
+ /**
* Closes the socket and cleans up the state of the class.
* It is not considered good to use this function without
* first trying to use QUIT.
+ * @access public
+ * @return void
*/
function Close() {
$this->error = null; # so there is no confusion
@@ -224,13 +222,11 @@
}
- /**************************************************************
+ /***************************************************************
* SMTP COMMANDS *
*************************************************************/
- /*
- * Data($msg_data)
- *
+ /**
* Issues a data command and sends the msg_data to the server
* finializing the mail transaction. $msg_data is the message
* that is to be send with the headers. Each header needs to be
@@ -246,6 +242,8 @@
* SMTP CODE FAILURE: 552,554,451,452
* SMTP CODE FAILURE: 451,554
* SMTP CODE ERROR : 500,501,503,421
+ * @access public
+ * @return bool
*/
function Data($msg_data) {
$this->error = null; # so no confusion is caused
@@ -342,6 +340,8 @@
# ok all the message data has been sent so lets get this
# over with aleady
fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+ # one of my qmail ldap servers had problems, to answer fast enough
+ #sleep(2);
$rply = $this->get_lines();
$code = substr($rply,0,3);
@@ -364,9 +364,7 @@
return true;
}
- /*
- * Expand($name)
- *
+ /**
* Expand takes the name and asks the server to list all the
* people who are members of the _list_. Expand will return
* back and array of the result or false if an error occurs.
@@ -379,6 +377,8 @@
* SMTP CODE SUCCESS: 250
* SMTP CODE FAILURE: 550
* SMTP CODE ERROR : 500,501,502,504,421
+ * @access public
+ * @return string array
*/
function Expand($name) {
$this->error = null; # so no confusion is caused
@@ -416,12 +416,10 @@
$list[] = substr($l,4);
}
- return $rval;
+ return $list;
}
- /*
- * Hello($host="")
- *
+ /**
* Sends the HELO command to the smtp server.
* This makes sure that we and the server are in
* the same known state.
@@ -430,6 +428,8 @@
*
* SMTP CODE SUCCESS: 250
* SMTP CODE ERROR : 500, 501, 504, 421
+ * @access public
+ * @return bool
*/
function Hello($host="") {
$this->error = null; # so no confusion is caused
@@ -474,9 +474,7 @@
return true;
}
- /*
- * Help($keyword="")
- *
+ /**
* Gets help information on the keyword specified. If the keyword
* is not specified then returns generic help, ussually contianing
* A list of keywords that help is available on. This function
@@ -488,7 +486,8 @@
*
* SMTP CODE SUCCESS: 211,214
* SMTP CODE ERROR : 500,501,502,504,421
- *
+ * @access public
+ * @return string
*/
function Help($keyword="") {
$this->error = null; # to avoid confusion
@@ -528,9 +527,7 @@
return $rply;
}
- /*
- * Mail($from)
- *
+ /**
* Starts a mail transaction from the email address specified in
* $from. Returns true if successful or false otherwise. If True
* the mail transaction is started and then one or more Recipient
@@ -541,6 +538,8 @@
* SMTP CODE SUCCESS: 250
* SMTP CODE SUCCESS: 552,451,452
* SMTP CODE SUCCESS: 500,501,421
+ * @access public
+ * @return bool
*/
function Mail($from) {
$this->error = null; # so no confusion is caused
@@ -574,15 +573,15 @@
return true;
}
- /*
- * Noop()
- *
+ /**
* Sends the command NOOP to the SMTP server.
*
* Implements from rfc 821: NOOP <CRLF>
*
* SMTP CODE SUCCESS: 250
* SMTP CODE ERROR : 500, 421
+ * @access public
+ * @return bool
*/
function Noop() {
$this->error = null; # so no confusion is caused
@@ -616,9 +615,7 @@
return true;
}
- /*
- * Quit($close_on_error=true)
- *
+ /**
* Sends the quit command to the server and then closes the socket
* if there is no error or the $close_on_error argument is true.
*
@@ -626,6 +623,8 @@
*
* SMTP CODE SUCCESS: 221
* SMTP CODE ERROR : 500
+ * @access public
+ * @return bool
*/
function Quit($close_on_error=true) {
$this->error = null; # so there is no confusion
@@ -669,9 +668,7 @@
return $rval;
}
- /*
- * Recipient($to)
- *
+ /**
* Sends the command RCPT to the SMTP server with the TO: argument of
$to.
* Returns true if the recipient was accepted false if it was rejected.
*
@@ -680,6 +677,8 @@
* SMTP CODE SUCCESS: 250,251
* SMTP CODE FAILURE: 550,551,552,553,450,451,452
* SMTP CODE ERROR : 500,501,503,421
+ * @access public
+ * @return bool
*/
function Recipient($to) {
$this->error = null; # so no confusion is caused
@@ -713,9 +712,7 @@
return true;
}
- /*
- * Reset()
- *
+ /**
* Sends the RSET command to abort and transaction that is
* currently in progress. Returns true if successful false
* otherwise.
@@ -724,6 +721,8 @@
*
* SMTP CODE SUCCESS: 250
* SMTP CODE ERROR : 500,501,504,421
+ * @access public
+ * @return bool
*/
function Reset() {
$this->error = null; # so no confusion is caused
@@ -758,9 +757,7 @@
return true;
}
- /*
- * Send($from)
- *
+ /**
* Starts a mail transaction from the email address specified in
* $from. Returns true if successful or false otherwise. If True
* the mail transaction is started and then one or more Recipient
@@ -773,6 +770,8 @@
* SMTP CODE SUCCESS: 250
* SMTP CODE SUCCESS: 552,451,452
* SMTP CODE SUCCESS: 500,501,502,421
+ * @access public
+ * @return bool
*/
function Send($from) {
$this->error = null; # so no confusion is caused
@@ -806,9 +805,7 @@
return true;
}
- /*
- * SendAndMail($from)
- *
+ /**
* Starts a mail transaction from the email address specified in
* $from. Returns true if successful or false otherwise. If True
* the mail transaction is started and then one or more Recipient
@@ -821,6 +818,8 @@
* SMTP CODE SUCCESS: 250
* SMTP CODE SUCCESS: 552,451,452
* SMTP CODE SUCCESS: 500,501,502,421
+ * @access public
+ * @return bool
*/
function SendAndMail($from) {
$this->error = null; # so no confusion is caused
@@ -854,9 +853,7 @@
return true;
}
- /*
- * SendOrMail($from)
- *
+ /**
* Starts a mail transaction from the email address specified in
* $from. Returns true if successful or false otherwise. If True
* the mail transaction is started and then one or more Recipient
@@ -869,6 +866,8 @@
* SMTP CODE SUCCESS: 250
* SMTP CODE SUCCESS: 552,451,452
* SMTP CODE SUCCESS: 500,501,502,421
+ * @access public
+ * @return bool
*/
function SendOrMail($from) {
$this->error = null; # so no confusion is caused
@@ -902,9 +901,7 @@
return true;
}
- /*
- * Turn()
- *
+ /**
* This is an optional command for SMTP that this class does not
* support. This method is here to make the RFC821 Definition
* complete for this class and __may__ be implimented in the future
@@ -914,6 +911,8 @@
* SMTP CODE SUCCESS: 250
* SMTP CODE FAILURE: 502
* SMTP CODE ERROR : 500, 503
+ * @access public
+ * @return bool
*/
function Turn() {
$this->error = array("error" => "This method, TURN, of the SMTP ".
@@ -924,9 +923,7 @@
return false;
}
- /*
- * Verify($name)
- *
+ /**
* Verifies that the name is recognized by the server.
* Returns false if the name could not be verified otherwise
* the response from the server is returned.
@@ -936,6 +933,8 @@
* SMTP CODE SUCCESS: 250,251
* SMTP CODE FAILURE: 550,551,553
* SMTP CODE ERROR : 500,501,502,421
+ * @access public
+ * @return int
*/
function Verify($name) {
$this->error = null; # so no confusion is caused
@@ -969,18 +968,18 @@
return $rply;
}
- /******************************************************************
+ /*******************************************************************
* INTERNAL FUNCTIONS *
******************************************************************/
- /*
- * get_lines()
- *
- * __internal_use_only__: read in as many lines as possible
+ /**
+ * Read in as many lines as possible
* either before eof or socket timeout occurs on the operation.
* With SMTP we can tell if we have more lines to read if the
* 4th character is '-' symbol. If it is a space then we don't
* need to read anything else.
+ * @access private
+ * @return string
*/
function get_lines() {
$data = "";
@@ -1002,7 +1001,7 @@
return $data;
}
- }
+}
?>
Index: inc/class.socaching.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.socaching.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.socaching.inc.php 18 Dec 2006 11:02:55 -0000 1.5
+++ inc/class.socaching.inc.php 18 Dec 2006 20:03:32 -0000 1.6
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.socaching.inc.php,v 1.5 2006/12/18 11:02:55 sigurdne Exp
$ */
+ /* $Id: class.socaching.inc.php,v 1.6 2006/12/18 20:03:32 sigurdne Exp
$ */
class socaching
{
@@ -47,55 +47,45 @@
#print "$query<br>";
}
- function getHeaders($_firstMessage='', $_numberOfMessages='',
$_sort='', $_filter='')
+ // create sql from the filter array
+ function getFilterSQL($_filter)
{
- switch($_sort)
+ if(is_array($_filter))
{
- case "0":
- $sort = "order by date desc";
- break;
- case "1":
- $sort = "order by date asc";
- break;
- case "2":
- $sort = "order by sender_address desc";
- break;
- case "3":
- $sort = "order by sender_address asc";
- break;
- case "4":
- $sort = "order by subject desc";
- break;
- case "5":
- $sort = "order by subject asc";
- break;
- default:
- $sort = "order by date desc";
- }
-
$filter = '';
while(list($key,$value) = @each($_filter))
{
+ if($filter != '') $filter .= " or ";
switch($key)
{
case "from":
- $filter .= " and (sender_name
like '%$value%' or sender_address like '%$value%') ";
+ $filter .=
"(sender_name like '%$value%' or sender_address like '%$value%') ";
break;
case "to":
- $filter .= " and (to_name like
'%$value%' or to_address like '%$value%') ";
+ $filter .= "(to_name
like '%$value%' or to_address like '%$value%') ";
break;
case "subject":
- $filter .= " and subject like
'%$value%' ";
+ $filter .= "subject
like '%$value%' ";
break;
}
}
+ if($filter != '') $filter = " and ($filter) ";
+ return $filter;
+ }
+ return '';
+
+ }
+
+ function getHeaders($_firstMessage='', $_numberOfMessages='',
$_sort='', $_filter='')
+ {
+ $sort = $this->getSortSQL($_sort);
+ $filter = $this->getFilterSQL($_filter);
$query = sprintf("select uid, date, subject,
sender_name, sender_address, to_name, to_address, size, attachments from
phpgw_felamimail_cache ".
"where accountid='%s' and
hostname='%s' and foldername = '%s' and accountname='%s' %s $sort",
$this->accountid,
addslashes($this->hostname),
addslashes($this->foldername),
addslashes($this->accountname),
$filter);
- #print "$query<br>";
if($_firstMessage == '' && $_numberOfMessages == '')
{
@@ -113,7 +103,8 @@
'sender_address' =>
$this->db->f('sender_address'),
'to_name' =>
$this->db->f('to_name'),
'to_address' =>
$this->db->f('to_address'),
- 'attachments' =>
$this->db->f('attachments')
+ 'attachments' =>
$this->db->f('attachments'),
+ 'date' =>
$this->db->f('date')
);
}
return $retValue;
@@ -159,29 +150,34 @@
// but use the use filter
function getMessageCounter($_filter)
{
+ if(is_array($_filter))
+ {
$filter = '';
while(list($key,$value) = @each($_filter))
{
+ if($filter != '') $filter .= " or ";
switch($key)
{
case "from":
- $filter .= " and (sender_name
like '%$value%' or sender_address like '%$value%') ";
+ $filter .=
"(sender_name like '%$value%' or sender_address like '%$value%') ";
break;
case "to":
- $filter .= " and (to_name like
'%$value%' or to_address like '%$value%') ";
+ $filter .= "(to_name
like '%$value%' or to_address like '%$value%') ";
break;
case "subject":
- $filter .= " and subject like
'%$value%' ";
+ $filter .= "subject
like '%$value%' ";
break;
}
}
+ if($filter !='') $filter = " and ($filter) ";
+ }
$query = sprintf("select count(*) as count from
phpgw_felamimail_cache ".
"where accountid='%s' and
hostname='%s' and foldername = '%s' and accountname='%s' %s",
$this->accountid,
addslashes($this->hostname),
addslashes($this->foldername),
addslashes($this->accountname),
$filter);
- #print "$query<br>";
+ #print "<br>$query<br>";
$this->db->query("$query",__LINE__,__FILE__);
@@ -190,6 +186,75 @@
return $this->db->f("count");
}
+ // get the next message
+ function getNextMessage($_uid, $_sort='', $_filter='')
+ {
+ $sort = $this->getSortSQL($_sort);
+ $filter = $this->getFilterSQL($_filter);
+
+ $query = sprintf("select uid, date, subject,
sender_name, sender_address, to_name, to_address from phpgw_felamimail_cache ".
+ "where accountid='%s' and
hostname='%s' and foldername = '%s' and accountname='%s' %s $sort",
+ $this->accountid,
addslashes($this->hostname),
+ addslashes($this->foldername),
addslashes($this->accountname),
+ $filter);
+
+ $this->db->query($query,__LINE__,__FILE__);
+
+ while($this->db->next_record())
+ {
+ // we found the current message
+ if($this->db->f('uid') == $_uid)
+ {
+ // jump to the next messages
+ if($this->db->next_record())
+ {
+ $retValue['next'] =
$this->db->f('uid');
+ }
+ // we are done
+ if($retValue) return $retValue;
+
+ // we should never get here
+ return false;
+ }
+ else
+ {
+ // we found (maybe!) the previous
message
+ $retValue['previous'] =
$this->db->f('uid');
+ }
+ }
+
+ // we should never get here
+ return false;
+ }
+
+ function getSortSQL($_sort)
+ {
+ switch($_sort)
+ {
+ case "0":
+ $sort = "order by date desc";
+ break;
+ case "1":
+ $sort = "order by date asc";
+ break;
+ case "2":
+ $sort = "order by sender_address desc";
+ break;
+ case "3":
+ $sort = "order by sender_address asc";
+ break;
+ case "4":
+ $sort = "order by subject desc";
+ break;
+ case "5":
+ $sort = "order by subject asc";
+ break;
+ default:
+ $sort = "order by date desc";
+ }
+ return $sort;
+ }
+
function removeFromCache($_uid)
{
$query = sprintf("delete from phpgw_felamimail_cache ".
Index: inc/class.sofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.sofelamimail.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.sofelamimail.inc.php 24 Nov 2002 00:32:13 -0000 1.4
+++ inc/class.sofelamimail.inc.php 18 Dec 2006 20:03:32 -0000 1.5
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.sofelamimail.inc.php,v 1.4 2002/11/24 00:32:13 lkneschke
Exp $ */
+ /* $Id: class.sofelamimail.inc.php,v 1.5 2006/12/18 20:03:32 sigurdne
Exp $ */
class sofelamimail
{
Index: inc/class.transformdate.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.transformdate.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.transformdate.inc.php 24 Nov 2002 00:32:13 -0000 1.4
+++ inc/class.transformdate.inc.php 18 Dec 2006 20:03:32 -0000 1.5
@@ -7,7 +7,7 @@
** <Tue,> 29 Jun 1999 09:52:11 -0500 (EDT)
** (as specified in RFC 822) -- 'Tue' is optional
**
- ** $Id: class.transformdate.inc.php,v 1.4 2002/11/24 00:32:13
lkneschke Exp $
+ ** $Id: class.transformdate.inc.php,v 1.5 2006/12/18 20:03:32
sigurdne Exp $
**/
class transformdate
Index: inc/class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.uicompose.inc.php 16 Dec 2006 21:52:00 -0000 1.5
+++ inc/class.uicompose.inc.php 18 Dec 2006 20:03:32 -0000 1.6
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uicompose.inc.php,v 1.5 2006/12/16 21:52:00 sigurdne Exp
$ */
+ /* $Id: class.uicompose.inc.php,v 1.6 2006/12/18 20:03:32 sigurdne Exp
$ */
class uicompose
{
@@ -48,8 +48,8 @@
$this->t->set_unknowns('remove');
- // $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
- // $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
+ $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
+ $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
}
@@ -104,7 +104,12 @@
break;
case "send":
- $this->bocompose->send($formData);
+ if(!$this->bocompose->send($formData))
+ {
+ $this->compose();
+ return;
+ }
+
$linkData = array
(
'mailbox' =>
$GLOBALS['HTTP_GET_VARS']['mailbox'],
@@ -117,7 +122,7 @@
}
}
- function compose()
+ function compose($_focusElement="to")
{
// read the data from session
// all values are empty for a new compose window
@@ -126,7 +131,7 @@
// is the to address set already?
if (!empty($GLOBALS['HTTP_GET_VARS']['send_to']))
{
- $sessionData['to'] =
urldecode($GLOBALS['HTTP_GET_VARS']['send_to']);
+ $sessionData['to'] =
stripslashes(urldecode($GLOBALS['HTTP_GET_VARS']['send_to']));
}
$this->display_app_header();
@@ -141,6 +146,7 @@
$this->translate();
$this->t->set_var("link_addressbook",$GLOBALS['phpgw']->link('/felamimail/addressbook.php'));
+ $this->t->set_var("focusElement",$_focusElement);
$linkData = array
(
@@ -156,22 +162,32 @@
$this->t->set_var("link_action",$GLOBALS['phpgw']->link('/index.php',$linkData));
$this->t->set_var('folder_name',$this->bofelamimail->sessionData['mailbox']);
+ // check for some error messages from last posting
attempt
+ if($errorInfo = $this->bocompose->getErrorInfo())
+ {
+ $this->t->set_var('errorInfo',"<font
color=\"red\"><b>$errorInfo</b></font>");
+ }
+ else
+ {
+ $this->t->set_var('errorInfo',' ');
+ }
+
// header
$this->t->set_var("from",htmlentities($this->bocompose->getUserName(),ENT_QUOTES));
-
$this->t->set_var("to",isset($sessionData['to'])?htmlentities($sessionData['to'],ENT_QUOTES):'');
-
$this->t->set_var("cc",isset($sessionData['cc'])?htmlentities($sessionData['cc'],ENT_QUOTES):'');
-
$this->t->set_var("bcc",isset($sessionData['bcc'])?htmlentities($sessionData['bcc'],ENT_QUOTES):'');
-
$this->t->set_var("reply_to",isset($sessionData['reply_to'])?htmlentities($sessionData['reply_to'],ENT_QUOTES):'');
-
$this->t->set_var("subject",isset($sessionData['subject'])?htmlentities($sessionData['subject'],ENT_QUOTES):'');
+
$this->t->set_var("to",htmlentities($sessionData['to'],ENT_QUOTES));
+
$this->t->set_var("cc",htmlentities($sessionData['cc'],ENT_QUOTES));
+
$this->t->set_var("bcc",htmlentities($sessionData['bcc'],ENT_QUOTES));
+
$this->t->set_var("reply_to",htmlentities($sessionData['reply_to'],ENT_QUOTES));
+
$this->t->set_var("subject",htmlentities($sessionData['subject'],ENT_QUOTES));
$this->t->pparse("out","header");
// body
-
$this->t->set_var("body",(isset($sessionData['body'])?$sessionData['body']:''));
-
$this->t->set_var("signature",(isset($sessionData['signature'])?$sessionData['signature']:''));
+ $this->t->set_var("body",$sessionData['body']);
+
$this->t->set_var("signature",$sessionData['signature']);
$this->t->pparse("out","body_input");
// attachments
- if (isset($sessionData['attachments']) &&
is_array($sessionData['attachments']) && count($sessionData['attachments']) > 0)
+ if (is_array($sessionData['attachments']) &&
count($sessionData['attachments']) > 0)
{
$this->t->set_var('row_color',$this->rowColor[0]);
$this->t->set_var('name',lang('name'));
@@ -222,7 +238,7 @@
// this fill the session data with the values
from the original email
$this->bocompose->getReplyData('single',
$replyID);
}
- $this->compose();
+ $this->compose('body');
}
function replyAll()
@@ -233,7 +249,7 @@
// this fill the session data with the values
from the original email
$this->bocompose->getReplyData('all', $replyID);
}
- $this->compose();
+ $this->compose('body');
}
function translate()
Index: inc/class.uidisplay.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uidisplay.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.uidisplay.inc.php 18 Dec 2006 14:43:28 -0000 1.5
+++ inc/class.uidisplay.inc.php 18 Dec 2006 20:03:32 -0000 1.6
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uidisplay.inc.php,v 1.5 2006/12/18 14:43:28 sigurdne Exp
$ */
+ /* $Id: class.uidisplay.inc.php,v 1.6 2006/12/18 20:03:32 sigurdne Exp
$ */
class uidisplay
{
@@ -26,20 +26,33 @@
function uidisplay()
{
$this->t = $GLOBALS['phpgw']->template;
+ #$this->t =
CreateObject('phpgwapi.Template_Smarty',PHPGW_APP_TPL);
$this->bofelamimail =
CreateObject('felamimail.bofelamimail');
+ $this->bofilter =
CreateObject('felamimail.bofilter');
+ $this->bopreferences =
CreateObject('felamimail.bopreferences');
+ $this->mailPreferences =
$this->bopreferences->getPreferences();
+
$this->bofelamimail->openConnection();
$this->mailbox =
$this->bofelamimail->sessionData['mailbox'];
+ $this->sort =
$this->bofelamimail->sessionData['sort'];
+
$this->uid =
$GLOBALS['HTTP_GET_VARS']['uid'];
- $this->rowColor[0] = 'row_on';
- $this->rowColor[1] = 'row_off';
+ $this->bocaching =
CreateObject('felamimail.bocaching',
+
$this->mailPreferences['imapServerAddress'],
+
$this->mailPreferences['username'],
+ $this->mailbox);
+
+ $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
+ $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
if($GLOBALS['HTTP_GET_VARS']['showHeader'] == "false")
{
$this->bofelamimail->sessionData['showHeader']
= 'False';
$this->bofelamimail->saveSessionData();
}
+
}
function createLinks($_data)
@@ -49,14 +62,45 @@
function display()
{
+ $transformdate =
CreateObject('felamimail.transformdate');
+ $htmlFilter = CreateObject('felamimail.htmlfilter');
+
$headers =
$this->bofelamimail->getMessageHeader($this->uid);
$rawheaders =
$this->bofelamimail->getMessageRawHeader($this->uid);
$bodyParts =
$this->bofelamimail->getMessageBody($this->uid);
$attachments =
$this->bofelamimail->getMessageAttachments($this->uid);
- $body = false;
+ $filterList = $this->bofilter->getFilterList();
+ $activeFilter = $this->bofilter->getActiveFilter();
+ $filter = $filterList[$activeFilter];
+ $nextMessage =
$this->bocaching->getNextMessage($this->uid, $this->sort, $filter);
+
+ #print "<pre>";print_r($rawheaders);print"</pre>";exit;
// add line breaks to $rawheaders
$newRawHeaders = explode("\n",$rawheaders);
+ reset($newRawHeaders);
+ // find the Organization header
+ // the header can also span multiple rows
+ while(is_array($newRawHeaders) && list($key,$value) =
each($newRawHeaders))
+ {
+ #print $value."<br>";
+ if(preg_match("/Organization:
(.*)/",$value,$matches))
+ {
+ $organization =
$this->bofelamimail->decode_header(chop($matches[1]));
+ #$organization = chop($matches[1]);
+ continue;
+ }
+ if(!empty($organization) &&
preg_match("/^\s+(.*)/",$value,$matches))
+ {
+ $organization .=
$this->bofelamimail->decode_header(chop($matches[1]));
+ break;
+ }
+ elseif(!empty($organization))
+ {
+ break;
+ }
+ }
+
// reset $rawheaders
$rawheaders = "";
// create it new, with good line breaks
@@ -70,9 +114,9 @@
if(!isset($GLOBALS['HTTP_GET_VARS']['printable']))
{
- $this->display_app_header(true);
+ $this->display_app_header();
}
- $this->t->set_root(PHPGW_APP_TPL);
+
$this->t->set_file(array("displayMsg" =>
"view_message.tpl"));
$this->t->set_block('displayMsg','message_main');
$this->t->set_block('displayMsg','message_header');
@@ -80,13 +124,15 @@
$this->t->set_block('displayMsg','message_navbar');
$this->t->set_block('displayMsg','message_navbar_print');
$this->t->set_block('displayMsg','message_cc');
+
$this->t->set_block('displayMsg','message_organization');
$this->t->set_block('displayMsg','message_attachement_row');
+
$this->t->set_block('displayMsg','previous_message_block');
+ $this->t->set_block('displayMsg','next_message_block');
$this->translate();
if(!isset($GLOBALS['HTTP_GET_VARS']['printable']))
{
-
// navbar
$linkData = array
(
@@ -144,6 +190,38 @@
);
$this->t->set_var("link_printable",$GLOBALS['phpgw']->link('/index.php',$linkData));
+ if($nextMessage['previous'])
+ {
+ $linkData = array
+ (
+ 'menuaction' =>
'felamimail.uidisplay.display',
+ 'showHeader' => 'false',
+ 'uid' =>
$nextMessage['previous']
+ );
+
$this->t->set_var('previous_url',$GLOBALS['phpgw']->link('/index.php',$linkData));
+
$this->t->parse('previous_message','previous_message_block',True);
+ }
+ else
+ {
+
$this->t->set_var('previous_message',' ');
+ }
+
+ if($nextMessage['next'])
+ {
+ $linkData = array
+ (
+ 'menuaction' =>
'felamimail.uidisplay.display',
+ 'showHeader' => 'false',
+ 'uid' =>
$nextMessage['next']
+ );
+
$this->t->set_var('next_url',$GLOBALS['phpgw']->link('/index.php',$linkData));
+
$this->t->parse('next_message','next_message_block',True);
+ }
+ else
+ {
+
$this->t->set_var('next_message',' ');
+ }
+
$langArray = array
(
'lang_messagelist' =>
lang('Message List'),
@@ -176,7 +254,7 @@
// rawheader
- if($this->bofelamimail->sessionData['showHeader'] ==
'True')
+/* if($this->bofelamimail->sessionData['showHeader'] ==
'True')
{
$this->t->set_var("raw_header_data",htmlentities($rawheaders));
$this->t->parse("rawheader",'message_raw_header',True);
@@ -187,64 +265,283 @@
$this->t->set_var("rawheader",'');
$this->t->set_var("view_header",lang('show
header'));
}
+*/
// header
-
$this->t->set_var("from_data",htmlentities($this->bofelamimail->decode_header($headers->fromaddress)));
-
$this->t->set_var("to_data",htmlentities($this->bofelamimail->decode_header($headers->toaddress)));
- if(isset($headers->ccaddress) && $headers->ccaddress)
+ // sent by a mailinglist??
+ // parse the from header
+ if($headers->senderaddress != $headers->fromaddress)
+ {
+ $senderAddress =
$this->emailAddressToHTML($headers->senderaddress);
+ $fromAddress =
$this->emailAddressToHTML($headers->fromaddress);
+ $this->t->set_var("from_data",
+ $senderAddress.
+ " ".lang('on behalf of')." ".
+ $fromAddress);
+ }
+ else
+ {
+ $fromAddress =
$this->emailAddressToHTML($headers->fromaddress);
+ $this->t->set_var("from_data",
+ $fromAddress);
+ }
+
+ // parse the to header
+ $toAddress =
$this->emailAddressToHTML($headers->toaddress);
+ $this->t->set_var("to_data",$toAddress);
+
+ // parse the cc header
+ if($headers->ccaddress)
{
-
$this->t->set_var("cc_data",htmlentities($this->bofelamimail->decode_header($headers->ccaddress)));
+ $ccAddress =
$this->emailAddressToHTML($headers->ccaddress);
+ $this->t->set_var("cc_data",$ccAddress);
$this->t->parse('cc_data_part','message_cc',True);
}
else
{
$this->t->set_var("cc_data_part",'');
}
-
$this->t->set_var("date_data",htmlentities($GLOBALS['phpgw']->common->show_date($headers->udate)));
+
+ // parse the cc header
+ if(!empty($organization))
+ {
+
$this->t->set_var("organization_data",$organization);
+
$this->t->parse('organization_data_part','message_organization',True);
+ }
+ else
+ {
+ $this->t->set_var("organization_data_part",'');
+ }
+
+ if (isset($headers->date))
+ {
+ $headers->date = ereg_replace(' ', ' ',
$headers->date);
+ $tmpdate = explode(' ', trim($headers->date));
+ }
+ else
+ {
+ $tmpdate = $date = array("","","","","","");
+ }
+
+
$this->t->set_var("date_data",htmlentities($GLOBALS['phpgw']->common->show_date($transformdate->getTimeStamp($tmpdate))));
$this->t->set_var("subject_data",htmlentities($this->bofelamimail->decode_header($headers->subject)));
+ //if(isset($organization)) exit;
$this->t->parse("header","message_header",True);
// body
+ if($this->bofelamimail->sessionData['showHeader'] ==
'True')
+ {
+ $body =
"<pre>".htmlentities($rawheaders)."</pre>";
+ $this->t->set_var("rawheader",'');
+ $this->t->set_var("view_header",lang('hide
header'));
+ }
+ else
+ {
+ $body = '';
+ $this->t->set_var("rawheader",'');
+ $this->t->set_var("view_header",lang('show
header'));
+ }
+
+#$tag_list = Array(
+# false,
+# 'blink',
+# 'object',
+# 'meta',
+# 'font',
+# 'html',
+# 'link',
+# 'frame',
+# 'iframe',
+# 'layer',
+# 'ilayer'
+# );
+
+$tag_list = Array(true, "b", "a", "i", "img", "strong", "em", "p");
+$tag_list = Array(true, "b", "a", "i", "strong", 'pre', 'ul', 'li',
+ "em", "p", 'td', 'tr', 'table',
+ 'font', 'hr', 'br', 'div');
+
+$rm_tags_with_content = Array(
+ 'script',
+ 'style',
+ 'applet',
+ 'embed',
+ 'head',
+ 'frameset',
+ 'xml'
+ );
+
+$self_closing_tags = Array(
+ 'img',
+ 'br',
+ 'hr',
+ 'input'
+ );
+
+$force_tag_closing = false;
+
+$rm_attnames = Array(
+ '/.*/' =>
+ Array(
+ '/target/i',
+ '/^on.*/i',
+ '/^dynsrc/i',
+ '/^datasrc/i',
+ '/^data.*/i',
+ '/^lowsrc/i'
+ )
+ );
+
+/**
+ * Yeah-yeah, so this looks horrible. Check out htmlfilter.inc for
+ * some idea of what's going on here. :)
+ */
+
+$bad_attvals = Array(
+ '/.*/' =>
+ Array(
+ '/.*/' =>
+ Array(
+ Array(
+ '/^([\'\"])\s*\S+\s*script\s*:*(.*)([\'\"])/i',
+# '/^([\'\"])\s*https*\s*:(.*)([\'\"])/i',
+ '/^([\'\"])\s*mocha\s*:*(.*)([\'\"])/i',
+ '/^([\'\"])\s*about\s*:(.*)([\'\"])/i'
+ ),
+ Array(
+ '\\1oddjob:\\2\\3',
+# '\\1uucp:\\2\\3',
+ '\\1amaretto:\\2\\3',
+ '\\1round:\\2\\3'
+ )
+ ),
+
+ '/^style/i' =>
+ Array(
+ Array(
+ '/expression/i',
+ '/behaviou*r/i',
+ '/binding/i',
+ '/url\(([\'\"]*)\s*https*:.*([\'\"]*)\)/i',
+ '/url\(([\'\"]*)\s*\S+script:.*([\'\"]*)\)/i'
+ ),
+ Array(
+ 'idiocy',
+ 'idiocy',
+ 'idiocy',
+ 'url(\\1http://securityfocus.com/\\2)',
+ 'url(\\1http://securityfocus.com/\\2)'
+ )
+ )
+ )
+ );
+
+$add_attr_to_tag = Array(
+ '/^a$/i' => Array('target' => '"_new"')
+ );
+ $add_attr_to_tag = Array();
+
+
+
for($i=0; $i<count($bodyParts); $i++ )
{
- if(!empty($body)) $body .= "<hr>";
+ // if($i > 0) $body .= "<br><br>Atachment
-------------------<br><br>";
// add line breaks to $bodyParts
- $newBody = explode("\n",$bodyParts[$i]);
- $bodyAppend = '';
+ #$newBody = explode("\n",$bodyParts[$i]);
+ #$bodyAppend = '';
// create it new, with good line breaks
- reset($newBody);
- while(list($key,$value) = @each($newBody))
+ #reset($newBody);
+ #while(list($key,$value) = @each($newBody))
+ #{
+ # $bodyAppend .=
wordwrap($value,90,"\n",1);
+ #}
+
+ #$body .=
htmlspecialchars($bodyAppend,ENT_QUOTES);
+
+ // add line breaks to $bodyParts
+ #$newBody =
wordwrap($bodyParts[$i],90,"\n",1);
+ #$newBody =
wordwrap($bodyParts[$i],90,"<br>",1);
+ if($bodyParts[$i]['mimeType'] == 'text/plain')
+ {
+ #$newBody =
ereg_replace("\n","<br>",$bodyParts[$i]['body']);
+
+ $newBody =
wordwrap($bodyParts[$i]['body'],90,"\n",1);
+ $newBody =
htmlspecialchars($newBody,ENT_QUOTES);
+ $newBody =
"<pre>".$newBody."</pre>";
+
+ }
+ else
{
- $bodyAppend .= wordwrap($value,90);
+ $newBody =
$bodyParts[$i]['body'];
+ $newBody =
$htmlFilter->sanitize($newBody,
+ $tag_list,
$rm_tags_with_content,
+
$self_closing_tags, $force_tag_closing,
+ $rm_attnames,
$bad_attvals, $add_attr_to_tag);
}
-
- $body .= htmlentities($bodyAppend);
+ $body .= $newBody;
+ #print "<hr><pre>$body</pre><hr>";
}
+
+ // search http[s] links and make them as links
available again
+ // to understand what's going on here, have a look at
+ //
http://www.php.net/manual/en/function.preg-replace.php
+
+ #$body = preg_replace("/(\>\;)/",
+ # "<font color=\"blue\">$1</font>", $body);
+
+
+ // create links for websites
+ #$body =
preg_replace("/((http(s?):\/\/)|(www\.))([\w\.,-.,\/.,\?.,\=.,&]+)/ie",
+ # "'<a
href=\"/phpgroupware/redirect.php?go='.htmlentities(urlencode('http$3://$4$5')).'\"
target=\"_blank\"><font color=\"blue\">$2$4$5</font></a>'", $body);
+ $body =
preg_replace("/((http(s?):\/\/)|(www\.))([\w,\-,\/,\?,\=,\.,&,!\n,\%,@,\*,#,:,~,\+]+)/ie",
+ "'<a
href=\"/phpgroupware/redirect.php?go='.htmlentities(urlencode('http$3://$4$5')).'\"
target=\"_blank\"><font color=\"blue\">$2$4$5</font></a>'", $body);
+
+ // create links for ftp sites
+ $body =
preg_replace("/((ftp:\/\/)|(ftp\.))([\w\.,-.,\/.,\?.,\=.,&]+)/i",
+ "<a href=\"ftp://$3$4\"; target=\"_blank\"><font
color=\"blue\">$1$3$4</font></a>", $body);
+
+ // create links for windows shares
+ // \\\\\\\\ == '\\' in real life!! :)
+ $body = preg_replace("/(\\\\\\\\)([\w,\\\\,-]+)/i",
+ "<a href=\"file:$1$2\" target=\"_blank\"><font
color=\"blue\">$1$2</font></a>", $body);
+
+ // make the signate light grey
+ #$body = preg_replace("/(--)/im","<font
color=\"grey\">$1</font>", $body);
+
+ // create links for email addresses
+ $linkData = array
+ (
+ 'menuaction' =>
'felamimail.uicompose.compose'
+ );
+ $link = $GLOBALS['phpgw']->link('/index.php',$linkData);
+ $body =
preg_replace("/([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+)/i",
+ "<a href=\"$link&send_to=$0\"><font
color=\"blue\">$0</font></a>", $body);
+
$this->t->set_var("body",$body);
-
$this->t->set_var("signature",(isset($sessionData['signature'])?$sessionData['signature']:''));
+
$this->t->set_var("signature",$sessionData['signature']);
// attachments
if (is_array($attachments) && count($attachments) > 0)
{
-
$this->t->set_var('row_class',$this->rowColor[0]);
+
$this->t->set_var('row_color',$this->rowColor[0]);
$this->t->set_var('name',lang('name'));
$this->t->set_var('type',lang('type'));
$this->t->set_var('size',lang('size'));
#$this->t->parse('attachment_rows','attachment_row_bold',True);
while (list($key,$value) = each($attachments))
{
-
$this->t->set_var('row_class',$this->rowColor[($key+1)%2]);
+
$this->t->set_var('row_color',$this->rowColor[($key+1)%2]);
$this->t->set_var('filename',htmlentities($this->bofelamimail->decode_header($value['name'])));
-
$this->t->set_var('mimetype',$value['type']);
+
$this->t->set_var('mimetype',$value['mimeType']);
$this->t->set_var('size',$value['size']);
$this->t->set_var('attachment_number',$key);
$linkData = array
(
'menuaction' =>
'felamimail.uidisplay.getAttachment',
'uid' => $this->uid,
- 'part' => $value['pid']
+ 'part' =>
$value['partID']
);
$this->t->set_var("link_view",$GLOBALS['phpgw']->link('/index.php',$linkData));
@@ -253,7 +550,7 @@
'menuaction' =>
'felamimail.uidisplay.getAttachment',
'mode' => 'save',
'uid' => $this->uid,
- 'part' => $value['pid']
+ 'part' =>
$value['partID']
);
$this->t->set_var("link_save",$GLOBALS['phpgw']->link('/index.php',$linkData));
@@ -270,14 +567,6 @@
// print it out
$this->t->pparse("out","message_main");
- global $calendar_id;
- list(,$app,,,,$calendar_id) =
explode('"',strstr($rawheaders,'X-phpGW-Type:'));
- if(!isset($GLOBALS['HTTP_GET_VARS']['printable']) &&
!empty($app))
- {
- echo '<table align="center"
width="100%"><tr><td align="center">';
- $GLOBALS['phpgw']->hooks->single('email',$app);
- echo '</td></tr></table>';
- }
}
function display_app_header()
@@ -286,6 +575,54 @@
echo parse_navbar();
}
+ function emailAddressToHTML($_emailAddress)
+ {
+ // create some nice formated HTML for senderaddress
+ $addressData = imap_rfc822_parse_adrlist
+
($this->bofelamimail->decode_header($_emailAddress),'');
+ if(is_array($addressData))
+ {
+ $senderAddress = '';
+ while(list($key,$val)=each($addressData))
+ {
+ if(!empty($senderAddress))
$senderAddress .= ", ";
+ if(!empty($val->personal))
+ {
+ $tempSenderAddress =
$val->mailbox."@".$val->host;
+ $newSenderAddress =
imap_rfc822_write_address($val->mailbox,
+
$val->host,
+
$val->personal);
+ $linkData = array
+ (
+ 'menuaction' =>
'felamimail.uicompose.compose',
+ 'send_to' =>
htmlentities($newSenderAddress)
+ );
+ $link =
$GLOBALS['phpgw']->link('/index.php',$linkData);
+ $senderAddress .= sprintf('<a
href="%s" title="%s">%s</a>',
+ $link,
+
htmlentities($newSenderAddress),
+
htmlentities($val->personal));
+ }
+ else
+ {
+ $tempSenderAddress =
$val->mailbox."@".$val->host;
+ $linkData = array
+ (
+ 'menuaction' =>
'felamimail.uicompose.compose',
+ 'send_to' =>
$tempSenderAddress
+ );
+ $link =
$GLOBALS['phpgw']->link('/index.php',$linkData);
+ $senderAddress .= sprintf('<a
href="%s">%s</a>',
+
$link,htmlentities($tempSenderAddress));
+ }
+ }
+ return $senderAddress;
+ }
+
+ // if something goes wrong, just return the original
address
+ return $_emailAddress;
+ }
+
function getAttachment()
{
@@ -295,16 +632,24 @@
$this->bofelamimail->closeConnection();
+ header ("Content-Type: ".$attachment['type'].";
name=\"".$attachment['filename']."\"");
if($GLOBALS['HTTP_GET_VARS']['mode'] == "save")
{
- header ("Content-Type:
application/octet-stream");
+ // ask for download
+ header ("Content-Disposition: attachment;
filename=\"".$attachment['filename']."\"");
}
else
{
- header ("Content-Type: ".$attachment['type']);
+ // display it
+ header ("Content-Disposition: inline;
filename=\"".$attachment['filename']."\"");
}
- header("Content-Disposition:
filename=\"".$attachment['filename']."\"");
+ header("Expires: 0");
+ // the next headers are for IE and SSL
+ header("Cache-Control: must-revalidate, post-check=0,
pre-check=0");
+ header("Pragma: public");
+
echo $attachment['attachment'];
+
$GLOBALS['phpgw']->common->phpgw_exit();
exit;
@@ -349,8 +694,15 @@
$this->t->set_var("lang_compose",lang('compose'));
$this->t->set_var("lang_date",lang('date'));
$this->t->set_var("lang_view",lang('view'));
+
$this->t->set_var("lang_organization",lang('organization'));
$this->t->set_var("lang_save",lang('save'));
$this->t->set_var("lang_printable",lang('print it'));
+ $this->t->set_var("lang_reply",lang('reply'));
+ $this->t->set_var("lang_reply_all",lang('reply all'));
+ $this->t->set_var("lang_forward",lang('forward'));
+ $this->t->set_var("lang_delete",lang('delete'));
+
$this->t->set_var("lang_previous_message",lang('previous message'));
+ $this->t->set_var("lang_next_message",lang('next
message'));
$this->t->set_var("th_bg",$GLOBALS['phpgw_info']["theme"]["th_bg"]);
$this->t->set_var("bg01",$GLOBALS['phpgw_info']["theme"]["bg01"]);
Index: inc/class.uifelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/class.uifelamimail.inc.php 18 Dec 2006 11:02:55 -0000 1.8
+++ inc/class.uifelamimail.inc.php 18 Dec 2006 20:03:32 -0000 1.9
@@ -11,18 +11,19 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uifelamimail.inc.php,v 1.8 2006/12/18 11:02:55 sigurdne
Exp $ */
+ /* $Id: class.uifelamimail.inc.php,v 1.9 2006/12/18 20:03:32 sigurdne
Exp $ */
class uifelamimail
{
var $public_functions = array
(
'addVcard' => True,
+ 'changeFilter' => True,
+ 'compressFolder' => True,
'deleteMessage' => True,
'handleButtons' => True,
'toggleFilter' => True,
- 'viewMainScreen' => True,
- 'compressFolder' => True
+ 'viewMainScreen' => True
);
var $mailbox; // the current folder in use
@@ -34,88 +35,83 @@
{
global $phpgw, $phpgw_info;
- if(isset($GLOBALS['HTTP_POST_VARS']['mark_unread_x']))
- $GLOBALS['HTTP_POST_VARS']['mark_unread'] =
"true";
- if(isset($GLOBALS['HTTP_POST_VARS']['mark_read_x']))
- $GLOBALS['HTTP_POST_VARS']['mark_read'] =
"true";
-
if(isset($GLOBALS['HTTP_POST_VARS']['mark_unflagged_x']))
- $GLOBALS['HTTP_POST_VARS']['mark_unflagged'] =
"true";
- if(isset($GLOBALS['HTTP_POST_VARS']['mark_flagged_x']))
- $GLOBALS['HTTP_POST_VARS']['mark_flagged'] =
"true";
- if(isset($GLOBALS['HTTP_POST_VARS']['mark_deleted_x']))
- $GLOBALS['HTTP_POST_VARS']['mark_deleted'] =
"true";
+ if(isset($GLOBALS['HTTP_POST_VARS']["mark_unread_x"]))
+ $GLOBALS['HTTP_POST_VARS']["mark_unread"] =
"true";
+ if(isset($GLOBALS['HTTP_POST_VARS']["mark_read_x"]))
+ $GLOBALS['HTTP_POST_VARS']["mark_read"] =
"true";
+
if(isset($GLOBALS['HTTP_POST_VARS']["mark_unflagged_x"]))
+ $GLOBALS['HTTP_POST_VARS']["mark_unflagged"] =
"true";
+ if(isset($GLOBALS['HTTP_POST_VARS']["mark_flagged_x"]))
+ $GLOBALS['HTTP_POST_VARS']["mark_flagged"] =
"true";
+ if(isset($GLOBALS['HTTP_POST_VARS']["mark_deleted_x"]))
+ $GLOBALS['HTTP_POST_VARS']["mark_deleted"] =
"true";
$this->bofelamimail =
CreateObject('felamimail.bofelamimail');
+ $this->bofilter =
CreateObject('felamimail.bofilter');
- if(isset($GLOBALS['HTTP_POST_VARS']['changeFilter']) &&
$GLOBALS['HTTP_POST_VARS']['changeFilter'] == 'changeFilter' &&
- isset($GLOBALS['HTTP_POST_VARS']['filter']))
+ if(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
+ $GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
+
empty($GLOBALS['HTTP_POST_VARS']["mark_unread"]) &&
+ empty($GLOBALS['HTTP_POST_VARS']["mark_read"])
&&
+
empty($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) &&
+
empty($GLOBALS['HTTP_POST_VARS']["mark_flagged"]) &&
+
empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"]))
{
- // change filter
-
$this->bofelamimail->sessionData['activeFilter'] =
$GLOBALS['HTTP_POST_VARS']['filter'];
- }
- elseif(isset($GLOBALS['HTTP_GET_VARS']['filter']))
- {
- // change filter
-
$this->bofelamimail->sessionData['activeFilter'] =
$GLOBALS['HTTP_GET_VARS']['filter'];
- }
- elseif(isset($GLOBALS['HTTP_POST_VARS']['mailbox']) &&
- $GLOBALS['HTTP_GET_VARS']['menuaction'] ==
"felamimail.uifelamimail.handleButtons" &&
-
empty($GLOBALS['HTTP_POST_VARS']['mark_unread']) &&
- empty($GLOBALS['HTTP_POST_VARS']['mark_read'])
&&
-
empty($GLOBALS['HTTP_POST_VARS']['mark_unflagged']) &&
-
empty($GLOBALS['HTTP_POST_VARS']['mark_flagged']) &&
-
empty($GLOBALS['HTTP_POST_VARS']['mark_deleted']))
- {
- if ($GLOBALS['HTTP_POST_VARS']['folderAction']
== "changeFolder")
+ if ($GLOBALS['HTTP_POST_VARS']["folderAction"]
== "changeFolder")
{
// change folder
-
$this->bofelamimail->sessionData['mailbox'] =
$GLOBALS['HTTP_POST_VARS']['mailbox'];
+
$this->bofelamimail->sessionData['mailbox'] =
$GLOBALS['HTTP_POST_VARS']["mailbox"];
$this->bofelamimail->sessionData['startMessage']= 1;
$this->bofelamimail->sessionData['sort'] = 6;
$this->bofelamimail->sessionData['activeFilter']= -1;
}
-
elseif($GLOBALS['HTTP_POST_VARS']['folderAction'] == "moveMessage")
+
elseif($GLOBALS['HTTP_POST_VARS']["folderAction"] == "moveMessage")
{
//print "move messages<br>";
-
$this->bofelamimail->sessionData['mailbox'] =
urldecode($GLOBALS['HTTP_POST_VARS']['oldMailbox']);
+
$this->bofelamimail->sessionData['mailbox'] =
urldecode($GLOBALS['HTTP_POST_VARS']["oldMailbox"]);
$this->bofelamimail->sessionData['startMessage']= 1;
- if
(is_array($GLOBALS['HTTP_POST_VARS']['msg']))
+ if
(is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
// we need to initialize the
classes first
$this->moveNeeded = "1";
}
}
}
- elseif(isset($GLOBALS['HTTP_POST_VARS']['mailbox']) &&
- $GLOBALS['HTTP_GET_VARS']['menuaction'] ==
"felamimail.uifelamimail.handleButtons" &&
-
!empty($GLOBALS['HTTP_POST_VARS']['mark_deleted']))
+ elseif(isset($GLOBALS['HTTP_POST_VARS']["mailbox"]) &&
+ $GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.handleButtons" &&
+
!empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"]))
{
// delete messages
$this->bofelamimail->sessionData['startMessage']= 1;
}
- elseif(isset($GLOBALS['HTTP_GET_VARS']['menuaction'])
&& $GLOBALS['HTTP_GET_VARS']['menuaction'] ==
"felamimail.uifelamimail.deleteMessage")
+ elseif($GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.deleteMessage")
{
// delete 1 message from the mail reading window
$this->bofelamimail->sessionData['startMessage']= 1;
}
+ elseif(isset($GLOBALS['HTTP_POST_VARS']["filter"]) ||
isset($GLOBALS['HTTP_GET_VARS']["filter"]))
+ {
+ // new search filter defined, lets start with
message 1
+
$this->bofelamimail->sessionData['startMessage']= 1;
+ }
// navigate for and back
- if(isset($GLOBALS['HTTP_GET_VARS']['startMessage']))
+ if(isset($GLOBALS['HTTP_GET_VARS']["startMessage"]))
{
-
$this->bofelamimail->sessionData['startMessage'] =
$GLOBALS['HTTP_GET_VARS']['startMessage'];
+
$this->bofelamimail->sessionData['startMessage'] =
$GLOBALS['HTTP_GET_VARS']["startMessage"];
}
// change sorting
- if(isset($GLOBALS['HTTP_GET_VARS']['sort']))
+ if(isset($GLOBALS['HTTP_GET_VARS']["sort"]))
{
- $this->bofelamimail->sessionData['sort'] =
$GLOBALS['HTTP_GET_VARS']['sort'];
+ $this->bofelamimail->sessionData['sort'] =
$GLOBALS['HTTP_GET_VARS']["sort"];
}
$this->bofelamimail->saveSessionData();
$this->mailbox =
$this->bofelamimail->sessionData['mailbox'];
$this->startMessage =
$this->bofelamimail->sessionData['startMessage'];
$this->sort =
$this->bofelamimail->sessionData['sort'];
- $this->filter =
$this->bofelamimail->sessionData['activeFilter'];
+ #$this->filter =
$this->bofelamimail->sessionData['activeFilter'];
#$this->cats =
CreateObject('phpgwapi.categories');
#$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
@@ -123,14 +119,13 @@
$this->t =
CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
#$this->grants =
$phpgw->acl->get_grants('notes');
#$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
-
$this->connectionStatus =
$this->bofelamimail->openConnection();
- // $this->rowColor[0] = $phpgw_info['theme']['row_on'];
- // $this->rowColor[1] = $phpgw_info['theme']['row_off'];
+ $this->rowColor[0] = $phpgw_info["theme"]["row_on"];
+ $this->rowColor[1] = $phpgw_info["theme"]["row_off"];
- // $this->dataRowColor[0] = $phpgw_info['theme']['bg01'];
- // $this->dataRowColor[1] = $phpgw_info['theme']['bg02'];
+ $this->dataRowColor[0] = $phpgw_info["theme"]["bg01"];
+ $this->dataRowColor[1] = $phpgw_info["theme"]["bg02"];
}
@@ -166,6 +161,22 @@
$GLOBALS['phpgw']->common->phpgw_exit();
}
+ function changeFilter()
+ {
+ if(isset($GLOBALS['HTTP_POST_VARS']["filter"]))
+ {
+ $data['quickSearch'] =
$GLOBALS['HTTP_POST_VARS']["quickSearch"];
+ $data['filter'] =
$GLOBALS['HTTP_POST_VARS']["filter"];
+ $this->bofilter->updateFilter($data);
+ }
+ elseif(isset($GLOBALS['HTTP_GET_VARS']["filter"]))
+ {
+ $data['filter'] =
$GLOBALS['HTTP_GET_VARS']["filter"];
+ $this->bofilter->updateFilter($data);
+ }
+ $this->viewMainScreen();
+ }
+
function compressFolder()
{
$this->bofelamimail->compressFolder();
@@ -174,9 +185,10 @@
function deleteMessage()
{
- $message[] = $GLOBALS['HTTP_GET_VARS']['message'];
+ $message[] = $GLOBALS['HTTP_GET_VARS']["message"];
$this->bofelamimail->deleteMessages($message);
+
$this->viewMainScreen();
}
@@ -193,38 +205,38 @@
{
if($this->moveNeeded == "1")
{
-
$this->bofelamimail->moveMessages($GLOBALS['HTTP_POST_VARS']['mailbox'],
-
$GLOBALS['HTTP_POST_VARS']['msg']);
+
$this->bofelamimail->moveMessages($GLOBALS['HTTP_POST_VARS']["mailbox"],
+
$GLOBALS['HTTP_POST_VARS']["msg"]);
}
-
elseif(!empty($GLOBALS['HTTP_POST_VARS']['mark_deleted']) &&
- is_array($GLOBALS['HTTP_POST_VARS']['msg']))
+
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_deleted"]) &&
+ is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
-
$this->bofelamimail->deleteMessages($GLOBALS['HTTP_POST_VARS']['msg']);
+
$this->bofelamimail->deleteMessages($GLOBALS['HTTP_POST_VARS']["msg"]);
}
-
elseif(!empty($GLOBALS['HTTP_POST_VARS']['mark_unread']) &&
- is_array($GLOBALS['HTTP_POST_VARS']['msg']))
+
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_unread"]) &&
+ is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
-
$this->bofelamimail->flagMessages("unread",$GLOBALS['HTTP_POST_VARS']['msg']);
+
$this->bofelamimail->flagMessages("unread",$GLOBALS['HTTP_POST_VARS']["msg"]);
}
- elseif(!empty($GLOBALS['HTTP_POST_VARS']['mark_read'])
&&
- is_array($GLOBALS['HTTP_POST_VARS']['msg']))
+ elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_read"])
&&
+ is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
-
$this->bofelamimail->flagMessages("read",$GLOBALS['HTTP_POST_VARS']['msg']);
+
$this->bofelamimail->flagMessages("read",$GLOBALS['HTTP_POST_VARS']["msg"]);
}
-
elseif(!empty($GLOBALS['HTTP_POST_VARS']['mark_unflagged']) &&
- is_array($GLOBALS['HTTP_POST_VARS']['msg']))
+
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_unflagged"]) &&
+ is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
-
$this->bofelamimail->flagMessages("unflagged",$GLOBALS['HTTP_POST_VARS']['msg']);
+
$this->bofelamimail->flagMessages("unflagged",$GLOBALS['HTTP_POST_VARS']["msg"]);
}
-
elseif(!empty($GLOBALS['HTTP_POST_VARS']['mark_flagged']) &&
- is_array($GLOBALS['HTTP_POST_VARS']['msg']))
+
elseif(!empty($GLOBALS['HTTP_POST_VARS']["mark_flagged"]) &&
+ is_array($GLOBALS['HTTP_POST_VARS']["msg"]))
{
-
$this->bofelamimail->flagMessages("flagged",$GLOBALS['HTTP_POST_VARS']['msg']);
+
$this->bofelamimail->flagMessages("flagged",$GLOBALS['HTTP_POST_VARS']["msg"]);
}
@@ -234,17 +246,13 @@
function viewMainScreen()
{
$bopreferences =
CreateObject('felamimail.bopreferences');
+ $preferences =
$bopreferences->getPreferences();
$bofilter =
CreateObject('felamimail.bofilter');
$mailPreferences =
$bopreferences->getPreferences();
- $firstMessage = '';
- $lastMessage = '';
- $totalMessage = '';
- $langTotal = lang("total");
-
$urlMailbox = urlencode($this->mailbox);
- $maxMessages =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ $maxMessages =
$GLOBALS['phpgw_info']["user"]["preferences"]["common"]["maxmatchs"];
$this->display_app_header();
@@ -252,30 +260,80 @@
$this->t->set_file(array("body" => 'mainscreen.tpl'));
$this->t->set_block('body','main');
$this->t->set_block('body','status_row_tpl');
- $this->t->set_block('body','header_row_S');
- $this->t->set_block('body','header_row_');
- $this->t->set_block('body','header_row_AS');
- $this->t->set_block('body','header_row_RAS');
- $this->t->set_block('body','header_row_ADS');
- $this->t->set_block('body','header_row_F');
- $this->t->set_block('body','header_row_FA');
- $this->t->set_block('body','header_row_FS');
- $this->t->set_block('body','header_row_FAS');
- $this->t->set_block('body','header_row_R');
- $this->t->set_block('body','header_row_RS');
- $this->t->set_block('body','header_row_D');
- $this->t->set_block('body','header_row_DS');
- $this->t->set_block('body','header_row_A');
+ $this->t->set_block('body','header_row');
$this->t->set_block('body','error_message');
+ $this->t->set_block('body','quota_block');
$this->translate();
$this->t->set_var('oldMailbox',$urlMailbox);
$this->t->set_var('image_path',PHPGW_IMAGES);
- $refreshTime =
isset($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['refreshTime'])?$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['refreshTime']:'';
+
+ // ui for the quotas
+ if($quota = $this->bofelamimail->getQuotaRoot())
+ {
+ if($quota['limit'] == 0)
+ {
+ $quotaPercent=100;
+ }
+ else
+ {
+
$quotaPercent=round(($quota['usage']*100)/$quota['limit']);
+ }
+
$quotaLimit=$this->show_readable_size($quota['limit']*1024);
+
$quotaUsage=$this->show_readable_size($quota['usage']*1024);
+
+ $this->t->set_var('leftWidth',$quotaPercent);
+ if($quotaPercent > 90)
+ {
+ $this->t->set_var('quotaBG','red');
+ }
+ elseif($quotaPercent > 80)
+ {
+ $this->t->set_var('quotaBG','yellow');
+ }
+ else
+ {
+ $this->t->set_var('quotaBG','#33ff33');
+ }
+
+ if($quotaPercent > 50)
+ {
+
$this->t->set_var('quotaUsage_right',' ');
+
$this->t->set_var('quotaUsage_left',$quotaUsage .'/'.$quotaLimit);
+ }
+ else
+ {
+
$this->t->set_var('quotaUsage_left',' ');
+
$this->t->set_var('quotaUsage_right',$quotaUsage .'/'.$quotaLimit);
+ }
+
+
$this->t->parse('quota_display','quota_block',True);
+ }
+ else
+ {
+ $this->t->set_var('quota_display',' ');
+ }
+
+ // set the images
+ $listOfImages = array(
+ 'read_small',
+ 'unread_small',
+ 'unread_flagged_small',
+ 'unread_small',
+ 'unread_deleted_small',
+ 'sm_envelope'
+ );
+
+ foreach ($listOfImages as $image)
+ {
+
$this->t->set_var($image,$GLOBALS['phpgw']->common->image('felamimail',$image));
+ }
+ // refresh settings
+ $refreshTime = $preferences['refreshTime'];
if($refreshTime > 0)
{
-
$this->t->set_var('refreshTime',sprintf("setTimeout( \"refresh()\", %s
);",$refreshTime*60*1000));
+ $this->t->set_var('refreshTime',sprintf("aktiv
= window.setTimeout( \"refresh()\", %s );",$refreshTime*60*1000));
}
else
{
@@ -288,6 +346,7 @@
);
$this->t->set_var('refresh_url',$GLOBALS['phpgw']->link('/index.php',$linkData));
+
// set the default values for the sort links (sort by
url)
$linkData = array
(
@@ -317,17 +376,22 @@
// create the filter ui
$filterList = $bofilter->getFilterList();
- if($this->filter == -1)
- $filterUI = "<option value=\"-1\">".lang('no
filter')."</option>";
+ $activeFilter = $bofilter->getActiveFilter();
+ // -1 == no filter selected
+ if($activeFilter == -1)
+ $filterUI .= "<option value=\"-1\"
selected>".lang('no filter')."</option>";
else
- $filterUI = "<option value=\"-1\"
selected>".lang('no filter')."</option>";
+ $filterUI .= "<option value=\"-1\">".lang('no
filter')."</option>";
while(list($key,$value) = @each($filterList))
{
$selected="";
- if($this->filter == $key) $selected="selected";
+ if($activeFilter == $key) $selected="selected";
$filterUI .= "<option value=".$key."
$selected>".$value['filterName']."</option>";
}
$this->t->set_var('filter_options',$filterUI);
+ // 0 == quicksearch
+ if($activeFilter == '0')
+
$this->t->set_var('quicksearch',$filterList[0]['subject']);
// create the urls for sorting
switch($this->sort)
@@ -376,7 +440,7 @@
$headers =
$this->bofelamimail->getHeaders($this->startMessage, $maxMessages, $this->sort);
// create the listing of subjects
- $maxSubjectLength = 80;
+ $maxSubjectLength = 75;
$maxAddressLength = 30;
for($i=0; $i<count($headers['header']); $i++)
{
@@ -390,7 +454,7 @@
$headers['header'][$i]['subject'] =
htmlentities($headers['header'][$i]['subject']);
if($headers['header'][$i]['attachments'] == "true")
{
- $image = '<img
src="'.PHPGW_IMAGES.'/attach.gif" border="0">';
+ $image = '<img
src="'.$GLOBALS['phpgw']->common->image('felamimail','attach').'" border="0">';
$headers['header'][$i]['subject'] =
"$image ".$headers['header'][$i]['subject'];
}
$this->t->set_var('header_subject', $headers['header'][$i]['subject']);
@@ -444,7 +508,7 @@
$this->t->set_var('sender_name',$sender_name);
$this->t->set_var('full_address',$full_address);
-
if(isset($GLOBALS['HTTP_GET_VARS']['select_all']) &&
$GLOBALS['HTTP_GET_VARS']['select_all'] == "select_all")
+
if($GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
{
$this->t->set_var('row_selected',"checked");
}
@@ -489,22 +553,74 @@
'menuaction' =>
'addressbook.uiaddressbook.add_email',
'add_email' =>
urlencode($headers['header'][$i]['sender_address']),
'name' =>
urlencode($headers['header'][$i]['sender_name']),
- 'referer' =>
(isset($_SERVER['PHP_SELF'])&&$_SERVER['PHP_SELF']?urlencode($_SERVER['PHP_SELF']):urlencode($_SERVER['QUERY_STRING']))
- // 'referer' =>
urlencode($GLOBALS['PHP_SELF'].'?'.$GLOBALS['QUERY_STRING'])
+ 'referer' =>
urlencode($GLOBALS['PHP_SELF'].'?'.$GLOBALS['QUERY_STRING'])
);
$this->t->set_var('url_add_to_addressbook',$GLOBALS['phpgw']->link('/index.php',$linkData));
$this->t->set_var('phpgw_images',PHPGW_IMAGES);
+
$this->t->set_var('row_css_class','header_row_'.$flags);
+ switch($flags)
+ {
+ case "":
+
$this->t->set_var('imageName','unread_small.png');
+
$this->t->set_var('row_text',lang('new'));
+ break;
+ case "D":
+ case "DS":
+ case "ADS":
+
$this->t->set_var('imageName','unread_small.png');
+
$this->t->set_var('row_text',lang('deleted'));
+ break;
+ case "F":
+
$this->t->set_var('imageName','unread_flagged_small.png');
+
$this->t->set_var('row_text',lang('new'));
+ break;
+ case "FS":
+
$this->t->set_var('imageName','read_flagged_small.png');
+
$this->t->set_var('row_text',lang('replied'));
+ break;
+ case "FAS":
+
$this->t->set_var('imageName','read_answered_flagged_small.png');
+
$this->t->set_var('row_text',lang('replied'));
+ break;
+ case "S":
+ case "RS":
+
$this->t->set_var('imageName','read_small.png');
+
$this->t->set_var('row_text',lang('read'));
+ break;
+ case "R":
+
$this->t->set_var('imageName','recent_small.gif');
+
$this->t->set_var('row_text','*'.lang('recent').'*');
+ break;
+ case "AS":
+
$this->t->set_var('imageName','read_answered_small.png');
+
$this->t->set_var('row_text',lang('replied'));
+ break;
+ default:
+
$this->t->set_var('row_text',$flags);
+ break;
+ }
-
$this->t->parse('header_rows','header_row_'.$flags,True);
+
$this->t->parse('header_rows','header_row',True);
}
$firstMessage = $headers['info']['first'];
$lastMessage = $headers['info']['last'];
$totalMessage = $headers['info']['total'];
+ $langTotal = lang("total");
+ }
+
+ $this->t->set_var('maxMessages',$i);
+ if($GLOBALS['HTTP_GET_VARS']["select_all"] ==
"select_all")
+ {
+ $this->t->set_var('checkedCounter',$i);
+ }
+ else
+ {
+ $this->t->set_var('checkedCounter','0');
}
// set the select all/nothing link
- if(isset($GLOBALS['HTTP_GET_VARS']['select_all']) &&
$GLOBALS['HTTP_GET_VARS']['select_all'] == "select_all")
+ if($GLOBALS['HTTP_GET_VARS']["select_all"] ==
"select_all")
{
// link to unselect all messages
$linkData = array
@@ -595,23 +711,19 @@
}
$this->t->parse('status_row','status_row_tpl',True);
- $options_folder = '';
- if(isset($folders) && is_array($folders))
- {
- for($i=0; $i<count($folders); $i++)
+ @reset($folders);
+ while(list($key,$value) = @each($folders))
{
$selected = '';
- if ($this->mailbox == $folders[$i])
+ if ($this->mailbox == $key)
{
$selected = ' selected';
}
$options_folder .= sprintf('<option
value="%s"%s>%s</option>',
-
htmlspecialchars($folders[$i]),
+ htmlspecialchars($key),
$selected,
-
htmlspecialchars($folders[$i]));
- }
+
htmlspecialchars($value));
}
-
$this->t->set_var('options_folder',$options_folder);
$linkData = array
@@ -631,8 +743,15 @@
'menuaction' =>
'felamimail.uifelamimail.handleButtons'
);
$this->t->set_var('url_change_folder',$GLOBALS['phpgw']->link('/index.php',$linkData));
+
+ $linkData = array
+ (
+ 'menuaction' =>
'felamimail.uifelamimail.changeFilter'
+ );
+
$this->t->set_var('url_search_settings',$GLOBALS['phpgw']->link('/index.php',$linkData));
+
$this->t->set_var('lang_mark_messages_as',lang('mark
messages as'));
- $this->t->set_var('lang_delete_selected',lang('delete
selected messages'));
+ $this->t->set_var('lang_delete',lang('delete'));
$this->t->parse("out","main");
print $this->t->get('out','main');
@@ -646,7 +765,7 @@
}
/* Returns a string showing the size of the message/attachment
*/
- function show_readable_size($bytes)
+ function show_readable_size($bytes, $_mode='short')
{
$bytes /= 1024;
$type = 'k';
@@ -654,7 +773,7 @@
if ($bytes / 1024 > 1)
{
$bytes /= 1024;
- $type = 'm';
+ $type = 'M';
}
if ($bytes < 10)
@@ -666,7 +785,7 @@
else
settype($bytes, 'integer');
- return $bytes . '<small> ' . $type . '</small>';
+ return $bytes . ' ' . $type ;
}
function toggleFilter()
@@ -679,9 +798,9 @@
{
global $phpgw_info;
-
$this->t->set_var('th_bg',$phpgw_info['theme']['th_bg']);
- $this->t->set_var('bg_01',$phpgw_info['theme']['bg01']);
- $this->t->set_var('bg_02',$phpgw_info['theme']['bg02']);
+
$this->t->set_var('th_bg',$phpgw_info["theme"]["th_bg"]);
+ $this->t->set_var('bg_01',$phpgw_info["theme"]["bg01"]);
+ $this->t->set_var('bg_02',$phpgw_info["theme"]["bg02"]);
$this->t->set_var('lang_compose',lang('compose'));
$this->t->set_var('lang_edit_filter',lang('edit
filter'));
@@ -696,6 +815,7 @@
$this->t->set_var('desc_deleted',lang("delete
selected"));
$this->t->set_var('lang_date',lang("date"));
$this->t->set_var('lang_size',lang("size"));
+
$this->t->set_var('lang_quicksearch',lang("Quicksearch"));
$this->t->set_var('lang_replied',lang("replied"));
$this->t->set_var('lang_read',lang("read"));
$this->t->set_var('lang_unread',lang("unread"));
Index: inc/class.uifilter.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uifilter.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/class.uifilter.inc.php 16 Dec 2006 21:52:00 -0000 1.3
+++ inc/class.uifilter.inc.php 18 Dec 2006 20:03:32 -0000 1.4
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uifilter.inc.php,v 1.3 2006/12/16 21:52:00 sigurdne Exp $
*/
+ /* $Id: class.uifilter.inc.php,v 1.4 2006/12/18 20:03:32 sigurdne Exp $
*/
class uifilter
{
@@ -26,9 +26,9 @@
{
// get posted variables
- $this->urlMailbox =
isset($GLOBALS['HTTP_GET_VARS']['mailbox'])?urldecode($GLOBALS['HTTP_GET_VARS']['mailbox']):'';
- $this->startMessage =
(isset($GLOBALS['HTTP_GET_VARS']['startMessage'])?$GLOBALS['HTTP_GET_VARS']['startMessage']:'');
- $this->sort =
(isset($GLOBALS['HTTP_GET_VARS']['sort'])?$GLOBALS['HTTP_GET_VARS']['sort']:'');
+ $this->urlMailbox =
urldecode($GLOBALS['HTTP_GET_VARS']['mailbox']);
+ $this->startMessage =
$GLOBALS['HTTP_GET_VARS']['startMessage'];
+ $this->sort =
$GLOBALS['HTTP_GET_VARS']['sort'];
$this->bofelamimail =
CreateObject('felamimail.bofelamimail',$this->urlMailbox);
$this->bofilter =
CreateObject('felamimail.bofilter');
@@ -37,8 +37,8 @@
$this->t =
CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
$this->t->set_unknowns('remove');
- // $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
- // $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
+ $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
+ $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
}
@@ -61,7 +61,7 @@
// translate most of the parts
$this->translate();
-
switch((isset($GLOBALS['HTTP_GET_VARS']['action'])?$GLOBALS['HTTP_GET_VARS']['action']:''))
+ switch($GLOBALS['HTTP_GET_VARS']['action'])
{
case "deleteFilter":
$filterID =
$GLOBALS['HTTP_GET_VARS']['filterID'];
@@ -98,18 +98,18 @@
$this->t->set_var("from",$filterList[$filterID]['from']);
$this->t->set_var("to",$filterList[$filterID]['to']);
$this->t->set_var("subject",$filterList[$filterID]['subject']);
-
if(isset($filterList[$filterID]['filterActive']) &&
$filterList[$filterID]['filterActive'] == "true")
+
if($filterList[$filterID]['filterActive'] == "true")
{
$this->t->set_var("filter_checked","checked");
}
break;
case "updateFilter":
- $filterID =
(isset($GLOBALS['HTTP_GET_VARS']['filterID'])?$GLOBALS['HTTP_GET_VARS']['filterID']:'');
+ $filterID =
$GLOBALS['HTTP_GET_VARS']['filterID'];
$formData['from'] =
$GLOBALS['HTTP_POST_VARS']['from'];
$formData['to'] =
$GLOBALS['HTTP_POST_VARS']['to'];
$formData['subject'] =
$GLOBALS['HTTP_POST_VARS']['subject'];
$formData['filterName'] =
$GLOBALS['HTTP_POST_VARS']['filterName'];
-
if(isset($GLOBALS['HTTP_POST_VARS']['filter_active'])&&
$GLOBALS['HTTP_POST_VARS']['filter_active'] == "on")
+
if($GLOBALS['HTTP_POST_VARS']['filter_active'] == "on")
{
$formData['filterActive']
= "true";
}
@@ -124,11 +124,11 @@
);
$this->t->set_var('link_action',$GLOBALS['phpgw']->link('/index.php',$linkData));
-
$this->t->set_var("filterName",(isset($filterList[$filterID]['filterName'])?$filterList[$filterID]['filterName']:''));
-
$this->t->set_var("from",(isset($filterList[$filterID]['from'])?$filterList[$filterID]['from']:''));
-
$this->t->set_var("to",(isset($filterList[$filterID]['to'])?$filterList[$filterID]['to']:''));
-
$this->t->set_var("subject",(isset($filterList[$filterID]['subject'])?$filterList[$filterID]['subject']:''));
-
if(isset($filterList[$filterID]['filterActive']) &&
$filterList[$filterID]['filterActive'] == "true")
+
$this->t->set_var("filterName",$filterList[$filterID]['filterName']);
+
$this->t->set_var("from",$filterList[$filterID]['from']);
+
$this->t->set_var("to",$filterList[$filterID]['to']);
+
$this->t->set_var("subject",$filterList[$filterID]['subject']);
+
if($filterList[$filterID]['filterActive'] == "true")
{
$this->t->set_var("filter_checked","checked");
}
@@ -165,12 +165,8 @@
$filterList = $this->bofilter->getFilterList();
- $i= 0;
while(list($key,$value)address@hidden($filterList))
{
- $row_class = $i % 2 ? 'row_on' : 'row_off';
- $i++;
- $this->t->set_var("row_class",$row_class);
$this->t->set_var("id",$key);
$this->t->set_var("filtername",$value['filterName']);
@@ -194,7 +190,7 @@
$linkData = array
(
- 'menuaction' =>
'felamimail.uifelamimail.viewMainScreen',
+ 'menuaction' =>
'felamimail.uifelamimail.changeFilter',
'filter' => $key
);
$link =
$GLOBALS['phpgw']->link('/index.php',$linkData);
Index: inc/class.uipreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uipreferences.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- inc/class.uipreferences.inc.php 24 Nov 2002 00:36:06 -0000 1.1
+++ inc/class.uipreferences.inc.php 18 Dec 2006 20:03:32 -0000 1.2
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uipreferences.inc.php,v 1.1 2002/11/24 00:36:06 lkneschke
Exp $ */
+ /* $Id: class.uipreferences.inc.php,v 1.2 2006/12/18 20:03:32 sigurdne
Exp $ */
class uipreferences
{
@@ -28,37 +28,90 @@
$this->t = $GLOBALS['phpgw']->template;
$this->bofelamimail =
CreateObject('felamimail.bofelamimail');
$this->bofelamimail->openConnection('',OP_HALFOPEN);
- // the name of the current folder
- if(isset($GLOBALS['HTTP_POST_VARS']['foldername']))
+
+
+ $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
+ $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
+
+ }
+
+ function display_app_header()
{
- $this->selectedFolder =
$GLOBALS['HTTP_POST_VARS']['foldername'];
+ $GLOBALS['phpgw']->common->phpgw_header();
+ echo parse_navbar();
}
- else
+
+ function listFolder()
+ {
+ // check user input BEGIN
+
+ // the name of the new current folder
+ if(isset($GLOBALS['HTTP_POST_VARS']['foldername']))
{
- $this->selectedFolder = "INBOX";
+
$this->bofelamimail->sessionData['preferences']['mailbox']
+ =
$GLOBALS['HTTP_POST_VARS']['foldername'];
+ $this->bofelamimail->saveSessionData();
}
+ $this->selectedFolder =
$this->bofelamimail->sessionData['preferences']['mailbox'];
+
// (un)subscribe to a folder??
if(isset($GLOBALS['HTTP_POST_VARS']['folderStatus']))
{
$this->bofelamimail->subscribe($this->selectedFolder,$GLOBALS['HTTP_POST_VARS']['folderStatus']);
}
- $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
- $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
+ // rename a mailbox
+ if(isset($GLOBALS['HTTP_POST_VARS']['newMailboxName']))
+ {
+ #print "rename to:
".$GLOBALS['HTTP_POST_VARS']['newMailboxName'];
+
+ $oldMailboxName = $this->selectedFolder;
+ $newMailboxName =
$GLOBALS['HTTP_POST_VARS']['newMailboxName'];
+ if($position = strrpos($oldMailboxName,'.'))
+ {
+ $newMailboxName =
substr($oldMailboxName,0,$position+1).$newMailboxName;
}
- function display_app_header()
+
+
if($this->bofelamimail->imap_renamemailbox($oldMailboxName, $newMailboxName))
{
- $GLOBALS['phpgw']->common->phpgw_header();
- echo parse_navbar();
+
$this->bofelamimail->sessionData['preferences']['mailbox']
+ = $newMailboxName;
+ $this->bofelamimail->saveSessionData();
+ }
}
- function listFolder()
+ // create a new Mailbox
+ if(isset($GLOBALS['HTTP_POST_VARS']['newSubFolder']))
+ {
+ $oldMailboxName =
$this->bofelamimail->sessionData['preferences']['mailbox'];
+ $newMailboxName =
$oldMailboxName.".".$GLOBALS['HTTP_POST_VARS']['newSubFolder'];
+
+
$this->bofelamimail->imap_createmailbox($newMailboxName,True);
+ }
+
+ // delete a Folder
+ if(isset($GLOBALS['HTTP_POST_VARS']['deleteFolder']))
{
+
if($this->bofelamimail->imap_deletemailbox($this->bofelamimail->sessionData['preferences']['mailbox']))
+ {
+
$this->bofelamimail->sessionData['preferences']['mailbox']
+ = "INBOX";
+ $this->bofelamimail->saveSessionData();
+ }
+ }
+
+ $this->selectedFolder =
$this->bofelamimail->sessionData['preferences']['mailbox'];
+
+ // check user input END
+
+
$folderList = $this->bofelamimail->getFolderList();
$folderStatus =
$this->bofelamimail->getFolderStatus($this->selectedFolder);
+ #$quota =
$this->bofelamimail->imap_get_quotaroot($this->selectedFolder);
+ $mailPrefs =
$this->bofelamimail->getMailPreferences();
$this->display_app_header();
@@ -79,9 +132,10 @@
// folder select box
while(list($key,$value) = @each($folderList))
{
- $currentFolderStatus =
$this->bofelamimail->getFolderStatus($value);
+ $currentFolderStatus =
$this->bofelamimail->getFolderStatus($key);
$this->t->set_var('folder_name',$value);
- if($this->selectedFolder == $value)
+ $this->t->set_var('folder_value',$key);
+ if($this->selectedFolder == $key)
{
$this->t->set_var('selected','selected');
}
@@ -111,7 +165,36 @@
$this->t->set_var('subscribed_checked','');
$this->t->set_var('unsubscribed_checked','checked');
}
+
+ if(is_array($quota))
+ {
+
$this->t->set_var('storage_usage',$quota['STORAGE']['usage']);
+
$this->t->set_var('storage_limit',$quota['STORAGE']['limit']);
+
$this->t->set_var('message_usage',$quota['MESSAGE']['usage']);
+
$this->t->set_var('message_limit',$quota['MESSAGE']['limit']);
+ }
+ else
+ {
+
$this->t->set_var('storage_usage',lang('unknown'));
+
$this->t->set_var('storage_limit',lang('unknown'));
+
$this->t->set_var('message_usage',lang('unknown'));
+
$this->t->set_var('message_limit',lang('unknown'));
+ }
+
+ $mailBoxTreeName = '';
+ $mailBoxName = $this->selectedFolder;
+ if($position = strrpos($this->selectedFolder,'.'))
+ {
+ $mailBoxTreeName =
substr($this->selectedFolder,0,$position+1);
+ $mailBoxName =
substr($this->selectedFolder,$position+1);
+ }
+
+ $this->t->set_var('mailboxTreeName',$mailBoxTreeName);
+ $this->t->set_var('mailboxNameShort',$mailBoxName);
+ $this->t->set_var('mailboxName',$mailBoxName);
$this->t->set_var('folderName',$this->selectedFolder);
+
$this->t->set_var('imap_server',$mailPrefs['imapServerAddress']);
+
$this->t->pparse("out","main");
$this->bofelamimail->closeConnection();
}
@@ -119,6 +202,7 @@
function translate()
{
$this->t->set_var("lang_folder_name",lang('folder
name'));
+
$this->t->set_var("lang_folder_list",lang('folderlist'));
$this->t->set_var("lang_select",lang('select'));
$this->t->set_var("lang_folder_status",lang('folder
status'));
$this->t->set_var("lang_subscribed",lang('subscribed'));
@@ -126,6 +210,12 @@
$this->t->set_var("lang_subscribe",lang('subscribe'));
$this->t->set_var("lang_unsubscribe",lang('unsubscribe'));
$this->t->set_var("lang_update",lang('update'));
+ $this->t->set_var("lang_rename_folder",lang('rename
folder'));
+ $this->t->set_var("lang_create_subfolder",lang('create
subfolder'));
+ $this->t->set_var("lang_delete_folder",lang('delete
folder'));
+ $this->t->set_var("lang_delete",lang('delete'));
+ $this->t->set_var("lang_imap_server",lang('IMAP
Server'));
+ $this->t->set_var("lang_folder_settings",lang('folder
settings'));
$this->t->set_var("th_bg",$GLOBALS['phpgw_info']["theme"]["th_bg"]);
$this->t->set_var("bg01",$GLOBALS['phpgw_info']["theme"]["bg01"]);
Index: inc/class.uisieve.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uisieve.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/class.uisieve.inc.php 24 Nov 2002 00:36:06 -0000 1.2
+++ inc/class.uisieve.inc.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uisieve.inc.php,v 1.2 2002/11/24 00:36:06 lkneschke Exp $
*/
+ /* $Id: class.uisieve.inc.php,v 1.3 2006/12/18 20:03:32 sigurdne Exp $
*/
class uisieve
{
Index: inc/hook_admin.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/hook_admin.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/hook_admin.inc.php 9 Sep 2006 09:04:49 -0000 1.8
+++ inc/hook_admin.inc.php 18 Dec 2006 20:03:32 -0000 1.9
@@ -2,20 +2,22 @@
/**************************************************************************\
* phpGroupWare
*
* http://www.phpgroupware.org
*
+ * Written by Joseph Engo <address@hidden> *
* --------------------------------------------
*
* This program is free software; you can redistribute it and/or modify
it *
* under the terms of the GNU General Public License as published by
the *
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: hook_admin.inc.php,v 1.8 2006/09/09 09:04:49 skwashd Exp $ */
- {
+
+ /* $Id: hook_admin.inc.php,v 1.9 2006/12/18 20:03:32 sigurdne Exp $ */
+{
// Only Modify the $file and $title variables.....
- $file = Array
- (
- 'Site Configuration' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction=admin.uiconfig.index',
'appname' => 'felamimail') )
+ $title = $appname;
+ $file = Array(
+ 'Site Configuration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
. $appname)
);
//Do not modify below this line
- $GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
- }
+ display_section($appname,$title,$file);
+}
?>
Index: inc/hook_home.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/hook_home.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/hook_home.inc.php 24 Nov 2002 00:32:13 -0000 1.8
+++ inc/hook_home.inc.php 18 Dec 2006 20:03:32 -0000 1.9
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_home.inc.php,v 1.8 2002/11/24 00:32:13 lkneschke Exp $ */
+ /* $Id: hook_home.inc.php,v 1.9 2006/12/18 20:03:32 sigurdne Exp $ */
$d1 = strtolower(substr(PHPGW_APP_INC,0,3));
if($d1 == 'htt' || $d1 == 'ftp' )
@@ -21,32 +21,32 @@
$tmp_app_inc = $GLOBALS['phpgw']->common->get_inc_dir('felamimail');
- if
($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['mainscreen_showmail']
== True)
- {
- // ---- Create the base email Msg Class -----
+# if
($GLOBALS['phpgw_info']['user']['preferences']['felamimail']['mainscreen_showmail']
== True)
+# {
+# // ---- Create the base email Msg Class -----
$GLOBALS['phpgw']->translation->add_app('felamimail');
$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
- $args_array = Array();
- $args_array['folder'] = 'INBOX';
- $args_array['do_login'] = True;
- $GLOBALS['phpgw']->msg->begin_request($args_array);
-
- if (!$GLOBALS['phpgw']->msg->mailsvr_stream)
- {
- $error_msg = '<b>Mail error:</b> Can not open
connection to mail server';
- echo "\r\n"
- .'<tr>'."\r\n"
- .'<td align="left">'."\r\n"
- .'<!-- start Mailbox info -->'."\r\n"
- .$error_msg."\r\n"
- .'<!-- ends Mailox info -->'."\r\n"
- .'</td>'."\r\n"
- .'</tr>'."\r\n";
- //$GLOBALS['phpgw']->common->phpgw_exit(True);
- }
- else
- {
- $title = '<font
color="#FFFFFF">'.lang('E-Mail').'</font>';
+# $args_array = Array();
+# $args_array['folder'] = 'INBOX';
+# $args_array['do_login'] = True;
+# $GLOBALS['phpgw']->msg->begin_request($args_array);
+
+# if (!$GLOBALS['phpgw']->msg->mailsvr_stream)
+# {
+# $error_msg = '<b>Mail error:</b> Can not open
connection to mail server';
+# echo "\r\n"
+# .'<tr>'."\r\n"
+# .'<td align="left">'."\r\n"
+# .'<!-- start Mailbox info -->'."\r\n"
+# .$error_msg."\r\n"
+# .'<!-- ends Mailox info -->'."\r\n"
+# .'</td>'."\r\n"
+# .'</tr>'."\r\n";
+# //$GLOBALS['phpgw']->common->phpgw_exit(True);
+# }
+# else
+# {
+ $title = '<font
color="#FFFFFF">'.lang('felamimail').'</font>';
$portalbox = CreateObject('phpgwapi.listbox',
Array(
@@ -78,76 +78,76 @@
$portalbox->data = Array();
- /* // this is the structure you will get
- $inbox_data['is_imap'] boolean - pop3 server do not
know what is "new" or not
- $inbox_data['folder_checked'] string - the folder
checked, as processed by the msg class
- $inbox_data['alert_string'] string - what to show the
user about this inbox check
- $inbox_data['number_new'] integer - for IMAP is
number "unseen"; for pop3 is number messages
- $inbox_data['number_all'] integer - for IMAP and pop3
is total number messages in that inbox
- */
- $inbox_data = Array();
- $inbox_data =
$GLOBALS['phpgw']->msg->new_message_check();
-
- if($inbox_data['number_all'] >= 5)
- {
- $check_msgs = 5;
- }
- else
- {
- $check_msgs = $inbox_data['number_all'];
- }
-
- if ($inbox_data['number_all'] > 0)
- {
- $msg_array = array();
- $msg_array =
$GLOBALS['phpgw']->msg->get_message_list();
- }
- for($i=0; $i<$check_msgs; $i++)
- {
- $msg =
$GLOBALS['phpgw']->dcom->header($GLOBALS['phpgw']->msg->mailsvr_stream,$msg_array[$i]);
- $subject =
$GLOBALS['phpgw']->msg->get_subject($msg,'');
- if (strlen($subject) > 65)
- {
- $subject = substr($subject,0,65).' ...';
- }
- $linkData = array
- (
- 'mailbox' =>
$GLOBALS['phpgw']->msg->prep_folder_out(''),
- 'passed_id' => $msg_array[$i],
- 'startMessage' => 1,
- 'show_more' => 0
- );
- $data[] = array(
- 'data' => $subject,
- 'link' =>
$GLOBALS['phpgw']->link('/felamimail/read_body.php',$linkData)
- );
- }
- // ADD FOLDER LISTBOX TO HOME PAGE (Needs to be
TEMPLATED)
- // Does This Mailbox Support Folders (i.e. more than
just INBOX)?
- if
($GLOBALS['phpgw']->msg->get_mailsvr_supports_folders() == False)
- {
- $extra_data = '';
- }
- else
- {
- // FUTURE: this will pick up the user option to
show num unseen msgs in dropdown list
- //$listbox_show_unseen = True;
- $listbox_show_unseen = False;
- $switchbox_listbox = '<select name="mailbox"
onChange="document.switchbox.submit()">'
- . '<option>' . lang('switch
current folder to') . ':'
- .
$GLOBALS['phpgw']->msg->all_folders_listbox('','','',$listbox_show_unseen)
- . '</select>';
- // make it another TR we can insert
- $switchbox_action =
$GLOBALS['phpgw']->link('/felamimail/index.php');
- $extra_data = '<form name="switchbox"
action="'.$switchbox_action.'" method="post">'."\r\n"
- .'<td align="left">'."\r\n"
- .' <strong>'.lang('E-Mail
Folders').':</strong> '.$switchbox_listbox
- .'<input type="hidden"
name="startMessage" value="1">'
- .'</td>'."\r\n"
- .'</form>'."\r\n";
- }
- $GLOBALS['phpgw']->msg->end_request();
-
+# /* // this is the structure you will get
+# $inbox_data['is_imap'] boolean - pop3 server do not
know what is "new" or not
+# $inbox_data['folder_checked'] string - the folder
checked, as processed by the msg class
+# $inbox_data['alert_string'] string - what to show the
user about this inbox check
+# $inbox_data['number_new'] integer - for IMAP is
number "unseen"; for pop3 is number messages
+# $inbox_data['number_all'] integer - for IMAP and pop3
is total number messages in that inbox
+# */
+# $inbox_data = Array();
+# $inbox_data =
$GLOBALS['phpgw']->msg->new_message_check();
+#
+# if($inbox_data['number_all'] >= 5)
+# {
+# $check_msgs = 5;
+# }
+# else
+# {
+# $check_msgs = $inbox_data['number_all'];
+# }
+
+# if ($inbox_data['number_all'] > 0)
+# {
+# $msg_array = array();
+# $msg_array =
$GLOBALS['phpgw']->msg->get_message_list();
+# }
+# for($i=0; $i<$check_msgs; $i++)
+# {
+# $msg =
$GLOBALS['phpgw']->dcom->header($GLOBALS['phpgw']->msg->mailsvr_stream,$msg_array[$i]);
+# $subject =
$GLOBALS['phpgw']->msg->get_subject($msg,'');
+# if (strlen($subject) > 65)
+# {
+# $subject = substr($subject,0,65).' ...';
+# }
+# $linkData = array
+# (
+# 'mailbox' =>
$GLOBALS['phpgw']->msg->prep_folder_out(''),
+# 'passed_id' => $msg_array[$i],
+# 'startMessage' => 1,
+# 'show_more' => 0
+## );
+# $data[] = array(
+# 'data' => $subject,
+# 'link' =>
$GLOBALS['phpgw']->link('/felamimail/read_body.php',$linkData)
+# );
+# }
+# // ADD FOLDER LISTBOX TO HOME PAGE (Needs to be
TEMPLATED)
+# // Does This Mailbox Support Folders (i.e. more than
just INBOX)?
+# if
($GLOBALS['phpgw']->msg->get_mailsvr_supports_folders() == False)
+# {
+# $extra_data = '';
+# }
+# else
+# {
+# // FUTURE: this will pick up the user option to
show num unseen msgs in dropdown list
+# //$listbox_show_unseen = True;
+# $listbox_show_unseen = False;
+# $switchbox_listbox = '<select name="mailbox"
onChange="document.switchbox.submit()">'
+# . '<option>' . lang('switch
current folder to') . ':'
+# .
$GLOBALS['phpgw']->msg->all_folders_listbox('','','',$listbox_show_unseen)
+# . '</select>';
+# // make it another TR we can insert
+# $switchbox_action =
$GLOBALS['phpgw']->link('/felamimail/index.php');
+# $extra_data = '<form name="switchbox"
action="'.$switchbox_action.'" method="post">'."\r\n"
+# .'<td align="left">'."\r\n"
+# .' <strong>'.lang('E-Mail
Folders').':</strong> '.$switchbox_listbox
+# .'<input type="hidden"
name="startMessage" value="1">'
+# .'</td>'."\r\n"
+# .'</form>'."\r\n";
+# }
+# $GLOBALS['phpgw']->msg->end_request();
+#
if($data)
{
$portalbox->data = $data;
@@ -157,6 +157,6 @@
echo "\r\n".'<!-- start Mailbox info -->'."\r\n"
.$portalbox->draw($extra_data)
.'<!-- ends Mailox info -->'."\r\n";
- }
- }
+# }
+# }
?>
Index: inc/hook_manual.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/hook_manual.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/hook_manual.inc.php 24 Nov 2002 00:36:06 -0000 1.2
+++ inc/hook_manual.inc.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_manual.inc.php,v 1.2 2002/11/24 00:36:06 lkneschke Exp $ */
+ /* $Id: hook_manual.inc.php,v 1.3 2006/12/18 20:03:32 sigurdne Exp $ */
// Only Modify the $file variable.....
$file = Array(
Index: inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/hook_preferences.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/hook_preferences.inc.php 18 Dec 2006 11:02:55 -0000 1.9
+++ inc/hook_preferences.inc.php 18 Dec 2006 20:03:32 -0000 1.10
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_preferences.inc.php,v 1.9 2006/12/18 11:02:55 sigurdne Exp $ */
+ /* $Id: hook_preferences.inc.php,v 1.10 2006/12/18 20:03:32 sigurdne Exp $ */
{
// Only Modify the $file and $title variables.....
$title = $appname;
@@ -21,16 +21,9 @@
);
$file = array(
- 'Mail Settings ' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>'felamimail')),
- 'Mail Settings' =>
$GLOBALS['phpgw']->link('/felamimail/preferences_email.php'),
- 'Message Highlighting' =>
$GLOBALS['phpgw']->link('/felamimail/preferences_highlight.php'),
- 'Index Order' =>
$GLOBALS['phpgw']->link('/felamimail/preferences_index_order.php'),
- 'Translation Preferences' =>
$GLOBALS['phpgw']->link('/felamimail/preferences_translate.php'),
- 'Display Preferences' =>
$GLOBALS['phpgw']->link('/felamimail/preferences_display.php'),
+ 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=felamimail'),
'Manage Sieve' =>
$GLOBALS['phpgw']->link('/index.php',$sieveLinkData),
- 'Folder Preferences' =>
$GLOBALS['phpgw']->link('/felamimail/preferences_folder.php'),
- 'Manage Folders ' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'felamimail.uipreferences.listFolder')),
- 'Manage Folders' =>
$GLOBALS['phpgw']->link('/felamimail/folders.php')
+ 'Manage Folders' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=felamimail.uipreferences.listFolder')
);
//Do not modify below this line
display_section($appname,$title,$file);
Index: inc/hook_settings.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/hook_settings.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/hook_settings.inc.php 24 Nov 2002 00:36:06 -0000 1.2
+++ inc/hook_settings.inc.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -9,19 +9,20 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: hook_settings.inc.php,v 1.2 2002/11/24 00:36:06 lkneschke Exp $
*/
+ /* $Id: hook_settings.inc.php,v 1.3 2006/12/18 20:03:32 sigurdne Exp $
*/
- $templates = $GLOBALS['phpgw']->common->list_templates();
- while (list($var,$value) = each($templates))
- {
- $_templates[$var] = $templates[$var]['title'];
- }
-
- $themes = $GLOBALS['phpgw']->common->list_themes();
- while (list(,$value) = each($themes))
- {
- $_themes[$value] = $value;
- }
+ $this->bofelamimail = CreateObject('felamimail.bofelamimail');
+ $this->bofelamimail->openConnection('',OP_HALFOPEN);
+ $folderList = $this->bofelamimail->getFolderList();
+ @reset($folderList);
+
+ $this->bofelamimail->closeConnection();
+
+ $config = CreateObject('phpgwapi.config','felamimail');
+ $config->read_repository();
+ $felamimailConfig = $config->config_data;
+ #_debug_array($felamimailConfig);
+ unset($config);
$refreshTime = array(
@@ -41,99 +42,73 @@
'30' => '30'
);
create_select_box('Refresh time in minutes','refreshTime',$refreshTime);
- create_text_area('email signature','email_sig',3,30);
- $selectOptions = array(
+
+ create_text_area('email signature','email_sig',3,50);
+
+ $sortOrder = array(
'0' => lang('date(newest first)'),
'1' => lang('date(oldest first)')
);
- create_select_box('Default sorting order','sortOrder',$selectOptions);
+ create_select_box('Default sorting order','sortOrder',$sortOrder);
+
$selectOptions = array(
'0' => lang('no'),
'1' => lang('yes')
);
create_select_box('show new messages on main
screen','mainscreen_showmail',$selectOptions);
-/* create_input_box('Max matches per page','maxmatchs');
- create_select_box('Interface/Template
Selection','template_set',$_templates);
- create_select_box('Theme (colors/fonts) Selection','theme',$_themes);
-
- $navbar_format = array(
- 'icons' => lang('Icons only'),
- 'icons_and_text' => lang('Icons and text'),
- 'text' => lang('Text only')
+ $deleteOptions = array(
+ 'move_to_trash' => lang('move to trash'),
+ 'mark_as_deleted' => lang('mark as deleted'),
+ 'remove_immediately' => lang('remove immediately')
);
- create_select_box('Show navigation bar
as','navbar_format',$navbar_format);
+ create_select_box('when deleting
messages','deleteOptions',$deleteOptions);
- for ($i = -23; $i<24; $i++)
- {
- $tz_offset[$i] = $i;
- }
- create_select_box('Time zone offset','tz_offset',$tz_offset);
+ $htmlOptions = array(
+ 'never_display' => lang('never display html emails'),
+ 'only_if_no_text' => lang('display only when no plain
text is available'),
+ 'always_display' => lang('always show html emails')
+ );
+ create_select_box('display of html emails','htmlOptions',$htmlOptions);
- $date_formats = array(
- 'm/d/Y' => 'm/d/Y',
- 'm-d-Y' => 'm-d-Y',
- 'm.d.Y' => 'm.d.Y',
- 'Y/d/m' => 'Y/d/m',
- 'Y-d-m' => 'Y-d-m',
- 'Y.d.m' => 'Y.d.m',
- 'Y/m/d' => 'Y/m/d',
- 'Y-m-d' => 'Y-m-d',
- 'Y.m.d' => 'Y.m.d',
- 'd/m/Y' => 'd/m/Y',
- 'd-m-Y' => 'd-m-Y',
- 'd.m.Y' => 'd.m.Y'
- );
- create_select_box('Date format','dateformat',$date_formats);
-
- $time_formats = array(
- '12' => '12 hour',
- '24' => '24 hour'
- );
- create_select_box('Time format','timeformat',$time_formats);
-
- $sbox = createobject('phpgwapi.sbox');
- create_select_box('Country','country',$sbox->country_array);
-
- $db2 = $GLOBALS['phpgw']->db;
- $GLOBALS['phpgw']->db->query("select distinct lang from
lang",__LINE__,__FILE__);
- while ($GLOBALS['phpgw']->db->next_record())
- {
-// $phpgw_info['installed_langs'][$phpgw->db->f('lang')] =
$phpgw->db->f('lang');
+ $trashOptions = array_merge(
+ array(
+ 'none' => lang("Don't use Trash")),
+ $folderList
+ );
+ create_select_box('trash folder','trashFolder',$trashOptions);
- $db2->query("select lang_name from languages where lang_id = '"
- . $GLOBALS['phpgw']->db->f('lang') .
"'",__LINE__,__FILE__);
- $db2->next_record();
-
- // When its not in the phpgw_languages table, it will show ???
in the field
- // otherwise
- if ($db2->f('lang_name'))
- {
- $langs[$GLOBALS['phpgw']->db->f('lang')] =
$db2->f('lang_name');
- }
- }
- create_select_box('Language','lang',$langs);
+ $sentOptions = array_merge(
+ array(
+ 'none' => lang("Don't use Sent")),
+ $folderList
+ );
+ create_select_box('sent folder','sentFolder',$sentOptions);
- // preference.php handles this function
- if (is_admin())
+ if ($felamimailConfig['userDefinedAccounts'] == 'yes')
{
- // The 'True' is *NOT* being used as a constant, don't change it
- $yes_and_no = array(
- 'True' => 'Yes',
- '' => 'No'
+ $selectOptions = array(
+ 'no' => lang('no'),
+ 'yes' => lang('yes')
);
- create_select_box('Show current users on navigation
bar','show_currentusers',$yes_and_no);
- }
+ create_select_box('use custom
settings','use_custom_settings',$selectOptions);
- reset($GLOBALS['phpgw_info']['user']['apps']);
- while (list($permission) = each($GLOBALS['phpgw_info']['user']['apps']))
- {
- if ($GLOBALS['phpgw_info']['apps'][$permission]['status'] != 2)
- {
- $user_apps[$permission] = $permission;
- }
- }
- create_select_box('Default application','default_app',$user_apps);
+ create_input_box('username','username','','',40);
+ create_password_box('password','key','','',40);
+ create_input_box('EMail Address','emailAddress','','',40);
+ create_input_box('IMAP Server
Address','imapServerAddress','','',40);
- create_input_box('Currency','currency');
-*/
\ No newline at end of file
+ $selectOptions = array(
+ 'no' => lang('IMAP'),
+ 'yes' => lang('IMAPS Encryption
only'),
+ 'imaps-encr-auth' => lang('IMAPS Authentication')
+ );
+ create_select_box('IMAP Server
type','imapServerMode',$selectOptions);
+
+ #$selectOptions = array(
+ # 'no' => lang('no'),
+ # 'yes' => lang('yes')
+ #);
+ #create_select_box('use custom
settings','use_custom_settings',$selectOptions);
+ }
+?>
\ No newline at end of file
Index: setup/phpgw_de.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_de.lang,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- setup/phpgw_de.lang 22 Feb 2006 06:10:03 -0000 1.3
+++ setup/phpgw_de.lang 18 Dec 2006 20:03:32 -0000 1.4
@@ -39,6 +39,7 @@
Display Preferences preferences de Anzeigeneinstellungen
Folder Preferences preferences de Ordnereinstellungen
Manage Folders preferences de Ordner verwalten
+Manage Folders felamimail de Ordner verwalten
email signature felamimail de EMail Signatur
empty trash felamimail de Trash-Ordner leeren
Viewing messages felamimail de zeige Nachrichten
@@ -131,8 +132,48 @@
date(oldest first) felamimail de Datum(alte zuerst)
date(newest first) felamimail de Datum(neue zuerst)
Manage Sieve preferences de Sieve Scripte verwalten
+Manage Sieve felamimail de Sieve Scripte verwalten
show header felamimail de Kopfzeilen anzeigen
hide header felamimail de Kopfzeilen verbergen
print it felamimail de EMail drucken
print this page felamimail de Diese Seite drucken
close this page felamimail de Diese Seite schlieÃen
+folder status felamimail de Ordner Status
+folder name felamimail de Ordner Name
+folderlist felamimail de Ordnerliste
+rename folder felamimail de Ordner umbenennen
+create subfolder felamimail de Unterordner anlegen
+subscribed felamimail de abonniert
+unsubscribed felamimail de abbestellt
+IMAP Server felamimail de IMAP Server
+folder settings felamimail de Ordner Einstellungen
+on behalf of felamimail de im Auftrag von
+wrote felamimail de schrieb
+delete all felamimail de alle löschen
+Quicksearch felamimail de Schnellsuche
+Mon felamimail de Mo
+Tue felamimail de Di
+Wed felamimail de Mi
+Thu felamimail de Do
+Fri felamimail de Fr
+Sat felamimail de Sa
+Sun felamimail de So
+SMTP settings admin de SMTP Einstellungen
+Use SMTP auth admin de SMTP Auth benutzen
+Organization name admin de Name der Organisation
+Sieve settings admin de Sieve Einstellungen
+Enter your SIEVE server hostname or IP address admin de Sieve-Server
Hostname oder IP-Adresse
+Enter your SIEVE server port admin de Port Adresse des Sieve Servers
+Enter your IMAP mail server hostname or IP address admin de
IMAP-Server Hostname oder IP-Adresse
+no Quota set felamimail de keine Quota aktiviert
+next message felamimail de nächste Nachricht
+previous message felamimail de vorherige Nachricht
+trash folder felamimail de Ordner für gelöschte Nachrichten
+sent folder felamimail de Ordner für gesendete Nachrichten
+Configuration felamimail de Konfiguration
+Users can define their own emailaccounts admin de Anwender
können ihre eigenen Konten definieren
+display of html emails preferences de HTML EMails anzeigen
+IMAP Server Address preferences de IMAP Server Adresse
+always show html emails preferences de immer anzeigen
+never display html emails preferences de niemals anzeigen
+display only when no plain text is available preferences de nur
anzeigen wenn kein Plain Text vorhanden ist
Index: setup/phpgw_en.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_en.lang,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- setup/phpgw_en.lang 30 May 2003 20:15:38 -0000 1.7
+++ setup/phpgw_en.lang 18 Dec 2006 20:03:32 -0000 1.8
@@ -1,8 +1,8 @@
(no subject) felamimail en (no subject)
(only Cc/Bcc) felamimail en (only Cc/Bcc)
(unknown sender) felamimail en (unknown sender)
-activate felamimail en activate
-add felamimail en Add
+activate felamimail en Activate
+add felamimail en add
add address felamimail en Add address
add to %1 felamimail en Add to %1
add to address book felamimail en Add to address book
@@ -10,23 +10,20 @@
additional info felamimail en Additional info
address book felamimail en Address Book
address book search felamimail en Address Book Search
-addressbook is read-only felamimail en Addressbook is read-only
-addresses felamimail en Addresses
after message body felamimail en After message body
all address books felamimail en All address books
all folders felamimail en All Folders
+always show html emails felamimail en always show html emails
as a subfolder of felamimail en as a subfolder of
-attach felamimail en Attach
attachments felamimail en Attachments
auto refresh folder list felamimail en Auto refresh folder list
back to folder felamimail en back to folder
-bad request: %1 felamimail en Bad request: %1
+bad reque felamimail en Bad reque
based upon given criteria, incoming messages can have different background
colors in the message list. This helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail en Based upon
given criteria, incoming messages can have different background colors in the
message list. This helps to easily distinguish who the messages are from,
especially for mailing lists.
-bcc felamimail en BCC
bcc felamimail en bcc
before headers felamimail en Before headers
between headers and message body felamimail en Between headers
and message body
-body felamimail en Body
+body part felamimail en body part
cc felamimail en cc
change folder felamimail en change folder
checkbox felamimail en Checkbox
@@ -37,33 +34,30 @@
color felamimail en Color
compose felamimail en Compose
compress folder felamimail en compress folder
-could not lock datafile felamimail en Could not lock datafile
-could not move/copy file. file not attached felamimail en Could
not move/copy file. File not attached
create felamimail en Create
create folder felamimail en Create Folder
create sent felamimail en Create Sent
+create subfolder felamimail en create subfolder
create trash felamimail en Create Trash
created folder successfully! felamimail en Created folder
successfully!
-custom email settings felamimail en Custom Email settings
dark blue felamimail en Dark Blue
dark cyan felamimail en Dark Cyan
dark gray felamimail en Dark Gray
dark green felamimail en Dark Green
dark magenta felamimail en Dark Magenta
dark yellow felamimail en Dark Yellow
-database error: %1 felamimail en Database error: %1
date felamimail en Date
date(newest first) felamimail en date(newest first)
date(oldest first) felamimail en date(oldest first)
-default sorting order felamimail en Default sorting order
+Default sorting order felamimail en Default sorting order
delete felamimail en Delete
delete all felamimail en delete all
delete folder felamimail en Delete Folder
delete selected felamimail en Delete selected
-delete selected attachments felamimail en Delete selected
attachments
delete selected messages felamimail en delete selected messages
deleted felamimail en deleted
deleted folder successfully! felamimail en Deleted folder
successfully!
+display only when no plain text is available felamimail en display
only when no plain text is available
display preferences felamimail en Display Preferences
do it! felamimail en do it!
do not use sent felamimail en Do not use Sent
@@ -76,39 +70,33 @@
download this as a file felamimail en Download this as a file
e-mail felamimail en E-mail
e-mail address felamimail en E-mail address
-e-mail address is missing felamimail en E-mail address is
missing
e-mail folders felamimail en E-Mail Folders
-e-mail preferences felamimail en E-Mail preferences
edit felamimail en Edit
-edit filter felamimail en edit filter
+edit filter felamimail en Edit filter
edit selected felamimail en Edit selected
-email account name felamimail en Email Account Name
-email address felamimail en Email address
-email password felamimail en Email Password
-email signature felamimail en email signature
+email signature felamimail en EMail signature
empty trash felamimail en empty trash
+Enter your IMAP mail server hostname or IP address admin en Enter
your IMAP mail server hostname or IP address
+Enter your SIEVE server hostname or IP address admin en Enter your
SIEVE server hostname or IP address
+Enter your SIEVE server port admin en Enter your SIEVE server port
erro felamimail en ERRO
error felamimail en ERROR
-error : bad or malformed request. felamimail en ERROR : Bad or
malformed request.
-error : could not complete request. felamimail en ERROR : Could
not complete request.
-error connecting to imap server: %1. felamimail en Error
connecting to IMAP server: %1.
-error initializing ldap server %1: felamimail en Error
initializing LDAP server %1:
+error connecting to IMAP serv felamimail en Error connecting to
IMAP serv
error opening felamimail en Error opening
-error opening file %1 felamimail en Error opening file %1
-everywhere felamimail en Everywhere
-ex: 63aa7f felamimail en Ex: 63aa7f
expunge felamimail en Expunge
felamimail common en FelaMiMail
files felamimail en files
filter active felamimail en filter active
-filter name felamimail en filter name
+filter name felamimail en Filter name
first name felamimail en First name
flagged felamimail en flagged
flags felamimail en Flags
-folder name felamimail en folder name
+folder name felamimail en Folder name
folder path felamimail en Folder Path
folder preferences felamimail en Folder Preferences
-folder status felamimail en folder status
+folder settings felamimail en Folder settings
+folder status felamimail en Folder status
+folderlist felamimail en Folderlist
folders felamimail en Folders
folders created successfully! felamimail en Folders created
successfully!
follow felamimail en follow
@@ -118,23 +106,23 @@
found felamimail en Found
from felamimail en From
full name felamimail en Full Name
-have a look at <a href="ht felamimail en Have a look at <a
href="ht
+Have a look at <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> to learn more about Squirrelmail.<br>
felamimail en Have a look at <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> to learn more about Squirrelmail.<br>
help felamimail en Help
hide header felamimail en hide header
html felamimail en HTML
-icons and text felamimail en Icons and text
-icons only felamimail en Icons only
+Icons and text felamimail en Icons and text
+Icons only felamimail en Icons only
identifying name felamimail en Identifying name
illegal folder name. please select a different name. felamimail en
Illegal folder name. Please select a different name.
-imap server type felamimail en IMAP Server Type
+imap felamimail en IMAP
+IMAP Server felamimail en IMAP Server
+imaps authentication felamimail en IMAPS Authentication
+imaps encryption only felamimail en IMAPS Encryption only
in felamimail en in
in order for squirrelmail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail en In order for SquirrelMail to provide the
full set of options you need to create the special folders listed below. Just
click the check box and hit the create button.
-in order for squirrelmail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail en In order for SquirrelMail to provide the
full set of options you need to create vhe special folders listed below. Just
click the check box and hit the create button.
in the center felamimail en in the center
index order felamimail en Index Order
-index_what_is felamimail en index_what_is
info felamimail en Info
-invalid input data felamimail en Invalid input data
invalid user name or password felamimail en Invalid user name or
password
javaScript felamimail en JavaScript
language felamimail en Language
@@ -151,13 +139,11 @@
list all felamimail en List all
location of buttons when composing felamimail en Location of
buttons when composing
location of folder list felamimail en Location of folder list
-mail folder(uw-maildir) felamimail en Mail Folder(UW-Maildir)
-mail server felamimail en Mail Server
-mail server type felamimail en Mail Server type
mail settings felamimail en Mail Settings
manage folders felamimail en Manage Folders
+Manage Sieve preferences en Manage sieve scripts
mark as deleted felamimail en mark as deleted
-mark messages as felamimail en mark messages as
+mark messages as felamimail en mark selected messages as
mark selected as flagged felamimail en mark selected as flagged
mark selected as read felamimail en mark selected as read
mark selected as unflagged felamimail en mark selected as
unflagged
@@ -176,13 +162,12 @@
move to trash felamimail en move to trash
Must be unique felamimail en Must be unique
Name felamimail en Name
-name is missing felamimail en Name is missing
+never display html emails felamimail en never display html
emails
New felamimail en New
-new filter felamimail en new filter
-new name: felamimail en New name:
+new filter felamimail en New filter
Next felamimail en Next
+next message felamimail en next message
Nickname felamimail en Nickname
-nickname contain illegal characters felamimail en Nickname
contain illegal characters
no filter felamimail en no filter
No folders found felamimail en No folders found
No folders were found to subscribe to! felamimail en No folders were
found to subscribe to!
@@ -194,37 +179,36 @@
No personal address book is defined. Contact administrator. felamimail
en No personal address book is defined. Contact administrator.
No persons matching your search was found felamimail en No
persons matching your search was found
no previous Message felamimail en no previous Message
-no such file or directory felamimail en No such file or
directory
none felamimail en none
-not a file name felamimail en Not a file name
Number of Messages to Index felamimail en Number of Messages to
Index
-on felamimail en on
+on behalf of felamimail en on behalf of
Only INBOX felamimail en Only INBOX
Only unseen felamimail en Only unseen
-open failed felamimail en Open failed
Options felamimail en Options
-original message felamimail en Original Message
+organization felamimail en organization
+Organization name admin en Organization name
Oth felamimail en Oth
-other: felamimail en Other:
-personal address book felamimail en Personal address book
Personal Information felamimail en Personal Information
Preference file %1 not found. Exiting abnormally felamimail en
Preference file %1 not found. Exiting abnormally
Preference file, %1, does not exist. Log out, and log back in to create a
default preference file. felamimail en Preference file, %1, does
not exist. Log out, and log back in to create a default preference file.
Previous felamimail en Previous
+previous message felamimail en previous message
print it felamimail en print it
print this page felamimail en print this page
purge felamimail en purge
+Quicksearch felamimail en Quicksearch
+read felamimail en read
Read da felamimail en Read da
-read data: felamimail en Read data:
Reason Giv felamimail en Reason Giv
-reason given: felamimail en Reason Given:
recent felamimail en recent
-refresh folder list felamimail en Refresh folder list
+refresh folder list felamimail en refresh folder list
Refresh Page felamimail en Refresh Page
+Refresh time in minutes felamimail en Refresh time in minutes
remove felamimail en remove
remove immediately felamimail en remove immediately
Rename felamimail en Rename
Rename a Folder felamimail en Rename a Folder
+rename folder felamimail en rename folder
Renamed successfully! felamimail en Renamed successfully!
replied felamimail en replied
Reply felamimail en Reply
@@ -242,19 +226,17 @@
Seconds felamimail en Seconds
Select felamimail en Select
Select All felamimail en Select All
-select home email address felamimail en Select home email
address
-select work email address felamimail en Select work email
address
-send deleted messages to the trash felamimail en Send deleted
messages to the trash
+Select home email address felamimail en Select home email
address
+Select work email address felamimail en Select work email
address
+send felamimail en Send
Sent Fold felamimail en Sent Fold
-sent folder: felamimail en Sent Folder:
Server respond felamimail en Server respond
-server responded: felamimail en Server responded:
show header felamimail en show header
-show new messages on main screen felamimail en show new
messages on main screen
-show sender's email address with name felamimail en Show sender's
email address with name
+Sieve settings admin en Sieve settings
Signature felamimail en Signature
Size felamimail en Size
Size of editor window felamimail en Size of editor window
+SMTP settings admin en SMTP settings
Some or all of the help documents are not present! felamimail en
Some or all of the help documents are not present!
Source felamimail en Source
Special Folder Options felamimail en Special Folder Options
@@ -269,8 +251,8 @@
Successfully saved personal information! felamimail en
Successfully saved personal information!
switch current folder to felamimail en switch current folder to
Table of Contents felamimail en Table of Contents
-text only felamimail en Text only
-the connection to the imap server failed!! felamimail en The
connection to the IMAP Server failed!!
+Text only felamimail en Text only
+The connection to the IMAP Server failed!! felamimail en The
connection to the IMAP Server failed!!
The help has not been translated to %1. It will be displayed in English
instead. felamimail en The help has not been translated to %1.
It will be displayed in English instead.
The index order is the order that the columns are arranged in the message
index. You can add, remove, and move columns around to customize them to fit
your needs. felamimail en The index order is the order that the
columns are arranged in the message index. You can add, remove, and move
columns around to customize them to fit your needs.
The order of the message index can be rearanged and changed to contain the
headers in any order you want. felamimail en The order of the
message index can be rearanged and changed to contain the headers in any order
you want.
@@ -287,12 +269,11 @@
Translation Preferences felamimail en Translation Preferences
Translation server felamimail en Translation server
Trash Fold felamimail en Trash Fold
-trash folder: felamimail en Trash Folder:
type felamimail en type
Unable to list addresses from %1 felamimail en Unable to list
addresses from %1
unflagged felamimail en unflagged
+Unknown err felamimail en Unknown err
Unknown error felamimail en Unknown error
-unknown error: %1 felamimail en Unknown error: %1
Unknown Sender felamimail en Unknown Sender
Unknown user or password incorrect. felamimail en Unknown user or
password incorrect.
unread felamimail en unread
@@ -308,13 +289,10 @@
Use a signature felamimail en Use a signature
Use a signature? felamimail en Use a signature?
Use Addresses felamimail en Use Addresses
-use custom settings felamimail en Use custom settings
Use Javascript or HTML addressbook? felamimail en Use Javascript
or HTML addressbook?
-user '%1' already exist felamimail en User '%1' already exist
-user '%1' does not exist felamimail en User '%1' does not exist
+Use SMTP auth admin en Use SMTP auth
View full header felamimail en View full header
View message felamimail en View message
-viewing a text attachment felamimail en Viewing a text
attachment
Viewing full header felamimail en Viewing full header
Viewing message felamimail en Viewing message
Viewing messages felamimail en Viewing messages
@@ -323,11 +301,9 @@
White felamimail en White
Width of folder list felamimail en Width of folder list
Wrap incoming text at felamimail en Wrap incoming text at
-write to addressbook failed felamimail en Write to addressbook
failed
wrote felamimail en wrote
You can change the way that SquirrelMail looks and displays information to
you, such as the colors, the language, and other settings. felamimail en
You can change the way that SquirrelMail looks and displays information to
you, such as the colors, the language, and other settings.
You can only edit one address at the time felamimail en You can
only edit one address at the time
-you have not filled in the "To:" field. felamimail en You
have not filled in the "To:" field.
You must login first. felamimail en You must login first.
You need a valid user and password to access this page! felamimail
en You need a valid user and password to access this page!
Your search failed with the following error(s) felamimail en Your
search failed with the following error(s)
Index: setup/phpgw_fi.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_fi.lang,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- setup/phpgw_fi.lang 22 Feb 2006 06:28:02 -0000 1.3
+++ setup/phpgw_fi.lang 18 Dec 2006 20:03:32 -0000 1.4
@@ -2,8 +2,7 @@
Additional info felamimail fi Lisätietoja
Address Book Search felamimail fi Etsi osoitekirjasta
Address Book felamimail fi Osoitekirja
-add felamimail fi lisää
-Add felamimail fi Lisää
+add felamimail fi Lisää
Add to address book felamimail fi Lisää osoitekirjaan
Add to %1 felamimail fi Lisää kohteeseen %1
After message body felamimail fi Viestin jälkeen
@@ -12,6 +11,7 @@
as a subfolder of felamimail fi alikansiona kohteelle
Attachments felamimail fi Liitteet
Auto refresh folder list felamimail fi Päivitä kansiolista
automaattisesti
+Bad reque felamimail fi Bad reque
Based upon given criteria, incoming messages can have different background
colors in the message list. This helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail fi Based upon
given criteria, incoming messages can have different background colors in the
message list. This helps to easily distinguish who the messages are from,
especially for mailing lists.
Before headers felamimail fi Ennen otsikkotietoja
Between headers and message body felamimail fi Otsikkotietojen
ja viestin välissä
@@ -34,7 +34,6 @@
Dark Magenta felamimail fi Tumma purppura
Dark Yellow felamimail fi Tumma keltainen
date felamimail fi päivä
-Date felamimail fi Päiväys
Deleted folder successfully! felamimail fi Kansio poistettu!
Delete Folder felamimail fi Poista kansio
Delete selected felamimail fi Poista valitut
@@ -50,11 +49,10 @@
down felamimail fi alas
Edit selected felamimail fi Muokkaa valittua
Edit felamimail fi Muokkaa
-E-mail address felamimail fi E-mail osoite
-E-Mail Address felamimail fi E-Mail Osoite
+e-mail address felamimail fi E-Mail Osoite
E-mail felamimail fi E-mail
empty trash felamimail fi tyhjennä roskakori
-Error connecting to IMAP server: %1. felamimail fi Virhe
yhdistettäessä IMAP palvelimeen: %1.
+Error connecting to IMAP serv felamimail fi Virhe yhdistettäessä
IMAP palvelimeen
Error opening felamimail fi Virhe avattaessa
ERROR felamimail fi VIRHE
ERRO felamimail fi VIRH
@@ -71,8 +69,7 @@
For received mail felamimail fi Saapuneille viesteille
Forward felamimail fi Eteenpäin
Found felamimail fi Löytyi
-from felamimail fi lähettäjä
-From felamimail fi Lähettäjä
+from felamimail fi Lähettäjä
Full Name felamimail fi Koko nimi
Have a look at <a href="ht felamimail fi Katso <a href="ht
Help felamimail fi Ohje
@@ -127,7 +124,6 @@
No highlighting is defined felamimail fi Korostusta ei
määritelty
No messages were selected. felamimail fi Ei valittuja viestejä.
none felamimail fi ei mitään
-None felamimail fi Ei mitään
no next Message felamimail fi ei seuraavaa viestiä
No notification felamimail fi Ei tiedotetta
No personal address book is defined. Contact administrator. felamimail
fi Henkilökohtaista osoitekirjaa ei määritelty. Ota yhteys ylläpitoon.
@@ -147,8 +143,7 @@
purge felamimail fi tuhoa
Read da felamimail fi Lue da
Reason Giv felamimail fi Syy ann
-refresh folder list felamimail fi päivitä kansiolista
-Refresh Folder List felamimail fi Päivitä kansiolista
+refresh folder list felamimail fi Päivitä kansiolista
Refresh Page felamimail fi Päivitä sivu
remove felamimail fi poista
Rename a Folder felamimail fi Vaihda kansion nimi
@@ -179,8 +174,7 @@
Special Folder Options felamimail fi Kansion erikoisasetukset
felamimail fi
Squirrelmail felamimail fi Squirrelmail
-subject felamimail fi aihe
-Subject felamimail fi Aihe
+subject felamimail fi Aihe
Submit felamimail fi Lähetä
Subscribed successfully! felamimail fi Tilattu!
Subscribe felamimail fi Tilaa
@@ -197,8 +191,7 @@
THIS FOLDER IS EMPTY felamimail fi KANSIO ON TYHJÃ
This port is based on Squirrelmail, which is a standalone IMAP client.<br>
felamimail fi Tämä sovellus perustuu Squirrelmail:iin, joka on IMAP
asiakasohjelma.<br>
Top felamimail fi Ylös
-to felamimail fi to
-To felamimail fi To
+to felamimail fi To
to the left felamimail fi vasemmalle
to the right felamimail fi oikealle
Translation location felamimail fi Translation location
@@ -207,6 +200,7 @@
Trash Fold felamimail fi Roskakori
Unable to list addresses from %1 felamimail fi Osoitteiden
listaus kohteesta %1 epäonnistui
Unknown error felamimail fi Tuntematon virhe
+Unknown err felamimail fi Tunt. virh.
(unknown sender) felamimail fi (tuntematon lähettäjä)
Unknown Sender felamimail fi Tuntematon Lähettäjä
Unknown user or password incorrect. felamimail fi Tuntematon
käyttäjä tai salasana väärin.
Index: setup/phpgw_fr.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_fr.lang,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- setup/phpgw_fr.lang 22 Feb 2006 06:08:24 -0000 1.8
+++ setup/phpgw_fr.lang 18 Dec 2006 20:03:32 -0000 1.9
@@ -10,23 +10,20 @@
additional info felamimail fr Informations additionnelles
address book felamimail fr Carnet d'adresses
address book search felamimail fr Recherche dans le carnet
d'adresses
-addressbook is read-only felamimail fr Le carnet d'adresses
est en lecture seule
-addresses felamimail fr Adresses
after message body felamimail fr Après le corps du message
all address books felamimail fr Tous les carnets d'adresses
all folders felamimail fr Tous les dossiers
+always show html emails felamimail fr Toujours montrer les
EMails HTML
as a subfolder of felamimail fr Comme un sous-dossier de
-attach felamimail fr Attacher
attachments felamimail fr Attachements
auto refresh folder list felamimail fr Auto-rafraîchir la
liste des dossiers
back to folder felamimail fr Retour au dossier
-bad request: %1 felamimail fr Mauvaise requête: %1
+bad reque felamimail fr Mauvaise requête
based upon given criteria, incoming messages can have different background
colors in the message list. This helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail fr En se
basant sur les critères donnés, les messages entrants peuvent avoir des
couleurs de fond différentes dans la liste des messages. Ceci aide Ã
distinguer aisément de qui sont les messages, spécialement pour les listes de
diffusion.
bcc felamimail fr bcc
-bcc felamimail fr bcc
before headers felamimail fr Avant les entêtes
between headers and message body felamimail fr Entre les
entêtes et le corps du message
-body felamimail fr Corps
+body part felamimail fr Corps du message
cc felamimail fr cc
change folder felamimail fr Changer de dossier
checkbox felamimail fr Boite à cocher
@@ -37,21 +34,18 @@
color felamimail fr Couleur
compose felamimail fr Composer
compress folder felamimail fr Compresser le dossier
-could not lock datafile felamimail fr N'a pas pu verouiller
le fichier de données
-could not move/copy file. file not attached felamimail fr N'a pas
pu déplacer/copier le fichier. Fichier non attaché
create felamimail fr Créer
create folder felamimail fr Créer dossier
create sent felamimail fr Créer Sent (envoyés)
+create subfolder felamimail fr Créer un sous-dossier
create trash felamimail fr Créer Trash (poubelle)
created folder successfully! felamimail fr Dossier crée avec
succès!
-custom email settings felamimail fr Réglages EMail personnalisés
dark blue felamimail fr Bleu foncé
dark cyan felamimail fr Cyan foncé
dark gray felamimail fr Gris foncé
dark green felamimail fr Vert foncé
dark magenta felamimail fr Magenta foncé
dark yellow felamimail fr Jaune foncé
-database error: %1 felamimail fr Erreur de base de données: %1
date felamimail fr Date
date(newest first) felamimail fr Date(plus récente d'abord)
date(oldest first) felamimail fr Date(plus ancienne d'abord)
@@ -60,10 +54,10 @@
delete all felamimail fr Effacer tous
delete folder felamimail fr Effacer dossier
delete selected felamimail fr Effacer sélectionnés
-delete selected attachments felamimail fr Effacer les
attachements sélectionnés
delete selected messages felamimail fr Effacer les messages
sélectionnés
deleted felamimail fr Effacés
deleted folder successfully! felamimail fr Dossier effacé avec
succès!
+display only when no plain text is available felamimail fr
Afficher seulement quand aucun texte standard n'est disponible
display preferences felamimail fr Afficher les préférences
do it! felamimail fr Fais-le!
do not use sent felamimail fr Ne pas utiliser Sent (envoyés)
@@ -76,27 +70,19 @@
download this as a file felamimail fr Downloader ceci comme
un fichier
e-mail felamimail fr EMail
e-mail address felamimail fr Adresse EMail
-e-mail address is missing felamimail fr L'adresse EMail est
manquante
e-mail folders felamimail fr Dossiers EMail
-e-mail preferences felamimail fr Préférences EMail
edit felamimail fr Modifier
edit filter felamimail fr Modifier le filtre
edit selected felamimail fr Modifier sélectionné
-email account name felamimail fr Nom du compte EMail
-email address felamimail fr Adresse EMail
-email password felamimail fr Mot de passe EMail
email signature felamimail fr Signature EMail
empty trash felamimail fr Poubelle (Trash) vide
+Enter your IMAP mail server hostname or IP address admin fr Entrez
le nom de votre serveur de mail IMAP ou son adresse IP
+Enter your SIEVE server hostname or IP address admin fr Entrez le nom
de votre serveur SIEVE ou son adresse IP
+Enter your SIEVE server port admin fr Entrez le port de votre serveur
SIEVE
erro felamimail fr ERR
error felamimail fr ERREUR
-error : bad or malformed request. felamimail fr ERREUR :
requête incorrecte ou malformée.
-error : could not complete request. felamimail fr ERREUR : n'a
pas pu mener la requête à terme.
-error connecting to imap server: %1. felamimail fr Erreur à la
connexion au serveur IMAP: %1.
-error initializing ldap server %1: felamimail fr Erreur Ã
l'initialisation du serveur LDAP %1:
+error connecting to IMAP serv felamimail fr Erreur à la connexion
au serveur IMAP
error opening felamimail fr Erreur à l'ouverture
-error opening file %1 felamimail fr Erreur à l'ouverture du
fichier %1
-everywhere felamimail fr Partout
-ex: 63aa7f felamimail fr Ex: 63aa7f
expunge felamimail fr Purger
felamimail common fr FelaMiMail
files felamimail fr Fichiers
@@ -108,7 +94,9 @@
folder name felamimail fr Nom du dossier
folder path felamimail fr Chemin du dossier
folder preferences felamimail fr Préférences du dossier
+folder settings felamimail fr Réglages dossier
folder status felamimail fr Etat dossier
+folderlist felamimail fr Liste de dossiers
folders felamimail fr Dossiers
folders created successfully! felamimail fr Dossiers crées avec
succès!
follow felamimail fr Suivre
@@ -118,7 +106,7 @@
found felamimail fr Trouvé
from felamimail fr De
full name felamimail fr Nom complet
-have a look at <a href="ht felamimail fr Jettez un oeil à <a
href="ht
+Have a look at <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> to learn more about Squirrelmail.<br>
felamimail fr Jettez un oeil à <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> pour en savoir plus suur Squirrelmail.<br>
help felamimail fr Aide
hide header felamimail fr Cacher l'entête
html felamimail fr HTML
@@ -126,16 +114,16 @@
Icons only felamimail fr Icônes seulement
identifying name felamimail fr Identifie le nom
illegal folder name. please select a different name. felamimail fr
Nom de dossier illégal. SVP choisissez-en un autre.
-imap server type felamimail fr Type de serveur IMAP
+imap felamimail fr IMAP
+IMAP Server felamimail fr Serveur IMAP
+imaps authentication felamimail fr Authentification IMAPS
+imaps encryption only felamimail fr Cryptage IMAPS seulement
in felamimail fr Dans
in order for squirrelmail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail fr Afin que Felamimail puisse vous proposer
l'ensemble des options vous devez créer les dossiers spéciaux listés
ci-dessous. Cliquez simplement sur les boites de sélection et cliquez sur le
bouton Créer.
-in order for squirrelmail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail fr Afin que Felamimail puisse vous proposer
l'ensemble des options vous devez créer les dossiers spéciaux listés
ci-dessous. Cliquez simplement sur les boites de sélection et cliquez sur le
bouton Créer.
in the center felamimail fr Au centre
index order felamimail fr Ordre d'index
-index_what_is felamimail fr Index qu'est-ce
info felamimail fr Info
invalid user name or password felamimail fr Nom d'utilisateur ou
mot de passe invalide
-invalid input data felamimail fr Données d'entrée invalides
javaScript felamimail fr JavaScript
language felamimail fr Langue
last name felamimail fr Nom de famille
@@ -151,11 +139,9 @@
list all felamimail fr Lister tous
location of buttons when composing felamimail fr Emplacement des
boutons lors de la composition
location of folder list felamimail fr Emplacement de la liste
des dossiers
-mail folder(uw-maildir) felamimail fr Dossier
EMail(UW-Maildir)
-mail server felamimail fr Serveur EMail
-mail server type felamimail fr Type de serveur EMail
mail settings felamimail fr Réglages EMail
manage folders felamimail fr Gérer les dossiers
+Manage Sieve preferences fr Gérer les scripts SIEVE
mark as deleted felamimail fr Marquer comme effacé
mark messages as felamimail fr Marquer les messages
sélectionnés comme
mark selected as flagged felamimail fr Marquer le choix comme
marqués
@@ -176,13 +162,12 @@
move to trash felamimail fr Déplacer vers la poubelle (Trash)
Must be unique felamimail fr Doit être unique
Name felamimail fr Nom
-name is missing felamimail fr Le nom est manquant
+never display html emails felamimail fr Ne jamais afficher les
EMails HTML
New felamimail fr Nouveau
new filter felamimail fr Nouveau filtre
-new name: felamimail fr Nouveau nom:
Next felamimail fr Suivant
+next message felamimail fr Message suivant
Nickname felamimail fr Surnom
-nickname contain illegal characters felamimail fr Le surnom
contient des caractères illégaux
no filter felamimail fr Pas de filtre
No folders found felamimail fr Aucun dossier trouvé
No folders were found to subscribe to! felamimail fr Aucun dossier
auquel s'inscrire n'a été trouvé!
@@ -194,37 +179,36 @@
No personal address book is defined. Contact administrator. felamimail
fr Aucun carnet d'adresses personnel défini. Contactez l'administrateur.
No persons matching your search was found felamimail fr Aucune
personne correspondant à votre recherche n'a été trouvée
no previous Message felamimail fr Pas de message précédent
-no such file or directory felamimail fr Aucun fichier ou
répertoire
none felamimail fr Aucun
-not a file name felamimail fr Pas un nom de fichier
Number of Messages to Index felamimail fr Nombre de messages Ã
indexer
-on felamimail fr sur
+on behalf of felamimail fr sur la base de
Only INBOX felamimail fr Seulement INBOX
Only unseen felamimail fr Seulement les non-vus
-open failed felamimail fr L'ouverture a échoué
Options felamimail fr Options
-original message felamimail fr Message original
+organization felamimail fr Organisation
+Organization name admin fr Nom d'organisation
Oth felamimail fr Oth
-other: felamimail fr Autre:
-personal address book felamimail fr Carnet d'adresses personnel
Personal Information felamimail fr Informations personelles
-Preference file %1 not found. Exiting abnormally felamimail fr
Fichier de préférences %1 non trouvé. Fin anormale
-Preference file, %1, does not exist. Log out, and log back in to create a
default preference file. felamimail fr Le fichier de
préférences, %1, n'existe pas. Déconnectez-vous, et reconnectez-vous pour
créér un fichier de préférences par défaut.
+Preference file %1 not found. Exiting abnormally felamimail fr
Fichier de préférences %1 non trouvé. Arrêt anormal.
+Preference file, %1, does not exist. Log out, and log back in to create a
default preference file. felamimail fr Le fichier de
préférences, %1, n'existe pas. Déconnectez-vous, puis reconnectez-vous pour
en créer un par défaut.
Previous felamimail fr Précédent
+previous message felamimail fr Message précédent
print it felamimail fr Imprimes-la
print this page felamimail fr Imprimer cette page
purge felamimail fr Purge
+Quicksearch felamimail fr Recherche Rapide
+read felamimail fr Lire
Read da felamimail fr Lire da
-read data: felamimail fr Lire les données:
Reason Giv felamimail fr Raison donnée
-reason given: felamimail fr Raison donnée:
recent felamimail fr Récent
refresh folder list felamimail fr Rafraîchir la liste des
dossiers
Refresh Page felamimail fr Rafraîchir la page
+Refresh time in minutes felamimail fr Temps de
rafraîchissement en minutes
remove felamimail fr Enlever
remove immediately felamimail fr Enlever immédiatement
Rename felamimail fr Renommer
Rename a Folder felamimail fr Renommer un dossier
+rename folder felamimail fr Renommer le dossier
Renamed successfully! felamimail fr Renommage réussi!
replied felamimail fr Répondu
Reply felamimail fr Répondre
@@ -234,7 +218,7 @@
Return felamimail fr Retourner
Return to options page felamimail fr Retourner à la page des options
Right felamimail fr Droit
-Running SquirrelMail version %1 (c) 1999-2000. felamimail fr
Exécute SquirrelMail version %1 (c) 1999-2000.
+Running SquirrelMail version %1 (c) 1999-2000. felamimail fr
Exécute Felamimail version %1 (c) 1999-2000.
Same Window - not functional yet felamimail fr Même fenêtre
- pas encore fonctionnel
save felamimail fr Sauver
Search felamimail fr Rechercher
@@ -244,17 +228,15 @@
Select All felamimail fr Sélectionner tous
Select home email address felamimail fr Sélectionner l'adresse
EMail domicile
Select work email address felamimail fr Sélectionner l'adresse
EMail travail
-send deleted messages to the trash felamimail fr Envoyer les
messages effacés à la poubelle (Trash)
+send felamimail fr Envoyer
Sent Fold felamimail fr Dossier envoyés (Sent)
-sent folder: felamimail fr Dossier envoyés:
Server respond felamimail fr Réponse du serveur
-server responded: felamimail fr Réponse du serveur:
show header felamimail fr Montrer les entêtes
-show new messages on main screen felamimail fr Montrer les
nouveaux messages sur l'écran principal
-show sender's email address with name felamimail fr Montrer
l'adresse EMail de l'envoyeur avec son nom
+Sieve settings admin fr Réglages SIEVE
Signature felamimail fr Signature
Size felamimail fr Taille
Size of editor window felamimail fr Taille de la fenêtre d'édition
+SMTP settings admin fr Réglages SMTP
Some or all of the help documents are not present! felamimail fr
Certains ou tous les documents d'aide ne sont pas présents!
Source felamimail fr Source
Special Folder Options felamimail fr Options spéciales de dossier
@@ -287,12 +269,11 @@
Translation Preferences felamimail fr Préférences de
traduction
Translation server felamimail fr Serveur de traduction
Trash Fold felamimail fr Dossier poubelle (Trash)
-trash folder: felamimail fr Dossier poubelle (Trash):
type felamimail fr Type
-Unable to list addresses from %1 felamimail fr Incapable de
lister les adresses depuis %1
+Unable to list addresses from %1 felamimail fr Impossible de
lister les adresses depuis %1
unflagged felamimail fr Dé-marqué
+Unknown err felamimail fr Erreur inconnue
Unknown error felamimail fr Erreur inconnue
-unknown error: %1 felamimail fr Erreur inconnue: %1
Unknown Sender felamimail fr Envoyeur inconnu
Unknown user or password incorrect. felamimail fr Utilisateur
inconnu ou mot de passe incorrect.
unread felamimail fr Non-lu
@@ -308,13 +289,10 @@
Use a signature felamimail fr Utiliser une signature
Use a signature? felamimail fr Utiliser une signature?
Use Addresses felamimail fr Utiliser les adresses
-use custom settings felamimail fr Utiliser les réglages
personnalisés
Use Javascript or HTML addressbook? felamimail fr Utiliser le
carnet d'adresses Javascript ou HTML?
-user '%1' already exist felamimail fr L'utilisateur '%1'
existe déjÃ
-user '%1' does not exist felamimail fr L'utilisateur '%1'
n'existe pas
+Use SMTP auth admin fr Utiliser l'authentification SMTP
View full header felamimail fr Voir toutes les entêtes
View message felamimail fr Voir message
-viewing a text attachment felamimail fr Affiche un attachement
texte
Viewing full header felamimail fr Visualise toutes les entêtes
Viewing message felamimail fr Visualise le message
Viewing messages felamimail fr Visualise les messages
@@ -323,11 +301,9 @@
White felamimail fr Blanc
Width of folder list felamimail fr Largeur de la liste des dossiers
Wrap incoming text at felamimail fr Couper le texte entrant Ã
-write to addressbook failed felamimail fr L'écriture dans le
carnet d'adresses a échoué
wrote felamimail fr écrivait
You can change the way that SquirrelMail looks and displays information to
you, such as the colors, the language, and other settings. felamimail fr
Vous pouvez modifier le look de Felamimail et sa manière de vous afficher
les informations, comme les couleurs, la langue, et d'autres réglages.
You can only edit one address at the time felamimail fr Vous
pouvez modifier une seule adresse à la fois
-you have not filled in the "To:" field. felamimail fr Vous
n'avez pas rempli le champ "To:".
You must login first. felamimail fr Vous devez vous connecter
d'abord.
You need a valid user and password to access this page! felamimail
fr Vous avez besoin d'un utilisateur et d'un mot de passe valides pour
accéder à cette page!
Your search failed with the following error(s) felamimail fr Votre
recherche a échoué avec l'(es) erreur(s) suivante(s)
Index: setup/phpgw_ja.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_ja.lang,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- setup/phpgw_ja.lang 26 May 2003 20:39:37 -0000 1.2
+++ setup/phpgw_ja.lang 18 Dec 2006 20:03:32 -0000 1.3
@@ -1,71 +1,364 @@
-add address felamimail ja ÄɲÃ
+%1 - preferences felamimail ja %1 - ¥æ¡¼¥¶¡¼ÀßÄê
+%1 mailer is not supported felamimail ja
¥á¡¼¥é¡¼¡Ê%1¡Ë¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó
+(no subject) felamimail ja (no subject)
+(only cc/bcc) felamimail ja (only Cc/Bcc)
+(unknown sender) felamimail ja (unknown sender)
+activate felamimail ja ͸ú¤Ë¤¹¤ë
+add felamimail ja ÄɲÃ
+add address felamimail ja ¥¢¥É¥ì¥¹ÄɲÃ
add to %1 felamimail ja %1 ÄɲÃ
+add to address book felamimail ja ¥¢¥É¥ì¥¹Ä¢¤ËÄɲÃ
+add to addressbook felamimail ja ¥¢¥É¥ì¥¹Ä¢¤ËÄɲÃ
additional info felamimail ja ÄɲþðÊó
+address book felamimail ja ¥¢¥É¥ì¥¹Ä¢
+address book search felamimail ja ¥¢¥É¥ì¥¹Ä¢¸¡º÷
+after message body felamimail ja ¥á¥Ã¥»¡¼¥¸ËÜʸ¤Î¸åÉô
+all address books felamimail ja Á´¥¢¥É¥ì¥¹Ä¢
+all folders felamimail ja Á´¥Õ¥©¥ë¥À
+always show html emails felamimail ja ¾ï¤ËHTML¥á¡¼¥ë¤òɽ¼¨
+an: felamimail ja From:
as a subfolder of felamimail ja ¿Æ¥Õ¥©¥ë¥À
attach: felamimail ja źÉÕ¥Õ¥¡¥¤¥ë
attachments felamimail ja źÉÕ¥Õ¥¡¥¤¥ë
+auto refresh folder list felamimail ja ¥Õ¥©¥ë¥À°ìÍ÷¼«Æ°¹¹¿·
+back to folder felamimail ja ¥Õ¥©¥ë¥À
+bad reque felamimail ja
+based upon given criteria, incoming messages can have different background
colors in the message list. this helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail ja
+bcc felamimail ja Bcc
bcc: felamimail ja £Â£Ã£Ã¡§
+before headers felamimail ja ¥Ø¥Ã¥À¡¼¤ÎÁ°Éô
+betreff: felamimail ja Subject:
+between headers and message body felamimail ja
¥Ø¥Ã¥À¡¼¤È¥á¥Ã¥»¡¼¥¸ËÜʸ¤Î´Ö
body felamimail ja ËÜʸ
+body part felamimail ja ËÜʸÉôʬ
+cc felamimail ja Cc
cc: felamimail ja £Ã£Ã¡§
+change folder felamimail ja ¥Õ¥©¥ë¥ÀÊѹ¹
checkbox felamimail ja ¥Á¥§¥Ã¥¯¥Ü¥Ã¥¯¥¹
checked messages felamimail ja »ØÄê¥á¥Ã¥»¡¼¥¸
+click here to log back in. felamimail ja
+click here to return to %1 felamimail ja
%1¤ËÌá¤ë¤Ë¤Ï¤³¤³¤ò¥¯¥ê¥Ã¥¯
+close this page felamimail ja ÊĤ¸¤ë
+close window felamimail ja ÊĤ¸¤ë
color felamimail ja ¿§
+compose felamimail ja ¥á¥Ã¥»¡¼¥¸ºîÀ®
+compress folder felamimail ja ¥Õ¥©¥ë¥À°µ½Ì
+configuration felamimail ja ¥µ¥¤¥È´Ä¶ÀßÄê
+could not access [%1] file felamimail ja ¥Õ¥¡¥¤¥ë %1
¤Ë¥¢¥¯¥»¥¹¤Ç¤¤Þ¤»¤ó
+could not execute %1 felamimail ja %1 ¤ò¼Â¹Ô¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
+could not instantiate mail() felamimail ja
mail´Ø¿ô¤¬¥¨¥é¡¼¤òÊÖ¤·¤Þ¤·¤¿
+could not write to %1 directory felamimail ja ¥Ç¥£¥ì¥¯¥È¥ê %1
¤Ø½ñ¤¹þ¤á¤Þ¤»¤ó
+create felamimail ja ºîÀ®
create folder felamimail ja ¥Õ¥©¥ë¥ÀºîÀ®
-Created folder successfully! felamimail ja ¥Õ¥©¥ë¥À¤òºîÀ®¤·¤Þ¤·¤¿¡£
+create new script felamimail ja ¿·µ¬¥¹¥¯¥ê¥×¥ÈºîÀ®
+create sent felamimail ja Á÷¿®ºÑ¥Õ¥©¥ë¥ÀºîÀ®
+create subfolder felamimail ja ¥µ¥Ö¥Õ¥©¥ë¥ÀºîÀ®
+create trash felamimail ja ¥´¥ßÈ¢¥Õ¥©¥ë¥ÀºîÀ®
+created folder successfully! felamimail ja ¥Õ¥©¥ë¥À¤òºîÀ®¤·¤Þ¤·¤¿¡£
current folder felamimail ja ¸½ºß¤Î¥Õ¥©¥ë¥À
current folder: felamimail ja ¸½ºß¤Î¥Õ¥©¥ë¥À
+date felamimail ja Æü»þ
+date format felamimail ja ÆüÉÕ¥Õ¥©¡¼¥Þ¥Ã¥È
+date(newest first) felamimail ja ¿·¤·¤¤ÆüÉÕ½ç
+date(oldest first) felamimail ja ¸Å¤¤ÆüÉÕ½ç
date: felamimail ja Á÷¿®ÆüÉÕ¡§
+default application felamimail ja ɸ½à¥¢¥×¥ê¥±¡¼¥·¥ç¥ó
+default preferences felamimail ja ɸ½à¥æ¡¼¥¶¡¼ÀßÄê
+default sorting order felamimail ja ¥½¡¼¥È½ç¡Ê´ûÄê¡Ë
+delete felamimail ja ºï½ü
+delete all felamimail ja Á´¤Æºï½ü
delete folder felamimail ja ¥Õ¥©¥ë¥Àºï½ü
-deleted folder successfully! felamimail ja ¥Õ¥©¥ë¥À¤òºï½ü¤·¤Þ¤·¤¿¡£
delete selected felamimail ja ºï½ü
+delete selected messages felamimail ja ÁªÂò¥á¥Ã¥»¡¼¥¸¤òºï½ü
+deleted felamimail ja ºï½üºÑ
+deleted folder successfully! felamimail ja ¥Õ¥©¥ë¥À¤òºï½ü¤·¤Þ¤·¤¿¡£
+display of html emails felamimail ja HTML¥á¡¼¥ë¤Îɽ¼¨
+display only when no plain text is available felamimail ja
ʿʸ¥Æ¥¥¹¥È¤¬Í¸ú¤Ç̵¤¤¾ì¹ç¤Ë¸Â¤êɽ¼¨
+display preferences felamimail ja ɽ¼¨ÀßÄê
+do it! felamimail ja
+don't use sent felamimail ja »ÈÍѤ·¤Ê¤¤
+don't use trash felamimail ja »ÈÍѤ·¤Ê¤¤
+done felamimail ja ¼Â¹Ô
down felamimail ja ²¼
+download felamimail ja ¥À¥¦¥ó¥í¡¼¥É
download this as a file felamimail ja
¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É
-e-mail address felamimail ja ÅŻҥ᡼¥ë
-edit selected felamimail ja ÄûÀµ
+e-mail felamimail ja ÅŻҥ᡼¥ë
+e-mail address felamimail ja ¥á¡¼¥ë¥¢¥É¥ì¥¹
+e-mail folders felamimail ja IMAP¥Õ¥©¥ë¥À
+edit felamimail ja ÊÔ½¸
+edit filter felamimail ja ¥Õ¥£¥ë¥¿ÊÔ½¸
+edit selected felamimail ja ÊÔ½¸
+editing script felamimail ja ¥¹¥¯¥ê¥×¥ÈÊÔ½¸
+email address preferences ja ¥á¡¼¥ë¥¢¥É¥ì¥¹
+email reader originally based on squirrelmail, ported to phpgroupware by lars
kneschke. about ja
ÅŻҥ᡼¥ë¥¯¥é¥¤¥¢¥ó¥È¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó<br>Squirrelmail°Ü¿¢ÈÇWeb¥á¡¼¥ë
+email signature felamimail ja ½ð̾
+enter your imap mail server hostname or ip address admin ja
IMAP¥µ¡¼¥Ð¡¼¥Û¥¹¥È̾¡ÊIP¥¢¥É¥ì¥¹)
+enter your sieve server hostname or ip address admin ja
Sieve¥µ¡¼¥Ð¡¼Ì¾¡ÊIP¥¢¥É¥ì¥¹¡Ë
+enter your sieve server port admin ja Sieve¥µ¡¼¥Ð¡¼¡¦¥Ý¡¼¥ÈÈÖ¹æ
+error felamimail ja ¥¨¥é¡¼
+error connecting to imap serv felamimail ja IMAP¥µ¡¼¥Ð¡¼Àܳ¥¨¥é¡¼
everywhere felamimail ja ¤¹¤Ù¤Æ
+expunge felamimail ja
+felamimail common ja FelaMiMail
+file error: could not open file %1 felamimail ja
¥Õ¥¡¥¤¥ë¥¨¥é¡¼¡§¥Õ¥¡¥¤¥ë %1 ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿
+files felamimail ja ¥Õ¥¡¥¤¥ë
+filter active felamimail ja ¥Õ¥£¥ë¥¿Í¸ú
+filter name felamimail ja ¥Õ¥£¥ë¥¿Ì¾
+first name felamimail ja ̾
+flagged felamimail ja ¥Õ¥é¥°¤¢¤ê
+flags felamimail ja ¥Õ¥é¥°
+folder name felamimail ja ¥Õ¥©¥ë¥À̾
+folder path felamimail ja ¥Õ¥©¥ë¥À¥Ñ¥¹
+folder preferences felamimail ja ¥Õ¥©¥ë¥À ¥æ¡¼¥¶¡¼ÀßÄê
+folder settings felamimail ja ¥Õ¥©¥ë¥ÀÀßÄê
+folder status felamimail ja ¥Õ¥©¥ë¥À¥¹¥Æ¡¼¥¿¥¹
+folderlist felamimail ja ¥Õ¥©¥ë¥À°ìÍ÷
+folders felamimail ja ¥Õ¥©¥ë¥À
+folders created successfully! felamimail ja ¥Õ¥©¥ë¥À¤òºîÀ®¤·¤Þ¤·¤¿
+follow felamimail ja
+for mail to be send - not functional yet felamimail ja
+for received mail felamimail ja ¼õ¿®ºÑ¥á¡¼¥ëÍÑ
+forced preferences felamimail ja ¶¯À©¥æ¡¼¥¶¡¼ÀßÄê
+forward felamimail ja žÁ÷
+found felamimail ja
+fri felamimail ja ¶â
+from felamimail ja º¹½Ð¿Í
from: felamimail ja º¹½Ð¿Í¡§
+full name felamimail ja ¥Õ¥ë¥Í¡¼¥à
+have a look at <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> to learn more about squirrelmail.<br>
felamimail ja Squirrelmail¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯ÃΤꤿ¤¤¾ì¹ç¤Ï¡¢<a
href="http://www.felamimail.org";
target="_new">www.felamimail.org</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+help felamimail ja ¥Ø¥ë¥×
+hide header felamimail ja ¥Ø¥Ã¥ÀÈóɽ¼¨
+html felamimail ja HTML
+icons and text felamimail ja ¥¢¥¤¥³¥ó&¥Æ¥¥¹¥È
+icons only felamimail ja ¥¢¥¤¥³¥ó¤Î¤ß
identifying name felamimail ja ÄêµÁ̾
+illegal folder name. please select a different name. felamimail ja
ÉÔÀµ¤Ê¥Õ¥©¥ë¥À̾¤Ç¤¹¡£Àµ³Î¤Ë¥Õ¥©¥ë¥À̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£
+imap felamimail ja IMAP
+imap server felamimail ja IMAP¥µ¡¼¥Ð¡¼
+imap server address preferences ja IMAP¥µ¡¼¥Ð¡¼Ì¾
+imaps authentication common ja IMAPSǧ¾Ú
+imaps encryption only common ja IMAPS(°Å¹æ²½¤Î¤ß)
+in felamimail ja
+in order for squirrelmail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail ja
+in the center felamimail ja
index order felamimail ja ɽ¼¨¹àÌÜÀßÄê
info felamimail ja ÄɲþðÊó
-message list felamimail ja ¥á¥Ã¥»¡¼¥¸°ìÍ÷
+interface/template selection felamimail ja
¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹/¥Æ¥ó¥×¥ì¡¼¥ÈÁªÂò
+invalid user name or password felamimail ja
¥æ¡¼¥¶¡¼Ì¾¤Þ¤¿¤Ï¥Ñ¥¹¥ï¡¼¥É¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó
+javascript felamimail ja JavaScript
+language felamimail ja ¸À¸ì
+last name felamimail ja À«
+left felamimail ja º¸
+less felamimail ja
+let this folder contain subfolders felamimail ja
+list all felamimail ja Á´¥ê¥¹¥È
+location of buttons when composing felamimail ja
¥á¡¼¥ëºîÀ®¥Ü¥¿¥ó¤Î°ÌÃÖ
+location of folder list felamimail ja ¥Õ¥©¥ë¥À¥ê¥¹¥È¤Î°ÌÃÖ
+mail settings felamimail ja ¥á¡¼¥ëÀßÄê
+manage folders common ja ¥Õ¥©¥ë¥À´ÉÍý
+manage sieve common ja Sieve¥¹¥¯¥ê¥×¥È´ÉÍý
+mark as deleted felamimail ja ºï½ü¥Þ¡¼¥¯¤òÉÕ²Ã
+mark messages as felamimail ja
+mark selected as flagged felamimail ja ¥Õ¥é¥°ÉÕ²Ã
+mark selected as read felamimail ja ´ûÆɤˤ¹¤ë
+mark selected as unflagged felamimail ja ¥Õ¥é¥°²ò½ü
+mark selected as unread felamimail ja ̤Æɤˤ¹¤ë
+match felamimail ja
+max matches per page felamimail ja £±¥Ú¡¼¥¸¤Ëɽ¼¨¤¹¤ëºÇÂç¹Ô¿ô
+maxmatchs felamimail ja
message highlighting felamimail ja ¥á¥Ã¥»¡¼¥¸¶¯Ä´É½¼¨
+message list felamimail ja ¥á¥Ã¥»¡¼¥¸°ìÍ÷
+messages felamimail ja ¥á¥Ã¥»¡¼¥¸
+minute felamimail ja ʬ
+minutes felamimail ja ʬ
+mon felamimail ja ·î
+more felamimail ja
move felamimail ja °ÜÆ°
move & follow felamimail ja °ÜÆ°¤ÈÁªÂò
+move messages felamimail ja ¥á¥Ã¥»¡¼¥¸°ÜÆ°
+move selected to felamimail ja ÁªÂò¥á¥Ã¥»¡¼¥¸°ÜÆ°
move selected to: felamimail ja ÁªÂò¥á¥Ã¥»¡¼¥¸°ÜÆ°Àè
+move to trash felamimail ja ¥´¥ßÈ¢¤Ø°ÜÆ°
must be unique felamimail ja ½ÅÊ£¤·¤Ê¤¤ÃͤòÆþÎÏ
-new felamimail ja ¿·µ¬ºîÀ®
+name felamimail ja ̾Á°
+never display html emails felamimail ja
HTML¥á¡¼¥ë¤Îɽ¼¨¤ò¹Ô¤ï¤Ê¤¤
+new felamimail ja ̤ÆÉ
+new filter felamimail ja ¿·µ¬¥Õ¥£¥ë¥¿
new name: felamimail ja ¿·¤·¤¤¥Õ¥©¥ë¥À̾¡§
+next felamimail ja ¼¡¥Ú¡¼¥¸
+next message felamimail ja ¼¡¤Î¥á¥Ã¥»¡¼¥¸
nickname felamimail ja ¥Ë¥Ã¥¯¥Í¡¼¥à
+no filter felamimail ja ¥Õ¥£¥ë¥¿¤Ê¤·
no folders found felamimail ja ¥Õ¥©¥ë¥À¤Ê¤·
no folders were found to subscribe to! felamimail ja
ɽ¼¨²Äǽ¤Ê¥Õ¥©¥ë¥À¤¬¤¢¤ê¤Þ¤»¤ó¡£
no folders were found to unsubscribe from! felamimail ja
Èóɽ¼¨²Äǽ¤Ê¥Õ¥©¥ë¥À¤¬¤¢¤ê¤Þ¤»¤ó¡£
no highlighting is defined felamimail ja ¶¯Ä´É½¼¨¤Ï̤ÄêµÁ¤Ç¤¹¡£
no messages found felamimail ja ¥á¥Ã¥»¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£
no messages were selected. felamimail ja
¥á¥Ã¥»¡¼¥¸¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
+no next message felamimail ja ¼¡¤Î¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó
+no notification felamimail ja ÄÌÃΤʤ·
+no personal address book is defined. contact administrator. felamimail
ja ¸Ä¿ÍÍÑ¥¢¥É¥ì¥¹Ä¢¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£´ÉÍý¼Ô¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£
+no persons matching your search was found felamimail ja
¸¡º÷¾ò·ï¤Ë°ìÃפ¹¤ë¿Íʪ¤Ï¸ºß¤·¤Þ¤»¤ó
+no previous message felamimail ja Á°¤Î¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó
+none felamimail ja ¤Ê¤·
+number of messages to index felamimail ja
+on behalf of felamimail ja ¡§
+only inbox felamimail ja INBOX¤Î¤ß
+only unseen felamimail ja ̤ÆɤΤß
options felamimail ja ¥ª¥×¥·¥ç¥ó
+organization felamimail ja ÁÈ¿¥
+organization name admin ja ÁÈ¿¥Ì¾
original message felamimail ja Original Message
+originalnachricht felamimail ja Original Message
+oth felamimail ja
personal address book felamimail ja ¸Ä¿Í¥¢¥É¥ì¥¹Ä¢
personal information felamimail ja ¸Ä¿Í¾ðÊó
+ported to phpgroupware by: felamimail ja phpGroupWare°Ü¿¢Ã´Åö¼Ô¡§
+preference file %1 not found. exiting abnormally felamimail ja
+preference file, %1, does not exist. log out, and log back in to create a
default preference file. felamimail ja
+previous felamimail ja Á°¥Ú¡¼¥¸
+previous message felamimail ja Á°¤Î¥á¥Ã¥»¡¼¥¸
+print it felamimail ja °õºþ²èÌÌ
+print this page felamimail ja ¥Ú¡¼¥¸°õºþ
+purge felamimail ja
+quicksearch felamimail ja ¥¯¥¤¥Ã¥¯¸¡º÷
+read felamimail ja ´ûÆÉ
+read da felamimail ja
+reason giv felamimail ja
+recent felamimail ja ºÇ¿·
refresh folder list felamimail ja ¥Õ¥©¥ë¥ÀºÆɽ¼¨
+refresh page felamimail ja ¥Ú¡¼¥¸¹¹¿·
+refresh time in minutes felamimail ja ¥ê¥Õ¥ì¥Ã¥·¥å´Ö³Ö¡Êʬ¡Ë
remove felamimail ja ºï½ü
-rename a folder felamimail ja ¥Õ¥©¥ë¥À̾¤ÎÊѹ¹
+remove immediately felamimail ja ¨ºÂ¤Ëºï½ü
+rename felamimail ja ¥ê¥Í¡¼¥à
+rename a folder felamimail ja ¥Õ¥©¥ë¥À̾Êѹ¹
+rename folder felamimail ja ¥Õ¥©¥ë¥À̾Êѹ¹
renamed successfully! felamimail ja ¥Õ¥©¥ë¥À̾¤òÊѹ¹¤·¤Þ¤·¤¿¡£
-reply to felamimail ja ¥ê¥×¥é¥¤
+replied felamimail ja ÊÖ¿®
+reply felamimail ja ÊÖ¿®
+reply all felamimail ja Á´°÷¤ËÊÖ¿®
+reply to felamimail ja ÊÖ¿®Àè
+replyto felamimail ja ÊÖ¿®Àè
+return felamimail ja Ìá¤ë
+return to options page felamimail ja ¥ª¥×¥·¥ç¥ó²èÌ̤ËÌá¤ë
+right felamimail ja
+running squirrelmail version %1 (c) 1999-2000. felamimail ja
+same window - not functional yet felamimail ja
+sat felamimail ja ÅÚ
+save felamimail ja Êݸ
+savescript felamimail ja ¥¹¥¯¥ê¥×¥ÈÊݸ
+script felamimail ja ¥¹¥¯¥ê¥×¥È
+script name felamimail ja ¥¹¥¯¥ê¥×¥È̾
+scripts available for this account. felamimail ja
¥¹¥¯¥ê¥×¥È¤Ï»ØÄꤷ¤¿¥¢¥«¥¦¥ó¥È¤ËÂФ·¤Æ͸ú¤Ç¤¹
+search felamimail ja ¸¡º÷
+search for felamimail ja
+seconds felamimail ja ÉÃ
+select felamimail ja ÁªÂò
select all felamimail ja Á´¤ÆÁªÂò
+select home email address felamimail ja ¸Ä¿ÍÍѥ᡼¥ë¥¢¥É¥ì¥¹
+select work email address felamimail ja »Å»öÍѥ᡼¥ë¥¢¥É¥ì¥¹
+send felamimail ja Á÷¿®
+sent fold felamimail ja Á÷¿®ºÑ¤ß¥Õ¥©¥ë¥À
+sent folder felamimail ja Á÷¿®ºÑ¤ß¥Õ¥©¥ë¥À
+server respond felamimail ja ¥µ¡¼¥Ð¡¼±þÅú
+show current users on navigation bar felamimail ja
¥Ê¥Ó¥Ð¡¼¤Ë¸½ºß¤Î¥æ¡¼¥¶¡¼¤òɽ¼¨
+show header felamimail ja ¥Ø¥Ã¥Àɽ¼¨
+show navigation bar as felamimail ja
+show new messages on main screen felamimail ja
¿·Ãå¥á¥Ã¥»¡¼¥¸¤ò¥Û¡¼¥à²èÌ̤Ëɽ¼¨
+sieve settings admin ja SieveÀßÄê
signature felamimail ja ½ð̾
-subscribe felamimail ja ɽ¼¨
-subscribed successfully! felamimail ja ɽ¼¨¤Ë¤·¤Þ¤·¤¿¡£
+size felamimail ja ¥µ¥¤¥º
+size of editor window felamimail ja ÊÔ½¸²èÌ̤Υµ¥¤¥º
+smtp error: could not authenticate felamimail ja
SMTP¥¨¥é¡¼¡§Ç§¾Ú¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
+smtp error: could not connect to smtp host server(s) felamimail ja
SMTP¥¨¥é¡¼¡§SMTP¥µ¡¼¥Ð¡¼¤Ø¤ÎÀܳ¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
+smtp error: data not accepted felamimail ja
SMTP¥¨¥é¡¼¡§¥Ç¡¼¥¿¤¬¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿
+smtp error: from address [%1] failed felamimail ja
SMTP¥¨¥é¡¼¡§º¹½Ð¿Í¥¢¥É¥ì¥¹¡Ê%1¡Ë¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó
+smtp error: the following recipients failed [%1] felamimail ja
SMTP¥¨¥é¡¼¡§¼¡¤Î¼õ¼è¿Í¥¢¥É¥ì¥¹¡Ê%1¡Ë¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó
+smtp settings admin ja SMTPÀßÄê
+some or all of the help documents are not present! felamimail ja
¥Ø¥ë¥×¥É¥¥å¥á¥ó¥È¤ÏÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó
+source felamimail ja
+special folder options felamimail ja Æüì¥Õ¥©¥ë¥À¡¦¥ª¥×¥·¥ç¥ó
+squirrelmail felamimail ja SquirrelMail
+subject felamimail ja ·ï̾
+submit felamimail ja ¼Â¹Ô
+subscribe felamimail ja ¹ØÆÉ
+subscribed felamimail ja ¹ØÆɤ¹¤ë
+subscribed successfully! felamimail ja ¹ØÆɤˤ·¤Þ¤·¤¿¡£
+successfully saved display preferences! felamimail ja
ɽ¼¨ÀßÄê¤òÊݸ¤·¤Þ¤·¤¿
+successfully saved folder preferences! felamimail ja
¥Õ¥©¥ë¥ÀÀßÄê¤òÊݸ¤·¤Þ¤·¤¿
+successfully saved personal information! felamimail ja
¸Ä¿Í¾ðÊó¤òÊݸ¤·¤Þ¤·¤¿
+sun felamimail ja Æü
+switch current folder to felamimail ja ¥«¥ì¥ó¥È¥Õ¥©¥ë¥ÀÀÚÂØ
+table of contents felamimail ja
+text only felamimail ja ¥Æ¥¥¹¥È¤Î¤ß
+the connection to the imap server failed!! felamimail ja
IMAP¥µ¡¼¥Ð¡¼¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿
+the help has not been translated to %1. it will be displayed in english
instead. felamimail ja
¥Ø¥ë¥×¤Ï%1¤ËËÝÌõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£Âå¤ï¤ê¤Ë±Ñ¸ì¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹¡£
+the index order is the order that the columns are arranged in the message
index. you can add, remove, and move columns around to customize them to fit
your needs. felamimail ja
+the order of the message index can be rearanged and changed to contain the
headers in any order you want. felamimail ja
+the supplied queue directory does not exist felamimail ja
+theme felamimail ja ¥Æ¡¼¥Þ
+theme (colors/fonts) selection felamimail ja
¥Æ¡¼¥Þ¡Ê¿§/¥Õ¥©¥ó¥È¡ËÁªÂò
+these settings change the way your folders are displayed and manipulated.
felamimail ja
this contains personal information about yourself such as your name, your
email address, etc. felamimail ja
ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤äÁ÷¿®¼Ô̾¤Ê¤É¤Î¸Ä¿Í¾ðÊó¤òÀßÄꤷ¤Þ¤¹¡£
-to felamimail ja £ô£ï
+this folder is empty felamimail ja
¤³¤Î¥Õ¥©¥ë¥À¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó
+this port is based on squirrelmail, which is a standalone imap client.<br>
felamimail ja IMAP¥¯¥é¥¤¥¢¥ó¥È¤Îɸ½à¤Ç¤¢¤ëSquirrelmail¤Î°Ü¿¢ÈǤǤ¹
+thu felamimail ja ÌÚ
+time format felamimail ja »þ¹ï¥Õ¥©¡¼¥Þ¥Ã¥È
+to felamimail ja °¸Àè
+to the left felamimail ja
+to the right felamimail ja
to: felamimail ja °¸À衧
-unsubscribe felamimail ja Èóɽ¼¨
-unsubscribed successfully! felamimail ja Èóɽ¼¨¤Ë¤·¤Þ¤·¤¿¡£
-unselect all felamimail ja Á´¤ÆÁªÂò²ò½ü
+top felamimail ja
+translation location felamimail ja
+translation preferences felamimail ja
+translation server felamimail ja
+trash fold felamimail ja ¥´¥ßÈ¢¥Õ¥©¥ë¥À
+trash folder felamimail ja ¥´¥ßÈ¢¥Õ¥©¥ë¥À
+tue felamimail ja ²Ð
+type felamimail ja MIME¥¿¥¤¥×
+unable to list addresses from %1 felamimail ja
+unflagged felamimail ja ¥Õ¥é¥°¤Ê¤·
+unknown encoding: %1 felamimail ja %1 ¤ÏÉÔÌÀ¤Ê¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤¹
+unknown err felamimail ja ÉÔÌÀ¤Ê¥¨¥é¡¼¤Ç¤¹
+unknown error felamimail ja ÉÔÌÀ¤Ê¥¨¥é¡¼¤Ç¤¹
+unknown sender felamimail ja Á÷¿®¼ÔÉÔÌÀ
+unknown user or password incorrect. felamimail ja
¥æ¡¼¥¶¡¼¤Þ¤¿¤Ï¥Ñ¥¹¥ï¡¼¥É¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó
+unread felamimail ja ̤ÆÉ
+unseen and total felamimail ja ̤ÆÉÁí¿ô
+unseen message notification felamimail ja ̤ÆÉ¥á¥Ã¥»¡¼¥¸ÄÌÃÎ
+unseen message notification type felamimail ja
̤ÆÉ¥á¥Ã¥»¡¼¥¸ÄÌÃÎ¥¿¥¤¥×
+unselect all felamimail ja Á´¤ÆÈóÁªÂò
+unsubscribe felamimail ja ̤¹ØÆÉ
+unsubscribed felamimail ja ¹ØÆɤ·¤Ê¤¤
+unsubscribed successfully! felamimail ja ̤¹ØÆɤˤ·¤Þ¤·¤¿
up felamimail ja ¾å
update address felamimail ja ¥¢¥É¥ì¥¹¹¹¿·
+use a signature felamimail ja ½ð̾¤ò»ÈÍÑ
use a signature? felamimail ja ½ð̾¤ò»ÈÍÑ
-view full header felamimail ja ¥Ø¥Ã¥Àɽ¼¨
-viewing full header felamimail ja ¥Ø¥Ã¥Àɽ¼¨
-viewing message felamimail ja ɽ¼¨¿ô
+use addresses felamimail ja ¥¢¥É¥ì¥¹»ÈÍÑ
+use custom settings preferences ja ¥«¥¹¥¿¥àÀßÄê¤ò»ÈÍÑ
+use javascript or html addressbook? felamimail ja
Javascript¤Þ¤¿¤ÏHTML¤Î¤É¤Á¤é¤Î¥¢¥É¥ì¥¹Ä¢¤ò»ÈÍѤ·¤Þ¤¹¤«
+use smtp auth admin ja SMTPǧ¾Ú
+users can define their own emailaccounts admin ja
³Æ¥æ¡¼¥¶¡¼¤Î¥á¡¼¥ë¥¢¥«¥¦¥ó¥ÈÀßÄê¤òµö²Ä
+view full header felamimail ja Á´¥Ø¥Ã¥Àɽ¼¨
+view message felamimail ja ¥á¥Ã¥»¡¼¥¸É½¼¨
view messages felamimail ja ¥á¥Ã¥»¡¼¥¸É½¼¨
+viewing full header felamimail ja ¥Ø¥Ã¥ÀÁ´É½¼¨
+viewing message felamimail ja ɽ¼¨¿ô
viewing messages felamimail ja ɽ¼¨¿ô
+von: felamimail ja To:
+wed felamimail ja ¿å
+welcome to %1's webmail system felamimail ja
%1¤ÎWeb¥á¡¼¥ë¥·¥¹¥Æ¥à¤Ø¤è¤¦¤³¤½¡ª
+when deleting messages felamimail ja ¥á¥Ã¥»¡¼¥¸ºï½ü½èÍý
+width of folder list felamimail ja ¥Õ¥©¥ë¥À¥ê¥¹¥È¤ÎÉý
+wrap incoming text at felamimail ja
+write to file failed felamimail ja ¥Õ¥¡¥¤¥ë½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿
+wrote felamimail ja wrote
+you can change the way that squirrelmail looks and displays information to
you, such as the colors, the language, and other settings. felamimail ja
+you can only edit one address at the time felamimail ja
°ìÅ٤ˤϣ±¤Ä¤Î¥¢¥É¥ì¥¹¤·¤«ÊÔ½¸¤Ç¤¤Þ¤»¤ó
+you must login first. felamimail ja
¤Þ¤º¤Ï¥í¥°¥¤¥ó¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó
+you must provide at least one recipient email address felamimail ja
¾¯¤Ê¤¯¤È¤â£±¿Í¤Ï¼õ¼è¿Í¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó
+you need a valid user and password to access this page! felamimail
ja ¤³¤Î¥Ú¡¼¥¸¤Ø¥¢¥¯¥»¥¹²Äǽ¤ÊÀµ¤·¤¤¥æ¡¼¥¶¡¼Ì¾¡¢¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹¡£
+your preferences felamimail ja ¥æ¡¼¥¶¡¼ÀìÍÑÀßÄê
+your search failed with the following error(s) felamimail ja
¼¡¤Î¥¨¥é¡¼¤Î°Ù¤Ë¡¢¸¡º÷¤Ï¼ºÇÔ¤·¤Þ¤·¤¿
Index: setup/phpgw_pl.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_pl.lang,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- setup/phpgw_pl.lang 22 Feb 2006 09:20:44 -0000 1.3
+++ setup/phpgw_pl.lang 18 Dec 2006 20:03:32 -0000 1.4
@@ -4,31 +4,32 @@
add felamimail pl Dodaj
add address felamimail pl Dodaj adres
add to %1 felamimail pl Dodaj do %1
-add to address book felamimail pl Dodaj do ksiÄ
żki adresowej
+add to address book felamimail pl Dodaj do ksi±¿ki adresowej
additional info felamimail pl
-address book felamimail pl KsiÄ
żka adresowa
+address book felamimail pl Ksi±¿ka adresowa
address book search felamimail pl
-after message body felamimail pl Za treÅciÄ
wiadomoÅci
+after message body felamimail pl Za tre¶ci± wiadomo¶ci
all address books felamimail pl
all folders felamimail pl
as a subfolder of felamimail pl jako podfolder w
-attachments felamimail pl ZaÅÄ
czniki
+attachments felamimail pl Za³±czniki
auto refresh folder list felamimail pl
+bad reque felamimail pl
based upon given criteria, incoming messages can have different background
colors in the message list. this helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail pl
-before headers felamimail pl Przed nagÅówkiem
-between headers and message body felamimail pl PomiÄdzy
nagÅówkiem a treÅciÄ
+before headers felamimail pl Przed nag³ówkiem
+between headers and message body felamimail pl Pomiêdzy
nag³ówkiem a tre¶ci±
cc felamimail pl DW
checkbox felamimail pl
click here to log back in. felamimail pl
click here to return to %1 felamimail pl
close window felamimail pl Zamknij okno
color felamimail pl Kolor
-compose felamimail pl Utwórz
+compose felamimail pl Utwórz
create felamimail pl
create folder felamimail pl Tworzenie folderu
create sent felamimail pl
create trash felamimail pl
-created folder successfully! felamimail pl Utworzono folder
pomyÅlnie!
+created folder successfully! felamimail pl Utworzono folder
pomy¶lnie!
dark blue felamimail pl
dark cyan felamimail pl
dark gray felamimail pl
@@ -36,20 +37,20 @@
dark magenta felamimail pl
dark yellow felamimail pl
date felamimail pl
-default sorting order felamimail pl DomyÅlny porzÄ
dek sortowania
+default sorting order felamimail pl Domy¶lny porz±dek sortowania
delete felamimail pl
delete folder felamimail pl Usuwanie folderu
-delete selected felamimail pl UsuÅ zaznaczone
+delete selected felamimail pl Usuñ zaznaczone
deleted folder successfully! felamimail pl
display preferences felamimail pl
do not use sent felamimail pl
do not use trash felamimail pl
don't use sent felamimail pl
don't use trash felamimail pl
-don\'t use sent felamimail pl Nie używaj wysÅane
-don\'t use trash felamimail pl Nie używaj kosza
+don\'t use sent felamimail pl Nie u¿ywaj wys³ane
+don\'t use trash felamimail pl Nie u¿ywaj kosza
done felamimail pl
-down felamimail pl w dóÅ
+down felamimail pl w dó³
download felamimail pl
download this as a file felamimail pl
e-mail felamimail pl E-mail
@@ -58,40 +59,41 @@
edit selected felamimail pl
email account name felamimail pl Nazwa konta
email address felamimail pl Adres e-mail
-email password felamimail pl HasÅo
+email password felamimail pl Has³o
email signature felamimail pl Sygnaturka
empty trash felamimail pl
erro felamimail pl
error felamimail pl
+error connecting to imap serv felamimail pl
error opening felamimail pl
expunge felamimail pl
felamimail common pl FelaMiMail
files felamimail pl pliki
-first name felamimail pl ImiÄ
+first name felamimail pl Imiê
flags felamimail pl
folder path felamimail pl
-folder preferences felamimail pl Preferencje folderów
+folder preferences felamimail pl Preferencje folderów
folders felamimail pl Foldery
-folders created successfully! felamimail pl PomyÅlnie utworzono
folder
+folders created successfully! felamimail pl Pomy¶lnie utworzono
folder
follow felamimail pl
for mail to be send - not functional yet felamimail pl
for received mail felamimail pl
forward felamimail pl
found felamimail pl
from felamimail pl Od
-full name felamimail pl PeÅna nazwa
+full name felamimail pl Pe³na nazwa
have a look at <a href="ht felamimail pl
help felamimail pl Pomoc
html felamimail pl HTML
identifying name felamimail pl Nazwa identyfikatora
-if applicable felamimail pl jeÅli wybrano
+if applicable felamimail pl je¶li wybrano
illegal folder name. please select a different name. felamimail pl
in felamimail pl w
in order for squirrelmail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail pl
-in the center felamimail pl w Årodku
-index order felamimail pl PorzÄ
dek indeksu
+in the center felamimail pl w ¶rodku
+index order felamimail pl Porz±dek indeksu
info felamimail pl Info
-invaild user name or password felamimail pl Niepoprawne hasÅo lub
nazwa użytkownika
+invaild user name or password felamimail pl Niepoprawne has³o lub
nazwa u¿ytkownika
javascript felamimail pl JavaScript
language felamimail pl
last name felamimail pl Nazwisko
@@ -105,38 +107,38 @@
light magenta felamimail pl
light yellow felamimail pl
list all felamimail pl
-location of buttons when composing felamimail pl Lokalizacja
przycisków przy tworzeniu
+location of buttons when composing felamimail pl Lokalizacja
przycisków przy tworzeniu
location of folder list felamimail pl
mail folder(uw-maildir) felamimail pl Katalog poczty
(uw-maildir)
mail server felamimail pl Serwer pocztowy
mail server type felamimail pl Typ serwera pocztowego
mail settings felamimail pl Ustawienia poczty
-manage folders felamimail pl ZarzÄ
dzanie folderami
-mark as deleted felamimail pl zaznacz jako usunietÄ
+manage folders felamimail pl Zarz±dzanie folderami
+mark as deleted felamimail pl zaznacz jako usuniet±
mark selected as flagged felamimail pl
mark selected as read felamimail pl
mark selected as unflagged felamimail pl
mark selected as unread felamimail pl
match felamimail pl Zgodne
medium gray felamimail pl
-message highlighting felamimail pl PodÅwietlanie wiadomoÅci
-message list felamimail pl Lista wiadomoÅci
-messages felamimail pl wiadomoÅci
+message highlighting felamimail pl Pod¶wietlanie wiadomo¶ci
+message list felamimail pl Lista wiadomo¶ci
+messages felamimail pl wiadomo¶ci
minute felamimail pl Minuta
minutes felamimail pl Minuty
more felamimail pl
move felamimail pl
move selected to felamimail pl
-move to trash felamimail pl przenieÅ do kosza
-must be unique felamimail pl Musi byÄ unikalny
+move to trash felamimail pl przenie¶ do kosza
+must be unique felamimail pl Musi byæ unikalny
name felamimail pl Nazwa
new felamimail pl Nowe
-next felamimail pl NastÄpny
+next felamimail pl Nastêpny
nickname felamimail pl
-no folders found felamimail pl Nie znaleziono folderów
+no folders found felamimail pl Nie znaleziono folderów
no folders were found to subscribe to! felamimail pl
no folders were found to unsubscribe from! felamimail pl
-no highlighting is defined felamimail pl Nie zdefiniowano
podÅwietleÅ
+no highlighting is defined felamimail pl Nie zdefiniowano
pod¶wietleñ
no messages were selected. felamimail pl
no next message felamimail pl
no notification felamimail pl
@@ -161,16 +163,16 @@
refresh folder list felamimail pl
refresh page felamimail pl
remove felamimail pl
-remove immediately felamimail pl usuÅ natychmiast
+remove immediately felamimail pl usuñ natychmiast
rename felamimail pl Zmiana nazwy
rename a folder felamimail pl Zmiana nazwy folderu
-renamed successfully! felamimail pl PomyÅlnie zmieniono nazwÄ
+renamed successfully! felamimail pl Pomy¶lnie zmieniono nazwê
reply felamimail pl Odpowiedz
reply all felamimail pl Odpowiedz wszystkim
reply to felamimail pl Odpowiedz
replyto felamimail pl Odpowiedz
-return felamimail pl Powrót
-return to options page felamimail pl Powrót do strony konfiguracji
+return felamimail pl Powrót
+return to options page felamimail pl Powrót do strony konfiguracji
right felamimail pl
running squirrelmail version %1 (c) 1999-2000. felamimail pl
Uruchomiona wersja SquirrelMail %1 (c) 1999-2000.
same window - not functional yet felamimail pl
@@ -182,16 +184,16 @@
select all felamimail pl Wybierz wszystko
sent fold felamimail pl
server respond felamimail pl
-show new messages on main screen felamimail pl WyÅwietlaÄ
nowe wiadomoÅci na stronie gÅównej?
+show new messages on main screen felamimail pl Wy¶wietlaæ nowe
wiadomo¶ci na stronie g³ównej?
signature felamimail pl
-size felamimail pl WielkoÅÄ
-size of editor window felamimail pl WielkoÅÄ okna edytora
+size felamimail pl Wielko¶æ
+size of editor window felamimail pl Wielko¶æ okna edytora
some or all of the help documents are not present! felamimail pl
-source felamimail pl ŹródÅo
-special folder options felamimail pl Opcje specjalne folderów
+source felamimail pl ¬ród³o
+special folder options felamimail pl Opcje specjalne folderów
squirrelmail felamimail pl Squirrelmail
subject felamimail pl Temat
-submit felamimail pl WyÅlij
+submit felamimail pl Wy¶lij
subscribe felamimail pl
subscribed successfully! felamimail pl
successfully saved display preferences! felamimail pl
@@ -210,9 +212,9 @@
to the left felamimail pl po lewej
to the right felamimail pl po prawej
top felamimail pl
-translation location felamimail pl PoÅożenie tÅumaczenia
+translation location felamimail pl Po³o¿enie t³umaczenia
translation preferences felamimail pl
-translation server felamimail pl Serwer tÅumaczeÅ
+translation server felamimail pl Serwer t³umaczeñ
trash fold felamimail pl
unable to list addresses from %1 felamimail pl
unknown err felamimail pl
@@ -225,23 +227,23 @@
unselect all felamimail pl
unsubscribe felamimail pl
unsubscribed successfully! felamimail pl
-up felamimail pl w górÄ
+up felamimail pl w górê
update address felamimail pl
use a signature felamimail pl
use a signature? felamimail pl
use addresses felamimail pl
-use custom settings felamimail pl Użyj ustawieŠużytkownika
+use custom settings felamimail pl U¿yj ustawieñ u¿ytkownika
use javascript or html addressbook? felamimail pl
-view full header felamimail pl Pokaż peÅny nagÅówek
+view full header felamimail pl Poka¿ pe³ny nag³ówek
view message felamimail pl
viewing full header felamimail pl
viewing message felamimail pl
viewing messages felamimail pl
welcome to %1's webmail system felamimail pl
-when deleting messages felamimail pl Gdy usuwasz wiadomoÅÄ
-white felamimail pl BiaÅy
+when deleting messages felamimail pl Gdy usuwasz wiadomo¶æ
+white felamimail pl Bia³y
width of folder list felamimail pl
-wrap incoming text at felamimail pl SzerokoÅÄ zawijania werszy
+wrap incoming text at felamimail pl Szeroko¶æ zawijania werszy
you can change the way that squirrelmail looks and displays information to
you, such as the colors, the language, and other settings. felamimail pl
you can only edit one address at the time felamimail pl
you must login first. felamimail pl
Index: setup/phpgw_pt.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_pt.lang,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- setup/phpgw_pt.lang 22 Feb 2006 09:21:55 -0000 1.4
+++ setup/phpgw_pt.lang 18 Dec 2006 20:03:32 -0000 1.5
@@ -3,14 +3,14 @@
(unknown sender) felamimail pt (remetente desconhecido)
activate felamimail pt Ativar
add felamimail pt adicionar
-add address felamimail pt Adicionar endereço
+add address felamimail pt Adicionar endereço
add to %1 felamimail pt Adicionar a %1
add to address book felamimail pt Adicionar aos contatos
add to addressbook felamimail pt adicionar aos contatos
-additional info felamimail pt Informações adicionais
+additional info felamimail pt Informações adicionais
address book felamimail pt Contatos
address book search felamimail pt Procurar nos contatos
-after message body felamimail pt Após o corpo da mensagem
+after message body felamimail pt Após o corpo da mensagem
all address books felamimail pt Todos os contatos
all folders felamimail pt Todas as pastas
always show html emails felamimail en Sempre mostrar emails
codificados em html
@@ -18,18 +18,18 @@
attachments felamimail pt Anexos
auto refresh folder list felamimail pt Atualizar
automaticamente lista de pastas
back to folder felamimail pt voltar para pasta
-Bad request felamimail pt Pedido inválido
-Based upon given criteria, incoming messages can have different background
colors in the message list. This helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail pt Baseado em
criterias dadas, mensagens de entrada podem ter cores de fundo diferentes na
lista de mensagens. Isso ajuda facilmente distinguir de quem são as
mensagens, particularmente no caso de listas de mensagens.
+Bad request felamimail pt Pedido inválido
+Based upon given criteria, incoming messages can have different background
colors in the message list. This helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail pt Baseado em
criterias dadas, mensagens de entrada podem ter cores de fundo diferentes na
lista de mensagens. Isso ajuda facilmente distinguir de quem são as mensagens,
particularmente no caso de listas de mensagens.
bcc felamimail pt bcc
before headers felamimail pt Antes dos headers
-between headers and message body felamimail pt Entre
cabeçalho e corpo da mensagem
+between headers and message body felamimail pt Entre cabeçalho
e corpo da mensagem
body part felamimail pt corpo
cc felamimail pt cc
change folder felamimail pt mudar a pasta
-checkbox felamimail pt Caixa de seleção
+checkbox felamimail pt Caixa de seleção
click here to log back in. felamimail pt Clique aqui para
(re-)login.
click here to return to %1 felamimail pt Clique aqui para voltar
a %1
-close this page felamimail pt Fechar esta página
+close this page felamimail pt Fechar esta página
close window felamimail pt Fecha janela
color felamimail pt Cor
compose felamimail pt Compor
@@ -49,7 +49,7 @@
date felamimail pt Data
date(newest first) felamimail pt Data(novas primeiro)
date(oldest first) felamimail pt Data(antigas primeiro)
-Default sorting order felamimail pt Ordenação padrão
+Default sorting order felamimail pt Ordenação padrão
delete felamimail pt Apagar
delete all felamimail pt apagar tudo
delete folder felamimail pt Apagar pasta
@@ -57,31 +57,31 @@
Delete selected messages felamimail pt Apagar
mensagens selecionadas
deleted felamimail pt apagado
deleted folder successfully! felamimail pt Pasta apagada com
sucesso!
-display only when no plain text is available felamimail pt mostrar
apenas quando não houver texto puro disponÃvel
-display preferences felamimail pt Mostrar preferências
-do it! felamimail pt faça isso!
-do not use sent felamimail pt Não usar enviados
-do not use trash felamimail pt Não usar lixeira
-don't use sent felamimail pt Não usar enviados
-don't use trash felamimail pt Não usar lixeira
+display only when no plain text is available felamimail pt mostrar
apenas quando não houver texto puro disponível
+display preferences felamimail pt Mostrar preferências
+do it! felamimail pt faça isso!
+do not use sent felamimail pt Não usar enviados
+do not use trash felamimail pt Não usar lixeira
+don't use sent felamimail pt Não usar enviados
+don't use trash felamimail pt Não usar lixeira
done felamimail pt Pronto
down felamimail pt abaixo
download felamimail pt salvar
download this as a file felamimail pt Salvar este como arquivo
e-mail felamimail pt Email
-e-mail address felamimail pt Endereço de email
+e-mail address felamimail pt Endereço de email
e-mail folders felamimail pt Pastas de email
edit felamimail pt Editar
edit filter felamimail pt Editar filtro
edit selected felamimail pt Editar selecionado
email signature felamimail pt Assinatura
empty trash felamimail pt Esvaziar lixeira
-Enter your IMAP mail server hostname or IP address admin pt Entre
com o nome ou endereço IP do teu servidor IMAP
-Enter your SIEVE server hostname or IP address admin pt Entre com o
nome ou endereço IP do teu servidor SIEVE
+Enter your IMAP mail server hostname or IP address admin pt Entre
com o nome ou endereço IP do teu servidor IMAP
+Enter your SIEVE server hostname or IP address admin pt Entre com o
nome ou endereço IP do teu servidor SIEVE
Enter your SIEVE server port admin pt Entre a porta do teu servidor
SIEVE
erro felamimail pt ERRO
error felamimail pt ERRO
-error connecting to IMAP server felamimail pt Erro na
conexão ao servidor IMAP
+error connecting to IMAP server felamimail pt Erro na conexão
ao servidor IMAP
error opening felamimail pt Erro abrindo
expunge felamimail pt Apagar
felamimail common pt FelaMiMail
@@ -93,40 +93,40 @@
flags felamimail pt Marcadores (flags)
folder name felamimail pt Nome da pasta
folder path felamimail pt Caminho da pasta
-folder preferences felamimail pt Preferências de pastas
-folder settings felamimail pt Configuração da pasta
-folder status felamimail pt Situação da pastaxs
+folder preferences felamimail pt Preferências de pastas
+folder settings felamimail pt Configuração da pasta
+folder status felamimail pt Situação da pastaxs
folderlist felamimail pt Lista de pastas
Folders felamimail pt Pastas
Folders created successfully! felamimail pt Pastas criadas com
sucesso!
follow felamimail pt seguir
-for mail to be send - not functional yet felamimail pt Para
enviar email - não funcionando ainda
+for mail to be send - not functional yet felamimail pt Para
enviar email - não funcionando ainda
for received mail felamimail pt Para email recebido
forward felamimail pt Encaminhar
found felamimail pt Encontrado
from felamimail pt de
full name felamimail pt Nome completo
-Have a look at <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> to learn more about Squirrelmail.<br>
felamimail en Dê uma olhada em <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> para aprender mais sobre Squirrelmail.<br>
+Have a look at <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> to learn more about Squirrelmail.<br>
felamimail en Dê uma olhada em <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> para aprender mais sobre Squirrelmail.<br>
help felamimail pt Ajuda
-hide header felamimail pt Não mostrar cabeçalho
+hide header felamimail pt Não mostrar cabeçalho
html felamimail pt HTML
-Icons and text felamimail pt Ãcones e texto
-Icons only felamimail pt Ãcones somente
-identifying name felamimail pt Nome de identificação
-illegal folder name. please select a different name. felamimail pt
Nome de pasta inválido. Por favor escolha um nome diferente.
+Icons and text felamimail pt Ícones e texto
+Icons only felamimail pt Ícones somente
+identifying name felamimail pt Nome de identificação
+illegal folder name. please select a different name. felamimail pt
Nome de pasta inválido. Por favor escolha um nome diferente.
imap felamimail pt IMAP
IMAP Server felamimail pt Servidor IMAP
-imaps authentication felamimail pt Autenticação IMAPS
-imaps encryption only felamimail pt Encriptação apenas IMAPS
+imaps authentication felamimail pt Autenticação IMAPS
+imaps encryption only felamimail pt Encriptação apenas IMAPS
in felamimail pt entrada
-in order for squirrelMail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail pt Para que SquirrelMail possa providenciar
todas as opções você precisa criar as pastas especiais em seguir. Apenas
clique a caixa de seleção e acione o botão de criar.
+in order for squirrelMail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail pt Para que SquirrelMail possa providenciar
todas as opções você precisa criar as pastas especiais em seguir. Apenas
clique a caixa de seleção e acione o botão de criar.
in the center felamimail pt no centro
-index order felamimail pt Ãndices de ordenação
+index order felamimail pt Índices de ordenação
info felamimail pt Info
-Invaild user name or password felamimail pt Usuário ou senha
inválido
+Invaild user name or password felamimail pt Usuário ou senha
inválido
javaScript felamimail pt JavaScript
language felamimail pt Linguagem
-last name felamimail pt Ãltimo nome
+last name felamimail pt Último nome
left felamimail pt Esquerda
less felamimail pt menos
let this folder contain subfolders felamimail pt Deixar esta
pasta conter subpastas
@@ -137,19 +137,19 @@
light magenta felamimail pt Bordeaux claro
light yellow felamimail pt Amarello claro
list all felamimail pt Listar todos
-location of buttons when composing felamimail pt Lugar dos
botões na hora de compor
+location of buttons when composing felamimail pt Lugar dos
botões na hora de compor
location of folder list felamimail pt Lugar da lista de pastas
-mail settings felamimail pt Configurações de mail
+mail settings felamimail pt Configurações de mail
manage folders felamimail pt Gerenciamento de pastas
Manage Sieve preferences pt Gerenciamento de scripts sieve
mark as deleted felamimail pt Marcar como apagada
mark selected as flagged felamimail pt colocar selecionadas
como marcadas
mark selected as read felamimail pt colocar selecionadas como lidas
-mark selected as unflagged felamimail pt colocar selecionadas
como não marcadas
-mark selected as unread felamimail pt colocar selecionadas
como não lidas
+mark selected as unflagged felamimail pt colocar selecionadas
como não marcadas
+mark selected as unread felamimail pt colocar selecionadas
como não lidas
Match felamimail pt Encontrado
-Medium Gray felamimail pt Cinza médio
-Message Highlighting felamimail pt Colorização de mensagens
+Medium Gray felamimail pt Cinza médio
+Message Highlighting felamimail pt Colorização de mensagens
Message List felamimail pt Lista de mensagens
messages felamimail pt mensagens
Minute felamimail pt Minuto
@@ -159,50 +159,50 @@
move messages felamimail pt mover mensagens
move selected to felamimail pt mover selecionados para
move to trash felamimail pt mover para lixeira
-Must be unique felamimail pt Deve ser único
+Must be unique felamimail pt Deve ser único
Name felamimail pt Nome
never display html emails felamimail pt nunca mostrar emails
codificados como html
New felamimail pt Novo
new filter felamimail pt Novo filtro
-Next felamimail pt Próximo
-next message felamimail pt próxima mensagem
+Next felamimail pt Próximo
+next message felamimail pt próxima mensagem
Nickname felamimail pt Apelido
no filter felamimail pt nenhum filtro
No folders found felamimail pt Nenhuma pasta encontrada
-No folders were found to subscribe to! felamimail pt Nenhuma pasta
encontrada para subscrição!
-No folders were found to unsubscribe from! felamimail pt Nenhuma
pasta encontrada para desubscrição!
-No highlighting is defined felamimail pt Nenhuma colorização
foi definida
+No folders were found to subscribe to! felamimail pt Nenhuma pasta
encontrada para subscrição!
+No folders were found to unsubscribe from! felamimail pt Nenhuma
pasta encontrada para desubscrição!
+No highlighting is defined felamimail pt Nenhuma colorização foi
definida
No messages were selected. felamimail pt Nenhuma mensagem foi
selecionada.
-no next Message felamimail pt não há mais mensagens
-No notification felamimail pt Nenhuma notificação
+no next Message felamimail pt não há mais mensagens
+No notification felamimail pt Nenhuma notificação
No personal address book is defined. Contact administrator. felamimail
pt Nenhum livro de contatos pessoal foi definido. Contatar administrador.
No persons matching your search was found felamimail pt Nenhuma
pessoa encontrada
-no previous Message felamimail pt não há mensagem anterior
+no previous Message felamimail pt não há mensagem anterior
none felamimail pt nenhum
-Number of Messages to Index felamimail pt Número de mensagens
para indexar
+Number of Messages to Index felamimail pt Número de mensagens
para indexar
on behalf of felamimail pt em nome de
Only INBOX felamimail pt Somente INBOX
-Only unseen felamimail pt Somente não vistas
-Options felamimail pt Opções
-organization felamimail pt organização
-Organization name admin pt Nome da Organização
+Only unseen felamimail pt Somente não vistas
+Options felamimail pt Opções
+organization felamimail pt organização
+Organization name admin pt Nome da Organização
Other felamimail pt Outro
-Personal Information felamimail pt Informação pessoal
-Preference file %1 not found. Exiting abnormally felamimail pt
Arquivo de preferência %1 não encontrado. Terminando emergencialmente
-Preference file, %1, does not exist. Log out, and log back in to create a
default preference file. felamimail pt Arquivo de preferência,
%1, não existe. Faça logout e login para criar um arquivo de preferência
padrão.
+Personal Information felamimail pt Informação pessoal
+Preference file %1 not found. Exiting abnormally felamimail pt
Arquivo de preferência %1 não encontrado. Terminando emergencialmente
+Preference file, %1, does not exist. Log out, and log back in to create a
default preference file. felamimail pt Arquivo de preferência,
%1, não existe. Faça logout e login para criar um arquivo de preferência padrão.
Previous felamimail pt Anteriores
previous message felamimail pt mensagem anterior
print it felamimail pt imprimir
-print this page felamimail pt imprima esta página
+print this page felamimail pt imprima esta página
purge felamimail pt apagar
-Quicksearch felamimail pt Busca rápida
+Quicksearch felamimail pt Busca rápida
read felamimail pt ler
Read da felamimail pt Ler da
-Reason Given felamimail pt Razões dadas
+Reason Given felamimail pt Razões dadas
recent felamimail pt recente
refresh folder list felamimail pt atualizar lista de pastas
-Refresh Page felamimail pt Atualizar página
-Refresh time in minutes felamimail pt Tempo de atualização
em minutos
+Refresh Page felamimail pt Atualizar página
+Refresh time in minutes felamimail pt Tempo de atualização em
minutos
remove felamimail pt apagar
remove immediately felamimail pt apagar imediatamente
Rename felamimail pt Renomear
@@ -215,84 +215,84 @@
Reply To felamimail pt Responde a
ReplyTo felamimail pt Responde a
Return felamimail pt Voltar
-Return to options page felamimail pt Voltar à página de opções
+Return to options page felamimail pt Voltar à página de opções
Right felamimail pt Direita
-Running SquirrelMail version %1 (c) 1999-2000. felamimail pt Usando
SquirrelMail versão %1 (c) 1999-2000.
-Same Window - not functional yet felamimail pt Mesma Janela -
não funcionando ainda
+Running SquirrelMail version %1 (c) 1999-2000. felamimail pt Usando
SquirrelMail versão %1 (c) 1999-2000.
+Same Window - not functional yet felamimail pt Mesma Janela -
não funcionando ainda
save felamimail pt salvar
Search felamimail pt Busca
Search for felamimail pt Buscar por
Seconds felamimail pt Segundos
Select felamimail pt Selecionar
Select All felamimail pt Selecionar Todos
-Select home email address felamimail pt Selecione o endereço
de email residencial
-Select work email address felamimail pt Selecione o endereço
de email comercial
+Select home email address felamimail pt Selecione o endereço de
email residencial
+Select work email address felamimail pt Selecione o endereço de
email comercial
send felamimail pt Enviar
Sent Folder felamimail pt Pasta de itens enviados
Server respond felamimail pt Servidor responde
-show header felamimail pt mostrar cabeçalho
-Sieve settings admin pt Configurações Sieve
+show header felamimail pt mostrar cabeçalho
+Sieve settings admin pt Configurações Sieve
Signature felamimail pt Assinatura
Size felamimail pt Tamanho
-Size of editor window felamimail pt Tamanho da janela de edição
-SMTP settings admin pt Configurações de SMTP
-Some or all of the help documents are not present! felamimail pt
Alguns ou todos documentos de ajuda não foram encontrados!
+Size of editor window felamimail pt Tamanho da janela de edição
+SMTP settings admin pt Configurações de SMTP
+Some or all of the help documents are not present! felamimail pt
Alguns ou todos documentos de ajuda não foram encontrados!
Source felamimail pt Fonte
-Special Folder Options felamimail pt Opções especiais de pasta
+Special Folder Options felamimail pt Opções especiais de pasta
Squirrelmail felamimail pt Squirrelmail
subject felamimail pt Assunto
Submit felamimail pt Enviar
Subscribe felamimail pt Subscrever
Subscribed felamimail pt Subscrito
Subscribed successfully! felamimail pt Subscreveu com sucesso!
-Successfully saved display preferences! felamimail pt
Preferências de aparência salvas com sucesso!
-Successfully saved folder preferences! felamimail pt Preferências
de pastas salvas com sucesso!
-Successfully saved personal information! felamimail pt
Preferências de informações pessoais salvas com sucesso!
+Successfully saved display preferences! felamimail pt
Preferências de aparência salvas com sucesso!
+Successfully saved folder preferences! felamimail pt Preferências de
pastas salvas com sucesso!
+Successfully saved personal information! felamimail pt
Preferências de informações pessoais salvas com sucesso!
switch current folder to felamimail pt enviar pasta corrente
para
-Table of Contents felamimail pt Tabela de conteúdo
+Table of Contents felamimail pt Tabela de conteúdo
Text only felamimail pt Texto somente
-The connection to the IMAP Server failed!! felamimail en A
conexão com o servidor IMAP falhou!
-The help has not been translated to %1. It will be displayed in English
instead. felamimail pt A ajuda não foi traduzida a %1. Vai ser
mostrado em Inglês.
-The index order is the order that the columns are arranged in the message
index. You can add, remove, and move columns around to customize them to fit
your needs. felamimail pt A ordem dos Ãndices é a ordem em que
as colunas são montados no Ãndice das mensagens. Você pode adicionar,
apagar, e mover colunas para customizâ-los conforme suas necessidades.
-The order of the message index can be rearanged and changed to contain the
headers in any order you want. felamimail pt A ordem de Ãndice
das mensagens pode ser alterada para conter o cabeçalho em qualquer ordem
desejada.
+The connection to the IMAP Server failed!! felamimail en A
conexão com o servidor IMAP falhou!
+The help has not been translated to %1. It will be displayed in English
instead. felamimail pt A ajuda não foi traduzida a %1. Vai ser
mostrado em Inglês.
+The index order is the order that the columns are arranged in the message
index. You can add, remove, and move columns around to customize them to fit
your needs. felamimail pt A ordem dos índices é a ordem em que as
colunas são montados no índice das mensagens. Você pode adicionar, apagar, e
mover colunas para customizâ-los conforme suas necessidades.
+The order of the message index can be rearanged and changed to contain the
headers in any order you want. felamimail pt A ordem de índice
das mensagens pode ser alterada para conter o cabeçalho em qualquer ordem
desejada.
Theme felamimail pt Tema
-These settings change the way your folders are displayed and manipulated.
felamimail pt Estas configurações alterão a maneira em que suas
pastas serão mostradas e manipuladas.
-This contains personal information about yourself such as your name, your
email address, etc. felamimail pt Isso contém informações
pessoais sobre você como seu nome, seu endereço de email, etc.
-THIS FOLDER IS EMPTY felamimail pt ESTA PASTA ESTÃ VAZIA
-This port is based on Squirrelmail, which is a standalone IMAP client.<br>
felamimail pt Esta versão é baseada no Squirrelmail, que é um
cliente IMAP independente.<br>
+These settings change the way your folders are displayed and manipulated.
felamimail pt Estas configurações alterão a maneira em que suas
pastas serão mostradas e manipuladas.
+This contains personal information about yourself such as your name, your
email address, etc. felamimail pt Isso contém informações pessoais
sobre você como seu nome, seu endereço de email, etc.
+THIS FOLDER IS EMPTY felamimail pt ESTA PASTA ESTÁ VAZIA
+This port is based on Squirrelmail, which is a standalone IMAP client.<br>
felamimail pt Esta versão é baseada no Squirrelmail, que é um cliente
IMAP independente.<br>
to felamimail pt Para
to the left felamimail pt na esquerda
to the right felamimail pt na direita
Top felamimail pt Top
-Translation location felamimail pt Lugar da tradução
-Translation Preferences felamimail pt Preferências de
tradução
-Translation server felamimail pt Servidor de tradução
+Translation location felamimail pt Lugar da tradução
+Translation Preferences felamimail pt Preferências de tradução
+Translation server felamimail pt Servidor de tradução
Trash Folder felamimail pt Lixiera
type felamimail pt tipo
-Unable to list addresses from %1 felamimail pt ImpossÃvel
listar endereços de %1
+Unable to list addresses from %1 felamimail pt Impossível
listar endereços de %1
unflagged felamimail pt desmarcado
Unknown err felamimail pt Erro desconhecido
Unknown error felamimail pt Erro desconhecido
Unknown Sender felamimail pt Remetente desconhecido
-Unknown user or password incorrect. felamimail pt Usuário ou
senha inválido.
-unread felamimail pt não lida
-Unseen and Total felamimail pt Não visto e total
-Unseen message notification felamimail pt Notificação de
mensagens não vistas
-Unseen message notification type felamimail pt Tipo de
notificação de mensagens não vistas
+Unknown user or password incorrect. felamimail pt Usuário ou
senha inválido.
+unread felamimail pt não lida
+Unseen and Total felamimail pt Não visto e total
+Unseen message notification felamimail pt Notificação de
mensagens não vistas
+Unseen message notification type felamimail pt Tipo de
notificação de mensagens não vistas
Unselect All felamimail pt Deselecionar Todos
Unsubscribe felamimail pt Desubscrever
Unsubscribed felamimail pt Desubscrito
Unsubscribed successfully! felamimail pt Desubscrito com sucesso!
up felamimail pt para cima
-Update address felamimail pt Atualizar endereço
+Update address felamimail pt Atualizar endereço
Use a signature felamimail pt Usar asinatura
Use a signature? felamimail pt Usar asinatura?
-Use Addresses felamimail pt Usar endereços
+Use Addresses felamimail pt Usar endereços
Use Javascript or HTML addressbook? felamimail pt Usar livro de
contatos em Javascript ou HTML?
Use SMTP auth admin pt Usar SMTP autenticado
-View full header felamimail pt Ver cabeçalho completo
+View full header felamimail pt Ver cabeçalho completo
View message felamimail pt Ver mensagem
-Viewing full header felamimail pt Vendo cabeçalho completo
+Viewing full header felamimail pt Vendo cabeçalho completo
Viewing message felamimail pt Vendo mensagem
Viewing messages felamimail pt Vendo mensagens
Welcome to %1's WebMail system felamimail pt Bemvindo ao sistema de
WebMail %1
@@ -300,8 +300,8 @@
White felamimail pt Branco
Width of folder list felamimail pt Largura da lista de pastas
Wrap incoming text at felamimail pt Quebrar a linha do texto em
-You can change the way that SquirrelMail looks and displays information to
you, such as the colors, the language, and other settings. felamimail pt
Você pode mudar a maneira como SquirrelMail aparece e mostra
informações, como cores, a linguagem e outras configurações.
-You can only edit one address at the time felamimail pt Você
pode editar somente um endereço a cada vez
-You must login first. felamimail pt Você preciar fazer o login
primeiro.
-You need a valid user and password to access this page! felamimail
pt Você precisa um usuário e a senha válida para acessar esta página!
+You can change the way that SquirrelMail looks and displays information to
you, such as the colors, the language, and other settings. felamimail pt
Você pode mudar a maneira como SquirrelMail aparece e mostra informações,
como cores, a linguagem e outras configurações.
+You can only edit one address at the time felamimail pt Você
pode editar somente um endereço a cada vez
+You must login first. felamimail pt Você preciar fazer o login
primeiro.
+You need a valid user and password to access this page! felamimail
pt Você precisa um usuário e a senha válida para acessar esta página!
Your search failed with the following error(s) felamimail pt Sua
busca falhou com o(s) seguinte(s) erro(s)
Index: setup/phpgw_tr.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_tr.lang,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- setup/phpgw_tr.lang 22 Feb 2006 09:36:57 -0000 1.3
+++ setup/phpgw_tr.lang 18 Dec 2006 20:03:32 -0000 1.4
@@ -1,7 +1,7 @@
-(no subject) felamimail tr (baÅlık yok)
+(no subject) felamimail tr (baþlýk yok)
(only Cc/Bcc) felamimail tr (sadece Cc/Bcc)
(unknown sender) felamimail tr (gönderen bilinmiyor)
-activate felamimail tr ÃalıÅtır
+activate felamimail tr Ãalýþtýr
add felamimail tr ekle
add address felamimail tr Adres ekle
add to %1 felamimail tr %1 içine ekle
@@ -10,7 +10,7 @@
additional info felamimail tr Ekstra bilgi
address book felamimail tr Adres Listesi
address book search felamimail tr Adres Listesi Arama
-after message body felamimail tr Mesajın body kısmından sonra
+after message body felamimail tr Mesajýn body kýsmýndan sonra
all address books felamimail tr Tüm adres listeleri
all folders felamimail tr Tüm Klasörler
always show html emails felamimail tr html emailleri herzaman
göster
@@ -18,54 +18,54 @@
attachments felamimail tr Eklentiler
auto refresh folder list felamimail tr Klasör listesini
otomatik tazele
back to folder felamimail tr klasöre geri dön
-bad reque felamimail tr Ä°stenmeyen talep
-based upon given criteria, incoming messages can have different background
colors in the message list. This helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail tr Ãzerinde
belirtilen kritere göre, gelen mesajlar mesaj listesinde farklı zemin
renklerine sahip olabilirler. Bu durum, özellikle mail listeleri için
mesajın kimden geldiÄini kolay bir Åekilde anlamamızı saÄlar.
+bad reque felamimail tr Ãstenmeyen talep
+based upon given criteria, incoming messages can have different background
colors in the message list. This helps to easily distinguish who the messages
are from, especially for mailing lists. felamimail tr Ãzerinde
belirtilen kritere göre, gelen mesajlar mesaj listesinde farklý zemin
renklerine sahip olabilirler. Bu durum, özellikle mail listeleri için
mesajýn kimden geldiðini kolay bir þekilde anlamamýzý saðlar.
bcc felamimail tr bcc
-before headers felamimail tr BaÅlıktan önce
-between headers and message body felamimail tr BaÅlıklar ve
mesajın body kısmı arasında
-body part felamimail tr body kısmının parçası
+before headers felamimail tr Baþlýktan önce
+between headers and message body felamimail tr Baþlýklar ve
mesajýn body kýsmý arasýnda
+body part felamimail tr body kýsmýnýn parçasý
cc felamimail tr cc
-change folder felamimail tr klasörü deÄiÅtir
-checkbox felamimail tr Ä°Åaretleme kutucuÄu
-click here to log back in. felamimail tr Geri giriŠiçin
buraya tıklayın.
-click here to return to %1 felamimail tr %1 e dönmek için
tıklayın
-close this page felamimail tr bu sayfayı kapat
+change folder felamimail tr klasörü deðiþtir
+checkbox felamimail tr Ãþaretleme kutucuðu
+click here to log back in. felamimail tr Geri giriþ için
buraya týklayýn.
+click here to return to %1 felamimail tr %1 e dönmek için
týklayýn
+close this page felamimail tr bu sayfayý kapat
close window felamimail tr Pencereyi kapat
color felamimail tr Renk
compose felamimail tr Mesaj yaz
-compress folder felamimail tr klasörü sıkıÅtır
-create felamimail tr OluÅtur
-create folder felamimail tr Klasör OluÅtur
-create sent felamimail tr Gönderilen mesajı tekrar gönder
-create subfolder felamimail tr alt klasör oluÅtur
-create trash felamimail tr Ãöplük OluÅtur
-created folder successfully! felamimail tr Klasör baÅarıyla
oluÅturuldu!
+compress folder felamimail tr klasörü sýkýþtýr
+create felamimail tr Oluþtur
+create folder felamimail tr Klasör Oluþtur
+create sent felamimail tr Gönderilen mesajý tekrar gönder
+create subfolder felamimail tr alt klasör oluþtur
+create trash felamimail tr Ãöplük Oluþtur
+created folder successfully! felamimail tr Klasör baþarýyla
oluþturuldu!
dark blue felamimail tr Koyu Mavi
-dark cyan felamimail tr Koyu Mavi-YeÅil
+dark cyan felamimail tr Koyu Mavi-Yeþil
dark gray felamimail tr Koyu Gri
-dark green felamimail tr Koyu YeÅil
-dark magenta felamimail tr Koyu Mor-Kırmızı
-dark yellow felamimail tr Koyu Sarı
+dark green felamimail tr Koyu Yeþil
+dark magenta felamimail tr Koyu Mor-Kýrmýzý
+dark yellow felamimail tr Koyu Sarý
date felamimail tr Tarih
date(newest first) felamimail tr Tarih(Yeniye Göre)
date(oldest first) felamimail tr Tarih(Eskiye Göre)
-Default sorting order felamimail tr Varsayılan sıralama düzeni
+Default sorting order felamimail tr Varsayýlan sýralama düzeni
delete felamimail tr Sil
delete all felamimail tr hepsini sil
delete folder felamimail tr Klasör Sil
delete selected felamimail tr Seçileni sil
-delete selected messages felamimail tr seçilen mesajları sil
+delete selected messages felamimail tr seçilen mesajlarý sil
deleted felamimail tr silindi
-deleted folder successfully! felamimail tr Klasör baÅarılya
silindi!
-display only when no plain text is available felamimail tr
açıklayıcı metin olmadıÄında göster
+deleted folder successfully! felamimail tr Klasör baþarýlya
silindi!
+display only when no plain text is available felamimail tr
açýklayýcý metin olmadýðýnda göster
display preferences felamimail tr Tercihleri Göster
-do it! felamimail tr iÅlemi yap!
-do not use sent felamimail tr GönderilmiÅleri kullanma
-do not use trash felamimail tr ÃöplüÄü kullanma
-don't use sent felamimail tr GönderilmiÅleri kullanma
-don't use trash felamimail tr ÃöplüÄü kullanma
+do it! felamimail tr iþlemi yap!
+do not use sent felamimail tr Gönderilmiþleri kullanma
+do not use trash felamimail tr Ãöplüðü kullanma
+don't use sent felamimail tr Gönderilmiþleri kullanma
+don't use trash felamimail tr Ãöplüðü kullanma
done felamimail tr Bitir
-down felamimail tr aÅaÄı
+down felamimail tr aþaðý
download felamimail tr indir
download this as a file felamimail tr Dosya olarak indir
e-mail felamimail tr E-posta
@@ -74,95 +74,95 @@
edit felamimail tr Düzenle
edit filter felamimail tr Süzücüyü düzenle
edit selected felamimail tr Seçileni düzenle
-email signature felamimail tr E-posta imzası
-empty trash felamimail tr çöplük boÅ
-Enter your IMAP mail server hostname or IP address admin tr IMAP
mail server adını ya da IP adresini girin
-Enter your SIEVE server hostname or IP address admin tr SIEVE server
adını ya da IP adresini girin
+email signature felamimail tr E-posta imzasý
+empty trash felamimail tr çöplük boþ
+Enter your IMAP mail server hostname or IP address admin tr IMAP
mail server adýný ya da IP adresini girin
+Enter your SIEVE server hostname or IP address admin tr SIEVE server
adýný ya da IP adresini girin
Enter your SIEVE server port admin tr SIEVE server port girin
erro felamimail tr HATA
error felamimail tr HATA
-error connecting to IMAP serv felamimail tr IMAP server a
baÄlanırken hata oluÅtu
-error opening felamimail tr Açılırken hata oluÅtu
-expunge felamimail tr Kaldır
+error connecting to IMAP serv felamimail tr IMAP server a
baðlanýrken hata oluþtu
+error opening felamimail tr Açýlýrken hata oluþtu
+expunge felamimail tr Kaldýr
felamimail common tr FelaMiMail
files felamimail tr dosyalar
filter active felamimail tr süzücü aktif
-filter name felamimail tr Süzücü adı
-first name felamimail tr Adı
-flagged felamimail tr iÅaretli
-flags felamimail tr Ä°Åaretler
-folder name felamimail tr Klasör adı
+filter name felamimail tr Süzücü adý
+first name felamimail tr Adý
+flagged felamimail tr iþaretli
+flags felamimail tr Ãþaretler
+folder name felamimail tr Klasör adý
folder path felamimail tr Klasör Yolu
folder preferences felamimail tr Klasör Tercihleri
-folder settings felamimail tr Klasör Ayarları
+folder settings felamimail tr Klasör Ayarlarý
folder status felamimail tr Klaösr durumu
folderlist felamimail tr Klasör listesi
folders felamimail tr Klasörler
-folders created successfully! felamimail tr Klasör baÅarıyla
oluÅturuldu!
-follow felamimail tr Åema
-for mail to be send - not functional yet felamimail tr Mail
gönderilmek için hazıe deÄil
+folders created successfully! felamimail tr Klasör baþarýyla
oluþturuldu!
+follow felamimail tr þema
+for mail to be send - not functional yet felamimail tr Mail
gönderilmek için hazýe deðil
for received mail felamimail tr Gelen mail ler için
-forward felamimail tr Ä°let
+forward felamimail tr Ãlet
found felamimail tr Bulundu
from felamimail tr Kimden
full name felamimail tr Ad Soyad
-Have a look at <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> to learn more about Squirrelmail.<br>
felamimail tr Squirrelmail hakkında daha fazla bilgi için <a
href="http://www.felamimail.org"; target="_new">www.felamimail.org</a> adresine
bakınız.<br>
-help felamimail tr Yardım
-hide header felamimail tr baÅlıÄı gizle
+Have a look at <a href="http://www.felamimail.org";
target="_new">www.felamimail.org</a> to learn more about Squirrelmail.<br>
felamimail tr Squirrelmail hakkýnda daha fazla bilgi için <a
href="http://www.felamimail.org"; target="_new">www.felamimail.org</a> adresine
bakýnýz.<br>
+help felamimail tr Yardým
+hide header felamimail tr baþlýðý gizle
html felamimail tr HTML
-Icons and text felamimail tr Ä°konlar ve metin
+Icons and text felamimail tr Ãkonlar ve metin
Icons only felamimail tr Sadece ikonlar
-identifying name felamimail tr İsim tanımlama
-illegal folder name. please select a different name. felamimail tr
Geçersiz klaöser adı. Lütfen farklı bir ad seçin.
+identifying name felamimail tr Ãsim tanýmlama
+illegal folder name. please select a different name. felamimail tr
Geçersiz klaöser adý. Lütfen farklý bir ad seçin.
imap felamimail tr IMAP
IMAP Server felamimail tr IMAP Server
imaps authentication felamimail tr IMAPS Güvelik Belgeleme
-imaps encryption only felamimail tr sadece IMAPS Åifreleme
+imaps encryption only felamimail tr sadece IMAPS þifreleme
in felamimail tr içinde
-in order for squirrelmail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail tr SquirrelMail in ayarlarını
deÄiÅtirebilmek için aÅaÄıda belirtilen özel klasörlerden
oluÅturmanız gerekiyor. Sadece iÅaret kutusunu iÅaretleyip oluÅtur
butonuna tıklamanız yeterli.
+in order for squirrelmail to provide the full set of options you need to
create the special folders listed below. just click the check box and hit the
create button. felamimail tr SquirrelMail in ayarlarýný
deðiþtirebilmek için aþaðýda belirtilen özel klasörlerden
oluþturmanýz gerekiyor. Sadece iþaret kutusunu iþaretleyip oluþtur
butonuna týklamanýz yeterli.
in the center felamimail tr ortada
-index order felamimail tr Indexe göre sırala
+index order felamimail tr Indexe göre sýrala
info felamimail tr Bilgi
-invalid user name or password felamimail tr Kullanıcı adı ve
Åifre geçersiz
+invalid user name or password felamimail tr Kullanýcý adý ve
þifre geçersiz
javaScript felamimail tr JavaScript
language felamimail tr Dil
-last name felamimail tr Ä°kinci ad
-left felamimail tr kaldı
+last name felamimail tr Ãkinci ad
+left felamimail tr kaldý
less felamimail tr den az
-let this folder contain subfolders felamimail tr Bu klasörün
alt klasörleri kapsamasına izin ver
-light blue felamimail tr Açık Mavi
-light cyan felamimail tr Açık Mavi-YeÅil
-light gray felamimail tr Açık Gri
-light green felamimail tr Açık YeÅil
-light magenta felamimail tr Açık Mor-Kırmızı
-light yellow felamimail tr Açık Sarı
+let this folder contain subfolders felamimail tr Bu klasörün
alt klasörleri kapsamasýna izin ver
+light blue felamimail tr Açýk Mavi
+light cyan felamimail tr Açýk Mavi-Yeþil
+light gray felamimail tr Açýk Gri
+light green felamimail tr Açýk Yeþil
+light magenta felamimail tr Açýk Mor-Kýrmýzý
+light yellow felamimail tr Açýk Sarý
list all felamimail tr Hepsini Listele
-location of buttons when composing felamimail tr Mesaj
gönderilirkenki butonların konumu
+location of buttons when composing felamimail tr Mesaj
gönderilirkenki butonlarýn konumu
location of folder list felamimail tr Klasör listesinin
konumu
-mail settings felamimail tr Mail Ayarları
+mail settings felamimail tr Mail Ayarlarý
manage folders felamimail tr Klasörleri Yönet
Manage Sieve preferences tr sieve scriptleri yönet
-mark as deleted felamimail tr silinmiÅ olarak iÅaretle
-mark messages as felamimail tr seçilen mesajları farklı
iÅaretle
-mark selected as flagged felamimail tr seçilenleri iÅaretle
-mark selected as read felamimail tr okunmuÅ olarak iÅaretle
-mark selected as unflagged felamimail tr seçilenlerin
iÅaretlerini kaldır
-mark selected as unread felamimail tr okunmamıŠolarak
iÅaretle
-Match felamimail tr KarÅılaÅtır
+mark as deleted felamimail tr silinmiþ olarak iþaretle
+mark messages as felamimail tr seçilen mesajlarý farklý
iþaretle
+mark selected as flagged felamimail tr seçilenleri iþaretle
+mark selected as read felamimail tr okunmuþ olarak iþaretle
+mark selected as unflagged felamimail tr seçilenlerin
iþaretlerini kaldýr
+mark selected as unread felamimail tr okunmamýþ olarak
iþaretle
+Match felamimail tr Karþýlaþtýr
Medium Gray felamimail tr Orta tonda gri
-Message Highlighting felamimail tr Mesajın Ãnem derecesini
belirtme
+Message Highlighting felamimail tr Mesajýn Ãnem derecesini
belirtme
Message List felamimail tr Mesaj Listesi
messages felamimail tr mesajlar
Minute felamimail tr Dakika
Minutes felamimail tr Dakika
more felamimail tr den daha fazla
-move felamimail tr taÅı
-move messages felamimail tr mesajları taÅı
-move selected to felamimail tr seçilenleri taÅı
+move felamimail tr taþý
+move messages felamimail tr mesajlarý taþý
+move selected to felamimail tr seçilenleri taþý
move to trash felamimail tr çöpe at
-Must be unique felamimail tr Benzersiz olmalı
+Must be unique felamimail tr Benzersiz olmalý
Name felamimail tr Ad
-never display html emails felamimail tr html e-postaları asla
gösterme
+never display html emails felamimail tr html e-postalarý asla
gösterme
New felamimail tr Yeni
new filter felamimail tr Yeni Süzücü
Next felamimail tr Sonraki
@@ -170,56 +170,56 @@
Nickname felamimail tr Takma ad
no filter felamimail tr süzücü yok
No folders found felamimail tr Hiç klasör yok
-No folders were found to subscribe to! felamimail tr İçine
taÅınacak klasör bulunamadı!
-No folders were found to unsubscribe from! felamimail tr den
kaldırılacak klaösr bulunamadı!
-No highlighting is defined felamimail tr Ãnem belirteci
tanımlanmamıÅ
+No folders were found to subscribe to! felamimail tr Ãçine
taþýnacak klasör bulunamadý!
+No folders were found to unsubscribe from! felamimail tr den
kaldýrýlacak klaösr bulunamadý!
+No highlighting is defined felamimail tr Ãnem belirteci
tanýmlanmamýþ
No messages were selected. felamimail tr Hiç mesaj seçilmedi.
-no next Message felamimail tr daha mesaj kalmadı
-No notification felamimail tr uyarı yok
-No personal address book is defined. Contact administrator. felamimail
tr KiÅisel adres listesi tanımlanmamıÅ. Yönetici ile temas kur.
-No persons matching your search was found felamimail tr Arama
sonuçlarınızla hiç bir kimse uyuÅmuyor
-no previous Message felamimail tr Ä°lk mesaj
+no next Message felamimail tr daha mesaj kalmadý
+No notification felamimail tr uyarý yok
+No personal address book is defined. Contact administrator. felamimail
tr Kiþisel adres listesi tanýmlanmamýþ. Yönetici ile temas kur.
+No persons matching your search was found felamimail tr Arama
sonuçlarýnýzla hiç bir kimse uyuþmuyor
+no previous Message felamimail tr Ãlk mesaj
none felamimail tr yok
-Number of Messages to Index felamimail tr Ä°ndexlenecek mesaj
sayısı
-on behalf of felamimail tr nin tarafında
+Number of Messages to Index felamimail tr Ãndexlenecek mesaj
sayýsý
+on behalf of felamimail tr nin tarafýnda
Only INBOX felamimail tr Sadece Gelen Kutusu
-Only unseen felamimail tr Sadece okunmamıÅlar
+Only unseen felamimail tr Sadece okunmamýþlar
Options felamimail tr Seçenekler
organization felamimail tr organizasyon
-Organization name admin tr Organizasyon adı
-Oth felamimail tr Sıfırıncı
-Personal Information felamimail tr KiÅisel Bilgi
-Preference file %1 not found. Exiting abnormally felamimail tr
Tercih edilen %1 dosyası bulunamadı. Program düzgün olmadan sonlandırıldı
-Preference file, %1, does not exist. Log out, and log back in to create a
default preference file. felamimail tr Tercih edilen dosya, %1,
yok. Varsayılan tercih dosyasını oluÅturmak için oturumu kapatın ve
tekrar oturum açın.
+Organization name admin tr Organizasyon adý
+Oth felamimail tr Sýfýrýncý
+Personal Information felamimail tr Kiþisel Bilgi
+Preference file %1 not found. Exiting abnormally felamimail tr
Tercih edilen %1 dosyasý bulunamadý. Program düzgün olmadan sonlandýrýldý
+Preference file, %1, does not exist. Log out, and log back in to create a
default preference file. felamimail tr Tercih edilen dosya, %1,
yok. Varsayýlan tercih dosyasýný oluþturmak için oturumu kapatýn ve
tekrar oturum açýn.
Previous felamimail tr Ãnceki
previous message felamimail tr önceki mesaj
-print it felamimail tr yazdır
-print this page felamimail tr bu sayfayı yazdır
-purge felamimail tr istenmeyenleri kaldır
-Quicksearch felamimail tr Hızlı arama
+print it felamimail tr yazdýr
+print this page felamimail tr bu sayfayý yazdýr
+purge felamimail tr istenmeyenleri kaldýr
+Quicksearch felamimail tr Hýzlý arama
read felamimail tr oku
Read da felamimail tr veriyi oku
Reason Giv felamimail tr Verilen sebep
-recent felamimail tr son zamanlarda alınan
+recent felamimail tr son zamanlarda alýnan
refresh folder list felamimail tr klasör listesini tazele
Refresh Page felamimail tr Sayfayo tekrar yükle
Refresh time in minutes felamimail tr Dakika dakika tazele
-remove felamimail tr kaldır
-remove immediately felamimail tr hemen kaldır
-Rename felamimail tr Yeniden adlandır
-Rename a Folder felamimail tr Bir klasör adı ver
-rename folder felamimail tr klasöün adını deÄiÅtir
-Renamed successfully! felamimail tr Ad baÅarıyla deÄiÅtirildi!
+remove felamimail tr kaldýr
+remove immediately felamimail tr hemen kaldýr
+Rename felamimail tr Yeniden adlandýr
+Rename a Folder felamimail tr Bir klasör adý ver
+rename folder felamimail tr klasöün adýný deðiþtir
+Renamed successfully! felamimail tr Ad baþarýyla deðiþtirildi!
replied felamimail tr Cevap verlien
Reply felamimail tr Cevap Ver
Reply All felamimail tr Hepsine cevap ver
-Reply To felamimail tr kiÅisine cevap ver
-ReplyTo felamimail tr kiÅisine cevap ver
+Reply To felamimail tr kiþisine cevap ver
+ReplyTo felamimail tr kiþisine cevap ver
Return felamimail tr Geridön
-Return to options page felamimail tr Seçenekler sayfasına dön
-Right felamimail tr DoÄru
-Running SquirrelMail version %1 (c) 1999-2000. felamimail tr Åuanki
SquirrelMail in versiyonu %1 (c) 1999-2000.
-Same Window - not functional yet felamimail tr Aynı pencere
kullanılamaz
+Return to options page felamimail tr Seçenekler sayfasýna dön
+Right felamimail tr Doðru
+Running SquirrelMail version %1 (c) 1999-2000. felamimail tr Ãuanki
SquirrelMail in versiyonu %1 (c) 1999-2000.
+Same Window - not functional yet felamimail tr Ayný pencere
kullanýlamaz
save felamimail tr kaydet
Search felamimail tr Ara
Search for felamimail tr Kritere göre ara
@@ -227,43 +227,43 @@
Select felamimail tr Seç
Select All felamimail tr Hepsini Seç
Select home email address felamimail tr Ev adreslerini seç
-Select work email address felamimail tr İŠadreslerini seç
+Select work email address felamimail tr Ãþ adreslerini seç
send felamimail tr Gönder
-Sent Fold felamimail tr GönderilmiŠMesajlar
-Server respond felamimail tr Sunucu yanıtı
-show header felamimail tr baÅlıÄı göster
-Sieve settings admin tr Sieve ayarları
-Signature felamimail tr Ä°mza
+Sent Fold felamimail tr Gönderilmiþ Mesajlar
+Server respond felamimail tr Sunucu yanýtý
+show header felamimail tr baþlýðý göster
+Sieve settings admin tr Sieve ayarlarý
+Signature felamimail tr Ãmza
Size felamimail tr Büyüklük
-Size of editor window felamimail tr Editör penceresinin
büyüklüÄü
-SMTP settings admin tr SMTP ayarları
-Some or all of the help documents are not present! felamimail tr
Birkaç yardım dökümanı mevcut deÄil ya da hiç yok!
+Size of editor window felamimail tr Editör penceresinin
büyüklüðü
+SMTP settings admin tr SMTP ayarlarý
+Some or all of the help documents are not present! felamimail tr
Birkaç yardým dökümaný mevcut deðil ya da hiç yok!
Source felamimail tr Kaynak
Special Folder Options felamimail tr Ãzel Klasör Seçenekleri
Squirrelmail felamimail tr Squirrelmail
-subject felamimail tr BaÅlık
+subject felamimail tr Baþlýk
Submit felamimail tr Gönder
Subscribe felamimail tr Ãyelik
subscribed felamimail tr üye
-Subscribed successfully! felamimail tr Ãyelik baÅarıyla
gerçekleÅtirildi!
-Successfully saved display preferences! felamimail tr
Belirtilen tercihler baÅarıyla kaydedildi!
-Successfully saved folder preferences! felamimail tr Klasör
tercihleri baÅarıyla kaydedildi!
-Successfully saved personal information! felamimail tr
KiÅisel bilgiler baÅarıyla kaydedildi!
-switch current folder to felamimail tr Åuanki klasörden
baÅka bir klasöre geç
-Table of Contents felamimail tr İçindekiler Tablosu
+Subscribed successfully! felamimail tr Ãyelik baþarýyla
gerçekleþtirildi!
+Successfully saved display preferences! felamimail tr
Belirtilen tercihler baþarýyla kaydedildi!
+Successfully saved folder preferences! felamimail tr Klasör
tercihleri baþarýyla kaydedildi!
+Successfully saved personal information! felamimail tr
Kiþisel bilgiler baþarýyla kaydedildi!
+switch current folder to felamimail tr þuanki klasörden
baþka bir klasöre geç
+Table of Contents felamimail tr Ãçindekiler Tablosu
Text only felamimail tr Sadece metin
-The connection to the IMAP Server failed!! felamimail tr IMAP
Server a yapılan baÄlantı baÅarısız!!
-The help has not been translated to %1. It will be displayed in English
instead. felamimail en Yardım henüz %1 diline çevrilmedi. Bu
dil yerine ingilizcesi görüntülenecek.
-The index order is the order that the columns are arranged in the message
index. You can add, remove, and move columns around to customize them to fit
your needs. felamimail en İndex düzenlemesi mesaj indexindeki
sütunların ayarlanması düzenidir. Ä°htiyacınıza göre istediÄiniz
Åekilde sütunları ekleyebilir, silebilir ve taÅıyabilirsiniz.
-The order of the message index can be rearanged and changed to contain the
headers in any order you want. felamimail en Mesaj indeksleme
mesaj baÅlıklarına göre istediÄiniz Åekilde yeniden düzenlenebilir ve
deÄiÅtirilebilir.
+The connection to the IMAP Server failed!! felamimail tr IMAP
Server a yapýlan baðlantý baþarýsýz!!
+The help has not been translated to %1. It will be displayed in English
instead. felamimail en Yardým henüz %1 diline çevrilmedi. Bu
dil yerine ingilizcesi görüntülenecek.
+The index order is the order that the columns are arranged in the message
index. You can add, remove, and move columns around to customize them to fit
your needs. felamimail en Ãndex düzenlemesi mesaj indexindeki
sütunlarýn ayarlanmasý düzenidir. Ãhtiyacýnýza göre istediðiniz
þekilde sütunlarý ekleyebilir, silebilir ve taþýyabilirsiniz.
+The order of the message index can be rearanged and changed to contain the
headers in any order you want. felamimail en Mesaj indeksleme
mesaj baþlýklarýna göre istediðiniz þekilde yeniden düzenlenebilir ve
deðiþtirilebilir.
Theme felamimail tr Tema
-These settings change the way your folders are displayed and manipulated.
felamimail tr Bu ayarlar klasörleriniz görüntüsünü
deÄiÅtirerek etkili kullanımını saÄlar.
-This contains personal information about yourself such as your name, your
email address, etc. felamimail tr Bu, kendiniz hakkında kiÅisel
bilgilerinizi örneÄin adınızı, soyadınızı, e-mail adresinizi vb. kapsar.
-THIS FOLDER IS EMPTY felamimail tr BU KLASÃRÃN Ä°ÃERÄ°ÄÄ° BOÅ
-This port is based on Squirrelmail, which is a standalone IMAP client.<br>
felamimail tr Bu port tekbaÅına çalıÅabilen IMAP clientı olup,
Squirrelmail üzerine inÅaa edilmiÅtir.<br>
+These settings change the way your folders are displayed and manipulated.
felamimail tr Bu ayarlar klasörleriniz görüntüsünü
deðiþtirerek etkili kullanýmýný saðlar.
+This contains personal information about yourself such as your name, your
email address, etc. felamimail tr Bu, kendiniz hakkýnda kiþisel
bilgilerinizi örneðin adýnýzý, soyadýnýzý, e-mail adresinizi vb. kapsar.
+THIS FOLDER IS EMPTY felamimail tr BU KLASÃRÃN ÃÃERÃÃÃ BOÃ
+This port is based on Squirrelmail, which is a standalone IMAP client.<br>
felamimail tr Bu port tekbaþýna çalýþabilen IMAP clientý olup,
Squirrelmail üzerine inþaa edilmiþtir.<br>
to felamimail tr Kime
to the left felamimail tr sola
-to the right felamimail tr saÄa
+to the right felamimail tr saða
Top felamimail tr Ãst
Translation location felamimail tr Ãeviri konumu
Translation Preferences felamimail tr Ãeviri Tercihleri
@@ -271,39 +271,39 @@
Trash Fold felamimail tr Ãöplük Dolu
type felamimail tr Tip
Unable to list addresses from %1 felamimail tr Adresler %1 den
listelenemiyor
-unflagged felamimail tr iÅaretlenmemiÅ
+unflagged felamimail tr iþaretlenmemiþ
Unknown err felamimail tr Bilinmeyen hata
Unknown error felamimail tr Bilinmeyen hata
Unknown Sender felamimail tr Unknown Sender
-Unknown user or password incorrect. felamimail tr Bilinmeyen
kullanıcı adı veya Åifre.
-unread felamimail tr okunmamıÅ
-Unseen and Total felamimail tr OkunmamıŠve Toplam
-Unseen message notification felamimail tr OkunmamıŠmesaj
uyarısı
-Unseen message notification type felamimail tr OkunmamıÅ
mesaj uyarı tipi
-Unselect All felamimail tr Tüm seçimi kaldır
-Unsubscribe felamimail tr Ãyelikten çık
-unsubscribed felamimail tr üyelikten çıkıldı
-Unsubscribed successfully! felamimail tr Ãyelikten baÅarıyla
çıkıldı!
-up felamimail tr yukarı
+Unknown user or password incorrect. felamimail tr Bilinmeyen
kullanýcý adý veya þifre.
+unread felamimail tr okunmamýþ
+Unseen and Total felamimail tr Okunmamýþ ve Toplam
+Unseen message notification felamimail tr Okunmamýþ mesaj
uyarýsý
+Unseen message notification type felamimail tr Okunmamýþ
mesaj uyarý tipi
+Unselect All felamimail tr Tüm seçimi kaldýr
+Unsubscribe felamimail tr Ãyelikten çýk
+unsubscribed felamimail tr üyelikten çýkýldý
+Unsubscribed successfully! felamimail tr Ãyelikten baþarýyla
çýkýldý!
+up felamimail tr yukarý
Update address felamimail tr Adresi güncelle
-Use a signature felamimail tr Ä°mza kullan
-Use a signature? felamimail tr Ä°mza kullanmak istermisin?
+Use a signature felamimail tr Ãmza kullan
+Use a signature? felamimail tr Ãmza kullanmak istermisin?
Use Addresses felamimail tr Adresleri kullan
-Use Javascript or HTML addressbook? felamimail tr Javascript mi
yoksa HTML adres listesi kullanırsın?
-Use SMTP auth admin tr SMTP kimlik doÄrulamasını kullan
-View full header felamimail tr Tüm baÅlıÄı gör
-View message felamimail tr Mesajı gör
-Viewing full header felamimail tr Tüm baÅlıÄı görmek
-Viewing message felamimail tr Mesajı görmek
-Viewing messages felamimail tr Mesajları görmek
-Welcome to %1's WebMail system felamimail tr %1'nin WebMail
sistemine hoÅgeldiniz
-when deleting messages felamimail tr mesajlar silindiÄinde
+Use Javascript or HTML addressbook? felamimail tr Javascript mi
yoksa HTML adres listesi kullanýrsýn?
+Use SMTP auth admin tr SMTP kimlik doðrulamasýný kullan
+View full header felamimail tr Tüm baþlýðý gör
+View message felamimail tr Mesajý gör
+Viewing full header felamimail tr Tüm baþlýðý görmek
+Viewing message felamimail tr Mesajý görmek
+Viewing messages felamimail tr Mesajlarý görmek
+Welcome to %1's WebMail system felamimail tr %1'nin WebMail
sistemine hoþgeldiniz
+when deleting messages felamimail tr mesajlar silindiðinde
White felamimail tr Beyaz
-Width of folder list felamimail tr Klasör listesinin geniÅliÄi
+Width of folder list felamimail tr Klasör listesinin geniþliði
Wrap incoming text at felamimail tr Gelen metni uydur
-wrote felamimail tr yazdı
-You can change the way that SquirrelMail looks and displays information to
you, such as the colors, the language, and other settings. felamimail tr
SquirrelMail in görüntüsünü ve bilgilendirme Åeklini
deÄiÅtirebilirsin. ÃrenÄin renkler, diller ve diÄer ayarlar gibi.
-You can only edit one address at the time felamimail tr Bu
sırada sadece 1 tane adresi düzenleyebilirsin
-You must login first. felamimail tr Ãncelikle oturum açmalısın.
-You need a valid user and password to access this page! felamimail
tr Bu sayfaya eriÅmek için geçerli bir kullanıcı adı ve Åifreye
sahip olmanız gerekmektedir!
-Your search failed with the following error(s) felamimail tr
Aramanız aÅaÄıdaki hatalardan dolayı baÅarısız oldu
+wrote felamimail tr yazdý
+You can change the way that SquirrelMail looks and displays information to
you, such as the colors, the language, and other settings. felamimail tr
SquirrelMail in görüntüsünü ve bilgilendirme þeklini
deðiþtirebilirsin. Ãrenðin renkler, diller ve diðer ayarlar gibi.
+You can only edit one address at the time felamimail tr Bu
sýrada sadece 1 tane adresi düzenleyebilirsin
+You must login first. felamimail tr Ãncelikle oturum açmalýsýn.
+You need a valid user and password to access this page! felamimail
tr Bu sayfaya eriþmek için geçerli bir kullanýcý adý ve þifreye
sahip olmanýz gerekmektedir!
+Your search failed with the following error(s) felamimail tr
Aramanýz aþaðýdaki hatalardan dolayý baþarýsýz oldu
Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/setup.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- setup/setup.inc.php 11 Mar 2006 23:20:49 -0000 1.12
+++ setup/setup.inc.php 18 Dec 2006 20:03:32 -0000 1.13
@@ -9,10 +9,11 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: setup.inc.php,v 1.12 2006/03/11 23:20:49 skwashd Exp $ */
+ /* $Id: setup.inc.php,v 1.13 2006/12/18 20:03:32 sigurdne Exp $ */
$setup_info['felamimail']['name'] = 'felamimail';
- $setup_info['felamimail']['version'] = '0.8.4';
+ $setup_info['felamimail']['title'] = 'FeLaMiMail';
+ $setup_info['felamimail']['version'] = '0.9.4';
$setup_info['felamimail']['app_order'] = 2;
$setup_info['felamimail']['enable'] = 1;
$setup_info['felamimail']['app_group'] = 'office';
@@ -24,20 +25,26 @@
$setup_info['felamimail']['based_on'] =
'This port is based on Squirrelmail, which is a standalone IMAP
client.';
$setup_info['felamimail']['based_on_url'] =
'http://www.squirrelmail.org';
- $setup_info['felamimail']['maintainer'] = 'Lars Kneschke';
- $setup_info['felamimail']['maintainer_email'] = 'address@hidden';
+ $setup_info['felamimail']['maintainer'] = 'phpGroupWare
Coordination Team';
+ $setup_info['felamimail']['maintainer_email'] = 'address@hidden';
$setup_info['felamimail']['tables'] = array(
'phpgw_felamimail_cache',
- 'phpgw_felamimail_folderstatus'
+ 'phpgw_felamimail_folderstatus',
+ 'phpgw_felamimail_displayfilter'
);
/* The hooks this app includes, needed for hooks registration */
$setup_info['felamimail']['hooks'][] = 'preferences';
+ $setup_info['felamimail']['hooks'][] = 'admin';
+ $setup_info['felamimail']['hooks'][] = 'manual';
+ $setup_info['felamimail']['hooks'][] = 'settings';
+ $setup_info['felamimail']['hooks'][] = 'home';
+ $setup_info['felamimail']['hooks'][] = 'sidebox_menu';
/* Dependacies for this app to work */
$setup_info['felamimail']['depends'][] = array(
'appname' => 'phpgwapi',
- 'versions' => Array('0.9.17', '0.9.18')
+ 'versions' => Array('0.9.17','0.9.18')
);
?>
Index: setup/tables_baseline.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/tables_baseline.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- setup/tables_baseline.inc.php 24 Nov 2002 00:40:36 -0000 1.2
+++ setup/tables_baseline.inc.php 18 Dec 2006 20:03:32 -0000 1.3
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: tables_baseline.inc.php,v 1.2 2002/11/24 00:40:36 lkneschke Exp $ */
+ /* $Id: tables_baseline.inc.php,v 1.3 2006/12/18 20:03:32 sigurdne Exp $ */
$phpgw_baseline = array(
'phpgw_felamimail_cache' => array(
@@ -25,7 +25,7 @@
'sender_address'=> array('type' => 'varchar',
'precision' => 120),
'to_name' => array('type' => 'varchar',
'precision' => 120),
'to_address' => array('type' => 'varchar',
'precision' => 120),
- 'date' => array('type' => 'timestamp'),
+ 'date' => array('type' => 'varchar',
'precision' => 120),
'size' => array('type' => 'int',
'precision' => 4),
'attachments' => array('type' => 'varchar',
'precision' =>120)
),
Index: setup/tables_current.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/tables_current.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- setup/tables_current.inc.php 24 Nov 2002 00:32:13 -0000 1.5
+++ setup/tables_current.inc.php 18 Dec 2006 20:03:32 -0000 1.6
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: tables_current.inc.php,v 1.5 2002/11/24 00:32:13 lkneschke Exp $ */
+ /* $Id: tables_current.inc.php,v 1.6 2006/12/18 20:03:32 sigurdne Exp $ */
$phpgw_baseline = array(
'phpgw_felamimail_cache' => array(
@@ -25,7 +25,7 @@
'sender_address'=> array('type' => 'varchar',
'precision' => 120),
'to_name' => array('type' => 'varchar',
'precision' => 120),
'to_address' => array('type' => 'varchar',
'precision' => 120),
- 'date' => array('type' => 'timestamp'),
+ 'date' => array('type' => 'varchar',
'precision' => 120),
'size' => array('type' => 'int',
'precision' => 4),
'attachments' => array('type' => 'varchar',
'precision' =>120)
),
@@ -50,6 +50,16 @@
'fk' => array(),
'ix' => array(),
'uc' => array()
+ ),
+ 'phpgw_felamimail_displayfilter' => array(
+ 'fd' => array(
+ 'accountid' => array('type' => 'int',
'precision' => 4, 'nullable' => false),
+ 'filter' => array('type' => 'text')
+ ),
+ 'pk' => array('accountid'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
)
);
?>
Index: setup/tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/tables_update.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- setup/tables_update.inc.php 24 Nov 2002 00:32:13 -0000 1.4
+++ setup/tables_update.inc.php 18 Dec 2006 20:03:32 -0000 1.5
@@ -9,7 +9,7 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: tables_update.inc.php,v 1.4 2002/11/24 00:32:13 lkneschke Exp $
*/
+ /* $Id: tables_update.inc.php,v 1.5 2006/12/18 20:03:32 sigurdne Exp $
*/
$test[] = '0.8.2';
function felamimail_upgrade0_8_2()
@@ -55,4 +55,59 @@
return $GLOBALS['setup_info']['felamimail']['currentver'];
}
+ $test[] = '0.9.2';
+ function felamimail_upgrade0_9_2()
+ {
+
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_felamimail_displayfilter',
+ Array(
+ 'fd' => array(
+ 'accountid' => array('type' =>
'int', 'precision' => 4, 'nullable' => false),
+ 'filter' => array('type' =>
'text')
+ ),
+ 'pk' => array('accountid'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+
+ );
+
+ $GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.3';
+ return $GLOBALS['setup_info']['felamimail']['currentver'];
+ }
+
+ $test[] = '0.9.3';
+ function felamimail_upgrade0_9_3()
+ {
+
$GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_felamimail_cache');
+ $GLOBALS['phpgw_setup']->oProc->query('delete from
phpgw_felamimail_folderstatus',__LINE__,__FILE__);
+
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_felamimail_cache',
+ Array(
+ 'fd' => array(
+ 'accountid' => array('type' =>
'int', 'precision' => 4, 'nullable' => false),
+ 'hostname' => array('type' =>
'varchar', 'precision' => 60, 'nullable' => false),
+ 'accountname' => array('type' =>
'varchar', 'precision' => 200, 'nullable' => false),
+ 'foldername' => array('type' =>
'varchar', 'precision' => 200, 'nullable' => false),
+ 'uid' => array('type' =>
'int', 'precision' => 4, 'nullable' => false),
+ 'subject' => array('type' =>
'text'),
+ 'striped_subject'=> array('type' =>
'text'),
+ 'sender_name' => array('type' =>
'varchar', 'precision' => 120),
+ 'sender_address'=> array('type' =>
'varchar', 'precision' => 120),
+ 'to_name' => array('type' =>
'varchar', 'precision' => 120),
+ 'to_address' => array('type' =>
'varchar', 'precision' => 120),
+ 'date' => array('type' =>
'varchar', 'precision' => 120),
+ 'size' => array('type' =>
'int', 'precision' => 4),
+ 'attachments' => array('type' =>
'varchar', 'precision' =>120)
+ ),
+ 'pk' =>
array('accountid','hostname','accountname','foldername','uid'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.4';
+ return $GLOBALS['setup_info']['felamimail']['currentver'];
+ }
+
?>
\ No newline at end of file
Index: templates/base/addressbook.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/addressbook.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/addressbook.tpl 18 Dec 2006 11:02:55 -0000 1.2
+++ templates/base/addressbook.tpl 18 Dec 2006 20:03:32 -0000 1.3
@@ -1,58 +1,77 @@
-<!-- $Id: addressbook.tpl,v 1.2 2006/12/18 11:02:55 sigurdne Exp $ -->
+<!-- $Id: addressbook.tpl,v 1.3 2006/12/18 20:03:32 sigurdne Exp $ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
"http://www.w3.org/TR/REC-html40/loose.dtd";>
<HTML LANG="en">
<head>
- <title>{title}</title>
- <meta http-equiv="content-type" content="text/html; charset={charset}">
- <!-- BEGIN theme_stylesheet -->
- <link href="{theme_style}" type="text/css" rel="StyleSheet">
- <!-- END theme_stylesheet -->
-
-
- <script LANGUAGE="JavaScript">
+<title>{title}</title>
+<meta http-equiv="content-type" content="text/html; charset={charset}">
+<STYLE type="text/css">
+ A {text-decoration:none;}
+ <!--
+ A:link {text-decoration:none;}
+ A:visted {text-decoration:none;}
+ A:active {text-decoration:none;}
+ body {margin-top: 0px; margin-right: 0px; margin-left: 0px;}
+ td {text-decoration:none;}
+ tr {text-decoration:none;}
+ table {text-decoration:none;}
+ center {text-decoration:none;}
+ -->
+</STYLE>
+<script LANGUAGE="JavaScript">
function ExchangeTo(thisform)
{
- if (opener.document.doit.to.value =='') {
- opener.document.doit.to.value = thisform.elements[0].value;
+ var address;
+
+ address = thisform.elements[1].value+'
<'+thisform.elements[0].value+'>';
+ //alert(address);
+ if (opener.document.doit.to.value =='')
+ {
+ opener.document.doit.to.value = address;
+ }
+ else
+ {
+ opener.document.doit.to.value +=", "+address;
}
- else {
- opener.document.doit.to.value +=","+thisform.elements[0].value;
}
+
+ function ExchangeCc(thisform)
+ {
+ var address;
+
+ address = thisform.elements[1].value+'
<'+thisform.elements[0].value+'>';
+ if (opener.document.doit.cc.value=='')
+ {
+ opener.document.doit.cc.value=address;
}
-function ExchangeCc(thisform)
+ else
{
- if (opener.document.doit.cc.value=='') {
- opener.document.doit.cc.value=thisform.elements[0].value;
- } else {
- opener.document.doit.cc.value+=","+thisform.elements[0].value;
+ opener.document.doit.cc.value+=", "+address;
+ }
}
+
+ function closeWindow()
+ {
+ window.close();
}
- </script>
+
+</script>
</head>
-<body>
- <center>
- <p><font face="{font}"><b>{lang_addressbook_action}</b></font><br>
- <hr noshade width="98%" align="center" size="1">
+<body bgcolor="{bg_color}">
+<center>
+<p><font face="{font}"><b>{lang_addressbook_action}</b></font><br>
+<hr noshade width="98%" align="center" size="1">
- <table>
- <tr>
- <td>
- <table border="0" width="100%">
+<table border="0" width="100%">
<tr>
<td width="33%" align="left">
<form
action="{cats_action}" name="form" method="POST">
<select
name="cat_id" onChange="this.form.submit();"><option
value="">{lang_select_cats}</option>{cats_list}</select>
-
<noscript> <input type="submit" name="submit"
value="{lang_submit}"></noscript>
- </form>
- </td>
- <td width="33%" align="center">
- {lang_showing}
- </td>
+ <noscript> <input type="submit" name="submit"
value="{lang_submit}"></noscript></form></td>
+ <td width="33%" align="center">{lang_showing}</td>
<td width="33%" align="right">
<form method="POST"
action="{search_action}">
<input type="text"
name="query"> <input type="submit" name="search" value="{lang_search}">
- </form>
- </td>
+ </form></td>
</tr>
<tr>
<td colspan="4">
@@ -65,57 +84,53 @@
</table>
</td>
</tr>
- </table>
- </td>
+</table>
+<table border="0" width="100%" cellpadding="2" cellspacing="2">
+ <tr bgcolor="{th_bg}">
+ <td width="14%" bgcolor="{th_bg}" align=center><font
face="{font}">{sort_firstname}</font></td>
+ <td width="14%" bgcolor="{th_bg}" align=center><font
face="{font}">{sort_lastname}</font></td>
+ <td width="26%" bgcolor="{th_bg}" align=center><font
face="{font}">{lang_email}</font></td>
+ <td width="26%" bgcolor="{th_bg}" align=center><font
face="{font}">{lang_hemail}</font></td>
</tr>
- <tr>
- <td>
- <table border="0" width="100%" cellpadding="2"
cellspacing="2">
- <tr class="th">
- <td width="15%"
align=center>{sort_firstname}</td>
- <td width="15%"
align=center>{sort_lastname}</td>
- <td width="25%"
align=center>{lang_email}</td>
- <td width="25%"
align=center>{lang_hemail}</td>
-
- <!-- BEGIN addressbook_list -->
- <tr class="{tr_class}">
- <td>{firstname}</td>
- <td>{lastname}</td>
- <td align="center">
+
+<!-- BEGIN addressbook_list -->
+ <tr bgcolor="{tr_color}">
+ <td><font face="{font}">{firstname}</font></td>
+ <td><font face="{font}">{lastname}</font></td>
<form>
- <input type="text"
size="25" name="email" value="{email}">
+ <td align="center">
+ <ffont face="{font}"><input type="text" size="25" name="email"
value="{email}">
+ <input type="hidden" name="realName" value="{realName}">
<input type="button"
size="25" name="button" value="To" onClick="ExchangeTo(this.form);">
<input type="button"
size="25" name="button" value="Cc" onClick="ExchangeCc(this.form);">
- </form>
+ </ffont>
</td>
-
-
- <td align="center">
+ </form>
<form>
- <input type="text"
size="25" name="hemail" value="{hemail}">
+ <td align="center">
+ <ffont face="{font}"><input type="text" size="25" name="hemail"
value="{hemail}">
+ <input type="hidden" name="realName" value="{realName}">
<input
type="button" size="25" name="button" value="To"
onClick="ExchangeTo(this.form);">
<input
type="button" size="25" name="button" value="Cc"
onClick="ExchangeCc(this.form);">
- </form>
- </td>
- </tr>
- <!-- END addressbook_list -->
- </table>
+ </ffont>
</td>
+ </form>
</tr>
- <tr>
- <td>
- <table cellpadding="2" cellspacing="2">
+<!-- END addressbook_list -->
+
+</table>
+<br>
+<table cellpadding="2" cellspacing="2">
<tr>
<td>
<form>
- <input
class="text" type="button" name="done" value="{lang_done}"
onClick="window.close()">
+ <font face="{font}">
+ <a href="javascript:closeWindow();">{lang_done}</a>
+ </font>
</form>
</td>
</tr>
- </table>
- </td>
- </tr>
- </table>
+</table>
</center>
</body>
</html>
Index: templates/base/composeForm.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/composeForm.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/composeForm.tpl 16 Dec 2006 21:50:31 -0000 1.1
+++ templates/base/composeForm.tpl 18 Dec 2006 20:03:33 -0000 1.2
@@ -89,7 +89,7 @@
<script language="javascript1.2">
<!--
// position cursor in top form field
-document.doit.to.focus();
+document.doit.{focusElement}.focus();
//-->
</script>
@@ -98,9 +98,12 @@
<!-- BEGIN body_input -->
<table width="98%" border="0" cellspacing="0" cellpading="0">
<tr bgcolor="{bg02}">
- <td colspan="2">
+ <td>
<br>
</td>
+ <td>
+ {errorInfo}<br>
+ </td>
</tr>
<tr bgcolor="{bg02}">
<td width="10%">
Index: templates/base/config.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/config.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/config.tpl 16 Dec 2006 21:50:31 -0000 1.1
+++ templates/base/config.tpl 18 Dec 2006 20:03:33 -0000 1.2
@@ -6,7 +6,7 @@
</tr>
<!-- END header -->
<!-- BEGIN body -->
- <tr bgcolor="{row_on}">
+ <tr>
<td colspan="2"> </td>
</tr>
@@ -15,7 +15,7 @@
</tr>
<tr bgcolor="{row_on}">
-
<td>{lang_Enter_your_POP}/{lang_IMAP_mail_server_hostname_or_IP_address}:</td>
+ <td>{lang_Enter_your_IMAP_mail_server_hostname_or_IP_address}:</td>
<td><input name="newsettings[imapServer]" value="{value_imapServer}"></td>
</tr>
@@ -58,22 +58,63 @@
</tr>
<tr bgcolor="{row_off}">
+ <td>{lang_Users_can_define_their_own_emailaccounts}:</td>
+ <td>
+ <select name="newsettings[userDefinedAccounts]">
+ <option value="no" {selected_userDefinedAccounts_no}>{lang_no}</option>
+ <option value="yes"
{selected_userDefinedAccounts_yes}>{lang_yes}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr bgcolor="{row_on}">
+ <td>{lang_Organization_name}:</td>
+ <td><input name="newsettings[organizationName]"
value="{value_organizationName}" size="30"></td>
+ </tr>
+
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+
+ <tr bgcolor="{row_off}">
+ <td colspan="2"> <b>{lang_SMTP_settings}</b></td>
+ </tr>
+
+ <tr bgcolor="{row_on}">
<td>{lang_Enter_your_SMTP_server_hostname_or_IP_address}:</td>
<td><input name="newsettings[smtpServer]" value="{value_smtpServer}"></td>
</tr>
- <tr bgcolor="{row_on}">
+ <tr bgcolor="{row_off}">
<td>{lang_Enter_your_SMTP_server_port}:</td>
<td><input name="newsettings[smtpPort]" value="{value_smtpPort}"></td>
</tr>
+ <tr bgcolor="{row_on}">
+ <td>{lang_Use_SMTP_auth}:</td>
+ <td>
+ <select name="newsettings[smtpAuth]">
+ <option value="no" {selected_smtpAuth_no}>{lang_no}</option>
+ <option value="yes" {selected_smtpAuth_yes}>{lang_yes}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+
<tr bgcolor="{row_off}">
+ <td colspan="2"> <b>{lang_Sieve_settings}</b></td>
+ </tr>
+
+ <tr bgcolor="{row_on}">
<td>{lang_Enter_your_SIEVE_server_hostname_or_IP_address}:</td>
<td><input name="newsettings[sieveServer]"
value="{value_sieveServer}"></td>
</tr>
- <tr bgcolor="{row_on}">
- <td>{lang_Enter_your_SMTP_server_port}:</td>
+ <tr bgcolor="{row_off}">
+ <td>{lang_Enter_your_SIEVE_server_port}:</td>
<td><input name="newsettings[sievePort]" value="{value_sievePort}"></td>
</tr>
Index: templates/base/filterForm.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/filterForm.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/filterForm.tpl 16 Dec 2006 21:50:31 -0000 1.1
+++ templates/base/filterForm.tpl 18 Dec 2006 20:03:33 -0000 1.2
@@ -19,7 +19,7 @@
<form method="post" name="filterForm" action="{link_action}">
<table width="50%" border="0" cellspacing="1" cellpading="1">
<tr>
- <td class="body" width="40%" align="right">
+ <td class="body" width="40%" align="left">
{lang_filter_name}:
</td>
<td class="body" width="60%" colspan="2">
@@ -27,7 +27,7 @@
</td>
</tr>
<tr>
- <td class="body" width="40%" align="right">
+ <td class="body" width="40%" align="left">
{lang_from}:
</td>
<td class="body" width="60%" colspan="2">
@@ -35,7 +35,7 @@
</td>
</tr>
<tr>
- <td class="body" width="40%" align="right">
+ <td class="body" width="40%" align="left">
{lang_to}:
</td>
<td class="body" width="60%" colspan="2">
@@ -43,7 +43,7 @@
</td>
</tr>
<tr>
- <td class="body" width="10%" align="right">
+ <td class="body" width="10%" align="left">
{lang_subject}:
</td>
<td class="body" colspan="2">
@@ -71,17 +71,17 @@
<form method="post" name="filterList" action="{link_action}">
<table width="95%" border="0" cellspacing="1" cellpading="1">
-<tr class="th">
- <td >
+<tr>
+ <td class="body">
{lang_no_filter}
</td>
- <td align="right">
+ <td class="body" align="right">
<a href={link_noFilter}>{lang_activate}</a>
</td>
- <td align="right">
+ <td class="body" align="right">
</td>
- <td align="right">
+ <td class="body" align="right">
</td>
</tr>
@@ -99,17 +99,17 @@
<!-- END header -->
<!-- BEGIN filterrow -->
-<tr class="{row_class}">
- <td>
+<tr>
+ <td class="body">
{filtername}
</td>
- <td align="right">
+ <td class="body" align="right">
<a href={link_activateFilter}>{lang_activate}</a>
</td>
- <td align="right">
+ <td class="body" align="right">
<a href={link_deleteFilter}>{lang_delete}</a>
</td>
- <td align="right">
+ <td class="body" align="right">
<a href={link_editFilter}>{lang_edit}</a>
</td>
</tr>
Index: templates/base/mainscreen.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/mainscreen.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/mainscreen.tpl 16 Dec 2006 21:50:31 -0000 1.1
+++ templates/base/mainscreen.tpl 18 Dec 2006 20:03:33 -0000 1.2
@@ -19,37 +19,160 @@
//-->
</script>
+<STYLE type="text/css">
+ .header_row_, A.header_row_
+ {
+ FONT-SIZE: 12px;
+ height : 12px;
+ padding: 0;
+ font-weight : bold;
+ }
+
+ .header_row_D, A.header_row_D
+ {
+ FONT-SIZE: 12px;
+ height : 12px;
+ padding: 0;
+ color: silver;
+ text-decoration : line-through;
+ font-weight : bold;
+ }
+
+ .header_row_DS, A.header_row_DS, .header_row_ADS, A.header_row_ADS
+ {
+ FONT-SIZE: 12px;
+ height : 12px;
+ padding: 0;
+ color: silver;
+ text-decoration : line-through;
+ }
+
+ .header_row_S, A.header_row_S
+ {
+ FONT-SIZE: 12px;
+ height : 12px;
+ padding: 0;
+ vertical-align : middle;
+ }
+
+ .header_row_AS, A.header_row_AS
+ {
+ FONT-SIZE: 12px;
+ height : 12px;
+ padding: 0;
+ vertical-align : middle;
+ }
+
+ .header_row_FAS, A.header_row_FAS, .header_row_FS, A.header_row_FS
+ {
+ color: red;
+ FONT-SIZE: 12px;
+ height : 12px;
+ padding: 0;
+ vertical-align : middle;
+ }
+
+ .header_row_F, A.header_row_F
+ {
+ color: red;
+ FONT-SIZE: 12px;
+ height : 12px;
+ padding: 0;
+ font-weight : bold;
+ vertical-align : middle;
+ }
+
+ .header_row_R, A.header_row_R
+ {
+ FONT-SIZE: 12px;
+ height : 12px;
+ padding: 0;
+ font-weight : bold;
+ vertical-align : middle;
+ }
+
+</STYLE>
+
<script type="text/javascript">
<!--
- function toggleFolderRadio()
+ var checkedCounter={checkedCounter}, aktiv;
+ var maxMessages = {maxMessages};
+
+ function ttoggleFolderRadio()
{
//alert(document.getElementsByTagName("input")[0].checked);
document.getElementsByTagName("input")[1].checked = "true";
}
+
+ function toggleFolderRadio(_counter)
+ {
+ if(aktiv)
+ {
+ // do not reload, while we try to select some messages
+ window.clearTimeout(aktiv);
+ {refreshTime}
+ }
+
+ var counter = parseInt(_counter);
+ //alert(document.getElementById("msg_input_"+_counter).checked);
+ //document.getElementsByTagName("input")[1].checked = "true";
+ //tr = eval(document.getElementsByTagName("tr")[counter+23]);
+ //input =
eval(document.getElementsByTagName("input")[counter+10]);
+ tr = document.getElementById("msg_tr_"+_counter);
+ input = document.getElementById("msg_input_"+_counter);
+ if(input.checked == true)
+ {
+ checkedCounter+=1;
+ }
+ else
+ {
+ checkedCounter-=1;
+ }
+ if (checkedCounter > 0)
+ {
+ document.getElementsByTagName("input")[3].checked =
"true";
+ }
+ else
+ {
+ document.getElementsByTagName("input")[2].checked =
"true";
+ }
+ }
+
//-->
</script>
-<TABLE BORDER=0 WIDTH="100%" CELLSPACING=0 CELLPADDING=2>
+<TABLE BORDER="0" WIDTH="100%" CELLSPACING=0 CELLPADDING=2>
<TR BGCOLOR="{row_off}">
- <TD ALIGN="left" WIDTH="40%">
+ <TD ALIGN="left" WIDTH="70%">
<a
href="{url_compose_empty}">{lang_compose}</a>
<a
href="{url_filter}">{lang_edit_filter}</a>
- <a href="{url_status_filter}">{lang_status_filter}</a>
</td>
- <td align="right" width="60%">
-
+ <td align='right' width="30%">
+ {quota_display}
</td>
</tr>
+ <TR valign="middle">
+ <form name=searchForm method=post
action="{url_search_settings}">
+ <td colspan="1" bgcolor="#ffffcc" align="left" width="70%">
+ {lang_quicksearch}:
+ <input type="text" size="50" name="quickSearch"
value="{quicksearch}"
+ onChange="javascript:document.searchForm.submit()">
+ </td>
+ <td bgcolor="#ffffcc" align="right" width="30%" valign="middle">
+ <input type=hidden name="changeFilter">
+ <select name="filter"
onChange="javascript:document.searchForm.submit()">
+ {filter_options}
+ </select>
+ </td>
+ </form>
+ </tr>
</table>
<TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
- <FORM name=messageList method=post action="{url_change_folder}">
- <colgroup>
- <col width="100%">
- </colgroup>
<TR>
<TD BGCOLOR="{row_off}">
- <TABLE BGCOLOR="{row_off}" COLS=2 BORDER=0
cellpadding=0 cellspacing=0 width="100%">
+ <TABLE BGCOLOR="{row_off}" COLS=2 BORDER='0'
cellpadding=0 cellspacing=0 width="100%">
<TR valign="middle">
+ <FORM name=messageList method=post
action="{url_change_folder}">
<td nowrap width="40%" align="LEFT"
valign="center" bgcolor="#ffffcc">
<TT><SMALL>
<SELECT NAME="mailbox"
onChange="document.messageList.submit()">
@@ -62,29 +185,35 @@
</noscript>
<INPUT TYPE=hidden
NAME="oldMailbox" value="{oldMailbox}">
</TD>
- <td width="50%">
+ <td width="40%">
</td>
<td width="2%" align="LEFT"
valign="center">
- <input type="image"
src="{image_path}/read_small.png" name="mark_read" alt="{desc_read}"
title="{desc_read}" width="16">
+ <input type="image"
src="{read_small}" name="mark_read" alt="{desc_read}" title="{desc_read}"
width="16">
</td>
<TD WIDTH="2%" ALIGN="MIDDLE"
valign="center">
|
</td>
<td width="2%" align="RIGHT"
valign="center">
- <input type="image"
src="{image_path}/unread_small.png" name="mark_unread" title="{desc_unread}"
width="16">
+ <input type="image"
src="{unread_small}" name="mark_unread" title="{desc_unread}" width="16">
+ </td>
+ <TD WIDTH="2%" ALIGN="MIDDLE"
valign="center">
+
</td>
<td width="2%" align="LEFT"
valign="center">
- <input type="image"
src="{image_path}/unread_flagged_small.png" name="mark_flagged"
title="{desc_important}" width="16">
+ <input type="image"
src="{unread_flagged_small}" name="mark_flagged" title="{desc_important}"
width="16">
</td>
<TD WIDTH="2%" ALIGN="MIDDLE"
valign="center">
|
</td>
<td width="2%" align="RIGHT"
valign="center">
- <input type="image"
src="{image_path}/unread_small.png" name="mark_unflagged"
title="{desc_unimportant}">
+ <input type="image"
src="{unread_small}" name="mark_unflagged" title="{desc_unimportant}">
+ </td>
+ <TD WIDTH="2%" ALIGN="MIDDLE"
valign="center">
+
</td>
<td width="2%" align="RIGHT"
valign="center">
- <input type="image"
src="{image_path}/unread_deleted_small.png" name="mark_deleted"
title="{desc_deleted}">
+ <input type="image"
src="{unread_deleted_small}" name="mark_deleted" title="{desc_deleted}">
</TD>
</TR>
</TABLE>
@@ -134,15 +263,15 @@
<!-- BEGIN status_row_tpl -->
<tr>
<TD>
- <table WIDTH=100% BORDER=0 CELLPADDING=1 CELLSPACING=0>
+ <table WIDTH="100%" BORDER="0" CELLPADDING="1"
CELLSPACING="0">
<tr BGCOLOR="#FFFFFF">
<td width="18%">
{link_previous} | {link_next}
</td>
- <td width="18%">
+ <td width="10%">
</td>
- <TD align="center" width="28%">
+ <TD align="center" width="36%">
{message}
</td>
<td width="18%">
@@ -158,341 +287,32 @@
<!-- END status_row_tpl -->
-<!-- BEGIN header_row_S -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_small.png" width="16" border="0"
alt="{lang_read}" title="{lang_read}">
- </td>
- <td bgcolor="#FFFFFF">
- <a name="subject_url"
href="{url_read_message}">{header_subject}</a>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_S -->
-
-<!-- BEGIN header_row_RS -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_small.png" width="16" border="0"
alt="{lang_read}" title="{lang_read}">
- </td>
- <td bgcolor="#FFFFFF">
- <a name="subject_url"
href="{url_read_message}">{header_subject}</a>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_RS -->
-
-<!-- BEGIN header_row_ -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <b><a href="{url_compose}"
title="{full_address}">{sender_name}</a></b>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/unread_small.png" width="16" border="0"
alt="{lang_unread}" title="{lang_unread}">
- </td>
- <td bgcolor="#FFFFFF">
- <b><a href="{url_read_message}">{header_subject}</a></b>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_ -->
-
-<!-- BEGIN header_row_F -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <b><a href="{url_compose}" title="{full_address}"><font
color="red">{sender_name}</font></a></b>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF">
- <img src="{image_path}/unread_flagged_small.png" width="16"
border="0" alt="{lang_unread}, {lang_flagged}" title="{lang_unread},
{lang_flagged}">
- </td>
- <td bgcolor="#FFFFFF">
- <b><a href="{url_read_message}"><font
color="red">{header_subject}</font></a></b>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_F -->
-
-<!-- BEGIN header_row_R -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <b><a href="{url_compose}"
title="{full_address}">{sender_name}</a></b>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF">
- <img src="{image_path}/recent_small.gif" width="16" border="0"
alt="{lang_recent}" title="{lang_recent}">
- </td>
- <td bgcolor="#FFFFFF">
- <b><a href="{url_read_message}">{header_subject}</a></b>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_R -->
-
-<!-- BEGIN header_row_AS -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_answered_small.png" width="16"
border="0" alt="{lang_replied}" title="{lang_replied}">
- </td>
- <td bgcolor="#FFFFFF">
- <a href="{url_read_message}">{header_subject}</a>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_AS -->
-
-<!-- BEGIN header_row_RAS -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_answered_small.png" width="16"
border="0" alt="{lang_replied}" title="{lang_replied}">
- </td>
- <td bgcolor="#FFFFFF">
- <a href="{url_read_message}">{header_subject}</a>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_RAS -->
-
-<!-- BEGIN header_row_A -->
-<tr>
+<!-- BEGIN header_row -->
+<tr class="{row_css_class}">
<td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
+ <iinput type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
+ <input class="{row_css_class}" type="checkbox"
id="msg_input_{message_counter}" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio('{message_counter}')"
{row_selected}>
</td>
<td width="10%" bgcolor="#FFFFFF" nowrap>
- <b><a href="{url_compose}"
title="{full_address}">{sender_name}</a></b>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
+ <a class="{row_css_class}" href="{url_compose}"
title="{full_address}">{sender_name}</a>
+ <a href="{url_add_to_addressbook}"><img src="{sm_envelope}"
width="10" height="8" border="0" align="absmiddle"
alt="{lang_add_to_addressbook}" title="{lang_add_to_addressbook}"></a>
</td>
<td bgcolor="#FFFFFF" nowrap align="center">
{date}
</td>
<td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_answered_small.png" width="16"
border="0" alt="{lang_replied}" title="{lang_replied}">
- </td>
- <td bgcolor="#FFFFFF">
- <b><a href="{url_read_message}">{header_subject}</a></b>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_A -->
-
-<!-- BEGIN header_row_ADS -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}"><font
color="#CCCCCC">{sender_name}</font></a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- <font color="#CCCCCC">{date}</font>
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_answered_deleted_small.png"
width="16" border="0" alt="{lang_replied}, {lang_deleted}"
title="{lang_replied}, {lang_deleted}">
- </td>
- <td bgcolor="#FFFFFF">
- <a href="{url_read_message}"><font
color="#CCCCCC">{header_subject}</font></a>
- </td>
- <td bgcolor="#FFFFFF">
- <font color="#CCCCCC">{size}</font>
- </td>
-</tr>
-<!-- END header_row_ADS -->
-
-<!-- BEGIN header_row_FS -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}"><font
color="red">{sender_name}</font></a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF">
- <img src="{image_path}/read_flagged_small.png" width="16"
border="0" alt="{lang_read}, {lang_flagged}" title="{lang_read},
{lang_flagged}">
+ {state}
+<!-- <img src="{image_path}/read_small.png" width="16" border="0"
alt="{lang_read}" title="{lang_read}">
+--> {row_text}
</td>
<td bgcolor="#FFFFFF">
- <a href="{url_read_message}"><font
color="red">{header_subject}</font></a>
+ <a class="{row_css_class}" name="subject_url"
href="{url_read_message}">{header_subject}</a>
</td>
<td bgcolor="#FFFFFF">
{size}
</td>
</tr>
-<!-- END header_row_FS -->
-
-<!-- BEGIN header_row_FAS -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}"><font
color="red">{sender_name}</font></a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_answered_small.png" width="16"
border="0" alt="{lang_replied}, {lang_flagged}" title="{lang_replied},
{lang_flagged}">
- </td>
- <td bgcolor="#FFFFFF">
- <a href="{url_read_message}"><font
color="red">{header_subject}</font></a>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_FAS -->
-
-<!-- BEGIN header_row_FA -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}"><font
color="red">{sender_name}</font></a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- {date}
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_answered_small.png" width="16"
border="0" alt="{lang_replied}, {lang_flagged}" title="{lang_replied},
{lang_flagged}">
- </td>
- <td bgcolor="#FFFFFF">
- <a href="{url_read_message}"><font
color="red">{header_subject}</font></a>
- </td>
- <td bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_FA -->
-
-<!-- BEGIN header_row_D -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <b><a href="{url_compose}" title="{full_address}"><font
color="#CCCCCC">{sender_name}</font></a></b>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- <font color="#CCCCCC">{date}</font>
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/unread_deleted_small.png" width="16"
border="0" alt="{lang_unread}, {lang_deleted}" title="{lang_unread},
{lang_deleted}">
- </td>
- <td bgcolor="#FFFFFF">
- <b><a name="subject_url" href="{url_read_message}"><font
color="#CCCCCC">{header_subject}</font></a></b>
- </td>
- <td bgcolor="#FFFFFF">
- <font color="#CCCCCC">{size}</font>
- </td>
-</tr>
-<!-- END header_row_D -->
-
-<!-- BEGIN header_row_DS -->
-<tr>
- <td width="1%" bgcolor="#FFFFFF" align="center">
- <input type="checkbox" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td width="10%" bgcolor="#FFFFFF" nowrap>
- <a href="{url_compose}" title="{full_address}"><font
color="#CCCCCC">{sender_name}</font></a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td bgcolor="#FFFFFF" nowrap align="center">
- <font color="#CCCCCC">{date}</font>
- </td>
- <td bgcolor="#FFFFFF" valign="middle" align="center">
- <img src="{image_path}/read_deleted_small.png" width="16"
border="0" alt="{lang_read}, {lang_deleted}" title="{lang_read},
{lang_deleted}">
- </td>
- <td bgcolor="#FFFFFF">
- <a name="subject_url" href="{url_read_message}"><font
color="#CCCCCC">{header_subject}</font></a>
- </td>
- <td bgcolor="#FFFFFF">
- <font color="#CCCCCC">{size}</font>
- </td>
-</tr>
-<!-- END header_row_DS -->
+<!-- END header_row -->
<!-- BEGIN error_message -->
<tr>
@@ -502,3 +322,16 @@
</td>
</tr>
<!-- END error_message -->
+
+<!-- BEGIN quota_block -->
+ <table border="1" cellpadding="0" cellspacing="0" width="200">
+ <tr valign="middle">
+ <td width="{leftWidth}%" bgcolor="{quotaBG}"
align="center" valign="middle">
+ <small>{quotaUsage_left}</small>
+ </td>
+ <td align="center" valign="middle">
+ <small>{quotaUsage_right}</small>
+ </td>
+ </tr>
+ </table>
+<!-- END quota_block -->
Index: templates/base/preferences_manage_folder.tpl
===================================================================
RCS file:
/sources/phpgroupware/felamimail/templates/base/preferences_manage_folder.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/preferences_manage_folder.tpl 16 Dec 2006 21:50:31
-0000 1.1
+++ templates/base/preferences_manage_folder.tpl 18 Dec 2006 20:03:33
-0000 1.2
@@ -1,55 +1,163 @@
<!-- BEGIN main -->
-<form action="{form_action}" method="post" name="folderList">
-<table border="0" width="100%">
+<table width="100%" border="0">
+ <tr>
+ <td width="1%" rowspan="2">
+ <form action="{form_action}" method="post"
name="folderList">
+ <table border="1" width="100%" cellpadding=2
cellspacing=0>
+ <caption>{lang_folder_list}</caption>
<tr>
- <td align="left">
- {lang_folder_name}
- </td>
<td align="center">
- <select name="foldername"
onchange="document.folderList.submit()">
+ <select size="30"
name="foldername" onchange="document.folderList.submit()">
{select_rows}
</select>
</td>
+ <noscript>
<td align="right">
<input type="submit" value="{lang_select}"
name="selectFolder">
</td>
+ </noscript>
+ </tr>
+ </table>
+ </form>
+ </td>
+ <td valign="top">
+ <table border="1" width="100%" cellpadding=2
cellspacing=0>
+ <caption>{lang_folder_settings}</caption>
+ <tr>
+ <td width="150"align="left">
+ {lang_imap_server}
+ </td>
+ <td align="center">
+ <b>{imap_server}</b>
+ </td>
</tr>
-</table>
-</form>
-
-<form action="{form_action}" method="post" name="subscribeList">
-<input type="hidden" name="foldername" value="{folderName}">
-<table border="0" width="100%">
<tr>
- <td align="left">
+ <td width="150"align="left">
+ {lang_folder_name}
+ </td>
+ <td align="center">
+ <b>{folderName}</b>
+ </td>
+ </tr>
+ <tr>
+ <td width="150"align="left">
{lang_folder_status}
</td>
<td align="center">
+ <form action="{form_action}"
method="post" name="subscribeList">
<input type="radio" name="folderStatus"
value="subscribe" onchange="document.subscribeList.submit()" id="subscribed"
{subscribed_checked}>
<label for="subscribed">{lang_subscribed}</label>
<input type="radio" name="folderStatus"
value="unsubscribe" onchange="document.subscribeList.submit()"
id="unsubscribed" {unsubscribed_checked}>
<label for="unsubscribed">{lang_unsubscribed}</label>
+ <noscript><input type="submit"
value="{lang_update}" name="un_subscribe"></noscript>
+ </form>
</td>
- <td align="right">
- <noscript><input type="submit" value="{lang_update}"
name="un_subscribe"></noscript>
+ </tr>
+ <tr>
+ <td width="150"align="left">
+ {lang_rename_folder}
+ </td>
+ <td align="center">
+ <form action="{form_action}"
method="post" name="renameMailbox">
+ <input type="text" size="30"
name="newMailboxName" value="{mailboxNameShort}"
onchange="document.renameMailbox.submit()">
+ <noscript><input type="submit"
value="{lang_rename}" name="renameMailbox"></noscript>
+ </form>
+ </td>
+ </tr>
+ <tr>
+ <td width="150"align="left">
+ {lang_create_subfolder}
+ </td>
+ <td align="center">
+ <form action="{form_action}"
method="post" name="createSubFolder">
+ <input type="text" size="30"
name="newSubFolder" onchange="document.createSubFolder.submit()">
+ <noscript><input type="submit"
value="{lang_create}" name="createSubFolder"></noscript>
+ </form>
</td>
</tr>
-</table>
-</form>
-
-<table border="0" width="100%">
<tr>
+ <td width="150"align="left">
+
+ </td>
+ <td align="center">
+
+ </td>
+ </tr>
+ <tr>
+ <td width="150"align="left">
+ {lang_delete_folder}
+ </td>
+ <td align="center">
+ <form action="{form_action}"
method="post" name="deleteFolder">
+ <input type="submit"
value="{lang_delete}" name="deleteFolder">
+ </form>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+<!-- <tr>
<td>
+ <table border="1" width="100%">
+ <tr>
+ <td width="100"align="left">
{lang_quota_status}
</td>
+ <td align="center">
+ <table width="100%" border="1">
+ <tr>
+ <td colspan="2">
+ Storage
Limit<br>
+ </td>
+ </tr>
+ <tr>
+ <td width="50%">
+ STORAGE
usage level is:
+ </td>
+ <td width="50%">
+
{storage_usage}
+ </td>
+ </tr>
+ <tr>
<td>
- xxx
+ STORAGE
limit level is:
+ </td>
+ <td>
+
{storage_limit}
</td>
</tr>
+ <tr>
+ <td colspan="2">
+ Message
Limit<br>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ MESSAGE
usage level is:
+ </td>
+ <td>
+
{message_usage}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ MESSAGE
limit level is:
+ </td>
+ <td>
+
{message_limit}
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr> -->
</table>
+
<!-- END main -->
<!-- BEGIN select_row -->
- <option value="{folder_name}"
{selected}>({subscribed}) {folder_name}</option>
+ <option value="{folder_value}"
{selected}>({subscribed}) {folder_name}</option>
<!-- END select_row -->
Index: templates/base/sieveForm.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/sieveForm.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/sieveForm.tpl 16 Dec 2006 21:50:31 -0000 1.1
+++ templates/base/sieveForm.tpl 18 Dec 2006 20:03:33 -0000 1.2
@@ -38,7 +38,7 @@
</tr>
<tr>
<td colspan=2>
- <textarea name=scriptContent cols=100
rows=20>{scriptContent}</textarea>
+ <textarea name=scriptContent cols=90
rows=20>{scriptContent}</textarea>
</td>
</tr>
<tr>
Index: templates/base/view_message.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/view_message.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/view_message.tpl 18 Dec 2006 14:43:28 -0000 1.2
+++ templates/base/view_message.tpl 18 Dec 2006 20:03:33 -0000 1.3
@@ -1,4 +1,29 @@
<!-- BEGIN message_main -->
+<STYLE type="text/css">
+ .subjectBold
+ {
+ FONT-SIZE: 12px;
+ font-weight : bold;
+ font-family : Arial;
+ }
+
+ .subject
+ {
+ FONT-SIZE: 12px;
+ font-family : Arial;
+ }
+
+ .body
+ {
+ FONT-SIZE: 12px;
+ font-family : Courier;
+ }
+
+ A.head_link
+ {
+ color: blue;
+ }
+</STYLE>
<table border="0" width="100%" cellspacing="0" bgcolor="white">
<tr>
<td>
@@ -13,9 +38,11 @@
{rawheader}
<tr>
<td bgcolor="white">
-<pre><font face="Verdana" size="-1">
+<div class="body">
+<!-- Body Begin -->
{body}
-</font></pre>
+<!-- Body End -->
+</div>
<td>
</tr>
<tr>
@@ -32,40 +59,46 @@
<!-- BEGIN message_raw_header -->
<tr>
<td bgcolor="white">
- <pre><font face="Verdana"
size="-1">{raw_header_data}</font></pre>
+ <pre><font face="Arial" size="-1">{raw_header_data}</font></pre>
</td>
</tr>
<!-- END message_raw_header -->
<!-- BEGIN message_navbar -->
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<table border="0" cellpadding="1" cellspacing="0" width="100%">
<tr bgcolor="{th_bg}">
- <td>
+ <td width="50%">
{lang_back_to_folder}: <a class="head_link"
href="{link_message_list}">{folder_name}</a>
|
<a class="head_link"
href="{link_compose}">{lang_compose}</a>
</td>
- <td align=right>
- <a href="{link_reply}">
- <img src="{app_image_path}/sm_reply.gif" height="26"
width="28" alt="{lang_reply}" border="0">
+ <td align="right">
+ {previous_message}
+ {next_message}
+ </td>
+ </tr>
+ <tr bgcolor="{th_bg}">
+ <td align="right" colspan="2">
+ <a class="head_link" href="{link_reply}">
+ <!-- <img src="{app_image_path}/sm_reply.gif"
height="26" width="28" alt="{lang_reply}" border="0"> -->
+ {lang_reply}
</a>
-
- <a href="{link_reply_all}">
- <img src="{app_image_path}/sm_reply_all.gif"
height="26" width="28" alt="{lang_reply_all}" border="0">
+ |
+ <a class="head_link" href="{link_reply_all}">
+ <!-- <img src="{app_image_path}/sm_reply_all.gif"
height="26" width="28" alt="{lang_reply_all}" border="0"> -->
+ {lang_reply_all}
</a>
-
- <a href="{link_forward}">
- <img src="{app_image_path}/sm_forward.gif" height="26"
width="28" alt="{lang_forward}" border="0">
+ |
+ <a class="head_link" href="{link_forward}">
+ <!-- <img src="{app_image_path}/sm_forward.gif"
height="26" width="28" alt="{lang_forward}" border="0"> -->
+ {lang_forward}
</a>
-
- <a href="{link_delete}">
- <img src="{app_image_path}/sm_delete.gif" height="26"
width="28" alt="{lang_delete}" border="0">
+ |
+ <a class="head_link" href="{link_delete}">
+ <!-- <img src="{app_image_path}/sm_delete.gif"
height="26" width="28" alt="{lang_delete}" border="0"> -->
+ {lang_delete}
</a>
</td>
- <td align="right">
- <!-- {left_arrow}
- {right_arrow}-->
- </td>
</tr>
</table>
<!-- END message_navbar -->
@@ -84,9 +117,9 @@
<!-- END message_navbar_print -->
<!-- BEGIN message_attachement_row -->
-<tr class = {row_class}>
+<tr>
<td valign="top" bgcolor={bg01}>
- <a href="{link_view}"><font size="2" face="{theme_font}">
+ <a href="{link_view}" target="_blank"><font size="2"
face="{theme_font}">
<b>{filename}</b></font><a>
</td>
<td colspan="2" bgcolor={bg01}>
@@ -109,75 +142,72 @@
<!-- BEGIN message_cc -->
<tr>
- <td valign="top" bgcolor={bg01}>
- <font size="2" face="{theme_font}">
- {lang_cc}:</font>
+ <td class="subject" valign="top" bgcolor={bg01} width="100">
+ {lang_cc}:
</td>
- <td colspan="2" bgcolor={bg01}>
- <font size="2" face="{theme_font}">
+ <td class="subject" colspan="2" bgcolor={bg01}>
{cc_data}
- </font>
</td>
</tr>
<!-- END message_cc -->
+<!-- BEGIN message_organization -->
+ [{organization_data}]
+<!-- END message_organization -->
+
<!-- BEGIN message_header -->
<table border="0" cellpadding="1" cellspacing="0" width="100%">
<tr>
- <td valign="top" width="10%" bgcolor={bg01}>
+ <td class="subject" valign="top" width="100" bgcolor="{bg01}">
{lang_from}:
</td>
- <td bgcolor={bg01}>
- <font size="2" face="{theme_font}">
- <strong>{from_data}</strong>
- </font>
+ <td class="subjectBold" bgcolor="{bg01}">
+ {from_data}{organization_data_part}
+
</td>
- <td nowrap align=right width="1%" bgcolor={bg01}>
- <font size="2" face="{theme_font}">
+ <td class="subject" nowrap align=right width="120" bgcolor={bg01}>
<a href="{link_header}">{view_header}</a>
- </font>
</td>
</tr>
<tr>
- <td valign="top" bgcolor="{bg01}">
+ <td class="subject" class="subject" valign="top" bgcolor="{bg01}">
{lang_to}:
</td>
- <td colspan="1" bgcolor="{bg01}">
- <font size="2" face="{theme_font}">
+ <td class="subject" bgcolor="{bg01}">
{to_data}
- </font>
</td>
- <td nowrap align=right width="1%" bgcolor={bg01}>
- <font size="2" face="{theme_font}">
+ <td class="subject" nowrap align=right width="1%" bgcolor={bg01}>
<a href="{link_printable}" target="_blank">{lang_printable}</a>
- </font>
</td>
</tr>
+
{cc_data_part}
<tr>
- <td valign="top" bgcolor="{bg01}">
- <font size="2" face="{theme_font}">
- {lang_date}:</font>
+ <td class="subject" valign="top" bgcolor="{bg01}">
+ {lang_date}:
</td>
- <td colspan="2" bgcolor="{bg01}">
- <font size="2" face="{theme_font}">
+ <td class="subject" colspan="2" bgcolor="{bg01}">
{date_data}
- </font>
</td>
</tr>
<tr>
- <td valign="top" bgcolor="{bg01}">
- <font size="2" face="{theme_font}">
- {lang_subject}:</font>
+ <td class="subject" valign="top" bgcolor="{bg01}">
+ {lang_subject}:
</td>
- <td colspan="2" bgcolor="{bg01}">
- <font size="2" face="{theme_font}">
- <strong>{subject_data}</strong>
- </font>
+ <td class="subjectBold" colspan="2" bgcolor="{bg01}">
+ {subject_data}
</td>
</tr>
</table>
<!-- END message_header -->
+
+<!-- BEGIN previous_message_block -->
+<a class="head_link" href="{previous_url}">{lang_previous_message}</a>
+<!-- END previous_message_block -->
+
+<!-- BEGIN next_message_block -->
+<a class="head_link" href="{next_url}">{lang_next_message}</a>
+<!-- END next_message_block -->
Index: templates/linux-at-work.de/composeForm.tpl
===================================================================
RCS file:
/sources/phpgroupware/felamimail/templates/linux-at-work.de/composeForm.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/linux-at-work.de/composeForm.tpl 24 Nov 2002 00:40:36 -0000
1.2
+++ templates/linux-at-work.de/composeForm.tpl 18 Dec 2006 20:03:33 -0000
1.3
@@ -86,20 +86,16 @@
</tr>
</table>
-<script language="javascript1.2">
-<!--
-// position cursor in top form field
-document.doit.to.focus();
-//-->
-</script>
-
<!-- END header -->
<!-- BEGIN body_input -->
<table width="98%" border="0" cellspacing="0" cellpading="0">
<tr>
- <td class="body" colspan="2">
- <br>
+ <td class="body">
+
+ </td>
+ <td class="body" colspan="1">
+ {errorInfo}<br>
</td>
</tr>
<tr>
@@ -124,6 +120,14 @@
</td>
</tr>
</table>
+
+<script language="javascript1.2">
+<!--
+// position cursor in top form field
+document.doit.{focusElement}.focus();
+//-->
+</script>
+
<!-- END body_input -->
<!-- BEGIN attachment -->
Index: templates/linux-at-work.de/mainscreen.tpl
===================================================================
RCS file:
/sources/phpgroupware/felamimail/templates/linux-at-work.de/mainscreen.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/linux-at-work.de/mainscreen.tpl 24 Nov 2002 00:32:14 -0000
1.3
+++ templates/linux-at-work.de/mainscreen.tpl 18 Dec 2006 20:03:33 -0000
1.4
@@ -1,5 +1,4 @@
<!-- BEGIN main -->
-<div class="main_body" style="border-width:0px; border-style:solid;
vertical-align : bottom; width : 100% ; height : 15% ; left : 0px ; top :0px ;
overflow : auto">
<script language="JavaScript1.2">
<!--
@@ -21,41 +20,206 @@
//-->
</script>
+<STYLE type="text/css">
+ .header_row_, A.header_row_
+ {
+ color: blue;
+ FONT-SIZE: 11px;
+ height : 12px;
+ padding: 0;
+ font-weight : bold;
+ }
+
+ .header_row_D, A.header_row_D
+ {
+ FONT-SIZE: 11px;
+ height : 12px;
+ padding: 0;
+ color: silver;
+ text-decoration : line-through;
+ font-weight : bold;
+ }
+
+ .header_row_DS, A.header_row_DS, .header_row_ADS, A.header_row_ADS
+ {
+ FONT-SIZE: 11px;
+ height : 12px;
+ padding: 0;
+ color: silver;
+ text-decoration : line-through;
+ }
+
+ .header_row_S, A.header_row_S
+ {
+ color: blue;
+ FONT-SIZE: 11px;
+ height : 12px;
+ padding: 0;
+ vertical-align : middle;
+ }
+
+ .header_row_AS, A.header_row_AS
+ {
+ ccolor: #000000;
+ color: blue;
+ FONT-SIZE: 11px;
+ height : 12px;
+ padding: 0;
+ vertical-align : middle;
+ }
+
+ .header_row_FAS, A.header_row_FAS, .header_row_FS, A.header_row_FS
+ {
+ color: red;
+ FONT-SIZE: 11px;
+ height : 12px;
+ padding: 0;
+ vertical-align : middle;
+ }
+
+ .header_row_F, A.header_row_F
+ {
+ color: red;
+ FONT-SIZE: 11px;
+ height : 12px;
+ padding: 0;
+ font-weight : bold;
+ vertical-align : middle;
+ }
+
+ .header_row_R, A.header_row_R
+ {
+ ccolor: #000000;
+ color: blue;
+ FONT-SIZE: 11px;
+ height : 12px;
+ padding: 0;
+ font-weight : bold;
+ vertical-align : middle;
+ }
+
+ .quota
+ {
+ FONT-SIZE: 9px;
+ height : 10px;
+ vertical-align : middle;
+ }
+
+
+</STYLE>
+
<script LANGUAGE="Javascript">
<!--
- var oldColor, oldFontWeight;
+ var maxMessages = {maxMessages};
+ var oldColor, oldFontWeight, checkedCounter=0, aktiv;
- function toggleFolderRadio()
+ function restartCounter()
+ {
+ if(aktiv)
{
- //alert(document.getElementsByTagName("input")[0].checked);
- document.getElementsByTagName("input")[1].checked = "true";
+ // do not reload, while we try to select some messages
+ window.clearTimeout(aktiv);
+ {refreshTime}
+ //window.alert('buh');
+ }
}
- function parentOn($_i)
+ function toggleFolderRadio(_counter)
+ {
+ restartCounter();
+
+ var counter = parseInt(_counter);
+ //document.getElementsByTagName("input")[1].checked = "true";
+ //tr = eval(document.getElementsByTagName("tr")[counter+23]);
+ //input =
eval(document.getElementsByTagName("input")[counter+10]);
+ tr = document.getElementById("msg_tr_"+_counter);
+ input = document.getElementById("msg_input_"+_counter);
+ if(input.checked == true)
+ {
+ tr.style.backgroundColor = "silver";
+ checkedCounter+=1;
+ }
+ else
+ {
+ tr.style.backgroundColor = "white";
+ checkedCounter-=1;
+ }
+ if (checkedCounter > 0)
{
- //alert(document.getElementsByName("link_sender")[$_i].title);
- address = eval(document.getElementsByName("link_sender")[$_i]);
- subject = eval(document.getElementsByName("link_subject")[$_i]);
+ document.getElementsByTagName("input")[3].checked =
"true";
+ }
+ else
+ {
+ document.getElementsByTagName("input")[2].checked =
"true";
+ }
+ }
+
+ function parentOn(_i)
+ {
+ restartCounter();
+
+ var i = parseInt(_i);
+ //tr = eval(document.getElementsByTagName("tr")[i+23]);
+ tr = document.getElementById("msg_tr_"+_i);
+
+ tr.style.backgroundColor = "#D3D3D3";
+ }
+
+ function parentOff(_i)
+ {
+ var i = parseInt(_i);
+
+ tr = document.getElementById("msg_tr_"+_i);
+ input = document.getElementById("msg_input_"+_i);
+
+ if(input.checked == true)
+ {
+ tr.style.backgroundColor = 'silver';
+ }
+ else
+ {
+ tr.style.backgroundColor = '#FFFFFF';
+ }
+ }
+
+ function mark()
+ {
+ restartCounter();
+
+ //alert(maxMessages);
+ //var counter = 10;
- oldColor = address.style.color;
- oldFontWeight = address.style.fontWeight;
+ master = document.getElementsByName("masterSelect")[0];
+ slaveInput = document.getElementsByTagName("input")[20];
- address.style.color = "#000000";
- address.style.fontWeight = "bold";
- subject.style.color = "#000000";
- subject.style.fontWeight = "bold";
+ for(var i = 0; i < maxMessages; i++)
+ {
+ input = document.getElementById("msg_input_"+i);
+ tr = document.getElementById("msg_tr_"+i);
+ if(master.checked == true)
+ {
+ input.checked = true;
+ tr.style.backgroundColor = 'silver';
+ }
+ else
+ {
+ input.checked = false;
+ tr.style.backgroundColor = '#FFFFFF';
+ }
}
- function parentOff($_i)
+ if(master.checked == true)
+ {
+ checkedCounter = maxMessages;
+ document.getElementsByTagName("input")[3].checked =
"true";
+ }
+ else
{
- //alert(document.getElementsByName("link_subject")[$_i].title);
- address = eval(document.getElementsByName("link_sender")[$_i]);
- subject = eval(document.getElementsByName("link_subject")[$_i]);
+ checkedCounter = 0;
+ document.getElementsByTagName("input")[2].checked =
"true";
+ }
- address.style.color = oldColor;
- address.style.fontWeight = oldFontWeight;
- subject.style.color = oldColor;
- subject.style.fontWeight = oldFontWeight;
+ //alert(master.checked);
}
function mark_read(action)
@@ -89,63 +253,54 @@
function change_filter(action)
{
- document.messageList.changeFilter.value = action;
- document.messageList.submit() ;
+ document.searchForm.changeFilter.value = action;
+ document.searchForm.submit() ;
}
//-->
</script>
+<ddiv class="main_body" style="font-weight:bold; height:18%; width:100%;
left:0px; vertical-align:bottom;">
-<center>
-
-<FORM name=messageList method=post action="{url_change_folder}">
-
-<TABLE WIDTH="99%" CELLPADDING="0" CELLSPACING="0" BORDER="0"
style="height:50%; vertical-align : bottom;">
+<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0">
<TR>
<TD BGCOLOR="{row_off}">
- <TABLE style='background:#f3f3ff;' bBGCOLOR="{row_off}"
COLS=2 BORDER="0" cellpadding=0 cellspacing=0 width="100%">
+ <TABLE style='background:#f3f3ff;' bBGCOLOR="{row_off}"
COLS=2 BORDER="0" cellpadding=0 cellspacing=0 width="100%" height="100%">
<TR valign="middle">
- <td nowrap width="100%" align="LEFT"
valign="top" bgcolor="#ffffcc" colspan="7" style='font-size:8.0pt;
font-family:Arial;'>
+ <form name=searchForm method=post
action="{url_search_settings}">
+ <td colspan="1" bgcolor="#ffffcc"
align="left" width="70%">
+ {lang_quicksearch}:
+ <input type="text" size="50"
name="quickSearch" value="{quicksearch}"
+
onChange="javascript:document.searchForm.submit()">
+ </td>
+ <td align="center" bgcolor="#ffffcc">
+ {quota_display}
+ </td>
+ <td bgcolor="#ffffcc" align="right"
width="30%" valign="middle">
+ <input type=hidden
name="changeFilter">
+ <select name="filter"
onChange="javascript:document.searchForm.submit()">
+ {filter_options}
+ </SELECT>
+ </td>
+ </form>
+ </TR>
+
+ <TR BGCOLOR="{row_off}">
+ <TD width="30%" ALIGN="left" nowrap
style='font-size:9.0pt; font-family:Arial;color:#5A538D;border=0px solid
#B0A3D9;font-weight:bold;'>
+ <a class="body_link"
href="{url_compose_empty}">{lang_compose}</a>
+ <a class="body_link"
href="{url_filter}">{lang_edit_filter}</a>
+ </td>
+ <TD colspan="2" width="70%"
ALIGN="right" nowrap style='font-size:9.0pt;
font-family:Arial;color:#5A538D;border=0px solid #000000;font-weight:bold;'>
+ <FORM name=messageList
method=post action="{url_change_folder}">
+ <SMALL><INPUT id="changefolder"
TYPE=radio NAME="folderAction" value="changeFolder"
{change_folder_checked}>{lang_change_folder}</SMALL>
+ <SMALL><INPUT id="movemessage"
TYPE=radio NAME="folderAction" value="moveMessage"
{move_message_checked}>{lang_move_message}</SMALL>
<TT><SMALL>
<SELECT NAME="mailbox"
onChange="document.messageList.submit()">
{options_folder}
</SELECT></SMALL></TT>
- <SMALL><INPUT TYPE=radio
NAME="folderAction" value="changeFolder"
{change_folder_checked}>{lang_change_folder}</SMALL>
- <SMALL><INPUT TYPE=radio
NAME="folderAction" value="moveMessage"
{move_message_checked}>{lang_move_message}</SMALL>
<noscript>
<NOBR><SMALL><INPUT
TYPE=SUBMIT NAME="moveButton" VALUE="{lang_doit}"></SMALL></NOBR>
</noscript>
<INPUT TYPE=hidden
NAME="oldMailbox" value="{oldMailbox}">
- </TD>
- <td bgcolor="#ffffcc" align="right">
- <SMALL>
- <input type=hidden
name="changeFilter">
- <select name="filter"
onChange="javascript:change_filter('changeFilter')">
- {filter_options}
- </SELECT></SMALL>
- </td>
- </TR>
- <TR BGCOLOR="{row_off}">
- <TD width="30%" colspan="4"
ALIGN="left" nowrap style='font-size:8.0pt;
font-family:Arial;color:#5A538D;border=0px solid #B0A3D9;'>
- {lang_mark_messages_as}:
- </td>
- <TD width="30%" colspan="4"
ALIGN="right" nowrap style='font-size:8.0pt;
font-family:Arial;color:#5A538D;border=0px solid #B0A3D9;'>
- <a class="body_link"
href="{url_compose_empty}">{lang_compose}</a>
- <a class="body_link"
href="{url_filter}">{lang_edit_filter}</a>
- </td>
- </tr>
- <tr>
- <td width="10%" colspan="4"
align="left" nowrap style='font-size:8.0pt;
font-family:Arial;color:#5A538D;border=0px solid #B0A3D9;'>
- <input type=hidden
name="mark_read">
- <input type=hidden
name="mark_unread">
- <input type=hidden
name="mark_flagged">
- <input type=hidden
name="mark_unflagged">
- <a class="body_link"
href="javascript:mark_read('mark_read')">{lang_read}</a>/<a class="body_link"
href="javascript:mark_unread('mark_unread')">{lang_unread}</a>
- <a class="body_link"
href="javascript:mark_flagged('mark_flagged')">{lang_flagged}</a>/<a
class="body_link"
href="javascript:mark_unflagged('mark_unflagged')">{lang_unflagged}</a>
- </td>
- <td width="10%" colspan="4"
align="right" nowrap style='font-size:8.0pt;
font-family:Arial;color:#5A538D;border=0px solid #B0A3D9;'>
- <input type=hidden
name="mark_deleted">
- <a class="body_link"
href="javascript:mark_deleted('mark_deleted')">{lang_delete_selected}</a><br>
</td>
</tr>
</TABLE>
@@ -153,10 +308,11 @@
</TR>
{status_row}
</table>
- <table WIDTH=99% BORDER=0 CELLPADDING="0"
CELLSPACING="0" style="height:20%; vertical-align : bottom;">
+
+<table border="0" width="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
<tr>
<td width="3%" bgcolor="#FFFFCC"
align="center">
-
+ <input name="masterSelect"
type="checkbox" onClick="javascript:mark()">
</td>
<td width="22%" bgcolor="#FFFFCC"
align="center">
<b><a
href="{url_sort_from}"><font color="black">{lang_from}</font></a></b>
@@ -174,24 +330,19 @@
<b>{lang_size}</b>
</td>
</tr>
- </table>
-</center>
-</div>
-<div class="main_body" style="position: absolute; border-width:0px;
border-style:dotted; width :
-100% ; height: 85%; left : 0px ; top : 15% ; overflow : auto">
- <center>
- <table WIDTH=99% CELLPADING="0" CELLSPACING="0"
bgcolor="#FFFFFF">
+</table>
+
+
+ <table WIDTH=100% CELLPADING="0" CELLSPACING="0"
bgcolor="#FFFFFF">
{header_rows}
</table>
- </center>
-</div>
</FORM>
<!-- END main -->
<!-- BEGIN status_row_tpl -->
<tr>
<TD valign="bottom">
- <table WIDTH=100% BORDER=0 CELLPADDING=1 CELLSPACING=0>
+ <table WIDTH=100% HEIGHT="100%" BORDER=0 CELLPADDING=1
CELLSPACING=0>
<tr BGCOLOR="#FFFFFF">
<td width="18%">
{link_previous} | {link_next}
@@ -205,8 +356,24 @@
<td width="18%">
{trash_link}
</td>
- <td align="right" width="18%">
- {select_all_link}
+ <td align="right" width="18%" nowrap
style='font-size:9.0pt; font-family:Arial; font-weight:bold;'>
+ <!-- {select_all_link} -->
+ <input type=hidden
name="mark_read">
+ <input type=hidden
name="mark_unread">
+ <input type=hidden
name="mark_flagged">
+ <input type=hidden
name="mark_unflagged">
+ <input type=hidden
name="mark_deleted">
+ <a class="body_link"
href="javascript:mark_read('mark_read')">{lang_read}</a>
+
+ <a class="body_link"
href="javascript:mark_unread('mark_unread')">{lang_unread}</a>
+
+ <a class="body_link"
href="javascript:mark_flagged('mark_flagged')">{lang_flagged}</a>
+
+ <a class="body_link"
href="javascript:mark_unflagged('mark_unflagged')">{lang_unflagged}</a>
+
+ <a class="body_link"
href="javascript:mark_deleted('mark_deleted')">{lang_delete}</a>
+
+
</td>
</tr>
</table>
@@ -215,340 +382,50 @@
<!-- END status_row_tpl -->
-<!-- BEGIN header_row_S -->
-<tr>
- <td class="header_row_S" width="3%" bgcolor="#FFFFFF" align="center"
valign="middle">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_S" width="24%" bgcolor="#FFFFFF" nowrap
valign="middle">
- <a class="header_row_S"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_S" width="9%" bgcolor="#FFFFFF" nowrap
align="center" valign="middle">
- {date}
+<!-- BEGIN header_row -->
+<tr onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" class="{row_css_class}"
id="msg_tr_{message_counter}">
+ <td class="{row_css_class}" width="3%" align="center">
+ <input class="{row_css_class}" type="checkbox"
id="msg_input_{message_counter}" name="msg[{message_counter}]"
value="{message_uid}" onClick="toggleFolderRadio('{message_counter}')"
{row_selected}>
</td>
- <td class="header_row_S" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_small.png" width="16" border="0"
alt="{lang_read}" title="{lang_read}">
+ <td class="{row_css_class}" width="24%" nowrap>
+ <a class="{row_css_class}" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
+ <a class="{row_css_class}" name="link_addr_image"
href="{url_add_to_addressbook}"><img valign="middle"
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
</td>
- <td class="header_row_S" bgcolor="#FFFFFF" valign="middle">
- <a class="header_row_S"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_S" width="5%" bgcolor="#FFFFFF" valign="middle">
- {size}
- </td>
-</tr>
-<!-- END header_row_S -->
-
-<!-- BEGIN header_row_RS -->
-<tr>
- <td class="header_row_S" width="3%" bgcolor="#FFFFFF" align="center"
valign="middle">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_S" width="24%" bgcolor="#FFFFFF" nowrap
valign="middle">
- <a class="header_row_S"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_S" width="9%" bgcolor="#FFFFFF" nowrap
align="center" valign="middle">
- {date}
- </td>
- <td class="header_row_S" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_small.png" width="16" border="0"
alt="{lang_read}" title="{lang_read}">
- </td>
- <td class="header_row_S" bgcolor="#FFFFFF" valign="middle">
- <a class="header_row_S"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_S" width="5%" bgcolor="#FFFFFF" valign="middle">
- {size}
- </td>
-</tr>
-<!-- END header_row_RS -->
-
-<!-- BEGIN header_row_ -->
-<tr>
- <td class="header_row_" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
+ <td class="{row_css_class}" width="9%" nowrap align="center"
style="color: black;">
{date}
</td>
- <td class="header_row_" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/unread_small.png" width="16" border="0"
alt="{lang_unread}" title="{lang_unread}">
+ <td class="{row_css_class}" width="8%" align="middle" style="color:
black;">
+ {state}
+<!-- <img class="{row_css_class}" src="{image_path}/{imageName}"
width="16" border="0" alt="{lang_read}" title="{lang_read}">
+ --> {row_text}
</td>
- <td class="header_row_" bgcolor="#FFFFFF">
- <a class="header_row_"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
+ <td class="{row_css_class}">
+ <a class="{row_css_class}" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
</td>
- <td class="header_row_" width="5%" bgcolor="#FFFFFF">
+ <td class="{row_css_class}" width="5%">
{size}
</td>
</tr>
-<!-- END header_row_ -->
+<!-- END header_row -->
-<!-- BEGIN header_row_F -->
-<tr>
- <td class="header_row_F" width="3%" bgcolor="#FFFFFF" align="center"
valign="middle">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_F" width="24%" bgcolor="#FFFFFF" nowrap
valign="middle">
- <a class="header_row_F"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_F" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_F" width="3%" bgcolor="#FFFFFF" align="center"
valign="middle">
- <img src="{image_path}/unread_flagged_small.png" width="16"
border="0" alt="{lang_unread}, {lang_flagged}" title="{lang_unread},
{lang_flagged}">
- </td>
- <td class="header_row_F" bgcolor="#FFFFFF" valign="middle">
- <a class="header_row_F"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_F" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_F -->
-
-<!-- BEGIN header_row_R -->
-<tr>
- <td class="header_row_R" width="3%" bgcolor="#FFFFFF" align="center"
valign="middle">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_R" width="24%" bgcolor="#FFFFFF" nowrap
valign="middle">
- <a class="header_row_R"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_R" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_R" width="3%" bgcolor="#FFFFFF" align="center"
valign="middle">
- <img src="{image_path}/recent_small.gif" width="16" border="0"
alt="{lang_recent}" title="{lang_recent}">
- </td>
- <td class="header_row_R" bgcolor="#FFFFFF">
- <a class="header_row_R"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_R" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_R -->
-
-<!-- BEGIN header_row_AS -->
-<tr>
- <td class="header_row_S" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_S" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_S"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_S" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_S" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_answered_small.png" width="16"
border="0" alt="{lang_replied}" title="{lang_replied}">
- </td>
- <td class="header_row_S" bgcolor="#FFFFFF">
- <a class="header_row_S"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_S" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_AS -->
-
-<!-- BEGIN header_row_RAS -->
-<tr>
- <td class="header_row_S" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_S" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_S"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_S" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_S" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_answered_small.png" width="16"
border="0" alt="{lang_replied}" title="{lang_replied}">
- </td>
- <td class="header_row_S" bgcolor="#FFFFFF">
- <a class="header_row_S"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_S" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_RAS -->
-
-<!-- BEGIN header_row_A -->
-<tr>
- <td class="header_row_" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_answered_small.png" width="16"
border="0" alt="{lang_replied}" title="{lang_replied}">
- </td>
- <td class="header_row_" bgcolor="#FFFFFF">
- <a class="header_row_"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_A -->
-
-
-<!-- BEGIN header_row_ADS -->
-<tr>
- <td class="header_row_ADS" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_ADS" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_ADS"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_ADS" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_ADS" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_answered_deleted_small.png"
width="16" border="0" alt="{lang_replied}, {lang_deleted}"
title="{lang_replied}, {lang_deleted}">
- </td>
- <td class="header_row_ADS" bgcolor="#FFFFFF">
- <a class="header_row_ADS"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_ADS" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_ADS -->
-
-<!-- BEGIN header_row_FS -->
-<tr>
- <td class="header_row_FS" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_FS" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_FS"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_FS" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_FS" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_flagged_small.png" width="16"
border="0" alt="{lang_read}, {lang_flagged}" title="{lang_read},
{lang_flagged}">
- </td>
- <td class="header_row_FS" bgcolor="#FFFFFF">
- <a class="header_row_FS"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
name="subject_url" href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_FS" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_FS -->
-
-<!-- BEGIN header_row_FAS -->
-<tr>
- <td class="header_row_FS" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_FS" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_FS"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_FS" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_FS" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_answered_flagged_small.png"
width="16" border="0" alt="{lang_replied}, {lang_flagged}"
title="{lang_replied}, {lang_flagged}">
- </td>
- <td class="header_row_FS" bgcolor="#FFFFFF">
- <a class="header_row_FS"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_FS" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_FAS -->
-
-<!-- BEGIN header_row_FA -->
-<tr>
- <td class="header_row_FS" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_FS" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_F"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_FS" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_FS" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_answered_flagged_small.png"
width="16" border="0" alt="{lang_replied}, {lang_flagged}"
title="{lang_replied}, {lang_flagged}">
- </td>
- <td class="header_row_FS" bgcolor="#FFFFFF">
- <a class="header_row_F"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_FS" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_FA -->
-
-<!-- BEGIN header_row_D -->
-<tr>
- <td class="header_row_D" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_D" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_D"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_D" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
- </td>
- <td class="header_row_D" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/unread_deleted_small.png" width="16"
border="0" alt="{lang_unread}, {lang_deleted}" title="{lang_unread},
{lang_deleted}">
- </td>
- <td class="header_row_D" bgcolor="#FFFFFF">
- <a class="header_row_D"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_D" width="5%" bgcolor="#FFFFFF">
- {size}
+<!-- BEGIN error_message -->
+ <tr>
+ <td bgcolor="#FFFFCC" align="center" colspan="6">
+ <font
color="red"><b>{lang_connection_failed}</b></font><br>
+ {message}
</td>
-</tr>
-<!-- END header_row_D -->
+ </tr>
+<!-- END error_message -->
-<!-- BEGIN header_row_DS -->
-<tr>
- <td class="header_row_DS" width="3%" bgcolor="#FFFFFF" align="center">
- <input class="header_row"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" type="checkbox"
name="msg[{message_counter}]" value="{message_uid}"
onClick="toggleFolderRadio()" {row_selected}>
- </td>
- <td class="header_row_DS" width="24%" bgcolor="#FFFFFF" nowrap>
- <a class="header_row_DS"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_sender"
href="{url_compose}" title="{full_address}">{sender_name}</a>
- <a href="{url_add_to_addressbook}"><img
src="{phpgw_images}/sm_envelope.gif" width="10" height="8" border="0"
align="absmiddle" alt="{lang_add_to_addressbook}"
title="{lang_add_to_addressbook}"></a>
- </td>
- <td class="header_row_DS" width="9%" bgcolor="#FFFFFF" nowrap
align="center">
- {date}
+<!-- BEGIN quota_block -->
+ <table border="1" cellpadding="0" cellspacing="0" width="100%">
+ <tr class="quota" valign="middle">
+ <td width="{leftWidth}%" bgcolor="{quotaBG}"
align="center" valign="middle">
+ <small>{quotaUsage_left}</small>
</td>
- <td class="header_row_DS" width="3%" bgcolor="#FFFFFF" valign="middle"
align="center">
- <img src="{image_path}/read_deleted_small.png" width="16"
border="0" alt="{lang_read}, {lang_deleted}" title="{lang_read},
{lang_deleted}">
+ <td align="center" valign="middle">
+ <small>{quotaUsage_right}</small>
</td>
- <td class="header_row_DS" bgcolor="#FFFFFF">
- <a class="header_row_DS"
onmouseover="parentOn('{message_counter}')"
onmouseout="parentOff('{message_counter}')" name="link_subject"
href="{url_read_message}">{header_subject}</a>
- </td>
- <td class="header_row_DS" width="5%" bgcolor="#FFFFFF">
- {size}
- </td>
-</tr>
-<!-- END header_row_DS -->
-
+ </tr>
+ </table>
+<!-- END quota_block -->
Index: templates/linux-at-work.de/images/attach.gif
===================================================================
RCS file: templates/linux-at-work.de/images/attach.gif
diff -N templates/linux-at-work.de/images/attach.gif
Binary files /dev/null and /tmp/cvsbVbpOt differ
Index: templates/linux-at-work.de/images/down_pointer.gif
===================================================================
RCS file: templates/linux-at-work.de/images/down_pointer.gif
diff -N templates/linux-at-work.de/images/down_pointer.gif
Binary files /dev/null and /tmp/cvs6Z5Rhu differ
Index: templates/linux-at-work.de/images/down_pointer.png
===================================================================
RCS file: templates/linux-at-work.de/images/down_pointer.png
diff -N templates/linux-at-work.de/images/down_pointer.png
Binary files /dev/null and /tmp/cvs7LzfJu differ
Index: templates/linux-at-work.de/images/navbar.gif
===================================================================
RCS file: templates/linux-at-work.de/images/navbar.gif
diff -N templates/linux-at-work.de/images/navbar.gif
Binary files /dev/null and /tmp/cvsK1ocUs differ
Index: templates/linux-at-work.de/images/navbar.png
===================================================================
RCS file: templates/linux-at-work.de/images/navbar.png
diff -N templates/linux-at-work.de/images/navbar.png
Binary files /dev/null and /tmp/cvsKCb8lt differ
Index: templates/linux-at-work.de/images/sm_envelope.gif
===================================================================
RCS file: templates/linux-at-work.de/images/sm_envelope.gif
diff -N templates/linux-at-work.de/images/sm_envelope.gif
Binary files /dev/null and /tmp/cvsba4LOt differ
Index: templates/linux-at-work.de/images/sm_envelope.png
===================================================================
RCS file: templates/linux-at-work.de/images/sm_envelope.png
diff -N templates/linux-at-work.de/images/sm_envelope.png
Binary files /dev/null and /tmp/cvsQzXuJw differ
Index: templates/linux-at-work.de/images/sm_important.png
===================================================================
RCS file: templates/linux-at-work.de/images/sm_important.png
diff -N templates/linux-at-work.de/images/sm_important.png
Binary files /dev/null and /tmp/cvsjnMXdx differ
Index: templates/linux-at-work.de/images/sm_read.png
===================================================================
RCS file: templates/linux-at-work.de/images/sm_read.png
diff -N templates/linux-at-work.de/images/sm_read.png
Binary files /dev/null and /tmp/cvs4KPbJv differ
Index: templates/linux-at-work.de/images/sm_unimportant.png
===================================================================
RCS file: templates/linux-at-work.de/images/sm_unimportant.png
diff -N templates/linux-at-work.de/images/sm_unimportant.png
Binary files /dev/null and /tmp/cvsb8shbw differ
Index: templates/linux-at-work.de/images/sm_unread.png
===================================================================
RCS file: templates/linux-at-work.de/images/sm_unread.png
diff -N templates/linux-at-work.de/images/sm_unread.png
Binary files /dev/null and /tmp/cvs49IyZy differ
Index: templates/linux-at-work.de/images/sort_none.gif
===================================================================
RCS file: templates/linux-at-work.de/images/sort_none.gif
diff -N templates/linux-at-work.de/images/sort_none.gif
Binary files /dev/null and /tmp/cvslA0Enz differ
Index: templates/linux-at-work.de/images/sort_none.png
===================================================================
RCS file: templates/linux-at-work.de/images/sort_none.png
diff -N templates/linux-at-work.de/images/sort_none.png
Binary files /dev/null and /tmp/cvscPUMQz differ
Index: templates/linux-at-work.de/images/up_pointer.gif
===================================================================
RCS file: templates/linux-at-work.de/images/up_pointer.gif
diff -N templates/linux-at-work.de/images/up_pointer.gif
Binary files /dev/null and /tmp/cvsD6im0x differ
Index: templates/linux-at-work.de/images/up_pointer.png
===================================================================
RCS file: templates/linux-at-work.de/images/up_pointer.png
diff -N templates/linux-at-work.de/images/up_pointer.png
Binary files /dev/null and /tmp/cvsW9Wrpy differ
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] felamimail Changelog addressbook.php index.php ...,
Sigurd Nes <=