[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email ChangeLog.beta1final--1.0,NONE,1.1.2.1 Cha
From: |
Dave Hall <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: email ChangeLog.beta1final--1.0,NONE,1.1.2.1 ChangeLog.codehere--1.1,NONE,1.2.2.1 ChangeLog.core--1.1,NONE,1.1.2.1 ChangeLog.lex--1.1,NONE,1.1.2.1 ChangeLog.ryan--1.1,NONE,1.1.2.1 addressbook-js.changelog.txt,NONE,1.1.2.1 addressbook-js.php,NONE,1.1.2.1 test.php,NONE,1.1.2.1 addressbook.php,1.32.2.4,1.32.2.5 compose.php,1.49.2.1,1.49.2.2 index.php,1.86.2.2,1.86.2.3 view_image.php,1.13.2.3,1.13.2.4 attach_file.php,1.24.2.2,NONE |
Date: |
Wed, 20 Nov 2002 18:03:56 -0500 |
Update of /cvsroot/phpgroupware/email
In directory subversions:/tmp/cvs-serv27209
Modified Files:
Tag: Version-0_9_14-branch
addressbook.php compose.php index.php view_image.php
Added Files:
Tag: Version-0_9_14-branch
ChangeLog.beta1final--1.0 ChangeLog.codehere--1.1
ChangeLog.core--1.1 ChangeLog.lex--1.1 ChangeLog.ryan--1.1
addressbook-js.changelog.txt addressbook-js.php test.php
Removed Files:
Tag: Version-0_9_14-branch
attach_file.php
Log Message:
try again ... anglemail 6-05 port ... email is now fixed!!
--- NEW FILE ---
# do not edit -- automatically generated by larch changelog
--- NEW FILE ---
# do not edit -- automatically generated by arch changelog
# tag: address@hidden/anglemail--codehere--1.1
#
2002-10-24 GMT Angles Puglisi <address@hidden> patch-65
Summary:
spead tweaks for large moves, including using refernces
Revision:
anglemail--codehere--1.1--patch-65
Spead tweaks for large moves, including using refernces to arg values.
Also made a simage move a param for pgpgw_delete in cases where we
are certain there is only one message to proces through the move command.
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.boaction.inc.php
[...2796 lines suppressed...]
version 1.1, this branch was sourced from anglemail--core--1.1 and is
called
anglemail--codehere--1.1, and when code here is ready, it should be star
merged
back into anglemail-core.
So far, anglemail--beta1final--1.0 -> continuation -> anglemail--core--1.1
and now -> continuation -> anglemail--codehere--1.1
SO FAR ALL THESE BRANCHES ARE IDENTICAL. This is just setting the coding
structure for next phase of development, no changes have yet been made
to anglemail--core--1.1 and this branch anglemail--codehere--1.1 has no
changes yet as we are just now making it, and of course "beta1final"
is CLOSED, no more coding in that branch.
new directories:
{arch}/anglemail/anglemail--codehere
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log
--- NEW FILE ---
# do not edit -- automatically generated by arch changelog
# tag: address@hidden/anglemail--core--1.1
#
2002-09-21 GMT Angles Puglisi <address@hidden> patch-3
Summary:
update merge anglemail-codehere (at patch-42) into anglemail-core
Revision:
anglemail--core--1.1--patch-3
Update merge anglemail-codehere (at patch-42) into anglemail-core.
Anglemail-codehere at patch-42 is just after the new addressbook by lex
was merged into the codehere tree, and after some significant bug fixes
including now working with register globals on of off.
So this was a good time to merge this code back into the core branch.
This after release of tarball anglemail-1.1-pre04-07.tar.bz2
The following paragraph was generated by arch command log-for-merge.
Patches applied:
* address@hidden/anglemail--codehere--1.1--patch-42
merge in addressbook code by lex, original one is optional, manual
merge.
* address@hidden/anglemail--codehere--1.1--patch-41
fix object call redirects, attach_file is now
class.boattach_files.attach
* address@hidden/anglemail--codehere--1.1--patch-40
fix the fix to the FILES data in attach_file.php
* address@hidden/anglemail--codehere--1.1--patch-39
fix FILES upload vars and 0k file size, and properly redirect and kill
script after sending mail
* address@hidden/anglemail--codehere--1.1--patch-38
base64 encode 57 bytes at a time, and clear lines after sending
* address@hidden/anglemail--codehere--1.1--patch-37
fix for php v4.2 and greater Superglobals issue
* address@hidden/anglemail--codehere--1.1--patch-36
merge in lex changes for non-aadybook files
* address@hidden/anglemail--codehere--1.1--patch-35
prep_folder_in checks for UWash foldername of "bare slash"
* address@hidden/anglemail--codehere--1.1--patch-34
better RH login "recovering" message, and always try that recovery
* address@hidden/anglemail--codehere--1.1--patch-33
update email lang files from Savannah CVS sources
* address@hidden/anglemail--codehere--1.1--patch-32
fix decode rfc2047 encoded attachment name MIME headers with download
* address@hidden/anglemail--codehere--1.1--patch-31
feature additions from Alex Borges
* address@hidden/anglemail--codehere--1.1--patch-30
patch to hook_notifywindow, thanks Dave Hall
* address@hidden/anglemail--codehere--1.1--patch-29
added debugging output to utf7 en/decode, verified working as per RFC
* address@hidden/anglemail--codehere--1.1--patch-28
patch to attach_file to show file size, thanks Dave Hall
* address@hidden/anglemail--codehere--1.1--patch-27
validate UWash namespace does not contain "bad" stuff
new files:
addressbook-chnagelog.txt addressbook-js.php
inc/selectboxes.js templates/default/addressbook-js-bits.tpl
templates/default/addressbook-js.tpl
templates/default/addressbook-real-plain.tpl-UNUSED
templates/default/addressbook.tpl-BAD
templates/default/addressbook.tpl-ORIG
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-27
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-28
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-29
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-30
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-31
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-32
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-33
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-34
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-35
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-36
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-37
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-38
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-39
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-40
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-41
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-42
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 attach_file.php
inc/class.boaction.inc.php inc/class.boattach_file.inc.php
inc/class.bocompose.inc.php inc/class.bofilters.inc.php
inc/class.bopreferences.inc.php inc/class.bosend.inc.php
inc/class.mail_dcom_base.inc.php
inc/class.mail_dcom_base_sock.inc.php
inc/class.mail_dcom_pop3_sock.inc.php
inc/class.mail_msg_base.inc.php
inc/class.mail_msg_wrappers.inc.php
inc/class.mail_send.inc.php inc/class.spell.inc.php
inc/class.svc_nextmatches.inc.php
inc/class.ui_mail_debug.inc.php inc/class.uicompose.inc.php
inc/class.uimessage.inc.php inc/class.uipreferences.inc.php
inc/hook_notifywindow.inc.php index.php setup/phpgw_da.lang
setup/phpgw_fr.lang setup/phpgw_pt.lang
templates/default/addressbook.tpl
templates/default/attach_file.tpl
templates/default/attach_file_blocks.tpl
templates/default/compose.tpl
new patches:
address@hidden/anglemail--codehere--1.1--patch-27
address@hidden/anglemail--codehere--1.1--patch-28
address@hidden/anglemail--codehere--1.1--patch-29
address@hidden/anglemail--codehere--1.1--patch-30
address@hidden/anglemail--codehere--1.1--patch-31
address@hidden/anglemail--codehere--1.1--patch-32
address@hidden/anglemail--codehere--1.1--patch-33
address@hidden/anglemail--codehere--1.1--patch-34
address@hidden/anglemail--codehere--1.1--patch-35
address@hidden/anglemail--codehere--1.1--patch-36
address@hidden/anglemail--codehere--1.1--patch-37
address@hidden/anglemail--codehere--1.1--patch-38
address@hidden/anglemail--codehere--1.1--patch-39
address@hidden/anglemail--codehere--1.1--patch-40
address@hidden/anglemail--codehere--1.1--patch-41
address@hidden/anglemail--codehere--1.1--patch-42
2002-08-04 GMT Angles Puglisi <address@hidden> patch-2
Summary:
update merge anglemail--codehere--1.1--patch-26 into anglemail--core--1.1
Revision:
anglemail--core--1.1--patch-2
Update merge anglemail--codehere--1.1--patch-26 into anglemail--core--1.1,
where anglemail--codehere--1.1--patch-26 has been released in tarball form
as file anglemail-1.1-pre3-15.tar.bz2 and, although needing some bug fixes,
had been used in production with general success.
Time was good to merge since this code is now a "known" element, and
even the bugs it has are "known" so this merges known elements into the
core branch and allows continued development in the codehere branch.
The following paragraph was generated by arch command log-for-merge.
Patches applied:
* address@hidden/anglemail--codehere--1.1--patch-26
fix mail svc_nextmatches to work with the redirect replacement
* address@hidden/anglemail--codehere--1.1--patch-25
made generalized make new env functions in boaction for public use
* address@hidden/anglemail--codehere--1.1--patch-24
expande no-redirect, handle curley braces, increase big threshhold to
95
* address@hidden/anglemail--codehere--1.1--patch-23
post-multi-delete redirect replaced with a direct object call
* address@hidden/anglemail--codehere--1.1--patch-22
add docs, fix comment in index tpl file
* address@hidden/anglemail--codehere--1.1--patch-21
added docs for move, delete, and expunge functions. DOCS ONLY.
* address@hidden/anglemail--codehere--1.1--patch-20
fix append to sent items folder
* address@hidden/anglemail--codehere--1.1--patch-19
migrate to "industrial_interacct_mail_move", track what needs
expunging, only expunge when done
* address@hidden/anglemail--codehere--1.1--patch-18
bugfixs for extreme caching being on or off
* address@hidden/anglemail--codehere--1.1--patch-17
wrap all new "extreme" caching in conditionals so it can be turned off
* address@hidden/anglemail--codehere--1.1--patch-16
add function to clear all "extreme" cache items, and not be "extreme"
for big moves
* address@hidden/anglemail--codehere--1.1--patch-15
fix moves, deleted, and expunging in extreme caching mode
* address@hidden/anglemail--codehere--1.1--patch-14
first try at no logins unless absolutely necessary
* address@hidden/anglemail--codehere--1.1--patch-13
folder stats now cached and assumed valid for X time, events keep it
current
* address@hidden/anglemail--codehere--1.1--patch-12
implement "extreme" cache management with option in not using it
* address@hidden/anglemail--codehere--1.1--patch-11
Skeleton code for recycling on msgball_list cache
* address@hidden/anglemail--codehere--1.1--patch-10
First code for "events" triggers used to alter cached data.
* address@hidden/anglemail--codehere--1.1--patch-9
added docs for caching
* address@hidden/anglemail--codehere--1.1--patch-8
fix non-contiguous Received filter b0rk, decode rfc headers can handle
multiline now
* address@hidden/anglemail--codehere--1.1--patch-7
expire single "phpgw_header" element for unseen message we are going
to view
* address@hidden/anglemail--codehere--1.1--patch-6
Added phpgw_header data to appsession cache
* address@hidden/anglemail--codehere--1.1--patch-5
sleep 1 sec in end_request, phpgw_fetchstructure data now cached in
appsession
new files:
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-10
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-11
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-12
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-13
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-14
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-15
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-16
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-17
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-18
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-19
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-20
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-21
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-22
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-23
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-24
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-25
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-26
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-5
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-6
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-7
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-8
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-9
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1
inc/class.boaction.inc.php inc/class.bofilters.inc.php
inc/class.bofolder.inc.php inc/class.boindex.inc.php
inc/class.bomessage.inc.php inc/class.bosend.inc.php
inc/class.html_widgets.inc.php inc/class.mail_filters.inc.php
inc/class.mail_msg_base.inc.php
inc/class.mail_msg_display.inc.php
inc/class.mail_msg_wrappers.inc.php
inc/class.msg_bootstrap.inc.php
inc/class.svc_nextmatches.inc.php
inc/class.ui_mail_debug.inc.php inc/class.uifilters.inc.php
inc/class.uifolder.inc.php inc/class.uiindex.inc.php
inc/class.uimessage.inc.php templates/default/debug.tpl
templates/default/index_main_b0_l1.tpl
templates/default/index_main_b0_l2.tpl
new patches:
address@hidden/anglemail--codehere--1.1--patch-10
address@hidden/anglemail--codehere--1.1--patch-11
address@hidden/anglemail--codehere--1.1--patch-12
address@hidden/anglemail--codehere--1.1--patch-13
address@hidden/anglemail--codehere--1.1--patch-14
address@hidden/anglemail--codehere--1.1--patch-15
address@hidden/anglemail--codehere--1.1--patch-16
address@hidden/anglemail--codehere--1.1--patch-17
address@hidden/anglemail--codehere--1.1--patch-18
address@hidden/anglemail--codehere--1.1--patch-19
address@hidden/anglemail--codehere--1.1--patch-20
address@hidden/anglemail--codehere--1.1--patch-21
address@hidden/anglemail--codehere--1.1--patch-22
address@hidden/anglemail--codehere--1.1--patch-23
address@hidden/anglemail--codehere--1.1--patch-24
address@hidden/anglemail--codehere--1.1--patch-25
address@hidden/anglemail--codehere--1.1--patch-26
address@hidden/anglemail--codehere--1.1--patch-5
address@hidden/anglemail--codehere--1.1--patch-6
address@hidden/anglemail--codehere--1.1--patch-7
address@hidden/anglemail--codehere--1.1--patch-8
address@hidden/anglemail--codehere--1.1--patch-9
2002-06-13 GMT Angles Puglisi <address@hidden> patch-1
Summary:
replay merge anglemail-codehere into anglemail-core
Revision:
anglemail--core--1.1--patch-1
Merge fixes and new stuff in codehere branch in to core.
This includes fix for the "view as html" button, some
basic detection of KLEZ iframe mails and "unfriendly" attachment
filename extensions for winbloze users, add company to
the addressbook (thanks dave hall), compose normalized
to 80 char lines, images for "add to addressbook" are normal
sized now.
Also, this version uses "notls" instead of "novalidate-cert"
for the RedHat php IMAP bug fix because normal IMAP on port
143 should not be encrypted, but port 143 traffic was
STARTTLS encrypted unless "notls" is used. Note that
SSL IMAP works as usual if encryption is desired.
Since codehere was branched FROM core and the two branches had
never been previously merged, core was ignorant of the codehere
patchlogs, which effectively meant that merging by update or
star-merge would produce an error about core not having a
patchlog for codehere.
So, this replay merge does 2 things, 1. it does the actual merge
which is now the right the right time to merge anyway, and
2. it lets the two branches "co-mingle" so now they know
about each other and core will certainly have change logs
for codehere, at least up to codehere patch4.
So hopefully the more exotic merging techniques will be
available for these 2 branches in the future because of this.
Note if this replay does the trick, then do a trivial
replay of new branches back into its trunk just so that trunk
has a change log for the new branch. We shall see...
The following paragraph was generated by arch command log-for-merge.
Patches applied:
* address@hidden/anglemail--codehere--1.1--patch-4
better detection of "bad" attachments, make compose box 78 chars wide
* address@hidden/anglemail--codehere--1.1--patch-3
Addressbook fix by address@hidden, more work on IMAP sockets class
* address@hidden/anglemail--codehere--1.1--patch-2
fix view as html as reference, give basic warnings for nefarious parts
* address@hidden/anglemail--codehere--1.1--patch-1
first commit to codehere, add docs and alias decode headers to a
better function
* address@hidden/anglemail--codehere--1.1--base-0
first tree FROM anglemail core 1.1 FOR coding new stuff, merge back
when ready
new files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/base-0
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-1
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-2
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-3
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-4
modified files:
addressbook.php inc/class.bomessage.inc.php
inc/class.html_widgets.inc.php inc/class.mail_dcom.inc.php
inc/class.mail_dcom_base_sock.inc.php
inc/class.mail_dcom_imap_sock.inc.php
inc/class.mail_msg_base.inc.php
inc/class.ui_mail_debug.inc.php
templates/default/addressbook.tpl
templates/default/compose.tpl templates/default/debug.tpl
templates/default/index_main_b0_l2.OLD.tpl
new directories:
{arch}/anglemail/anglemail--codehere
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log
new patches:
address@hidden/anglemail--codehere--1.1--base-0
address@hidden/anglemail--codehere--1.1--patch-1
address@hidden/anglemail--codehere--1.1--patch-2
address@hidden/anglemail--codehere--1.1--patch-3
address@hidden/anglemail--codehere--1.1--patch-4
2002-06-05 GMT Angles Puglisi <address@hidden> base-0
Summary:
first tree for anglemail version 1.1, this is the core, base branch for
1.1
Revision:
anglemail--core--1.1--base-0
branched from address@hidden/anglemail--beta1final--1.0--base-0
Sourced from anglemail beta1final, this is a continuation branch from that
and
this the FIRST branch that is anglemail version 1.1, and this is the CORE,
BASE
branch for anglemail 1.1, all other development for anglemail 1.1 will
branch
from this tree and merge back into this tree when ready, should be
continuation
from this branch, should be able to use star merge to get changes into this
core mail "trunk" branch.
Used this coommand sequence:
CMD: cd src/anglemail/anglemail-beta1final
CMD: larch prepare-branch anglemail--beta1final--1.0 anglemail--core--1.1
src/anglemail/anglemail-core
CMD: cd src/anglemail/anglemail-core
CMD: edit this log file you are reading now
new directories:
{arch}/anglemail/anglemail--core
{arch}/anglemail/anglemail--core/anglemail--core--1.1
{arch}/anglemail/anglemail--core/anglemail--core--1.1/address@hidden
{arch}/anglemail/anglemail--core/anglemail--core--1.1/address@hidden/patch-log
--- NEW FILE ---
# do not edit -- automatically generated by arch changelog
# tag: address@hidden/anglemail--lex--1.1
#
2002-10-17 GMT Angles Puglisi <address@hidden> patch-22
Summary:
commit to lex "anglemail-1.1-pre5-03-lex4" from 021014
Revision:
anglemail--lex--1.1--patch-22
commit to lex "anglemail-1.1-pre5-03-lex4" from 021014
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.uijsaddressbook.inc.php
templates/default/addressbook-js.tpl
[...1201 lines suppressed...]
branched from address@hidden/anglemail--codehere--1.1--patch-35
That was the source branch and latest revision for this new branch. This is
a "continuation" branch. Purpose is an anglemail branch for lex's code, so
a tarball can be dumped here and committed as new revision for
anglemail-lex.
Then merging is possible between the branches (hopefully). This is to
simplify
maintenance of tracking various trees of anglemail and merging them.
modified files:
ChangeLog.codehere--1.1
new directories:
{arch}/anglemail/anglemail--lex
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log
--- NEW FILE ---
# do not edit -- automatically generated by arch changelog
# tag: address@hidden/anglemail--ryan--1.1
#
2002-10-18 GMT Angles Puglisi <address@hidden> patch-12
Summary:
merge into ryan "anglemail-1.1-pre5-03-rcb1-lex5-unified" on 021017
Revision:
anglemail--ryan--1.1--patch-12
merge into ryan "anglemail-1.1-pre5-03-rcb1-lex5-unified" on 021017
This is already a merged bzball, had new ryan code and some lex code
newer than the lex code star merged into ryan branch just before this
merge, thus this was a hand merge using xemacs. Had I made the script
to normalize the whitespace linebreak to UNIX, this could have been
an automated merge.
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.bocompose.inc.php
inc/class.bojsaddressbook.inc.php
inc/class.mail_msg_base.inc.php
inc/class.mail_msg_wrappers.inc.php inc/class.spell.inc.php
inc/class.uijsaddressbook.inc.php inc/selectboxes.js
templates/default/addressbook-js.tpl
templates/default/addressbook-real-plain.tpl-UNUSED
templates/default/addressbook.tpl
templates/default/addressbook.tpl-BAD
templates/default/addressbook.tpl-ORIG
2002-10-18 GMT Angles Puglisi <address@hidden> patch-11
Summary:
star merge lex into ryan b4 in prep for already merged ryan tarball
Revision:
anglemail--ryan--1.1--patch-11
star merge lex into ryan b4 in prep for already merged ryan tarball
new files:
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-20
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-21
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-22
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.bojsaddressbook.inc.php
inc/class.uijsaddressbook.inc.php inc/selectboxes.js
templates/default/addressbook-js-frameset.tpl
templates/default/addressbook-js.tpl
new patches:
address@hidden/anglemail--lex--1.1--patch-20
address@hidden/anglemail--lex--1.1--patch-21
address@hidden/anglemail--lex--1.1--patch-22
2002-10-15 GMT Angles Puglisi <address@hidden> patch-10
Summary:
commit "anglemail-1.1-pre5-03-rcb1" to ryan, 021015
Revision:
anglemail--ryan--1.1--patch-10
commit "anglemail-1.1-pre5-03-rcb1" to ryan, 021015. Right now
lex and ryan branches are different, I don't know if it will stay
this way for a while or not. Sometimes they manually merge as
they code.
Ryan comments:
anglemail-1.1-pre5-03-rcb1
* Changes all button so they are using
$GLOBALS['phpgw']->msg->get_pref_value('button_type') to lookup the
button_type, now
it will respect extra accounts having different preferences.
* Added Preference "account_name".
* Changed all_accounts_combobox function in class.html_widgets so it
displays the
new "account_name" preference if it is set, if it isn't set it will
fallback to the
old display.
* Changed ex_account_list function and tpl file so that it will display
"[accountnum] account_name" now.
new files:
{arch}/=tagging-method
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.bocompose.inc.php
inc/class.boindex.inc.php inc/class.bopreferences.inc.php
inc/class.html_widgets.inc.php inc/class.uipreferences.inc.php
2002-10-13 GMT Angles Puglisi <address@hidden> patch-9
Summary:
commit lex "pre5-02-rcb3-edge11-unified" and ryan
"pre5-02-rcb4-edge11-unified" to ryan
Revision:
anglemail--ryan--1.1--patch-9
commit lex "pre5-02-rcb3-edge11-unified" and ryan
"pre5-02-rcb4-edge11-unified" to ryan
Lex:
"pre5-02-rcb3-edge11-unified" had one file change
"email/templates/default/addressbook-js.tpl"
This fixes the focus behaviour of the addressbook so that u can only
select a single entry in one box and thus, allways know what are you
querying for user record. This behaviour only applies when the checkbox
is checked
Ryan:
one file changed: inc/class.uipreferences.inc.php
* Changed class.uipreferences.inc.php so that after the user shows_help
they are
given the option to hide_help
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.uipreferences.inc.php
templates/default/addressbook-js.tpl
2002-10-13 GMT Angles Puglisi <address@hidden> patch-8
Summary:
apply lex changes in "pre5-02-rcb3-edge9-unified" to ryan branch
Revision:
anglemail--ryan--1.1--patch-8
apply changes in "pre5-02-rcb3-edge9-unified" to ryan branch
I think I forgot the commit notes for previous commit of
pre5-02-rcb3-edge7-unified which was ryan's changes:
RYAN's Notes for previous commit:
anglemail-1.1-pre5-02-rcb3-edge7-unified.tar.gz
* Fixed default preference for "button_type". I had set it to "Both",
it should have been "both".
pre5-02rcb-2
* Fixed bocompose class. The links for the address book were not being set
correctly.
pre5-02rcb-1
* Merged in Compose.tpl File. Buttons were not showing up, this file was
changed
in pre5-01rcb-1.
* Fixed default preference for "button_type". I had set it to "text", it
should have been "both".
Pre5-01rcb-2
* Changed the buttons on the widgets_toolbar to display according to the
button_type preference.
===============
Lex's notes for this commit. Currently developing in one branch.
anglemail-1.1-pre5-02-rcb-edge8-unified.tar.gz
Heyas... latest unified is out on the usual spot....its against the
latest ryan sent (although i failed to reflect this onthe file name)
U aint gonna believe this.
This addybook now fully controls the destination textboxes. If you put
in some addresses, and then open the addressbook and select users to put
in the mail, it will detect those already in there and wont repeat them.
If you remove them from the destination boxes in the addressbook, it
will remove them (and only those u want) from the compose textboxes. If
you remove by hand on the compose page, this change will be reflected in
the addressbook as well....
Its cool, it works on moz and ie (and js regex <yuk> compliant
browsers)....
(that commit skipped to this:)
anglemail-1.1-pre5-02-rcb3-edge9-unified.tar.bz2
puts a cancel button so it forgets your cached query...
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.uijsaddressbook.inc.php
inc/selectboxes.js
templates/default/addressbook-js-frameset.tpl
templates/default/addressbook-js.tpl
2002-10-12 GMT Angles Puglisi <address@hidden> patch-7
Summary:
"pre5-02-rcb3-edge7-unified" fix ryan stuff lost in merge, add lex edge7
on 021010
Revision:
anglemail--ryan--1.1--patch-7
File anglemail-1.1-pre5-02-rcb3-edge7-unified committed to RYAN branch on
021010.
This fixes some ryan code lost in the previous merge, and also adds lex
code from
a seperate bzball "edge7" which ryan has already put into this tarball.
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.bocompose.inc.php
inc/class.bopreferences.inc.php
inc/class.uijsaddressbook.inc.php
templates/default/addressbook-js.tpl
templates/default/compose.tpl
2002-10-10 GMT Angles Puglisi <address@hidden> patch-6
Summary:
star merge lex and ryan in 021010
Revision:
anglemail--ryan--1.1--patch-6
star merge lex and ryan in 021010
> larch star-merge --in-place anglemail--codehere--1.1 anglemail--lex--1.1
./anglemail-ryan
Previously:
lex star merged into codehere
ryan took local changes
codehere update mreged into ryan
* made bzball
ryan takes local changes
star merge codehere into lex (so lex = codehere)
lex takes local changes
star merge from codehere to lex to ryan into ryan
rej file was templates/compose.tpl, all white space, no code changes.
Output from "log-for-merge"
Patches applied:
* address@hidden/anglemail--lex--1.1--patch-19
merge "pre4-12lex-edge6" into lex branch on 021010
* address@hidden/anglemail--lex--1.1--patch-18
star merge make lex and codehere the same 021010a
new files:
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-18
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-19
removed files:
brother1.html brother2.html data1.html frameset.html
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 addressbook-js.changelog.txt
inc/class.bocompose.inc.php inc/class.bojsaddressbook.inc.php
inc/class.bopreferences.inc.php
inc/class.uijsaddressbook.inc.php inc/selectboxes.js
templates/default/addressbook-js-bits.tpl
templates/default/addressbook-js-frameset.tpl
templates/default/addressbook-js.tpl
templates/default/compose.tpl
new patches:
address@hidden/anglemail--lex--1.1--patch-18
address@hidden/anglemail--lex--1.1--patch-19
2002-10-10 GMT Angles Puglisi <address@hidden> patch-5
Summary:
commit "Pre5-01rcb-2" to ryan 021010 and normalize unix line breaks and
whilespaces
Revision:
anglemail--ryan--1.1--patch-5
(angles) file format of some rcb files was dos style CRLF, and to a
lesses extent, [space][space][tab] was in place of [tab] in GVIM when
tabstop was set to 4. Eventhough simple whitespace changes, this can
confuse a pure diff, when it is plain "diff -u" instead of "diff -ub".
Arch was actually sensitive to this and wanting to replace entire files.
So I'll whip up a script to fix that b4 next merge and commit.
Ryan changelogs:
Pre5-01rcb-1
* Merged with Anglemail-1.1-pre5-01rcb.
* Fixed class.mail_msg_display.inc.php. File was missing merge from
Pre4-012.1-2rcb,
and wasn't showing The Number of new message in the Folders Combobox when
the user
select the preference.
* Added a preference, button_type, to choose to display teh buttons as a
image,
text, or both.
* Changed the buttons on the compose page so they recognize the new
button_type
preference.
* Changed the buttons on the index_main_b0_l2 page so they recognize the new
button_type preference.
-----------
Pre5-01rcb-2
* Changed the buttons on the widgets_toolbar to display according to the
button_type
preference.
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.bocompose.inc.php
inc/class.boindex.inc.php inc/class.bopreferences.inc.php
inc/class.html_widgets.inc.php
inc/class.mail_msg_display.inc.php
inc/class.ui_mail_debug.inc.php inc/class.uicompose.inc.php
inc/class.uiindex.inc.php inc/hook_home.inc.php
templates/default/compose.tpl
templates/default/index_main_b0_l2.tpl
2002-10-08 GMT Angles Puglisi <address@hidden> patch-4
Summary:
update merge from codehere into ryan on 021008
Revision:
anglemail--ryan--1.1--patch-4
Update merge from codehere into ryan on 021008. This is after
a star merge between codehere and lex. The concept here is to
keep new feauure in ryan branch while in development, but yet
ryan branch still gets latest stable code.
>larch update --in-place anglemail-ryan anglemail--codehere--1.1--patch-53
There was one rej file, mail_msg_display, but that was apparently
because they were to stay identical. So they stayed the same.
This is from arch command log-for-merge:
address@hidden anglemail-ryan]$ larch log-for-merge
Patches applied:
* address@hidden/anglemail--codehere--1.1--patch-53
star merge in changes from lex banch on 021008
* address@hidden/anglemail--codehere--1.1--patch-52
standardize and lang "warn" strings, some updates to license blocks
* address@hidden/anglemail--lex--1.1--patch-17
commit "pre4-12lex-edge3" to lex
* address@hidden/anglemail--lex--1.1--patch-16
commit "pre4-12lex-edge", adressbook now bo and ui, small cache change
* address@hidden/anglemail--lex--1.1--patch-15
restore lex patchlogs 0 to 5 from backup location
* address@hidden/anglemail--lex--1.1--patch-14
commit anglemail-1.1-pre4-12lex to lex branch 021003
* address@hidden/anglemail--lex--1.1--patch-13
star merge makes lex same as codehere
* address@hidden/anglemail--lex--1.1--patch-12
this is a test commit of nothing changed maybe fixes mrege rej files
* address@hidden/anglemail--lex--1.1--patch-5
merge lex chnanges that should unify the branch
* address@hidden/anglemail--lex--1.1--patch-4
update merge anglemail-codehere latest changes into anglemail-lex
branch
* address@hidden/anglemail--lex--1.1--patch-3
merge in superglobals GPC fix from branch "codehere" into "lex"
* address@hidden/anglemail--lex--1.1--patch-2
OOPS, that update style copy missed these lex files
* address@hidden/anglemail--lex--1.1--patch-1
commit lex code 020913 "adressbook beta2"
* address@hidden/anglemail--lex--1.1--patch-10
merge from lex "pre4-10lex.tar.gz"
* address@hidden/anglemail--lex--1.1--patch-11
merge from lex "pre4-011lex-1.tar.bz2"
* address@hidden/anglemail--lex--1.1--patch-12
this is a test commit of nothing changed maybe fixes mrege rej files
* address@hidden/anglemail--lex--1.1--patch-13
star merge makes lex same as codehere
* address@hidden/anglemail--lex--1.1--patch-14
commit anglemail-1.1-pre4-12lex to lex branch 021003
* address@hidden/anglemail--lex--1.1--patch-15
restore lex patchlogs 0 to 5 from backup location
* address@hidden/anglemail--lex--1.1--patch-16
commit "pre4-12lex-edge", adressbook now bo and ui, small cache change
* address@hidden/anglemail--lex--1.1--patch-17
commit "pre4-12lex-edge3" to lex
* address@hidden/anglemail--lex--1.1--base-0
make continuation branch for anglemail-lex
new files:
brother1.html brother2.html data1.html frameset.html
inc/class.bojsaddressbook.inc.php
inc/class.uijsaddressbook.inc.php
templates/default/addressbook-js-frameset.tpl
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-52
{arch}/anglemail/anglemail--codehere/anglemail--codehere--1.1/address@hidden/patch-log/patch-53
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/base-0
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-1
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-12
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-13
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-14
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-15
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-16
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-17
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-2
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-3
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-4
{arch}/anglemail/anglemail--lex/anglemail--lex--1.1/address@hidden/patch-log/patch-5
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 addressbook-js.php
inc/class.boaction.inc.php inc/class.bocompose.inc.php
inc/class.boindex.inc.php inc/class.bomessage.inc.php
inc/class.mail_dcom_base.inc.php
inc/class.mail_msg_base.inc.php
inc/class.mail_msg_display.inc.php
inc/class.ui_mail_debug.inc.php inc/class.uimessage.inc.php
inc/selectboxes.js templates/default/addressbook-js-bits.tpl
templates/default/addressbook-js.tpl
new patches:
address@hidden/anglemail--codehere--1.1--patch-52
address@hidden/anglemail--codehere--1.1--patch-53
address@hidden/anglemail--lex--1.1--base-0
address@hidden/anglemail--lex--1.1--patch-1
address@hidden/anglemail--lex--1.1--patch-12
address@hidden/anglemail--lex--1.1--patch-13
address@hidden/anglemail--lex--1.1--patch-14
address@hidden/anglemail--lex--1.1--patch-15
address@hidden/anglemail--lex--1.1--patch-16
address@hidden/anglemail--lex--1.1--patch-17
address@hidden/anglemail--lex--1.1--patch-2
address@hidden/anglemail--lex--1.1--patch-3
address@hidden/anglemail--lex--1.1--patch-4
address@hidden/anglemail--lex--1.1--patch-5
2002-10-06 GMT Angles Puglisi <address@hidden> patch-3
Summary:
commit "Pre4-012.1-2rcb" from 021004 to ryan branch
Revision:
anglemail--ryan--1.1--patch-3
Pre4-012.1-2rcb
* Added a preference to set whether or not to display the # of new messages
in the combo box.
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.bopreferences.inc.php
inc/class.html_widgets.inc.php
inc/class.mail_msg_display.inc.php inc/hook_home.inc.php
2002-10-06 GMT Angles Puglisi <address@hidden> patch-2
Summary:
commit "pre4-012.1rcb-1" from 021002
Revision:
anglemail--ryan--1.1--patch-2
commit "pre4-012.1rcb-1" from 021002 to ryan branch
(Ryan) Merged Anglemail pre12.1 with the # new message changes from
pre4-012-5rcb
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
ChangeLog.ryan--1.1 inc/class.html_widgets.inc.php
inc/class.mail_msg_display.inc.php inc/hook_home.inc.php
2002-10-06 GMT Angles Puglisi <address@hidden> patch-1
Summary:
just adding the new auto patchlog for this tree
Revision:
anglemail--ryan--1.1--patch-1
Just adding the new auto patchlog for this tree. Command
used was "larch changelog > ChangeLog.ryan--1.1", file
name is ChangeLog.ryan--1.1 of course.
1st, the file would have no real content before the import
because the tree itself was not yet completed. Alsom technically
this changelog was not a result of the merge used to create
the tree, so really was not part of the import itself.
Committing it now simply seperates the addition of the
log file from later commits that will have actual code
changes.
new files:
ChangeLog.ryan--1.1
modified files:
ChangeLog.codehere--1.1 ChangeLog.core--1.1 ChangeLog.lex--1.1
2002-10-06 GMT Angles Puglisi <address@hidden> base-0
Summary:
created an anglemail--ryan branch for Ryan Bonham code
Revision:
anglemail--ryan--1.1--base-0
created an anglemail--ryan branch for Ryan Bonham code
I have a ryan bzball that was based on codehere-patch-51 then
has his changes to that. So I want this branch to start with that
as its base before I put in the code ryan changed.
Also, I want maximum multibranch awareness for this ryan branch, so I
used unusual way to generate it.
>larch get anglemail--codehere--1.1--patch-51 ./anglemail-ryan51got
>larch star-merge anglemail--core--1.1 ./anglemail-ryan51got
anglemail--codehere--1.1--patch-51 ./anglemail-ryan
>rm -vr anglemail-ryan51got
>cd anglemail-ryan
>larch set-tree-version anglemail--ryan--1.1
>larch add-log anglemail--ryan--1.1
>larch make-log (you're reading it now)
>larch import
>larch changelog > ChangeLog.ryan--1.1
> then probably a commit just to add that changelog
new files:
./ChangeLog.beta1final--1.0 ./ChangeLog.codehere--1.1
./ChangeLog.core--1.1 ./ChangeLog.lex--1.1
./addressbook-js.changelog.txt ./addressbook-js.php
./addressbook.php ./attach_file.php ./compose.php
./doc/FAQ.txt ./doc/copyright.gpl ./help/index.php
./inc/class.boaction.inc.php ./inc/class.boattach_file.inc.php
./inc/class.bocompose.inc.php ./inc/class.bofilters.inc.php
./inc/class.bofolder.inc.php ./inc/class.boindex.inc.php
./inc/class.bomessage.inc.php
./inc/class.bopreferences.inc.php ./inc/class.bosend.inc.php
./inc/class.html_widgets.inc.php ./inc/class.mail_dcom.inc.php
./inc/class.mail_dcom_base.inc.php
./inc/class.mail_dcom_base_sock.inc.php
./inc/class.mail_dcom_imap.inc.php
./inc/class.mail_dcom_imap_sock.inc.php
./inc/class.mail_dcom_nntp.inc.php
./inc/class.mail_dcom_nntp_sock.inc.php
./inc/class.mail_dcom_pop3.inc.php
./inc/class.mail_dcom_pop3_sock.inc.php
./inc/class.mail_filters.inc.php ./inc/class.mail_msg.inc.php
./inc/class.mail_msg_base.inc.php
./inc/class.mail_msg_display.inc.php
./inc/class.mail_msg_wrappers.inc.php
./inc/class.mail_send.inc.php
./inc/class.msg_bootstrap.inc.php ./inc/class.spell.inc.php
./inc/class.spell_struct.inc.php
./inc/class.spell_svc_none.inc.php
./inc/class.spell_svc_php.inc.php
./inc/class.svc_nextmatches.inc.php
./inc/class.ui_mail_debug.inc.php
./inc/class.uiattach_file.inc.php
./inc/class.uicompose.inc.php ./inc/class.uifilters.inc.php
./inc/class.uifolder.inc.php ./inc/class.uiindex.inc.php
./inc/class.uimessage.inc.php
./inc/class.uipreferences.inc.php ./inc/functions.inc.php
./inc/hook_admin.inc.php ./inc/hook_email_add_def_pref.inc.php
./inc/hook_home.inc.php ./inc/hook_manual.inc.php
./inc/hook_notifywindow.inc.php
./inc/hook_notifywindow_simple.inc.php
./inc/hook_preferences.inc.php ./inc/selectboxes.js
./index.php ./setup/phpgw_da.lang ./setup/phpgw_de.lang
./setup/phpgw_en.lang ./setup/phpgw_es.lang
./setup/phpgw_fi.lang ./setup/phpgw_fr.lang
./setup/phpgw_hu.lang ./setup/phpgw_it.lang
./setup/phpgw_ja.lang ./setup/phpgw_ko.lang
./setup/phpgw_nl.lang ./setup/phpgw_pt.lang
./setup/phpgw_sv.lang ./setup/phpgw_zt.lang
./setup/setup.inc.php ./templates/default/OLD-preferences.tpl
./templates/default/addressbook-js-bits.tpl
./templates/default/addressbook-js-smaller.tpl
./templates/default/addressbook-js.tpl
./templates/default/addressbook-real-plain.tpl-UNUSED
./templates/default/addressbook.tpl
./templates/default/addressbook.tpl-BAD
./templates/default/addressbook.tpl-ORIG
./templates/default/attach_file.tpl
./templates/default/attach_file_blocks.tpl
./templates/default/class_prefs_blocks.tpl
./templates/default/class_prefs_ex_accounts.tpl
./templates/default/class_prefs_ui.tpl
./templates/default/compose.tpl ./templates/default/config.tpl
./templates/default/debug.tpl ./templates/default/filters.tpl
./templates/default/filters_blocks.tpl
./templates/default/filters_list.tpl
./templates/default/folder.tpl
./templates/default/images/check.gif
./templates/default/images/check.png
./templates/default/images/evo-accounts-16.gif
./templates/default/images/evo-accounts-24.gif
./templates/default/images/evo-add-attachment-16.gif
./templates/default/images/evo-add-attachment-24.gif
./templates/default/images/evo-add-attachment.gif
./templates/default/images/evo-address-conduit-16.gif
./templates/default/images/evo-address-conduit-24.gif
./templates/default/images/evo-arrow-2left-16.gif
./templates/default/images/evo-arrow-2left-24.gif
./templates/default/images/evo-arrow-2left-no-16.gif
./templates/default/images/evo-arrow-2left-no-24.gif
./templates/default/images/evo-arrow-2right-16.gif
./templates/default/images/evo-arrow-2right-24.gif
./templates/default/images/evo-arrow-2right-no-16.gif
./templates/default/images/evo-arrow-2right-no-24.gif
./templates/default/images/evo-arrow-left-16.gif
./templates/default/images/evo-arrow-left-24.gif
./templates/default/images/evo-arrow-left-no-16.gif
./templates/default/images/evo-arrow-left-no-24.gif
./templates/default/images/evo-arrow-right-16.gif
./templates/default/images/evo-arrow-right-24.gif
./templates/default/images/evo-arrow-right-no-16.gif
./templates/default/images/evo-arrow-right-no-24.gif
./templates/default/images/evo-compose-message-16.gif
./templates/default/images/evo-compose-message-24.gif
./templates/default/images/evo-customize-16.gif
./templates/default/images/evo-customize-24.gif
./templates/default/images/evo-customize3-24.gif
./templates/default/images/evo-customize4-24.gif
./templates/default/images/evo-delete-message.gif
./templates/default/images/evo-envelope.gif
./templates/default/images/evo-filters-16.gif
./templates/default/images/evo-filters-24.gif
./templates/default/images/evo-filters-config-24.gif
./templates/default/images/evo-folder-16.gif
./templates/default/images/evo-folder-24.gif
./templates/default/images/evo-folder-config-16.gif
./templates/default/images/evo-folder-config-24.gif
./templates/default/images/evo-folder-config2-24.gif
./templates/default/images/evo-forward.gif
./templates/default/images/evo-move-message.gif
./templates/default/images/evo-next-message.gif
./templates/default/images/evo-previous-message.gif
./templates/default/images/evo-reply-all.gif
./templates/default/images/evo-reply-all2.gif
./templates/default/images/evo-reply-to-all.gif
./templates/default/images/evo-reply.gif
./templates/default/images/evo-send-16.gif
./templates/default/images/evo-send-24.gif
./templates/default/images/evo-spellcheck-16.gif
./templates/default/images/evo-spellcheck-24.gif
./templates/default/images/evo-trash-16.gif
./templates/default/images/evo-trash-24.gif
./templates/default/images/moz-accounts-16.gif
./templates/default/images/moz-accounts-24.gif
./templates/default/images/moz-add-attachment-16.gif
./templates/default/images/moz-add-attachment-24.gif
./templates/default/images/moz-address-conduit-16.gif
./templates/default/images/moz-address-conduit-24.gif
./templates/default/images/moz-arrow-2left-16.gif
./templates/default/images/moz-arrow-2left-24.gif
./templates/default/images/moz-arrow-2left-no-16.gif
./templates/default/images/moz-arrow-2left-no-24.gif
./templates/default/images/moz-arrow-2right-16.gif
./templates/default/images/moz-arrow-2right-24.gif
./templates/default/images/moz-arrow-2right-no-16.gif
./templates/default/images/moz-arrow-2right-no-24.gif
./templates/default/images/moz-arrow-left-16.gif
./templates/default/images/moz-arrow-left-24.gif
./templates/default/images/moz-arrow-left-no-16.gif
./templates/default/images/moz-arrow-left-no-24.gif
./templates/default/images/moz-arrow-right-16.gif
./templates/default/images/moz-arrow-right-24.gif
./templates/default/images/moz-arrow-right-no-16.gif
./templates/default/images/moz-arrow-right-no-24.gif
./templates/default/images/moz-compose-message-16.gif
./templates/default/images/moz-compose-message-24.gif
./templates/default/images/moz-customize-16.gif
./templates/default/images/moz-customize-24.gif
./templates/default/images/moz-delete-message.gif
./templates/default/images/moz-filters-16.gif
./templates/default/images/moz-filters-24.gif
./templates/default/images/moz-folder-16.gif
./templates/default/images/moz-folder-24.gif
./templates/default/images/moz-forward.gif
./templates/default/images/moz-reply-all.gif
./templates/default/images/moz-reply.gif
./templates/default/images/moz-send-16.gif
./templates/default/images/moz-send-24.gif
./templates/default/images/moz-spellcheck-16.gif
./templates/default/images/moz-spellcheck-24.gif
./templates/default/images/moz-trash-16.gif
./templates/default/images/moz-trash-24.gif
./templates/default/images/navbar.gif
./templates/default/images/navbar.png
./templates/default/images/refresh.gif
./templates/default/images/refresh.png
./templates/default/images/sm_delete.gif
./templates/default/images/sm_delete.png
./templates/default/images/sm_envelope.gif
./templates/default/images/sm_envelope.png
./templates/default/images/sm_forward.gif
./templates/default/images/sm_forward.png
./templates/default/images/sm_reply.gif
./templates/default/images/sm_reply.png
./templates/default/images/sm_reply_all.gif
./templates/default/images/sm_reply_all.png
./templates/default/images/tree_collapse.gif
./templates/default/images/tree_collapse.png
./templates/default/images/tree_end.gif
./templates/default/images/tree_end.png
./templates/default/images/tree_expand.gif
./templates/default/images/tree_expand.png
./templates/default/images/tree_leaf.gif
./templates/default/images/tree_leaf.png
./templates/default/images/tree_space.gif
./templates/default/images/tree_space.png
./templates/default/images/tree_split.gif
./templates/default/images/tree_split.png
./templates/default/images/tree_vertline.gif
./templates/default/images/tree_vertline.png
./templates/default/index_blocks.tpl
./templates/default/index_main_b0_l1.OLD.tpl
./templates/default/index_main_b0_l1.tpl
./templates/default/index_main_b0_l2.OLD.tpl
./templates/default/index_main_b0_l2.tpl
./templates/default/index_mlist.tpl
./templates/default/message_echo_dump.tpl
./templates/default/message_main.tpl
./templates/default/spell_review.tpl
./templates/default/widget_toolbar.tpl
./templates/idsociety/images/check.gif
./templates/idsociety/images/check.png
./templates/idsociety/images/evo-accounts-16.gif
./templates/idsociety/images/evo-accounts-24.gif
./templates/idsociety/images/evo-add-attachment-16.gif
./templates/idsociety/images/evo-add-attachment-24.gif
./templates/idsociety/images/evo-add-attachment.gif
./templates/idsociety/images/evo-address-conduit-16.gif
./templates/idsociety/images/evo-address-conduit-24.gif
./templates/idsociety/images/evo-arrow-2left-16.gif
./templates/idsociety/images/evo-arrow-2left-24.gif
./templates/idsociety/images/evo-arrow-2left-no-16.gif
./templates/idsociety/images/evo-arrow-2left-no-24.gif
./templates/idsociety/images/evo-arrow-2right-16.gif
./templates/idsociety/images/evo-arrow-2right-24.gif
./templates/idsociety/images/evo-arrow-2right-no-16.gif
./templates/idsociety/images/evo-arrow-2right-no-24.gif
./templates/idsociety/images/evo-arrow-left-16.gif
./templates/idsociety/images/evo-arrow-left-24.gif
./templates/idsociety/images/evo-arrow-left-no-16.gif
./templates/idsociety/images/evo-arrow-left-no-24.gif
./templates/idsociety/images/evo-arrow-right-16.gif
./templates/idsociety/images/evo-arrow-right-24.gif
./templates/idsociety/images/evo-arrow-right-no-16.gif
./templates/idsociety/images/evo-arrow-right-no-24.gif
./templates/idsociety/images/evo-compose-message-16.gif
./templates/idsociety/images/evo-compose-message-24.gif
./templates/idsociety/images/evo-customize-16.gif
./templates/idsociety/images/evo-customize-24.gif
./templates/idsociety/images/evo-customize3-24.gif
./templates/idsociety/images/evo-customize4-24.gif
./templates/idsociety/images/evo-delete-message.gif
./templates/idsociety/images/evo-envelope.gif
./templates/idsociety/images/evo-filters-16.gif
./templates/idsociety/images/evo-filters-24.gif
./templates/idsociety/images/evo-filters-config-24.gif
./templates/idsociety/images/evo-folder-16.gif
./templates/idsociety/images/evo-folder-24.gif
./templates/idsociety/images/evo-folder-config-16.gif
./templates/idsociety/images/evo-folder-config-24.gif
./templates/idsociety/images/evo-folder-config2-24.gif
./templates/idsociety/images/evo-forward.gif
./templates/idsociety/images/evo-move-message.gif
./templates/idsociety/images/evo-next-message.gif
./templates/idsociety/images/evo-previous-message.gif
./templates/idsociety/images/evo-reply-all.gif
./templates/idsociety/images/evo-reply-all2.gif
./templates/idsociety/images/evo-reply-to-all.gif
./templates/idsociety/images/evo-reply.gif
./templates/idsociety/images/evo-send-16.gif
./templates/idsociety/images/evo-send-24.gif
./templates/idsociety/images/evo-spellcheck-16.gif
./templates/idsociety/images/evo-spellcheck-24.gif
./templates/idsociety/images/evo-trash-16.gif
./templates/idsociety/images/evo-trash-24.gif
./templates/idsociety/images/moz-accounts-16.gif
./templates/idsociety/images/moz-accounts-24.gif
./templates/idsociety/images/moz-add-attachment-16.gif
./templates/idsociety/images/moz-add-attachment-24.gif
./templates/idsociety/images/moz-address-conduit-16.gif
./templates/idsociety/images/moz-address-conduit-24.gif
./templates/idsociety/images/moz-arrow-2left-16.gif
./templates/idsociety/images/moz-arrow-2left-24.gif
./templates/idsociety/images/moz-arrow-2left-no-16.gif
./templates/idsociety/images/moz-arrow-2left-no-24.gif
./templates/idsociety/images/moz-arrow-2right-16.gif
./templates/idsociety/images/moz-arrow-2right-24.gif
./templates/idsociety/images/moz-arrow-2right-no-16.gif
./templates/idsociety/images/moz-arrow-2right-no-24.gif
./templates/idsociety/images/moz-arrow-left-16.gif
./templates/idsociety/images/moz-arrow-left-24.gif
./templates/idsociety/images/moz-arrow-left-no-16.gif
./templates/idsociety/images/moz-arrow-left-no-24.gif
./templates/idsociety/images/moz-arrow-right-16.gif
./templates/idsociety/images/moz-arrow-right-24.gif
./templates/idsociety/images/moz-arrow-right-no-16.gif
./templates/idsociety/images/moz-arrow-right-no-24.gif
./templates/idsociety/images/moz-compose-message-16.gif
./templates/idsociety/images/moz-compose-message-24.gif
./templates/idsociety/images/moz-customize-16.gif
./templates/idsociety/images/moz-customize-24.gif
./templates/idsociety/images/moz-delete-message.gif
./templates/idsociety/images/moz-filters-16.gif
./templates/idsociety/images/moz-filters-24.gif
./templates/idsociety/images/moz-folder-16.gif
./templates/idsociety/images/moz-folder-24.gif
./templates/idsociety/images/moz-forward.gif
./templates/idsociety/images/moz-reply-all.gif
./templates/idsociety/images/moz-reply.gif
./templates/idsociety/images/moz-send-16.gif
./templates/idsociety/images/moz-send-24.gif
./templates/idsociety/images/moz-spellcheck-16.gif
./templates/idsociety/images/moz-spellcheck-24.gif
./templates/idsociety/images/moz-trash-16.gif
./templates/idsociety/images/moz-trash-24.gif
./templates/idsociety/images/navbar-over.gif
./templates/idsociety/images/navbar-over.png
./templates/idsociety/images/navbar.gif
./templates/idsociety/images/navbar.png ./view_image.php
new patches:
address@hidden/anglemail--beta1final--1.0--base-0
address@hidden/anglemail--brubaker--1.1--patch-1
address@hidden/anglemail--codehere--1.1--base-0
address@hidden/anglemail--codehere--1.1--patch-1
address@hidden/anglemail--codehere--1.1--patch-2
address@hidden/anglemail--codehere--1.1--patch-3
address@hidden/anglemail--codehere--1.1--patch-4
address@hidden/anglemail--codehere--1.1--patch-5
address@hidden/anglemail--codehere--1.1--patch-6
address@hidden/anglemail--codehere--1.1--patch-7
address@hidden/anglemail--codehere--1.1--patch-8
address@hidden/anglemail--codehere--1.1--patch-9
address@hidden/anglemail--codehere--1.1--patch-10
address@hidden/anglemail--codehere--1.1--patch-11
address@hidden/anglemail--codehere--1.1--patch-12
address@hidden/anglemail--codehere--1.1--patch-13
address@hidden/anglemail--codehere--1.1--patch-14
address@hidden/anglemail--codehere--1.1--patch-15
address@hidden/anglemail--codehere--1.1--patch-16
address@hidden/anglemail--codehere--1.1--patch-17
address@hidden/anglemail--codehere--1.1--patch-18
address@hidden/anglemail--codehere--1.1--patch-19
address@hidden/anglemail--codehere--1.1--patch-20
address@hidden/anglemail--codehere--1.1--patch-21
address@hidden/anglemail--codehere--1.1--patch-22
address@hidden/anglemail--codehere--1.1--patch-23
address@hidden/anglemail--codehere--1.1--patch-24
address@hidden/anglemail--codehere--1.1--patch-25
address@hidden/anglemail--codehere--1.1--patch-26
address@hidden/anglemail--codehere--1.1--patch-27
address@hidden/anglemail--codehere--1.1--patch-28
address@hidden/anglemail--codehere--1.1--patch-29
address@hidden/anglemail--codehere--1.1--patch-30
address@hidden/anglemail--codehere--1.1--patch-31
address@hidden/anglemail--codehere--1.1--patch-32
address@hidden/anglemail--codehere--1.1--patch-33
address@hidden/anglemail--codehere--1.1--patch-34
address@hidden/anglemail--codehere--1.1--patch-35
address@hidden/anglemail--codehere--1.1--patch-36
address@hidden/anglemail--codehere--1.1--patch-37
address@hidden/anglemail--codehere--1.1--patch-38
address@hidden/anglemail--codehere--1.1--patch-39
address@hidden/anglemail--codehere--1.1--patch-40
address@hidden/anglemail--codehere--1.1--patch-41
address@hidden/anglemail--codehere--1.1--patch-42
address@hidden/anglemail--codehere--1.1--patch-43
address@hidden/anglemail--codehere--1.1--patch-44
address@hidden/anglemail--codehere--1.1--patch-45
address@hidden/anglemail--codehere--1.1--patch-46
address@hidden/anglemail--codehere--1.1--patch-47
address@hidden/anglemail--codehere--1.1--patch-48
address@hidden/anglemail--codehere--1.1--patch-49
address@hidden/anglemail--codehere--1.1--patch-50
address@hidden/anglemail--codehere--1.1--patch-51
address@hidden/anglemail--core--1.1--base-0
address@hidden/anglemail--core--1.1--patch-1
address@hidden/anglemail--core--1.1--patch-2
address@hidden/anglemail--core--1.1--patch-3
address@hidden/anglemail--lex--1.1--patch-6
address@hidden/anglemail--lex--1.1--patch-7
address@hidden/anglemail--lex--1.1--patch-8
address@hidden/anglemail--lex--1.1--patch-9
address@hidden/anglemail--lex--1.1--patch-10
address@hidden/anglemail--lex--1.1--patch-11
--- NEW FILE ---
Hi....:)... good that one of you three are checkling this...
Difference from the preceding tarball:
-This text file
-Comments in addressbook.php
-The addressbook remembers whatever is in the destination boxes (to,cc and bcc)
and this data
survives a submit. This is needed since, when you click on a name in the
source (where the names resulting from a query appear)
, we do a form.submit so we can go and fetch the extra user data from the
database -if, and only if, a) U selected ONE name and
b) the More Data checkbox is on
TODO:
- Keep cleaning up and documenting
- When you click on a name in the destination boxs, say, to select it for
removal, this thing does a submit and, so, if u have a single
entry in this places, you effectively cannot remove them (its now a
documented feature...:P)
- What should happen is, you click on one of the names in the destination
boxes, it does the submit but IT SEARCHES for the extra data
AND REMEMBERS your selection in this boxes....it shouldnt be that hard but
its very very late (4:30) so im leaving
Please dont hate it, help me improve it.... i think this email clients can be
cool and easy to use, lets give this kind of
thing a chance to attract new users and developers into the whole project.
Sunday 22 of september
New Stuff:
- Change the name of this file from addressbook-chnglog.txt to
addressbook-js.changelog.txt
- Changes in selectboxes.js to support a couple of functions we needed for the
rest of the changes
- You now can select a single user from a destination box and his data will be
shown in the more data textarea box
- Formatting changes in the addressbook-js.tpl to make this thing
smaller...this was supposed to run in 800x600, now i have no idea how
to cram all that inside that
- The addressbook now remembers everything you clicked regardless of where u
did it with the exeptions mentioned in the next section
TODO:
- Keep cleaning and documenting
- It would be nice if the destination boxes content didnt die when u hit a
category, sometimes u want to send mail to different categories
- Sleep, but this is no time to do that.... im going to take a crack at a
"forward as inline" functionality as a user preference
Monday 23 of september
- Lots of caching gets performed so that we dont go and fetch the whole thing
everytime we click on a name.
- Bug that made the boxes forget what was in them if u clicked on the more-data
button
- Created preferences for your screensize which controls both the size of the
window that gets poped up and the fonts of
the html widgets withing them.
- Your addressbook choice is now a preference
TODO:
- Keep cleaning and documenting
- It would be nice if the destination boxes content didnt die when u hit a
category, sometimes u want to send mail to different categories
- Search button still not working...pretty stupid
- U guys go and test it.... id the behaviour is good, i will move to make it a
class.... please check it out... i think its production qualuty...im putting it
online about wensday
Wendsday October 9 2002
- This changelog entry makes up for the last releases of no documenting the
changes
- This thing went into a major overhaul, the js addressbook now is implemented
in two classes
class.uijsaddressbook and class.bojsaddressbook.
- The templates also changed as we moved to an event driven model of two
frames, one hidden, one shown
The shown frame is basicaly what we were using as an index file
(addressbook-js.php). The second frame
is dynamicaly set byu the event system when it needs to go fetch data from
the server.
- The particular stuff each of this classes provides will be put into angles
documentation style
once my life is a bit stabler
- Major changes include the hability to select the fields you want shown for
user data, extreme use
of caching to improve performance... etc
BUGFIXES:
- This addressbook now remembers everything with each page submit, actually, it
will remember your
last selections and queries for the rest of your phpgw session.
- This thing now uses the event system for most everything that doesnt involve
a query to the database (and ill move that as well)
this means it cannot forget your selections on any of the relevant boxes
unless you requery the database, in which case the present
selection of the nameselect box is unimportant and the destboxes are refeched
from cache.... this baby rocks....
TODO:
- I have tons of documentation to do, i know.... its good that tony doesnt live
here cause he would probably shoot me
since he is so good at it himself... I promise it wont take long.
***** Error reading new file: [Errno 2] No such file or directory:
'addressbook-js.php'
***** Error reading new file: [Errno 2] No such file or directory: 'test.php'
Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/addressbook.php,v
retrieving revision 1.32.2.4
retrieving revision 1.32.2.5
diff -C2 -r1.32.2.4 -r1.32.2.5
*** addressbook.php 25 Jun 2002 00:50:13 -0000 1.32.2.4
--- addressbook.php 20 Nov 2002 23:03:23 -0000 1.32.2.5
***************
*** 1,218 ****
! <?php
!
/**************************************************************************\
! * phpGroupWare - email/addressbook
*
! * http://www.phpgroupware.org
*
! * Written by Bettina Gille 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$ */
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'noheader' => True,
! 'nonavbar' => True,
! 'currentapp' => 'email',
! 'enable_nextmatchs_class' => True
! );
!
! include('../header.inc.php');
!
! $GLOBALS['phpgw']->template->set_file(array(
! 'addressbook_list_t' => 'addressbook.tpl',
! 'addressbook_list' => 'addressbook.tpl'
! ));
!
$GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_list','list');
!
! $d = CreateObject('phpgwapi.contacts');
! $c = CreateObject('phpgwapi.categories');
! $c->app_name = 'addressbook';
!
! $include_personal = True;
!
! $charset = $GLOBALS['phpgw']->translation->translate('charset');
! $GLOBALS['phpgw']->template->set_var('charset',$charset);
!
$GLOBALS['phpgw']->template->set_var('title',$GLOBALS['phpgw_info']['site_title']);
!
$GLOBALS['phpgw']->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
!
$GLOBALS['phpgw']->template->set_var('lang_addressbook_action',lang('Address
book'));
!
$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
!
! $GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
!
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php'));
! $GLOBALS['phpgw']->template->set_var('lang_select_cats',lang('Select
category'));
!
! if (! $start)
! {
! $start = 0;
! }
!
! if (!$filter)
! {
! $filter = 'none';
! }
!
! if (!$cat_id)
! {
! if ($filter == 'none')
! {
! $qfilter = 'tid=n';
! }
! elseif ($filter == 'private')
! {
! $qfilter =
'tid=n,owner='.$GLOBALS['phpgw_info']['user']['account_id'];
! }
! else
! {
! $qfilter = 'tid=n,owner='.$filter;
! }
! }
! else
! {
! if ($filter == 'none')
! {
! $qfilter = 'tid=n,cat_id='.$cat_id;
! }
! elseif ($filter == 'private')
! {
! $qfilter =
'tid=n,owner='.$GLOBALS['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))
! {
! $offset =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
! }
! else
! {
! $offset = 15;
! }
!
! $account_id = $GLOBALS['phpgw_info']['user']['account_id'];
!
! $cols = array (
! 'n_given' => 'n_given',
! 'n_family' => 'n_family',
! 'email' => 'email',
! 'email_home' => 'email_home'
! );
!
! $entries =
$d->read($start,$offset,$cols,$query,$qfilter,$sort,$order,$account_id);
!
! //------------------------------------------- nextmatch
--------------------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query");
! $GLOBALS['phpgw']->template->set_var('left',$left);
! $GLOBALS['phpgw']->template->set_var('right',$right);
!
! if ($d->total_records >
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
! {
!
$GLOBALS['phpgw']->template->set_var('lang_showing',lang('showing x - x of
x',($start + 1),($start +
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']),$d->total_records));
! }
! else
! {
!
$GLOBALS['phpgw']->template->set_var('lang_showing',lang('showing
x',$d->total_records));
! }
! // --------------------------------------- end nextmatch
------------------------------------------
!
! // ------------------- list header variable template-declaration
-----------------------
!
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
$GLOBALS['phpgw']->template->set_var('sort_firstname',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'n_given',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Firstname')));
!
$GLOBALS['phpgw']->template->set_var('sort_lastname',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'n_family',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Lastname')));
! $GLOBALS['phpgw']->template->set_var('lang_email',lang('Select work
email address'));
! $GLOBALS['phpgw']->template->set_var('lang_hemail',lang('Select home
email address'));
! //
$GLOBALS['phpgw']->template->set_var('cats_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
!
$GLOBALS['phpgw']->template->set_var('cats_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query"));
!
$GLOBALS['phpgw']->template->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
! $GLOBALS['phpgw']->template->set_var('lang_select',lang('Select'));
!
! // --------------------------- end header declaration
----------------------------------
! for ($i=0;$i<count($entries);$i++)
! {
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $GLOBALS['phpgw']->template->set_var(tr_color,$tr_color);
! $firstname = $entries[$i]['n_given'];
! if (!$firstname)
! {
! $firstname = ' ';
! }
! $lastname = $entries[$i]['n_family'];
! if (!$lastname)
! {
! $lastname = ' ';
! }
!
! $personal_firstname = '';
! $personal_lastname = '';
! $personal_part = '';
! if ((isset($firstname)) &&
! ($firstname != '') &&
! ($firstname != ' '))
! {
! $personal_firstname = $firstname.' ';
! }
! if ((isset($lastname)) &&
! ($lastname != '') &&
! ($lastname != ' '))
! {
! $personal_lastname = $lastname;
! }
! $personal_part = $personal_firstname.$personal_lastname;
!
! if (($personal_part == '') ||
! ($include_personal == False))
! {
! $id = $entries[$i]['id'];
! $email = $entries[$i]['email'];
! $hemail = $entries[$i]['email_home'];
! }
! else
! {
! $id = $entries[$i]['id'];
! if ((isset($entries[$i]['email'])) &&
! (trim($entries[$i]['email']) != ''))
! {
! $email = '"'.$personal_part.'"
<'.$entries[$i]['email'].'>';
! }
! else
! {
! $email = $entries[$i]['email'];
! }
! if ((isset($entries[$i]['email_home'])) &&
! (trim($entries[$i]['email_home']) != ''))
! {
! $hemail = '"'.$personal_part.'"
<'.$entries[$i]['email_home'].'>';
! }
! else
! {
! $hemail = $entries[$i]['email_home'];
! }
! }
!
! // --------------------- template declaration for list records
--------------------------
! $GLOBALS['phpgw']->template->set_var(array(
! 'firstname' => $firstname,
! 'lastname' => $lastname
! ));
!
! $GLOBALS['phpgw']->template->set_var('id',$id);
! $GLOBALS['phpgw']->template->set_var('email',$email);
! $GLOBALS['phpgw']->template->set_var('hemail',$hemail);
!
!
$GLOBALS['phpgw']->template->parse('list','addressbook_list',True);
! }
! // --------------------------- end record declaration
---------------------------
!
! $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
! $GLOBALS['phpgw']->template->parse('out','addressbook_list_t',True);
! $GLOBALS['phpgw']->template->p('out');
!
! $GLOBALS['phpgw']->common->phpgw_exit();
! ?>
--- 1,229 ----
! <?php
!
/**************************************************************************\
! * phpGroupWare - email/addressbook
*
! * http://www.phpgroupware.org
*
! * Written by Bettina Gille 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$ */
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'noheader' => True,
! 'nonavbar' => True,
! 'currentapp' => 'email',
! 'enable_nextmatchs_class' => True
! );
!
! include('../header.inc.php');
!
! $GLOBALS['phpgw']->template->set_file(array(
! 'addressbook_list_t' => 'addressbook.tpl',
! 'addressbook_list' => 'addressbook.tpl'
! ));
!
$GLOBALS['phpgw']->template->set_block('addressbook_list_t','addressbook_list','list');
!
! $d = CreateObject('phpgwapi.contacts');
! $c = CreateObject('phpgwapi.categories');
! $c->app_name = 'addressbook';
!
! $include_personal = True;
!
! $charset = $GLOBALS['phpgw']->translation->translate('charset');
! $GLOBALS['phpgw']->template->set_var('charset',$charset);
!
$GLOBALS['phpgw']->template->set_var('title',$GLOBALS['phpgw_info']['site_title']);
!
$GLOBALS['phpgw']->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
!
$GLOBALS['phpgw']->template->set_var('lang_addressbook_action',lang('Address
book'));
!
$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
!
! $GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
!
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php'));
! $GLOBALS['phpgw']->template->set_var('lang_select_cats',lang('Select
category'));
!
! if (! $start)
! {
! $start = 0;
! }
!
! if (!$filter)
! {
! $filter = 'none';
! }
!
! if (!$cat_id)
! {
! if ($filter == 'none')
! {
! $qfilter = 'tid=n';
! }
! elseif ($filter == 'private')
! {
! $qfilter =
'tid=n,owner='.$GLOBALS['phpgw_info']['user']['account_id'];
! }
! else
! {
! $qfilter = 'tid=n,owner='.$filter;
! }
! }
! else
! {
! if ($filter == 'none')
! {
! $qfilter = 'tid=n,cat_id='.$cat_id;
! }
! elseif ($filter == 'private')
! {
! $qfilter =
'tid=n,owner='.$GLOBALS['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))
! {
! $offset =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
! }
! else
! {
! $offset = 15;
! }
!
! $account_id = $GLOBALS['phpgw_info']['user']['account_id'];
!
! $cols = array (
! 'n_given' => 'n_given',
! 'n_family' => 'n_family',
! 'org_name' => 'org_name',
! 'email' => 'email',
! 'email_home' => 'email_home'
! );
!
! $entries =
$d->read($start,$offset,$cols,$query,$qfilter,$sort,$order,$account_id);
!
! //------------------------------------------- nextmatch
--------------------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',$start,$d->total_records,"&order=$order&filter=$filter&sort=$sort&query=$query");
! $GLOBALS['phpgw']->template->set_var('left',$left);
! $GLOBALS['phpgw']->template->set_var('right',$right);
!
! if ($d->total_records >
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
! {
!
$GLOBALS['phpgw']->template->set_var('lang_showing',lang('showing x - x of
x',($start + 1),($start +
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']),$d->total_records));
! }
! else
! {
!
$GLOBALS['phpgw']->template->set_var('lang_showing',lang('showing
x',$d->total_records));
! }
! // --------------------------------------- end nextmatch
------------------------------------------
!
! // ------------------- list header variable template-declaration
-----------------------
!
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
$GLOBALS['phpgw']->template->set_var('sort_firstname',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'n_given',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Firstname')));
!
$GLOBALS['phpgw']->template->set_var('sort_lastname',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'n_family',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Lastname')));
!
$GLOBALS['phpgw']->template->set_var('sort_company',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'org_name',$order,'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',lang('Company')));
! $GLOBALS['phpgw']->template->set_var('lang_email',lang('Select work
email address'));
! $GLOBALS['phpgw']->template->set_var('lang_hemail',lang('Select home
email address'));
!
$GLOBALS['phpgw']->template->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
! $GLOBALS['phpgw']->template->set_var('lang_select',lang('Select'));
!
!
//$GLOBALS['phpgw']->template->set_var('cats_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
! // thanks to address@hidden for fixing drop down list filtering by
categories
!
$GLOBALS['phpgw']->template->set_var('cats_action',$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/addressbook.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query"));
!
! // --------------------------- end header declaration
----------------------------------
! for ($i=0;$i<count($entries);$i++)
! {
! $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
! $firstname = $entries[$i]['n_given'];
! if (!$firstname)
! {
! $firstname = ' ';
! }
! $lastname = $entries[$i]['n_family'];
! if (!$lastname)
! {
! $lastname = ' ';
! }
! // thanks to address@hidden for adding company
! $company = $entries[$i]['org_name'];
! if (!$company)
! {
! $company = ' ';
! }
!
! $personal_firstname = '';
! $personal_lastname = '';
! $personal_part = '';
! if ((isset($firstname)) &&
! ($firstname != '') &&
! ($firstname != ' '))
! {
! $personal_firstname = $firstname.' ';
! }
! if ((isset($lastname)) &&
! ($lastname != '') &&
! ($lastname != ' '))
! {
! $personal_lastname = $lastname;
! }
! $personal_part = $personal_firstname.$personal_lastname;
!
! if (($personal_part == '') ||
! ($include_personal == False))
! {
! $id = $entries[$i]['id'];
! $email = $entries[$i]['email'];
! $hemail = $entries[$i]['email_home'];
! }
! else
! {
! $id = $entries[$i]['id'];
! if ((isset($entries[$i]['email'])) &&
! (trim($entries[$i]['email']) != ''))
! {
! $email = '"'.$personal_part.'"
<'.$entries[$i]['email'].'>';
! }
! else
! {
! $email = $entries[$i]['email'];
! }
! if ((isset($entries[$i]['email_home'])) &&
! (trim($entries[$i]['email_home']) != ''))
! {
! $hemail = '"'.$personal_part.'"
<'.$entries[$i]['email_home'].'>';
! }
! else
! {
! $hemail = $entries[$i]['email_home'];
! }
! }
!
! // --------------------- template declaration for list records
--------------------------
! $GLOBALS['phpgw']->template->set_var(array(
! 'firstname' => $firstname,
! 'lastname' => $lastname,
! 'company' => $company
! ));
!
! $GLOBALS['phpgw']->template->set_var('id',$id);
! $GLOBALS['phpgw']->template->set_var('email',$email);
! $GLOBALS['phpgw']->template->set_var('hemail',$hemail);
!
!
$GLOBALS['phpgw']->template->parse('list','addressbook_list',True);
! }
! // --------------------------- end record declaration
---------------------------
!
! $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
! $GLOBALS['phpgw']->template->parse('out','addressbook_list_t',True);
! $GLOBALS['phpgw']->template->p('out');
!
! $GLOBALS['phpgw']->common->phpgw_exit();
! ?>
Index: compose.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/compose.php,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -C2 -r1.49.2.1 -r1.49.2.2
*** compose.php 29 Mar 2002 17:48:48 -0000 1.49.2.1
--- compose.php 20 Nov 2002 23:03:23 -0000 1.49.2.2
***************
*** 1,52 ****
! <?php
!
/**************************************************************************\
! * phpGroupWare - E-Mail *
! * http://www.phpgroupware.org *
! * Based on Aeromail by Mark C3ushman <address@hidden> *
! * http://the.cushman.net/ *
! * Currently maintained by Angles <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$ */
!
! Header('Cache-Control: no-cache');
! Header('Pragma: no-cache');
! Header('Expires: Sat, Jan 01 2000 01:01:01 GMT');
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'email',
! 'noheader' => True,
! 'nofooter' => True,
! 'nonavbar' => True,
! 'noappheader' => True,
! 'noappfooter' => True
! );
! include('../header.inc.php');
! // time limit should be controlled elsewhere
! //@set_time_limit(0);
!
! // this index page is acting like a calling app which wants the HTML
produced by mail.uiindex.index
! // but DOES NOT want mail.uiindex.index to actually echo or print out
any HTML
! // we, the calling app, will handle the outputting of the HTML
! //$is_modular = True;
! $is_modular = False;
!
! header('Location: '.$GLOBALS['phpgw']->link(
! '/index.php',
! 'menuaction=email.uicompose.compose'.
! '&fldball[folder]='.$fldball[folder].
! '&fldball[acctnum]='.$fldball[acctnum].
! '&to='.$to.
! '&cc='.$cc.
! '&bcc='.$bcc.
! '&subject='.$subject.
! '&body='.$body.
! '&personal='.$personal.
! '&sort='.$sort.
! '&order='.$order.
! '&start='.$start));
! ?>
--- 1,93 ----
! <?php
!
/**************************************************************************\
! * phpGroupWare - E-Mail *
! * http://www.phpgroupware.org *
! * Based on Aeromail by Mark C3ushman <address@hidden> *
! * http://the.cushman.net/ *
! * Currently maintained by Angles <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$ */
!
! Header('Cache-Control: no-cache');
! Header('Pragma: no-cache');
! Header('Expires: Sat, Jan 01 2000 01:01:01 GMT');
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'email',
! 'noheader' => True,
! 'nofooter' => True,
! 'nonavbar' => True,
! 'noappheader' => True,
! 'noappfooter' => True
! );
! include('../header.inc.php');
!
! // we need a msg object BUT NO LOGIN IS NEEDED
! $my_msg_bootstrap = '';
! $my_msg_bootstrap = CreateObject("email.msg_bootstrap");
! $my_msg_bootstrap->set_do_login(False);
! $my_msg_bootstrap->ensure_mail_msg_exists('email: compose.php', 0);
!
! // time limit should be controlled elsewhere
! //@set_time_limit(0);
! $pass_the_ball_uri = '';
!
! if ($GLOBALS['phpgw']->msg->get_isset_arg('fldball'))
! {
! $my_fldball = $GLOBALS['phpgw']->msg->get_arg_value('fldball');
! $pass_the_ball_uri = '&fldball[folder]='.$my_fldball['folder']
!
.'&fldball[acctnum]='.$my_fldball['acctnum'];
! }
! elseif ($GLOBALS['phpgw']->msg->get_isset_arg('msgball'))
! {
! $my_msgball = $GLOBALS['phpgw']->msg->get_arg_value('msgball');
! $pass_the_ball_uri = '&msgball[folder]='.$my_msgball['folder']
!
.'&msgball[acctnum]='.$my_msgball['acctnum']
!
.'&msgball[msgnum]='.$my_msgball['msgnum'];
! }
! else
! {
! $pass_the_ball_uri = '&fldball[folder]=INBOX'
! .'&fldball[acctnum]=0';
! }
!
! header('Location: '.$GLOBALS['phpgw']->link(
! '/index.php',
! 'menuaction=email.uicompose.compose'.
! $pass_the_ball_uri.
! '&to='.$to.
! '&cc='.$cc.
! '&bcc='.$bcc.
! '&subject='.$subject.
! '&body='.$body.
! '&personal='.$personal.
! '&sort='.$sort.
! '&order='.$order.
! '&start='.$start));
!
! if (is_object($GLOBALS['phpgw']->msg))
! {
! $terminate = True;
! }
! else
! {
! $terminate = False;
! }
!
! if ($terminate == True)
! {
! // close down ALL mailserver streams
! $GLOBALS['phpgw']->msg->end_request();
! // destroy the object
! $GLOBALS['phpgw']->msg = '';
! unset($GLOBALS['phpgw']->msg);
! }
! // shut down this transaction
! $GLOBALS['phpgw']->common->phpgw_exit(False);
!
! ?>
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/index.php,v
retrieving revision 1.86.2.2
retrieving revision 1.86.2.3
diff -C2 -r1.86.2.2 -r1.86.2.3
*** index.php 14 Feb 2002 13:12:51 -0000 1.86.2.2
--- index.php 20 Nov 2002 23:03:23 -0000 1.86.2.3
***************
*** 1,72 ****
! <?php
!
/**************************************************************************\
! * phpGroupWare - E-Mail
*
! * http://www.phpgroupware.org
*
! * Based on Aeromail by Mark C3ushman <address@hidden>
*
! * http://the.cushman.net/
*
! * Currently maintained by Angles <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$ */
!
! Header('Cache-Control: no-cache');
! Header('Pragma: no-cache');
! Header('Expires: Sat, Jan 01 2000 01:01:01 GMT');
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'email',
! 'noheader' => True,
! 'nofooter' => True,
! 'nonavbar' => True,
! 'noappheader' => True,
! 'noappfooter' => True
! );
! include('../header.inc.php');
!
! /*
! time limit should be controlled elsewhere
! @set_time_limit(0);
!
! this index page is acting like a calling app which wants the HTML
produced by mail.uiindex.index
! but DOES NOT want mail.uiindex.index to actually echo or print out any
HTML
! we, the calling app, will handle the outputting of the HTML
! $is_modular = True;
! */
! $is_modular = False;
!
! header('Location: '.$GLOBALS['phpgw']->link(
! '/index.php',
! 'menuaction=email.uiindex.index'));
! return;
! /*
! if ($is_modular == True)
! {
! // pretend we are a calling app outputting some HTML, including
the header and navbar
! $GLOBALS['phpgw']->common->phpgw_header();
! echo parse_navbar();
! // retrieve the html data from class uiindex
! $obj = CreateObject('email.uiindex');
! $obj->set_is_modular(True);
! $retured_html = $obj->index();
! // time for us to output the returned html data
! echo $retured_html;
! // now as the calling app, it's time to output the bottom of
the page
! $GLOBALS['phpgw']->common->phpgw_footer();
! }
! else
! {
! // this NON-modular usage will have class uiindex itself output
the header, navbar, class HTML data, and footer
! $obj = CreateObject('email.uiindex');
! $obj->index();
! // STRANGEly enough, menuaction=email.uiindex.index as
non-module STILL requires an
! // outside-the-class entity to call common->phpgw_footer(),
eventhough the class itself will
! // output the header and navbar, but it may not output
common->phpgw_footer() else page gets 2 footers
! $GLOBALS['phpgw']->common->phpgw_footer();
! }
! */
! ?>
--- 1,101 ----
! <?php
!
/**************************************************************************\
! * phpGroupWare - E-Mail
*
! * http://www.phpgroupware.org
*
! * Based on Aeromail by Mark C3ushman <address@hidden>
*
! * http://the.cushman.net/
*
! * Currently maintained by Angles <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$ */
!
! Header('Cache-Control: no-cache');
! Header('Pragma: no-cache');
! Header('Expires: Sat, Jan 01 2000 01:01:01 GMT');
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'email',
! 'noheader' => True,
! 'nofooter' => True,
! 'nonavbar' => True,
! 'noappheader' => True,
! 'noappfooter' => True
! );
! include('../header.inc.php');
!
! /*
! time limit should be controlled elsewhere
! @set_time_limit(0);
!
! this index page is acting like a calling app which wants the HTML
produced by mail.uiindex.index
! but DOES NOT want mail.uiindex.index to actually echo or print out any
HTML
! we, the calling app, will handle the outputting of the HTML
! $is_modular = True;
! */
!
! $simple_redirect = True;
! //$simple_redirect = False;
!
! if ($simple_redirect == True)
! {
! //header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'));
!
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'));
! if (is_object($GLOBALS['phpgw']->msg))
! {
! // close down ALL mailserver streams
! $GLOBALS['phpgw']->msg->end_request();
! // destroy the object
! $GLOBALS['phpgw']->msg = '';
! unset($GLOBALS['phpgw']->msg);
! }
! // shut down this transaction
! $GLOBALS['phpgw']->common->phpgw_exit(False);
! }
! else
! {
! /*
! // OBSOLETED CODE
! // pretend we are a calling app outputting some HTML, including
the header and navbar
! $GLOBALS['phpgw']->common->phpgw_header();
! echo parse_navbar();
! // retrieve the html data from class uiindex
! $obj = CreateObject('email.uiindex');
! $obj->set_is_modular(True);
! $retured_html = $obj->index();
! // time for us to output the returned html data
! echo $retured_html;
! // now as the calling app, it's time to output the bottom of
the page
! $GLOBALS['phpgw']->common->phpgw_footer();
! */
!
! /*
! // NOTE: this does NOT WORK
! // make a uiinex object and make it do its job
! // it will output the header, navbar, class HTML data, and
footer
! class uiindex_holder
! {
! var $uiindex_obj = '';
! }
!
! $my_msg_bootstrap = '';
! $my_msg_bootstrap = CreateObject('email.msg_bootstrap');
! $my_msg_bootstrap->ensure_mail_msg_exists('index.php', 3);
!
! echo 'calling CreateObject email.uiindex <br>';
! $GLOBALS['phphw_uiindex'] = new uiindex_holder;
! $GLOBALS['phphw_uiindex']->uiindex_obj =
CreateObject('email.uiindex');
! echo 'done calling CreateObject email.uiindex <br>';
! $GLOBALS['phphw_uiindex']->uiindex_obj->index();
! // STRANGEly enough, menuaction=email.uiindex.index as
non-module STILL requires an
! // outside-the-class entity to call common->phpgw_footer(),
eventhough the class itself will
! // output the header and navbar, but it may not output
common->phpgw_footer() else page gets 2 footers
! //$GLOBALS['phpgw']->common->phpgw_footer();
! */
! }
!
! ?>
Index: view_image.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/view_image.php,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C2 -r1.13.2.3 -r1.13.2.4
*** view_image.php 26 Mar 2002 02:20:40 -0000 1.13.2.3
--- view_image.php 20 Nov 2002 23:03:23 -0000 1.13.2.4
***************
*** 1,51 ****
! <?php
! /**************************************************************************\
! * phpGroupWare - E-Mail *
! * http://www.phpgroupware.org *
! * Based on Aeromail by Mark Cushman <address@hidden> *
! * http://the.cushman.net/ *
! * -------------------------------------------- *
! * 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$ */
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'email',
! 'enable_network_class' => True,
! 'noheader' => True,
! 'nonavbar' => True
! );
! include('../header.inc.php');
! /*
! if (isset($GLOBALS['phpgw_info']['flags']['newsmode']) &&
$GLOBALS['phpgw_info']['flags']['newsmode'])
! {
! $GLOBALS['phpgw']->common->read_preferences('nntp');
! }
! @set_time_limit(0);
!
! echo 'Mailbox = '.$mailbox.'<br>'."\n";
! echo 'Mailbox = '.$GLOBALS['phpgw']->msg->mailsvr_stream.'<br>'."\n";
! echo 'Msgnum = '.$m.'<br>'."\n";
! echo 'Part Number = '.$p.'<br>'."\n";
! echo 'Subtype = '.$s.'<br>'."\n";
! */
! //$data =
$GLOBALS['phpgw']->dcom->fetchbody($GLOBALS['phpgw']->msg->mailsvr_stream, $m,
$p);
! $data = $GLOBALS['phpgw']->msg->phpgw_fetchbody($p);
! //$picture = $GLOBALS['phpgw']->dcom->base64($data);
! $picture = $GLOBALS['phpgw']->msg->de_base64($data);
!
! // echo strlen($picture)."<br>\n";
! // echo $data;
!
! Header('Content-length: '.strlen($picture));
! Header('Content-type: image/'.$s);
! Header('Content-disposition: attachment; filename="'.urldecode($n).'"');
! echo $picture;
! flush();
!
! $GLOBALS['phpgw']->msg->end_request();
! ?>
--- 1,70 ----
! <?php
! /**************************************************************************\
! * phpGroupWare - E-Mail *
! * http://www.phpgroupware.org *
! * Based on Aeromail by Mark Cushman <address@hidden> *
! * http://the.cushman.net/ *
! * -------------------------------------------- *
! * 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$ */
!
! $GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'email',
! 'enable_network_class' => True,
! 'noheader' => True,
! 'nonavbar' => True
! );
! include('../header.inc.php');
! /*
! if (isset($GLOBALS['phpgw_info']['flags']['newsmode']) &&
$GLOBALS['phpgw_info']['flags']['newsmode'])
! {
! $GLOBALS['phpgw']->common->read_preferences('nntp');
! }
! @set_time_limit(0);
!
! echo 'Mailbox = '.$mailbox.'<br>'."\n";
! echo 'Mailbox = '.$GLOBALS['phpgw']->msg->mailsvr_stream.'<br>'."\n";
! echo 'Msgnum = '.$m.'<br>'."\n";
! echo 'Part Number = '.$p.'<br>'."\n";
! echo 'Subtype = '.$s.'<br>'."\n";
! */
! //$data =
$GLOBALS['phpgw']->dcom->fetchbody($GLOBALS['phpgw']->msg->mailsvr_stream, $m,
$p);
! $data = $GLOBALS['phpgw']->msg->phpgw_fetchbody($p);
! //$picture = $GLOBALS['phpgw']->dcom->base64($data);
! $picture = $GLOBALS['phpgw']->msg->de_base64($data);
!
! // echo strlen($picture)."<br>\n";
! // echo $data;
!
! Header('Content-length: '.strlen($picture));
! Header('Content-type: image/'.$s);
! Header('Content-disposition: attachment; filename="'.urldecode($n).'"');
! echo $picture;
! flush();
!
! // IS THIS FILE EVER USED ANYMORE?
! if (is_object($GLOBALS['phpgw']->msg))
! {
! $terminate = True;
! }
! else
! {
! $terminate = False;
! }
!
! if ($terminate == True)
! {
! // close down ALL mailserver streams
! $GLOBALS['phpgw']->msg->end_request();
! // destroy the object
! $GLOBALS['phpgw']->msg = '';
! unset($GLOBALS['phpgw']->msg);
! }
! // shut down this transaction
! $GLOBALS['phpgw']->common->phpgw_exit(False);
! ?>
--- attach_file.php DELETED ---
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email ChangeLog.beta1final--1.0,NONE,1.1.2.1 ChangeLog.codehere--1.1,NONE,1.2.2.1 ChangeLog.core--1.1,NONE,1.1.2.1 ChangeLog.lex--1.1,NONE,1.1.2.1 ChangeLog.ryan--1.1,NONE,1.1.2.1 addressbook-js.changelog.txt,NONE,1.1.2.1 addressbook-js.php,NONE,1.1.2.1 test.php,NONE,1.1.2.1 addressbook.php,1.32.2.4,1.32.2.5 compose.php,1.49.2.1,1.49.2.2 index.php,1.86.2.2,1.86.2.3 view_image.php,1.13.2.3,1.13.2.4 attach_file.php,1.24.2.2,NONE,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: email/templates/default addressbook-js-bits.tpl,NONE,1.1.2.1 addressbook-js-frameset.tpl,NONE,1.1.2.1 addressbook-js-smaller.tpl,NONE,1.1.2.1 addressbook-js.tpl,NONE,1.1.2.1 debug.tpl,NONE,1.1.2.1 spell_review.tpl,NONE,1.1.2.1 widget_toolbar.tpl,NONE,1.1.2.1 OLD-preferences.tpl,1.1,1.1.2.1 addressbook.tpl,1.7.6.1,1.7.6.2 attach_file.tpl,1.1,1.1.4.1 attach_file_blocks.tpl,1.1,1.1.4.1 class_prefs_blocks.tpl,1.2.2.1,1.2.2.2 class_prefs_ex_accounts.tpl,1.2.2.1,1.2.2.2 class_prefs_ui.tpl,1.2,1.2.2.1 compose.tpl,1.2.2.1,1.2.2.2 config.tpl,1.5,1.5.2.1 filters.tpl,1.2.2.1,1.2.2.2 filters_blocks.tpl,1.5.2.1,1.5.2.2 filters_list.tpl,1.3.2.1,1.3.2.2 folder.tpl,1.7,1.7.2.1 index_blocks.tpl,1.3.2.1,1.3.2.2 index_main_b0_l1.tpl,1.9,1.9.2.1 index_main_b0_l2.tpl,1.15,1.15.2.1 index_mlist.tpl,1.1,1.1.2.1 message_echo_dump.tpl,1.1,1.1.4.1 message_main.tpl,1.7.2.1,1.7.2.2
- Next by Date:
[Phpgroupware-cvs] CVS: email/setup phpgw_de.lang,1.7,1.7.2.1 phpgw_en.lang,1.7.2.6,1.7.2.7 phpgw_es.lang,1.5.2.1,1.5.2.2 phpgw_fr.lang,1.4.2.3,1.4.2.4 phpgw_it.lang,1.3,1.3.2.1 phpgw_pt.lang,1.1.2.1,1.1.2.2 phpgw_sv.lang,1.2,1.2.2.1 setup.inc.php,1.8.2.2,1.8.2.3
- Previous by thread:
[Phpgroupware-cvs] CVS: email/templates/default addressbook-js-bits.tpl,NONE,1.1.2.1 addressbook-js-frameset.tpl,NONE,1.1.2.1 addressbook-js-smaller.tpl,NONE,1.1.2.1 addressbook-js.tpl,NONE,1.1.2.1 debug.tpl,NONE,1.1.2.1 spell_review.tpl,NONE,1.1.2.1 widget_toolbar.tpl,NONE,1.1.2.1 OLD-preferences.tpl,1.1,1.1.2.1 addressbook.tpl,1.7.6.1,1.7.6.2 attach_file.tpl,1.1,1.1.4.1 attach_file_blocks.tpl,1.1,1.1.4.1 class_prefs_blocks.tpl,1.2.2.1,1.2.2.2 class_prefs_ex_accounts.tpl,1.2.2.1,1.2.2.2 class_prefs_ui.tpl,1.2,1.2.2.1 compose.tpl,1.2.2.1,1.2.2.2 config.tpl,1.5,1.5.2.1 filters.tpl,1.2.2.1,1.2.2.2 filters_blocks.tpl,1.5.2.1,1.5.2.2 filters_list.tpl,1.3.2.1,1.3.2.2 folder.tpl,1.7,1.7.2.1 index_blocks.tpl,1.3.2.1,1.3.2.2 index_main_b0_l1.tpl,1.9,1.9.2.1 index_main_b0_l2.tpl,1.15,1.15.2.1 index_mlist.tpl,1.1,1.1.2.1 message_echo_dump.tpl,1.1,1.1.4.1 message_main.tpl,1.7.2.1,1.7.2.2
- Next by thread:
[Phpgroupware-cvs] CVS: email/setup phpgw_de.lang,1.7,1.7.2.1 phpgw_en.lang,1.7.2.6,1.7.2.7 phpgw_es.lang,1.5.2.1,1.5.2.2 phpgw_fr.lang,1.4.2.3,1.4.2.4 phpgw_it.lang,1.3,1.3.2.1 phpgw_pt.lang,1.1.2.1,1.1.2.2 phpgw_sv.lang,1.2,1.2.2.1 setup.inc.php,1.8.2.2,1.8.2.3
- Index(es):