[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail inc/class.bofelamimail.inc.php inc/c...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] felamimail inc/class.bofelamimail.inc.php inc/c... |
|
Date: |
Tue, 19 Dec 2006 15:20:36 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Sigurd Nes <sigurdne> 06/12/19 15:20:36
Modified files:
inc : class.bofelamimail.inc.php
class.bopreferences.inc.php
class.socaching.inc.php class.uicompose.inc.php
class.uidisplay.inc.php
class.uifelamimail.inc.php
hook_preferences.inc.php
templates/base : addressbook.tpl
Log message:
mostly notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bopreferences.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.socaching.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uidisplay.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uifelamimail.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/addressbook.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: inc/class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- inc/class.bofelamimail.inc.php 18 Dec 2006 20:03:32 -0000 1.10
+++ inc/class.bofelamimail.inc.php 19 Dec 2006 15:20:36 -0000 1.11
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bofelamimail.inc.php,v 1.10 2006/12/18 20:03:32 sigurdne
Exp $ */
+ /* $Id: class.bofelamimail.inc.php,v 1.11 2006/12/19 15:20:36 sigurdne
Exp $ */
class bofelamimail
{
@@ -487,14 +487,14 @@
$messageData['date'] =
$header->udate;
$messageData['subject'] =
$header->subject;
- $messageData['to_name'] =
$header->to[0]->personal;
+ $messageData['to_name'] =
(isset($header->to[0]->personal)?$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($sections['attachment']))
+ if (isset($sections['attachment']) &&
is_array($sections['attachment']))
{
$messageData['attachments']
= "true";
}
@@ -574,7 +574,7 @@
// now lets gets the important messages
$filterList = $bofilter->getFilterList();
$activeFilter = $bofilter->getActiveFilter();
- $filter = $filterList[$activeFilter];
+ $filter =
(isset($filterList[$activeFilter])?$filterList[$activeFilter]:'');
$displayHeaders = $caching->getHeaders($_startMessage,
$_numberOfMessages, $_sort, $filter);
$count=0;
@@ -636,7 +636,7 @@
# printf ("this->bofelamimail->getHeaders done:
%s<br>",date("H:i:s",mktime()));
- if(is_array($retValue['header']))
+ if(isset($retValue['header']) &&
is_array($retValue['header']))
{
$retValue['info']['total'] =
$caching->getMessageCounter($filter);
$retValue['info']['first'] =
$_startMessage;
@@ -780,7 +780,7 @@
// return the qouta of the users INBOX
function getQuotaRoot()
{
- if(is_array($this->storageQuota))
+ if(isset($this->storageQuota) &&
is_array($this->storageQuota))
{
return $this->storageQuota;
}
@@ -962,7 +962,7 @@
#print "found text $_partID<br>";
$mime_type = "text";
$data['encoding'] =
$_structure->encoding;
- $data['size'] =
$_structure->bytes;
+ $data['size'] =
(isset($_structure->bytes)?$_structure->bytes:'');
$data['partID'] = $_partID;
$data["mimeType"] =
$mime_type."/". strtolower($_structure->subtype);
$data["name"] =
lang("unknown");
@@ -985,7 +985,7 @@
// if partID[0] is set, we have no
attachments
if($_partID == '') $_partID = '0';
- if
(strtolower($_structure->disposition) == "attachment" ||
+ if (isset($_structure->disposition) &&
strtolower($_structure->disposition) == "attachment" ||
$data["name"] !=
lang("unknown"))
{
#print "found a attachment<br>";
@@ -1039,7 +1039,6 @@
array('text/plain' => 2,
'text/html' => 1);
break;
-
default:
$allowedMimeType =
array("text/plain" => 1);
@@ -1048,7 +1047,7 @@
break;
}
// add
only allowed mime types to the list
-
if($allowedMimeType[$partData['mimeType']])
+
if(isset($allowedMimeType[$partData['mimeType']]) &&
$allowedMimeType[$partData['mimeType']])
{
// now let only the prefered part one survive
#print $orderOfMimeType[$partData['mimeType']]."<br>".
@@ -1056,7 +1055,10 @@
#$lastPartID."<br>";
if($orderOfMimeType[$partData['mimeType']] > $lastPartID)
{
+
if(isset($retData['body'][$lastPartID]))
+
{
unset($retData['body'][$lastPartID]);
+
}
$retData['body'][$partID] = $partData;
$lastPartID = $partID;
}
@@ -1068,7 +1070,7 @@
}
}
}
-
if(is_array($structureData['attachment']))
+
if(isset($structureData['attachment']) &&
is_array($structureData['attachment']))
{
reset($structureData['attachment']);
while(list($partID,$partData) = each($structureData['attachment']))
@@ -1078,7 +1080,6 @@
}
}
break;
-
case TYPEMESSAGE:
#print "found message $_partID<br>";
$mime_type = "message";
Index: inc/class.bopreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- inc/class.bopreferences.inc.php 18 Dec 2006 20:03:32 -0000 1.7
+++ inc/class.bopreferences.inc.php 19 Dec 2006 15:20:36 -0000 1.8
@@ -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.7 2006/12/18 20:03:32 sigurdne
Exp $ */
+ /* $Id: class.bopreferences.inc.php,v 1.8 2006/12/19 15:20:36 sigurdne
Exp $ */
class bopreferences
{
@@ -63,7 +63,7 @@
$data['defaultDomainname'] =
$GLOBALS['phpgw_info']["server"]["mail_suffix"];
$data['smtpServerAddress'] =
$GLOBALS['phpgw_info']["server"]["smtp_server"];
- $data['smtpPort'] =
$GLOBALS['phpgw_info']["server"]["smtp_port"];
+ $data['smtpPort'] =
(isset($GLOBALS['phpgw_info']["server"]["smtp_port"])?$GLOBALS['phpgw_info']["server"]["smtp_port"]:'');
// check for felamimail specific settings
if(!empty($felamimailConfig['imapServer']))
@@ -73,7 +73,7 @@
$data['smtpServerAddress'] =
$felamimailConfig['smtpServer'];
if(!empty($felamimailConfig['smtpServer']))
- $data['smtpPort'] =
$felamimailConfig['smtpPort'];
+ $data['smtpPort'] =
(isset($felamimailConfig['smtpPort'])?$felamimailConfig['smtpPort']:'');
if(!empty($felamimailConfig['mailSuffix']))
$data['defaultDomainname'] =
$felamimailConfig['mailSuffix'];
@@ -158,22 +158,22 @@
$data['deleteOptions'] = 'mark_as_deleted';
}
- $data['htmlOptions'] =
$userPrefs['felamimail']['htmlOptions'];
+ $data['htmlOptions'] =
(isset($userPrefs['felamimail']['htmlOptions'])?$userPrefs['felamimail']['htmlOptions']:'');
// where is the trash folder
- $data['trash_folder'] =
$userPrefs['felamimail']['trashFolder'];
+ $data['trash_folder'] =
(isset($userPrefs['felamimail']['trashFolder'])?$userPrefs['felamimail']['trashFolder']:'');
if(!empty($userPrefs['felamimail']['sentFolder']))
{
- $data['sent_folder'] =
$userPrefs['felamimail']['sentFolder'];
- $data['sentFolder'] =
$userPrefs['felamimail']['sentFolder'];
+ $data['sent_folder'] =
(isset($userPrefs['felamimail']['sentFolder'])?$userPrefs['felamimail']['sentFolder']:'');
+ $data['sentFolder'] =
$data['sent_folder']; //$userPrefs['felamimail']['sentFolder'];
}
- $data['refreshTime'] =
$userPrefs['felamimail']['refreshTime'];
+ $data['refreshTime'] =
(isset($userPrefs['felamimail']['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'] =
$userPrefs['felamimail']['email_sig'];
+ $data['signature'] =
(isset($userPrefs['felamimail']['email_sig'])?$userPrefs['felamimail']['email_sig']:'');
#_debug_array($data);
return $data;
Index: inc/class.socaching.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.socaching.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.socaching.inc.php 18 Dec 2006 20:03:32 -0000 1.6
+++ inc/class.socaching.inc.php 19 Dec 2006 15:20:36 -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.socaching.inc.php,v 1.6 2006/12/18 20:03:32 sigurdne Exp
$ */
+ /* $Id: class.socaching.inc.php,v 1.7 2006/12/19 15:20:36 sigurdne Exp
$ */
class socaching
{
@@ -95,6 +95,7 @@
{
$this->db->limit_query("$query",$_firstMessage-1,__LINE__,__FILE__,$_numberOfMessages);
}
+ $retValue = array();
while($this->db->next_record())
{
$retValue[] = array(
@@ -150,9 +151,9 @@
// but use the use filter
function getMessageCounter($_filter)
{
- if(is_array($_filter))
- {
$filter = '';
+ if(isset($_filter) && is_array($_filter))
+ {
while(list($key,$value) = @each($_filter))
{
if($filter != '') $filter .= " or ";
@@ -276,14 +277,25 @@
addslashes($this->foldername),
addslashes($this->accountname));
$this->db->query($query);
- $query = sprintf("insert into
phpgw_felamimail_folderstatus ".
+ $values = array
+ (
+ $this->accountid,
+ addslashes($this->hostname),
+ addslashes($this->foldername),
+ addslashes($this->accountname),
+ $_status->messages,
+ $_status->recent,
+ $_status->unseen,
+ $_status->uidnext,
+ $_status->uidvalidity
+ );
+
+ $values = $this->db->validate_insert($values);
+ $query = "INSERT INTO phpgw_felamimail_folderstatus ".
"(accountid,hostname,foldername,accountname,messages,recent,unseen,uidnext,uidvalidity)
".
-
"values('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
- $this->accountid, addslashes($this->hostname),
- addslashes($this->foldername),
addslashes($this->accountname),
- $_status->messages, $_status->recent,
$_status->unseen, $_status->uidnext,
- $_status->uidvalidity);
- $this->db->query($query);
+ "values($values)";
+
+ $this->db->query($query,__LINE__,__FILE__);
}
}
?>
Index: inc/class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.uicompose.inc.php 18 Dec 2006 20:03:32 -0000 1.6
+++ inc/class.uicompose.inc.php 19 Dec 2006 15:20:36 -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.uicompose.inc.php,v 1.6 2006/12/18 20:03:32 sigurdne Exp
$ */
+ /* $Id: class.uicompose.inc.php,v 1.7 2006/12/19 15:20:36 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] = 'row_on';
+ $this->rowColor[1] = 'row_off';
}
@@ -71,7 +71,7 @@
$formData['body'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['body']);
$formData['priority'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['priority']);
$formData['signature'] =
$this->bocompose->stripSlashes($GLOBALS['HTTP_POST_VARS']['signature']);
- $formData['mailbox'] =
$GLOBALS['HTTP_GET_VARS']['mailbox'];
+ $formData['mailbox'] =
(isset($GLOBALS['HTTP_GET_VARS']['mailbox'])?$GLOBALS['HTTP_GET_VARS']['mailbox']:'');
if (isset($GLOBALS['HTTP_POST_VARS']['send']))
{
@@ -174,20 +174,20 @@
// header
$this->t->set_var("from",htmlentities($this->bocompose->getUserName(),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->set_var("to",htmlentities((isset($sessionData['to'])?$sessionData['to']:''),ENT_QUOTES));
+
$this->t->set_var("cc",htmlentities((isset($sessionData['cc'])?$sessionData['cc']:''),ENT_QUOTES));
+
$this->t->set_var("bcc",htmlentities((isset($sessionData['bcc'])?$sessionData['bcc']:''),ENT_QUOTES));
+
$this->t->set_var("reply_to",htmlentities((isset($sessionData['reply_to'])?$sessionData['reply_to']:''),ENT_QUOTES));
+
$this->t->set_var("subject",htmlentities((isset($sessionData['subject'])?$sessionData['subject']:''),ENT_QUOTES));
$this->t->pparse("out","header");
// body
- $this->t->set_var("body",$sessionData['body']);
-
$this->t->set_var("signature",$sessionData['signature']);
+
$this->t->set_var("body",(isset($sessionData['body'])?$sessionData['body']:''));
+
$this->t->set_var("signature",(isset($sessionData['signature'])?$sessionData['signature']:''));
$this->t->pparse("out","body_input");
// attachments
- if (is_array($sessionData['attachments']) &&
count($sessionData['attachments']) > 0)
+ if (isset($sessionData['attachments']) &&
is_array($sessionData['attachments']) && count($sessionData['attachments']) > 0)
{
$this->t->set_var('row_color',$this->rowColor[0]);
$this->t->set_var('name',lang('name'));
Index: inc/class.uidisplay.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uidisplay.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.uidisplay.inc.php 18 Dec 2006 20:03:32 -0000 1.6
+++ inc/class.uidisplay.inc.php 19 Dec 2006 15:20:36 -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.uidisplay.inc.php,v 1.6 2006/12/18 20:03:32 sigurdne Exp
$ */
+ /* $Id: class.uidisplay.inc.php,v 1.7 2006/12/19 15:20:36 sigurdne Exp
$ */
class uidisplay
{
@@ -44,8 +44,8 @@
$this->mailPreferences['username'],
$this->mailbox);
- $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
- $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
+ $this->rowColor[0] = 'row_on';
+ $this->rowColor[1] = 'row_off';
if($GLOBALS['HTTP_GET_VARS']['showHeader'] == "false")
{
@@ -71,7 +71,7 @@
$attachments =
$this->bofelamimail->getMessageAttachments($this->uid);
$filterList = $this->bofilter->getFilterList();
$activeFilter = $this->bofilter->getActiveFilter();
- $filter = $filterList[$activeFilter];
+ $filter =
(isset($filterList[$activeFilter])?$filterList[$activeFilter]:'');
$nextMessage =
$this->bocaching->getNextMessage($this->uid, $this->sort, $filter);
#print "<pre>";print_r($rawheaders);print"</pre>";exit;
@@ -117,6 +117,7 @@
$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');
@@ -292,7 +293,7 @@
$this->t->set_var("to_data",$toAddress);
// parse the cc header
- if($headers->ccaddress)
+ if(isset($headers->ccaddress) && $headers->ccaddress)
{
$ccAddress =
$this->emailAddressToHTML($headers->ccaddress);
$this->t->set_var("cc_data",$ccAddress);
@@ -520,7 +521,7 @@
"<a href=\"$link&send_to=$0\"><font
color=\"blue\">$0</font></a>", $body);
$this->t->set_var("body",$body);
-
$this->t->set_var("signature",$sessionData['signature']);
+
$this->t->set_var("signature",(isset($sessionData['signature'])?$sessionData['signature']:''));
// attachments
if (is_array($attachments) && count($attachments) > 0)
Index: inc/class.uifelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/class.uifelamimail.inc.php 18 Dec 2006 20:03:32 -0000 1.9
+++ inc/class.uifelamimail.inc.php 19 Dec 2006 15:20:36 -0000 1.10
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uifelamimail.inc.php,v 1.9 2006/12/18 20:03:32 sigurdne
Exp $ */
+ /* $Id: class.uifelamimail.inc.php,v 1.10 2006/12/19 15:20:36 sigurdne
Exp $ */
class uifelamimail
{
@@ -85,7 +85,7 @@
// delete messages
$this->bofelamimail->sessionData['startMessage']= 1;
}
- elseif($GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.deleteMessage")
+ elseif(isset($GLOBALS['HTTP_GET_VARS']["menuaction"])
&& $GLOBALS['HTTP_GET_VARS']["menuaction"] ==
"felamimail.uifelamimail.deleteMessage")
{
// delete 1 message from the mail reading window
$this->bofelamimail->sessionData['startMessage']= 1;
@@ -121,11 +121,11 @@
#$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] = 'row_on';
+ $this->rowColor[1] = 'row_off';
- $this->dataRowColor[0] = $phpgw_info["theme"]["bg01"];
- $this->dataRowColor[1] = $phpgw_info["theme"]["bg02"];
+ $this->dataRowColor[0] = 'row_on';
+ $this->dataRowColor[1] = 'row_off';
}
@@ -377,6 +377,7 @@
// create the filter ui
$filterList = $bofilter->getFilterList();
$activeFilter = $bofilter->getActiveFilter();
+ $filterUI = '';
// -1 == no filter selected
if($activeFilter == -1)
$filterUI .= "<option value=\"-1\"
selected>".lang('no filter')."</option>";
@@ -465,7 +466,7 @@
$this->t->set_var('header_subject',htmlentities("(".lang('no subject').")"));
}
- if ($mailPreferences['sent_folder'] ==
$this->mailbox)
+ if
(isset($mailPreferences['sent_folder']) && $mailPreferences['sent_folder'] ==
$this->mailbox)
{
if
(!empty($headers['header'][$i]['to_name']))
{
@@ -508,7 +509,7 @@
$this->t->set_var('sender_name',$sender_name);
$this->t->set_var('full_address',$full_address);
-
if($GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
+
if(isset($GLOBALS['HTTP_GET_VARS']["select_all"]) &&
$GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
{
$this->t->set_var('row_selected',"checked");
}
@@ -553,8 +554,9 @@
'menuaction' =>
'addressbook.uiaddressbook.add_email',
'add_email' =>
urlencode($headers['header'][$i]['sender_address']),
'name' =>
urlencode($headers['header'][$i]['sender_name']),
- 'referer' =>
urlencode($GLOBALS['PHP_SELF'].'?'.$GLOBALS['QUERY_STRING'])
+ 'referer' =>
urlencode($_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'])
);
+
$this->t->set_var('url_add_to_addressbook',$GLOBALS['phpgw']->link('/index.php',$linkData));
$this->t->set_var('phpgw_images',PHPGW_IMAGES);
@@ -610,7 +612,9 @@
}
$this->t->set_var('maxMessages',$i);
- if($GLOBALS['HTTP_GET_VARS']["select_all"] ==
"select_all")
+
+ //Fix this: move into next if-block
+ if(isset($GLOBALS['HTTP_GET_VARS']["select_all"]) &&
$GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
{
$this->t->set_var('checkedCounter',$i);
}
@@ -620,7 +624,7 @@
}
// set the select all/nothing link
- if($GLOBALS['HTTP_GET_VARS']["select_all"] ==
"select_all")
+ if(isset($GLOBALS['HTTP_GET_VARS']["select_all"]) &&
$GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
{
// link to unselect all messages
$linkData = array
@@ -711,6 +715,7 @@
}
$this->t->parse('status_row','status_row_tpl',True);
+ $options_folder = '';
@reset($folders);
while(list($key,$value) = @each($folders))
{
Index: inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/hook_preferences.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- inc/hook_preferences.inc.php 18 Dec 2006 20:03:32 -0000 1.10
+++ inc/hook_preferences.inc.php 19 Dec 2006 15:20:36 -0000 1.11
@@ -10,7 +10,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: hook_preferences.inc.php,v 1.10 2006/12/18 20:03:32 sigurdne Exp $ */
+ /* $Id: hook_preferences.inc.php,v 1.11 2006/12/19 15:20:36 sigurdne Exp $ */
{
// Only Modify the $file and $title variables.....
$title = $appname;
@@ -21,9 +21,9 @@
);
$file = array(
- 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=felamimail'),
+ 'Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>'felamimail')),
'Manage Sieve' =>
$GLOBALS['phpgw']->link('/index.php',$sieveLinkData),
- 'Manage Folders' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=felamimail.uipreferences.listFolder')
+ 'Manage Folders' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'felamimail.uipreferences.listFolder'))
);
//Do not modify below this line
display_section($appname,$title,$file);
Index: templates/base/addressbook.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/addressbook.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/addressbook.tpl 18 Dec 2006 20:03:32 -0000 1.3
+++ templates/base/addressbook.tpl 19 Dec 2006 15:20:36 -0000 1.4
@@ -1,22 +1,13 @@
-<!-- $Id: addressbook.tpl,v 1.3 2006/12/18 20:03:32 sigurdne Exp $ -->
+<!-- $Id: addressbook.tpl,v 1.4 2006/12/19 15:20:36 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}">
-<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>
+ <!-- BEGIN theme_stylesheet -->
+ <link href="{theme_style}" type="text/css" rel="StyleSheet">
+ <!-- END theme_stylesheet -->
+
<script LANGUAGE="JavaScript">
function ExchangeTo(thisform)
{
@@ -56,9 +47,9 @@
</script>
</head>
-<body bgcolor="{bg_color}">
+<body>
<center>
-<p><font face="{font}"><b>{lang_addressbook_action}</b></font><br>
+<p><font <b>{lang_addressbook_action}</b><br>
<hr noshade width="98%" align="center" size="1">
<table border="0" width="100%">
@@ -86,7 +77,7 @@
</tr>
</table>
<table border="0" width="100%" cellpadding="2" cellspacing="2">
- <tr bgcolor="{th_bg}">
+ <tr class="th">
<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>
@@ -94,25 +85,23 @@
</tr>
<!-- BEGIN addressbook_list -->
- <tr bgcolor="{tr_color}">
+ <tr class="{tr_class}">
<td><font face="{font}">{firstname}</font></td>
<td><font face="{font}">{lastname}</font></td>
<form>
<td align="center">
- <ffont face="{font}"><input type="text" size="25" name="email"
value="{email}">
+ <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);">
- </ffont>
</td>
</form>
<form>
<td align="center">
- <ffont face="{font}"><input type="text" size="25" name="hemail"
value="{hemail}">
+ <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);">
- </ffont>
</td>
</form>
</tr>