[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/inc class.boaction.inc.php, 1.17.2.1, 1.17
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc class.boaction.inc.php, 1.17.2.1, 1.17.2.2 class.boattach_file.inc.php, 1.4.2.1, 1.4.2.2 class.bofilters.inc.php, 1.14.2.1, 1.14.2.2 class.bofolder.inc.php, 1.8.2.1, 1.8.2.2 class.boindex.inc.php, 1.30.2.4, 1.30.2.5 class.bomessage.inc.php, 1.14.2.1, 1.14.2.2 class.bopreferences.inc.php, 1.23.2.3, 1.23.2.4 class.bosend.inc.php, 1.11.2.1, 1.11.2.2 class.html_widgets.inc.php, 1.3.2.3, 1.3.2.4 class.mail_dcom_base.inc.php, 1.9.2.1, 1.9.2.2 class.mail_dcom_imap.inc.php, 1.21.2.1, 1.21.2.2 class.mail_dcom_nntp.inc.php, 1.4.2.1, 1.4.2.2 class.mail_dcom_pop3.inc.php, 1.11.2.1, 1.11.2.2 class.mail_filters.inc.php, 1.7.2.1, 1.7.2.2 class.mail_msg.inc.php, 1.4.2.1, 1.4.2.2 class.mail_msg_base.inc.php, 1.78.2.4, 1.78.2.5 class.mail_msg_display.inc.php, 1.40.2.2, 1.40.2.3 class.mail_msg_wrappers.inc.php, 1.37.2.2, 1.37.2.3 class.mail_send.inc.php, 1.11.2.1, 1.11.2.2 class.msg_bootstrap.inc.php, 1.2.2.1, 1.2.2.2 class.so_mail_msg.inc.php, 1.1.1.1.2.1, 1.1.1.1.2.2 class.spell.inc.php, 1.2.2.1, 1.2.2.2 class.spell_struct.inc.php, 1.2.2.1, 1.2.2.2 class.spell_svc_none.inc.php, 1.2.2.1, 1.2.2.2 class.spell_svc_php.inc.php, 1.2.2.1, 1.2.2.2 class.svc_debug.inc.php, 1.1.1.1.2.1, 1.1.1.1.2.2 class.svc_nextmatches.inc.php, 1.2.2.1, 1.2.2.2 class.ui_mail_debug.inc.php, 1.2.2.1, 1.2.2.2 class.uiattach_file.inc.php, 1.2.2.1, 1.2.2.2 class.uicompose.inc.php, 1.4.2.2, 1.4.2.3 class.uifilters.inc.php, 1.12.2.3, 1.12.2.4 class.uifolder.inc.php, 1.4.2.2, 1.4.2.3 class.uiindex.inc.php, 1.21.2.2, 1.21.2.3 class.uimessage.inc.php, 1.9.2.3, 1.9.2.4 class.uipreferences.inc.php, 1.16.2.3, 1.16.2.4 class.uisearch.inc.php, 1.1.2.1, 1.1.2.2 functions.inc.php, 1.116.2.1, 1.116.2.2 hook_admin.inc.php, 1.6.2.1, 1.6.2.2 hook_home.inc.php, 1.56.2.1, 1.56.2.2 hook_manual.inc.php, 1.8, 1.8.2.1 hook_notifywindow.inc.php, 1.11, 1.11.2.1 hook_notifywindow_simple.inc.php, 1.9, 1.9.2.1 hook_preferences.inc.php, 1.14.2.5, 1.14.2.6 new_nav.js, 1.1.1.1, NONE selectboxes.js, 1.2, NONE |
|
Date: |
Fri, 12 Sep 2003 21:46:21 -0400 |
Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv20201/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boaction.inc.php class.boattach_file.inc.php
class.bofilters.inc.php class.bofolder.inc.php
class.boindex.inc.php class.bomessage.inc.php
class.bopreferences.inc.php class.bosend.inc.php
class.html_widgets.inc.php class.mail_dcom_base.inc.php
class.mail_dcom_imap.inc.php class.mail_dcom_nntp.inc.php
class.mail_dcom_pop3.inc.php class.mail_filters.inc.php
class.mail_msg.inc.php class.mail_msg_base.inc.php
class.mail_msg_display.inc.php class.mail_msg_wrappers.inc.php
class.mail_send.inc.php class.msg_bootstrap.inc.php
class.so_mail_msg.inc.php class.spell.inc.php
class.spell_struct.inc.php class.spell_svc_none.inc.php
class.spell_svc_php.inc.php class.svc_debug.inc.php
class.svc_nextmatches.inc.php class.ui_mail_debug.inc.php
class.uiattach_file.inc.php class.uicompose.inc.php
class.uifilters.inc.php class.uifolder.inc.php
class.uiindex.inc.php class.uimessage.inc.php
class.uipreferences.inc.php class.uisearch.inc.php
functions.inc.php hook_admin.inc.php hook_home.inc.php
hook_manual.inc.php hook_notifywindow.inc.php
hook_notifywindow_simple.inc.php hook_preferences.inc.php
Removed Files:
Tag: Version-0_9_16-branch
new_nav.js selectboxes.js
Log Message:
reimport to remove the broken prefs changes
Index: class.boaction.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.boaction.inc.php,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -C2 -r1.17.2.1 -r1.17.2.2
*** class.boaction.inc.php 8 Sep 2003 08:33:30 -0000 1.17.2.1
--- class.boaction.inc.php 13 Sep 2003 01:46:14 -0000 1.17.2.2
***************
*** 702,706 ****
$GLOBALS['phpgw']->msg->set_arg_value('folder',
$new_folder, $new_acctnum);
! // (b) LOOP thru Gathered Args, setting the
class args to those values
reset($new_args_env);
while(list($key,$value) = each($new_args_env))
--- 702,706 ----
$GLOBALS['phpgw']->msg->set_arg_value('folder',
$new_folder, $new_acctnum);
! // (b) LOOP thru Gathered Args, setting the
class args to those values
reset($new_args_env);
while(list($key,$value) = each($new_args_env))
***************
*** 966,970 ****
$GLOBALS['phpgw']->msg->set_arg_value('folder',
$new_folder, $new_acctnum);
! // (b) LOOP thru Gathered Args, setting the class args
to those values
if ($this->debug_new_env > 1) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.apply_new_args_env
('.__LINE__.'): continue by LOOPING thru Final Gathered Args, setting the class
args to those values that are not still "-1" (that data was found for)<br>'); }
reset($new_args_env);
--- 966,970 ----
$GLOBALS['phpgw']->msg->set_arg_value('folder',
$new_folder, $new_acctnum);
! // (b) LOOP thru Gathered Args, setting the class args
to those values
if ($this->debug_new_env > 1) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.apply_new_args_env
('.__LINE__.'): continue by LOOPING thru Final Gathered Args, setting the class
args to those values that are not still "-1" (that data was found for)<br>'); }
reset($new_args_env);
***************
*** 988,998 ****
/*!
@function get_attach
! @abstract browser requests a specific MIME part number, this
function will get it from the mail server
and send it to the browser.
@author Angles and previous maintainers
! @discussion Uses the phpgw api browser class to generate the
headers which preceed the actual attachment
! data. Note this is tricky because different browsers,
especially the MSIE versions, require different headers
! to be present in order to handle the data effectively at the
clients browser. Incorrect headers can cause things
! like the browser not getting the name of the attachment, or not
starting the associated viewer for the attachment,
or even several save_or_open dialogs in a row.
*/
--- 988,998 ----
/*!
@function get_attach
! @abstract browser requests a specific MIME part number, this
function will get it from the mail server
and send it to the browser.
@author Angles and previous maintainers
! @discussion Uses the phpgw api browser class to generate the
headers which preceed the actual attachment
! data. Note this is tricky because different browsers,
especially the MSIE versions, require different headers
! to be present in order to handle the data effectively at the
clients browser. Incorrect headers can cause things
! like the browser not getting the name of the attachment, or not
starting the associated viewer for the attachment,
or even several save_or_open dialogs in a row.
*/
***************
*** 1004,1014 ****
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
!
$this->msg_bootstrap =
CreateObject('email.msg_bootstrap');
$this->msg_bootstrap->ensure_mail_msg_exists('email.boaction.get_attach',
$this->debug);
!
if ($this->debug > 0) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.get_attach: creating
$this->browser <br>'); }
$this->browser = CreateObject('phpgwapi.browser');
!
$msgball =
$GLOBALS['phpgw']->msg->get_arg_value('msgball');
if (!isset($msgball['part_no']))
--- 1004,1014 ----
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
!
$this->msg_bootstrap =
CreateObject('email.msg_bootstrap');
$this->msg_bootstrap->ensure_mail_msg_exists('email.boaction.get_attach',
$this->debug);
!
if ($this->debug > 0) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.get_attach: creating
$this->browser <br>'); }
$this->browser = CreateObject('phpgwapi.browser');
!
$msgball =
$GLOBALS['phpgw']->msg->get_arg_value('msgball');
if (!isset($msgball['part_no']))
***************
*** 1017,1021 ****
$msgball['part_no'] = $part_no;
}
!
// decode rfc2047 encoded attachment name MIME part
headers
// see RFC2047 "Message Header Extensions for Non-ASCII
Text"
--- 1017,1021 ----
$msgball['part_no'] = $part_no;
}
!
// decode rfc2047 encoded attachment name MIME part
headers
// see RFC2047 "Message Header Extensions for Non-ASCII
Text"
***************
*** 1027,1039 ****
$GLOBALS['phpgw']->msg->set_arg_value('name',
$att_name);
}
!
$mime =
strtolower($GLOBALS['phpgw']->msg->get_arg_value('type')) .'/'
.strtolower($GLOBALS['phpgw']->msg->get_arg_value('subtype'));
// do not do this until we get a length
//$this->browser->content_header($GLOBALS['phpgw']->msg->get_arg_value('name'),
$mime);
!
////echo 'get all args dump<pre>';
print_r($GLOBALS['phpgw']->msg->get_all_args()); echo '</pre>';
////echo '$mime: ['.$mime.']<br>';
////echo
'$GLOBALS[phpgw]->msg->get_arg_value(encoding):
['.$GLOBALS['phpgw']->msg->get_arg_value('encoding').']<br>';
!
// ---- 'irregular' "view raw message" functionality
----
if ($msgball['part_no'] == 'raw_message')
--- 1027,1039 ----
$GLOBALS['phpgw']->msg->set_arg_value('name',
$att_name);
}
!
$mime =
strtolower($GLOBALS['phpgw']->msg->get_arg_value('type')) .'/'
.strtolower($GLOBALS['phpgw']->msg->get_arg_value('subtype'));
// do not do this until we get a length
//$this->browser->content_header($GLOBALS['phpgw']->msg->get_arg_value('name'),
$mime);
!
////echo 'get all args dump<pre>';
print_r($GLOBALS['phpgw']->msg->get_all_args()); echo '</pre>';
////echo '$mime: ['.$mime.']<br>';
////echo
'$GLOBALS[phpgw]->msg->get_arg_value(encoding):
['.$GLOBALS['phpgw']->msg->get_arg_value('encoding').']<br>';
!
// ---- 'irregular' "view raw message" functionality
----
if ($msgball['part_no'] == 'raw_message')
***************
*** 1046,1050 ****
$headers_msgball = $msgball;
$headers_msgball['part_no'] = 0;
! // that can also be used to ge tthe raw message
body because phpgw_body() doesn't care about "part_no"
echo
$GLOBALS['phpgw']->msg->phpgw_fetchbody($headers_msgball);
echo
$GLOBALS['phpgw']->msg->phpgw_body($headers_msgball);
--- 1046,1050 ----
$headers_msgball = $msgball;
$headers_msgball['part_no'] = 0;
! // that can also be used to ge tthe raw message
body because phpgw_body() doesn't care about "part_no"
echo
$GLOBALS['phpgw']->msg->phpgw_fetchbody($headers_msgball);
echo
$GLOBALS['phpgw']->msg->phpgw_body($headers_msgball);
***************
*** 1075,1078 ****
--- 1075,1079 ----
$this->output_data =
$GLOBALS['phpgw']->msg->phpgw_fetchbody($msgball);
$size = strlen($this->output_data);
+ $mime =
$this->get_real_mime($GLOBALS['phpgw']->msg->get_arg_value('name'),
$this->output_data);
$this->browser->content_header($GLOBALS['phpgw']->msg->get_arg_value('name'),
$mime, $size);
echo $this->output_data;
***************
*** 1090,1112 ****
$GLOBALS['phpgw']->common->phpgw_exit(False);
}
!
/*!
@function view_html
@abstract special handler to view certain types of html mail
@author Angles
! @discussion Used in special cases when simply giving the client
browser unprocessed html MIME part(s)
! is not a good idea or needs special attention. Not a good idea
means that there is CSS in the html part which would
! totally b0rk the look of the clients browser, or certain
unusual script. Special Handling means a MULTIPART
! RELATED message such as Outkrook stationary or Evolutions
version of the same, where the html has IMG
! tags in it that are not real HREFs but rather a reference to
another MIME part in the same message. To handle
! that this message display code swaps that IMG mime part
reference with an actual URL used by "get_attach" function
! to retrieve that particular MIME part from the email server and
send it to the browser, this the IMG appears in the
! HTML message as intended. In that case the processing is done
before the message is dispayed, and the processed HTML
! part is stored as a form hiddenvar in base64 encoded format.
The user sees a button saying "View HTML", if clicked this
! processed HTML part is submitted to this function which base64
decodes it and sends it to the browser as a simgle
! html page, not a part of a mail like is typical. In either case
the user gets that button and the buttons associated form
! submits data to this function. If the part is not RELATED, i.e.
did not require special IMG tag swapping, then this
! function gets submitted to is a reference to the particular
HTML part of the message and it is sent to the browser
! as a page unto itself. In either case, the part is not
displayed inline with other MIME parts, not displayed in the same
browser window as the rest of the groupware template, instead
this part will be viewed in its own page.
*/
--- 1091,1113 ----
$GLOBALS['phpgw']->common->phpgw_exit(False);
}
!
/*!
@function view_html
@abstract special handler to view certain types of html mail
@author Angles
! @discussion Used in special cases when simply giving the client
browser unprocessed html MIME part(s)
! is not a good idea or needs special attention. Not a good idea
means that there is CSS in the html part which would
! totally b0rk the look of the clients browser, or certain
unusual script. Special Handling means a MULTIPART
! RELATED message such as Outkrook stationary or Evolutions
version of the same, where the html has IMG
! tags in it that are not real HREFs but rather a reference to
another MIME part in the same message. To handle
! that this message display code swaps that IMG mime part
reference with an actual URL used by "get_attach" function
! to retrieve that particular MIME part from the email server and
send it to the browser, this the IMG appears in the
! HTML message as intended. In that case the processing is done
before the message is dispayed, and the processed HTML
! part is stored as a form hiddenvar in base64 encoded format.
The user sees a button saying "View HTML", if clicked this
! processed HTML part is submitted to this function which base64
decodes it and sends it to the browser as a simgle
! html page, not a part of a mail like is typical. In either case
the user gets that button and the buttons associated form
! submits data to this function. If the part is not RELATED, i.e.
did not require special IMG tag swapping, then this
! function gets submitted to is a reference to the particular
HTML part of the message and it is sent to the browser
! as a page unto itself. In either case, the part is not
displayed inline with other MIME parts, not displayed in the same
browser window as the rest of the groupware template, instead
this part will be viewed in its own page.
*/
***************
*** 1118,1128 ****
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
!
$this->msg_bootstrap =
CreateObject('email.msg_bootstrap');
$this->msg_bootstrap->ensure_mail_msg_exists('email.boaction.get_attach',
$this->debug);
!
if ($this->debug > 0) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.view_html: creating
$this->browser <br>'); }
$this->browser = CreateObject('phpgwapi.browser');
!
//$this->browser->content_header($name,$mime);
if
((($GLOBALS['phpgw']->msg->get_isset_arg('html_part')))
--- 1119,1129 ----
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
!
$this->msg_bootstrap =
CreateObject('email.msg_bootstrap');
$this->msg_bootstrap->ensure_mail_msg_exists('email.boaction.get_attach',
$this->debug);
!
if ($this->debug > 0) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.view_html: creating
$this->browser <br>'); }
$this->browser = CreateObject('phpgwapi.browser');
!
//$this->browser->content_header($name,$mime);
if
((($GLOBALS['phpgw']->msg->get_isset_arg('html_part')))
***************
*** 1156,1161 ****
$GLOBALS['phpgw']->common->phpgw_exit(False);
}
!
!
}
?>
--- 1157,1185 ----
$GLOBALS['phpgw']->common->phpgw_exit(False);
}
!
! /**
! * Get the real mime type of an attachment - still not 100%
reliable, but lets see
! *
! * Note this will soon be moved to the api soon - but here as an
interim
! * solution. Also this documentation is in phpdoc - the new
phpgw standard
! *
! * @author skwashd
! * @param string $attach_name name of the attachment
! * @param string $data attachment data
! * @return string mime type for attachment
! */
! function get_real_mimetype($attach_name, $attach_data)
! {
! $mime_magic = createObject('email.mime_magic');
!
! $mime_type = $mime_magic->filename2mime($attach_name);
! if($mime_type == 'application/octet-stream')//lets try
another way
! {
! $mime_type =
$mime_magic->analyze_data($attach_data)
! }
! return $mime_type;
! }
!
!
}
?>
Index: class.boattach_file.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.boattach_file.inc.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
Index: class.bofilters.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bofilters.inc.php,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
Index: class.bofolder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bofolder.inc.php,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
Index: class.boindex.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.boindex.inc.php,v
retrieving revision 1.30.2.4
retrieving revision 1.30.2.5
diff -C2 -r1.30.2.4 -r1.30.2.5
Index: class.bomessage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bomessage.inc.php,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bopreferences.inc.php,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -C2 -r1.23.2.3 -r1.23.2.4
Index: class.bosend.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bosend.inc.php,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
Index: class.html_widgets.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.html_widgets.inc.php,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
Index: class.mail_dcom_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom_base.inc.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
Index: class.mail_dcom_imap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom_imap.inc.php,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -r1.21.2.1 -r1.21.2.2
Index: class.mail_dcom_nntp.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom_nntp.inc.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
Index: class.mail_dcom_pop3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom_pop3.inc.php,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
Index: class.mail_filters.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_filters.inc.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
Index: class.mail_msg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg.inc.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.78.2.4
retrieving revision 1.78.2.5
diff -C2 -r1.78.2.4 -r1.78.2.5
Index: class.mail_msg_display.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_display.inc.php,v
retrieving revision 1.40.2.2
retrieving revision 1.40.2.3
diff -C2 -r1.40.2.2 -r1.40.2.3
*** class.mail_msg_display.inc.php 8 Sep 2003 08:33:34 -0000 1.40.2.2
--- class.mail_msg_display.inc.php 13 Sep 2003 01:46:16 -0000 1.40.2.3
***************
*** 25,29 ****
/* $Id$ */
!
// include this last, it extends mail_msg_wrappers which extends
mail_msg_base
// so (1) include mail_msg_base, (2) incluse mail_msg_wrappers
extending mail_msg_base
--- 25,29 ----
/* $Id$ */
!
// include this last, it extends mail_msg_wrappers which extends
mail_msg_base
[...2222 lines suppressed...]
@author Angles
*/
--- 3078,3094 ----
return $msg_list_display;
}
!
/*!
@function _image_on
@abstract temp replacement for phpgwapi image_on until it supports
images in different dirs.
! @discussion Email themes have a group of similar looking images grouped
into a directory with
! somewhat standard names that AngleMail understands as a themed image
set. phpgwapi does not
! currently support subdirectories under the template images directory.
Params are only to match the
! phpgw api function, we do not really use them. As of this writting, Feb
2003, images used for all themes,
! i.e. are not in a theme subdir but are used, are check and attach on
the index page, they are not even
! sized, and, these are sized but not themed, on the message view page,
are view_nofmt, view_formatted,
! view_headers, view_raw, and view_printable. Remember if these are
themed they must be moved
! into the subdirs, all of them, even if they are copies, and removed
from the main images dir, so it is
! obvious if they are group themed or not.
@author Angles
*/
Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -C2 -r1.37.2.2 -r1.37.2.3
Index: class.mail_send.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_send.inc.php,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
Index: class.msg_bootstrap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.msg_bootstrap.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
Index: class.so_mail_msg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.so_mail_msg.inc.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
Index: class.spell.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.spell.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
Index: class.spell_struct.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.spell_struct.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
Index: class.spell_svc_none.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.spell_svc_none.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
Index: class.spell_svc_php.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.spell_svc_php.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
Index: class.svc_debug.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.svc_debug.inc.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
Index: class.svc_nextmatches.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.svc_nextmatches.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
Index: class.ui_mail_debug.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.ui_mail_debug.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
Index: class.uiattach_file.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uiattach_file.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
Index: class.uicompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uicompose.inc.php,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
Index: class.uifilters.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uifilters.inc.php,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -C2 -r1.12.2.3 -r1.12.2.4
Index: class.uifolder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uifolder.inc.php,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
Index: class.uiindex.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uiindex.inc.php,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -C2 -r1.21.2.2 -r1.21.2.3
Index: class.uimessage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uimessage.inc.php,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -r1.9.2.3 -r1.9.2.4
Index: class.uipreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uipreferences.inc.php,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -C2 -r1.16.2.3 -r1.16.2.4
Index: class.uisearch.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/Attic/class.uisearch.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/functions.inc.php,v
retrieving revision 1.116.2.1
retrieving revision 1.116.2.2
diff -C2 -r1.116.2.1 -r1.116.2.2
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_admin.inc.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_home.inc.php,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -C2 -r1.56.2.1 -r1.56.2.2
Index: hook_manual.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_manual.inc.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
Index: hook_notifywindow.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_notifywindow.inc.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
Index: hook_notifywindow_simple.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_notifywindow_simple.inc.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_preferences.inc.php,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -C2 -r1.14.2.5 -r1.14.2.6
*** hook_preferences.inc.php 8 Sep 2003 08:33:36 -0000 1.14.2.5
--- hook_preferences.inc.php 13 Sep 2003 01:46:18 -0000 1.14.2.6
***************
*** 15,24 ****
$title = $appname;
$file = Array(
! //'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.preferences'),
! 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=email&prefix='),
// need empty prefix
'Extra E-Mail Accounts' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.ex_accounts_list'),
'E-Mail Filters' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uifilters.filters_list')
);
!
if (is_object($GLOBALS['phpgw']->xslttpl))
{
--- 15,23 ----
$title = $appname;
$file = Array(
! 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.preferences'),
'Extra E-Mail Accounts' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.ex_accounts_list'),
'E-Mail Filters' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uifilters.filters_list')
);
! // relfbecker recommends NOT using a version test for xslt check
if (is_object($GLOBALS['phpgw']->xslttpl))
{
***************
*** 40,43 ****
--- 39,72 ----
display_section($appname,$file);
}
+ /*
+ $this_ver = $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
+ $pre_xslt_ver = '0.9.14.0.1.1';
+ if (function_exists(amorethanb))
+ {
+ if (($this_ver)
+ && (amorethanb($this_ver, $pre_xslt_ver)))
+ {
+ // this is the xslt template era
+ display_section($appname,$file);
+ }
+ else
+ {
+ display_section($appname,$title,$file);
+ }
+ }
+ else
+ {
+ if (($this_ver)
+ && ($GLOBALS['phpgw']->common->cmp_version_long($this_ver,
$pre_xslt_ver)))
+ {
+ // this is the xslt template era
+ display_section($appname,$file);
+ }
+ else
+ {
+ display_section($appname,$title,$file);
+ }
+ }
+ */
}
?>
--- new_nav.js DELETED ---
--- selectboxes.js DELETED ---
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc class.boaction.inc.php, 1.17.2.1, 1.17.2.2 class.boattach_file.inc.php, 1.4.2.1, 1.4.2.2 class.bofilters.inc.php, 1.14.2.1, 1.14.2.2 class.bofolder.inc.php, 1.8.2.1, 1.8.2.2 class.boindex.inc.php, 1.30.2.4, 1.30.2.5 class.bomessage.inc.php, 1.14.2.1, 1.14.2.2 class.bopreferences.inc.php, 1.23.2.3, 1.23.2.4 class.bosend.inc.php, 1.11.2.1, 1.11.2.2 class.html_widgets.inc.php, 1.3.2.3, 1.3.2.4 class.mail_dcom_base.inc.php, 1.9.2.1, 1.9.2.2 class.mail_dcom_imap.inc.php, 1.21.2.1, 1.21.2.2 class.mail_dcom_nntp.inc.php, 1.4.2.1, 1.4.2.2 class.mail_dcom_pop3.inc.php, 1.11.2.1, 1.11.2.2 class.mail_filters.inc.php, 1.7.2.1, 1.7.2.2 class.mail_msg.inc.php, 1.4.2.1, 1.4.2.2 class.mail_msg_base.inc.php, 1.78.2.4, 1.78.2.5 class.mail_msg_display.inc.php, 1.40.2.2, 1.40.2.3 class.mail_msg_wrappers.inc.php, 1.37.2.2, 1.37.2.3 class.mail_send.inc.php, 1.11.2.1, 1.11.2.2 class.msg_bootstrap.inc.php, 1.2.2.1, 1.2.2.2 class.so_mail_msg.inc.php, 1.1.1.1.2.1, 1.1.1.1.2.2 class.spell.inc.php, 1.2.2.1, 1.2.2.2 class.spell_struct.inc.php, 1.2.2.1, 1.2.2.2 class.spell_svc_none.inc.php, 1.2.2.1, 1.2.2.2 class.spell_svc_php.inc.php, 1.2.2.1, 1.2.2.2 class.svc_debug.inc.php, 1.1.1.1.2.1, 1.1.1.1.2.2 class.svc_nextmatches.inc.php, 1.2.2.1, 1.2.2.2 class.ui_mail_debug.inc.php, 1.2.2.1, 1.2.2.2 class.uiattach_file.inc.php, 1.2.2.1, 1.2.2.2 class.uicompose.inc.php, 1.4.2.2, 1.4.2.3 class.uifilters.inc.php, 1.12.2.3, 1.12.2.4 class.uifolder.inc.php, 1.4.2.2, 1.4.2.3 class.uiindex.inc.php, 1.21.2.2, 1.21.2.3 class.uimessage.inc.php, 1.9.2.3, 1.9.2.4 class.uipreferences.inc.php, 1.16.2.3, 1.16.2.4 class.uisearch.inc.php, 1.1.2.1, 1.1.2.2 functions.inc.php, 1.116.2.1, 1.116.2.2 hook_admin.inc.php, 1.6.2.1, 1.6.2.2 hook_home.inc.php, 1.56.2.1, 1.56.2.2 hook_manual.inc.php, 1.8, 1.8.2.1 hook_notifywindow.inc.php, 1.11, 1.11.2.1 hook_notifywindow_simple.inc.php, 1.9, 1.9.2.1 hook_preferences.inc.php, 1.14.2.5, 1.14.2.6 new_nav.js, 1.1.1.1, NONE selectboxes.js, 1.2, NONE,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: email/templates/default addressbook.tpl, 1.10.2.1, 1.10.2.2 addressbook-js-bits.tpl, 1.2, NONE addressbook-js-frameset.tpl, 1.2, NONE addressbook-js-smaller.tpl, 1.2, NONE addressbook-js.tpl, 1.2, NONE addressbook-real-plain.tpl-UNUSED, 1.2.2.1, NONE addressbook.tpl-BAD, 1.2.2.1, NONE addressbook.tpl-ORIG, 1.2.2.1, NONE index_main_b0_l1.OLD.tpl, 1.2, NONE index_main_b0_l2.OLD.tpl, 1.2, NONE
- Next by Date:
[Phpgroupware-cvs] CVS: email/inc class.boaction.inc.php, 1.17.2.2, 1.17.2.3
- Previous by thread:
[Phpgroupware-cvs] CVS: email/templates/default addressbook.tpl, 1.10.2.1, 1.10.2.2 addressbook-js-bits.tpl, 1.2, NONE addressbook-js-frameset.tpl, 1.2, NONE addressbook-js-smaller.tpl, 1.2, NONE addressbook-js.tpl, 1.2, NONE addressbook-real-plain.tpl-UNUSED, 1.2.2.1, NONE addressbook.tpl-BAD, 1.2.2.1, NONE addressbook.tpl-ORIG, 1.2.2.1, NONE index_main_b0_l1.OLD.tpl, 1.2, NONE index_main_b0_l2.OLD.tpl, 1.2, NONE
- Next by thread:
[Phpgroupware-cvs] CVS: email/inc class.boaction.inc.php, 1.17.2.2, 1.17.2.3
- Index(es):