[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/inc hook_admin.inc.php,1.3,1.4 hook_email_
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc hook_admin.inc.php,1.3,1.4 hook_email_add_def_pref.inc.php,1.3,1.4 hook_home.inc.php,1.50,1.51 hook_manual.inc.php,1.3,1.4 hook_notifywindow_simple.inc.php,1.5,1.6 hook_preferences.inc.php,1.11,1.12 functions.inc.php,1.111,1.112 |
|
Date: |
Sun, 03 Mar 2002 19:56:59 -0500 |
Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv4491
Modified Files:
hook_admin.inc.php hook_email_add_def_pref.inc.php
hook_home.inc.php hook_manual.inc.php
hook_notifywindow_simple.inc.php hook_preferences.inc.php
functions.inc.php
Log Message:
formatting
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_admin.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hook_admin.inc.php 27 Dec 2001 17:56:03 -0000 1.3
--- hook_admin.inc.php 4 Mar 2002 00:56:56 -0000 1.4
***************
*** 16,20 ****
$title = $appname;
$file = Array(
! 'Site Configuration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
. $appname)
);
//Do not modify below this line
--- 16,20 ----
$title = $appname;
$file = Array(
! 'Site Configuration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
. $appname)
);
//Do not modify below this line
Index: hook_email_add_def_pref.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_email_add_def_pref.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hook_email_add_def_pref.inc.php 19 Feb 2001 15:16:20 -0000 1.3
--- hook_email_add_def_pref.inc.php 4 Mar 2002 00:56:56 -0000 1.4
***************
*** 1,8 ****
<?php
! global $pref;
! $pref->change("email","mainscreen_showmail","True");
! $pref->change("email","use_trash_folder","False");
! $pref->change("email","default_sorting","old_new");
! $pref->change("email","show_addresses","from");
! $pref->change("email","email_sig","");
?>
--- 1,20 ----
<?php
! /**************************************************************************\
! * phpGroupWare - Preferences *
! * http://www.phpgroupware.org *
! * Written by Mark Peters <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['pref']->change('email','mainscreen_showmail','True');
! $GLOBALS['pref']->change('email','use_trash_folder','False');
! $GLOBALS['pref']->change('email','default_sorting','old_new');
! $GLOBALS['pref']->change('email','show_addresses','from');
! $GLOBALS['pref']->change('email','email_sig','');
?>
Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_home.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** hook_home.inc.php 15 Jan 2002 20:29:47 -0000 1.50
--- hook_home.inc.php 4 Mar 2002 00:56:56 -0000 1.51
***************
*** 43,47 ****
if (!$some_stream)
{
! $title = '<font
color="#FFFFFF">'.lang('EMail').'</font>';
$extra_data = '<b>Mail error:</b> Can not open
connection to mail server';
}
--- 43,47 ----
if (!$some_stream)
{
! $title = '<font color="#FFFFFF">' . lang('EMail') .
'</font>';
$extra_data = '<b>Mail error:</b> Can not open
connection to mail server';
}
***************
*** 51,55 ****
// this is the structure you will get
$inbox_data['is_imap'] boolean - pop3 server do not
know what is "new" or not
! $inbox_data['folder_checked'] string - the folder
checked, as processed by the msg class
$inbox_data['alert_string'] string - what to show the
user about this inbox check
$inbox_data['number_new'] integer - for IMAP is
number "unseen"; for pop3 is number messages
--- 51,55 ----
// this is the structure you will get
$inbox_data['is_imap'] boolean - pop3 server do not
know what is "new" or not
! $inbox_data['folder_checked'] string - the folder
checked, as processed by the msg class
$inbox_data['alert_string'] string - what to show the
user about this inbox check
$inbox_data['number_new'] integer - for IMAP is
number "unseen"; for pop3 is number messages
***************
*** 59,63 ****
$inbox_data =
$GLOBALS['phpgw']->msg->new_message_check();
! $title = '<font color="#FFFFFF">'.lang('EMail').'
'.$inbox_data['alert_string'].'</font>';
if($inbox_data['number_all'] >= 5)
--- 59,63 ----
$inbox_data =
$GLOBALS['phpgw']->msg->new_message_check();
! $title = '<font color="#FFFFFF">' . lang('EMail') . ' '
. $inbox_data['alert_string'] . '</font>';
if($inbox_data['number_all'] >= 5)
***************
*** 79,109 ****
$msg_headers =
$GLOBALS['phpgw']->msg->phpgw_header($msgball_list[$i]);
$subject =
$GLOBALS['phpgw']->msg->get_subject($msg_headers,'');
! if (strlen($subject) > 65)
{
$subject = substr($subject,0,65).' ...';
}
$data[] = array(
! 'text' => $subject,
! 'link' => $GLOBALS['phpgw']->link(
! '/index.php',
!
'menuaction=email.uimessage.message'
!
.'&'.$msgball_list[$i]['uri'])
);
}
!
// COMPOSE NEW email link
$compose_link = $GLOBALS['phpgw']->link(
! '/index.php',
!
'menuaction=email.uicompose.compose'
! // this data
tells us where to return to after sending a message
! // since we
started from home page, send can not (at this time) take us back there
! // so instead
take user to INBOX for the default account (acctnum 0) after clicking the send
button
!
.'&fldball[folder]=INBOX'
!
.'&fldball[acctnum]=0');
$compose_href = '<a
href="'.$compose_link.'">'.lang('Compose New').'</a>'."\r\n";
!
// ADD FOLDER LISTBOX TO HOME PAGE (Needs to be
TEMPLATED)
// Does This Mailbox Support Folders (i.e. more than
just INBOX)?
! if
($GLOBALS['phpgw']->msg->get_mailsvr_supports_folders() == False)
{
$extra_data = ' '.$compose_href;
--- 79,111 ----
$msg_headers =
$GLOBALS['phpgw']->msg->phpgw_header($msgball_list[$i]);
$subject =
$GLOBALS['phpgw']->msg->get_subject($msg_headers,'');
! if(strlen($subject) > 65)
{
$subject = substr($subject,0,65).' ...';
}
$data[] = array(
! 'text' => $subject,
! 'link' => $GLOBALS['phpgw']->link(
! '/index.php',
!
'menuaction=email.uimessage.message'
! . '&' . $msgball_list[$i]['uri']
! )
);
}
!
// COMPOSE NEW email link
$compose_link = $GLOBALS['phpgw']->link(
! '/index.php',
! 'menuaction=email.uicompose.compose'
! // this data tells us where to return to after
sending a message
! // since we started from home page, send can
not (at this time) take us back there
! // so instead take user to INBOX for the
default account (acctnum 0) after clicking the send button
! . '&fldball[folder]=INBOX'
! . '&fldball[acctnum]=0'
! );
$compose_href = '<a
href="'.$compose_link.'">'.lang('Compose New').'</a>'."\r\n";
!
// ADD FOLDER LISTBOX TO HOME PAGE (Needs to be
TEMPLATED)
// Does This Mailbox Support Folders (i.e. more than
just INBOX)?
!
if($GLOBALS['phpgw']->msg->get_mailsvr_supports_folders() == False)
{
$extra_data = ' '.$compose_href;
***************
*** 117,129 ****
// anything not specified will be replace with
a default value if the function has one for that param
$feed_args = Array(
! 'mailsvr_stream' => '',
! 'pre_select_folder' => '',
! 'skip_folder' => '',
! 'show_num_new' =>
$listbox_show_unseen,
! 'widget_name' =>
'fldball_fake_uri',
! 'folder_key_name' => 'folder',
! 'acctnum_key_name' => 'acctnum',
! 'on_change' =>
'document.switchbox.submit()',
! 'first_line_txt' => lang('switch
current folder to')
);
// get you custom built HTML listbox (a.k.a.
selectbox) widget
--- 119,131 ----
// anything not specified will be replace with
a default value if the function has one for that param
$feed_args = Array(
! 'mailsvr_stream' => '',
! 'pre_select_folder' => '',
! 'skip_folder' => '',
! 'show_num_new' =>
$listbox_show_unseen,
! 'widget_name' =>
'fldball_fake_uri',
! 'folder_key_name' => 'folder',
! 'acctnum_key_name' => 'acctnum',
! 'on_change' =>
'document.switchbox.submit()',
! 'first_line_txt' => lang('switch
current folder to')
);
// get you custom built HTML listbox (a.k.a.
selectbox) widget
***************
*** 132,144 ****
// and surround it in FORM tags so the submit
will work
$switchbox_action = $GLOBALS['phpgw']->link(
! '/index.php',
!
'menuaction=email.uiindex.index');
! $extra_data =
! '<form name="switchbox"
action="'.$switchbox_action.'" method="post">'."\r\n"
! .'<td align="left">'."\r\n"
!
.' <strong>'.lang('E-Mail
Folders').':</strong> '.$switchbox_listbox."\r\n"
! .'
'.$compose_href."\r\n"
! .'</td>'."\r\n"
! .'</form>'."\r\n";
}
$GLOBALS['phpgw']->msg->end_request();
--- 134,146 ----
// and surround it in FORM tags so the submit
will work
$switchbox_action = $GLOBALS['phpgw']->link(
! '/index.php',
! 'menuaction=email.uiindex.index'
! );
! $extra_data = '<form name="switchbox" action="'
. $switchbox_action . '" method="post">' . "\r\n"
! . '<td align="left">' . "\r\n"
! . ' <strong>'. lang('E-Mail
Folders') . ':</strong> ' . $switchbox_listbox . "\r\n"
! . ' '. $compose_href .
"\r\n"
! . '</td>' . "\r\n"
! . '</form>' . "\r\n";
}
$GLOBALS['phpgw']->msg->end_request();
***************
*** 147,157 ****
$portalbox = CreateObject('phpgwapi.listbox',
Array(
! 'title' => $title,
! 'primary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
! 'secondary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
! 'tertiary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
! 'width' => '100%',
! 'outerborderwidth' => '0',
! 'header_background_image' =>
$GLOBALS['phpgw']->common->image('phpgwapi/templates/phpgw_website','bg_filler.gif')
)
);
--- 149,159 ----
$portalbox = CreateObject('phpgwapi.listbox',
Array(
! 'title' => $title,
! 'primary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
! 'secondary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
! 'tertiary' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
! 'width' => '100%',
! 'outerborderwidth' => '0',
! 'header_background_image' =>
$GLOBALS['phpgw']->common->image('phpgwapi/templates/phpgw_website','bg_filler.gif')
)
);
***************
*** 159,167 ****
$GLOBALS['portal_order'][] = $app_id;
$var = Array(
! 'up' => Array('url' => '/set_box.php', 'app'
=> $app_id),
! 'down' => Array('url' => '/set_box.php', 'app'
=> $app_id),
! 'close' => Array('url' => '/set_box.php', 'app'
=> $app_id),
! 'question' => Array('url' => '/set_box.php',
'app' => $app_id),
! 'edit' => Array('url' => '/set_box.php', 'app'
=> $app_id)
);
--- 161,169 ----
$GLOBALS['portal_order'][] = $app_id;
$var = Array(
! 'up' => Array('url' => '/set_box.php', 'app' =>
$app_id),
! 'down' => Array('url' => '/set_box.php', 'app' =>
$app_id),
! 'close' => Array('url' => '/set_box.php', 'app' =>
$app_id),
! 'question' => Array('url' => '/set_box.php', 'app' =>
$app_id),
! 'edit' => Array('url' => '/set_box.php', 'app' =>
$app_id)
);
***************
*** 178,183 ****
// output the portalbox and below it (1) the folders listbox
(if applicable) and (2) Compose New mail link
echo "\r\n".'<!-- start Mailbox info -->'."\r\n"
! .$portalbox->draw($extra_data)
! .'<!-- ends Mailox info -->'."\r\n";
}
?>
--- 180,185 ----
// output the portalbox and below it (1) the folders listbox
(if applicable) and (2) Compose New mail link
echo "\r\n".'<!-- start Mailbox info -->'."\r\n"
! . $portalbox->draw($extra_data)
! . '<!-- ends Mailox info -->'."\r\n";
}
?>
Index: hook_manual.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_manual.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hook_manual.inc.php 14 May 2001 00:18:12 -0000 1.3
--- hook_manual.inc.php 4 Mar 2002 00:56:56 -0000 1.4
***************
*** 1,5 ****
<?php
/**************************************************************************\
! * phpGroupWare - Calendar Holidays *
* http://www.phpgroupware.org *
* Written by Mark Peters <address@hidden> *
--- 1,5 ----
<?php
/**************************************************************************\
! * phpGroupWare - Manual *
* http://www.phpgroupware.org *
* Written by Mark Peters <address@hidden> *
***************
*** 14,21 ****
$file = Array(
! 'Viewing' => 'viewing.php',
! 'Replying' => 'replying.php',
! 'Composing/Saving/Deleting' => 'other.php',
! 'Notes' => 'notes.php'
);
//Do not modify below this line
--- 14,21 ----
$file = Array(
! 'Viewing' => 'viewing.php',
! 'Replying' => 'replying.php',
! 'Composing/Saving/Deleting' => 'other.php',
! 'Notes' => 'notes.php'
);
//Do not modify below this line
Index: hook_notifywindow_simple.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_notifywindow_simple.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** hook_notifywindow_simple.inc.php 28 Dec 2001 07:19:37 -0000 1.5
--- hook_notifywindow_simple.inc.php 4 Mar 2002 00:56:56 -0000 1.6
***************
*** 1,11 ****
<?php
/**************************************************************************\
! * phpGroupWare - E-Mail
*
! * http://www.phpgroupware.org
*
! * --------------------------------------------
*
! * 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.
*
\**************************************************************************/
--- 1,11 ----
<?php
/**************************************************************************\
! * phpGroupWare - E-Mail *
! * http://www.phpgroupware.org *
! * -------------------------------------------- *
! * 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. *
\**************************************************************************/
***************
*** 24,34 ****
//$GLOBALS['phpgw_info']["server"]["app_inc"] =
$GLOBALS['phpgw_info']["server"]["server_root"]."/email/inc";
! if
(($GLOBALS['phpgw_info']["user"]["preferences"]["email"]["mainscreen_showmail"])
! && (isset($GLOBALS['phpgw_info']["user"]["apps"]["email"]))
! && ($GLOBALS['phpgw_info']["user"]["apps"]["email"]))
{
// ---- Create the base email Msg Class -----
//$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
! if (is_object($GLOBALS['phpgw']->msg))
{
//echo 'email hook_notifywindow_simple: is_object test:
$GLOBALS[phpgw]->msg is already set, do not create again<br>'; }
--- 24,34 ----
//$GLOBALS['phpgw_info']["server"]["app_inc"] =
$GLOBALS['phpgw_info']["server"]["server_root"]."/email/inc";
!
if(($GLOBALS['phpgw_info']['user']['preferences']['email']['mainscreen_showmail'])
&&
! (isset($GLOBALS['phpgw_info']['user']['apps']['email'])) &&
! ($GLOBALS['phpgw_info']['user']['apps']['email']))
{
// ---- Create the base email Msg Class -----
//$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
! if(is_object($GLOBALS['phpgw']->msg))
{
//echo 'email hook_notifywindow_simple: is_object test:
$GLOBALS[phpgw]->msg is already set, do not create again<br>'; }
***************
*** 37,41 ****
{
//echo 'email hook_notifywindow_simple: is_object test:
$GLOBALS[phpgw]->msg is NOT set, creating mail_msg object<br>'; }
! $GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
}
$args_array = Array();
--- 37,41 ----
{
//echo 'email hook_notifywindow_simple: is_object test:
$GLOBALS[phpgw]->msg is NOT set, creating mail_msg object<br>'; }
! $GLOBALS['phpgw']->msg = CreateObject('email.mail_msg');
}
$args_array = Array();
***************
*** 43,47 ****
$args_array['do_login'] = True;
$GLOBALS['phpgw']->msg->begin_request($args_array);
! if
((string)$GLOBALS['phpgw']->msg->get_arg_value('mailsvr_stream') != '')
{
/* // this is the structure you will get
--- 43,47 ----
$args_array['do_login'] = True;
$GLOBALS['phpgw']->msg->begin_request($args_array);
!
if((string)$GLOBALS['phpgw']->msg->get_arg_value('mailsvr_stream') != '')
{
/* // this is the structure you will get
***************
*** 53,62 ****
*/
$inbox_data = Array();
! $inbox_data =
$GLOBALS['phpgw']->msg->new_message_check();
! if ($inbox_data['is_imap'])
{
! if ($inbox_data['number_new'] > 0)
{
! echo
'action:newmail:'.$inbox_data["number_all"].chr(13);
}
}
--- 53,62 ----
*/
$inbox_data = Array();
! $inbox_data =
$GLOBALS['phpgw']->msg->new_message_check();
! if($inbox_data['is_imap'])
{
! if($inbox_data['number_new'] > 0)
{
! echo 'action:newmail:' .
$inbox_data['number_all'] . chr(13);
}
}
***************
*** 65,69 ****
if ($inbox_data['number_all'] > 0)
{
! echo
'action:newmail'.$inbox_data["number_all"].chr(13);
}
}
--- 65,69 ----
if ($inbox_data['number_all'] > 0)
{
! echo 'action:newmail' .
$inbox_data['number_all'] . chr(13);
}
}
***************
*** 79,82 ****
// is this still necessary?
//$GLOBALS['phpgw_info']["server"]["app_inc"] = $tmp_app_inc;
-
?>
--- 79,81 ----
Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_preferences.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** hook_preferences.inc.php 17 Feb 2002 07:29:22 -0000 1.11
--- hook_preferences.inc.php 4 Mar 2002 00:56:56 -0000 1.12
***************
*** 16,22 ****
$title = $appname;
$file = Array(
! 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.preferences'),
! 'Extra E-Mail Accounts' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.ex_accounts_list'),
! 'E-Mail Filters' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uifilters.filters_list')
);
//Do not modify below this line
--- 16,22 ----
$title = $appname;
$file = Array(
! 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.preferences'),
! 'Extra E-Mail Accounts' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.ex_accounts_list'),
! 'E-Mail Filters' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uifilters.filters_list')
);
//Do not modify below this line
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/functions.inc.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -r1.111 -r1.112
*** functions.inc.php 3 Jan 2002 10:03:28 -0000 1.111
--- functions.inc.php 4 Mar 2002 00:56:56 -0000 1.112
***************
*** 1,13 ****
<?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.
*
\**************************************************************************/
--- 1,13 ----
<?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.
*
\**************************************************************************/
***************
*** 37,44 ****
//$debug_logins = True;
$debug_logins = False;
!
//$debug_args_array = True;
$debug_args_array = False;
!
// ---- == IS IT OK TO LOGIN To Mailserver == -----
/*
--- 37,44 ----
//$debug_logins = True;
$debug_logins = False;
!
//$debug_args_array = True;
$debug_args_array = False;
!
// ---- == IS IT OK TO LOGIN To Mailserver == -----
/*
***************
*** 51,55 ****
// OK TO LOGIN pre-conditions
// were we called from the main screen (user's home page)
! if (strstr($GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
'0.9.12'))
{
// user's welcome page was called "index.php" in ver 0.9.12
--- 51,55 ----
// OK TO LOGIN pre-conditions
// were we called from the main screen (user's home page)
! if(strstr($GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
'0.9.12'))
{
// user's welcome page was called "index.php" in ver 0.9.12
***************
*** 64,71 ****
// were we in a typical email session
$in_email = eregi("^.*\/email\/.*$",$GLOBALS['PHP_SELF']);
!
// DO NOT LOGIN for these conditions --------
$login_allowed = True; // initialize
!
// these files do not require login to email server, or have been
replaced by n-tier classes.
$no_login_check = Array(
--- 64,71 ----
// were we in a typical email session
$in_email = eregi("^.*\/email\/.*$",$GLOBALS['PHP_SELF']);
!
// DO NOT LOGIN for these conditions --------
$login_allowed = True; // initialize
!
// these files do not require login to email server, or have been
replaced by n-tier classes.
$no_login_check = Array(
***************
*** 79,88 ****
"indexx\.php"
);
! if ($debug_logins) { echo 'email functions.php: $no_login_check[]:
'.serialize($no_login_check).'<br>'; }
! for ($i=0; $i<count($no_login_check); $i++)
{
$match_this = $no_login_check[$i];
! if (eregi("^.*\/email\/$match_this.*$",$GLOBALS['PHP_SELF']))
{
$login_allowed = False;
--- 79,88 ----
"indexx\.php"
);
! if($debug_logins) { echo 'email functions.php: $no_login_check[]:
'.serialize($no_login_check).'<br>'; }
! for($i=0; $i<count($no_login_check); $i++)
{
$match_this = $no_login_check[$i];
! if(eregi("^.*\/email\/$match_this.*$",$GLOBALS['PHP_SELF']))
{
$login_allowed = False;
***************
*** 141,145 ****
See below for the currently available array elements that mail_msg
class will accept.
Here are some simplified instructions on initializing and using the
mail_msg class.
!
---- INSTRUCTIONS: -------
1: create an instance of the mail_msg class
--- 141,145 ----
See below for the currently available array elements that mail_msg
class will accept.
Here are some simplified instructions on initializing and using the
mail_msg class.
!
---- INSTRUCTIONS: -------
1: create an instance of the mail_msg class
***************
*** 167,171 ****
7: when you are done, end the request with this command:
$GLOBALS['phpgw']->msg->end_request('');
!
Simple Example:
$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
--- 167,171 ----
7: when you are done, end the request with this command:
$GLOBALS['phpgw']->msg->end_request('');
!
Simple Example:
$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
***************
*** 182,192 ****
// ---- Create the mail_msg Class -----
//$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
! if (is_object($GLOBALS['phpgw']->msg))
{
! if ($debug_logins) { echo 'email: functions.inc.php: is_object
test: $GLOBALS[phpgw]->msg is already set, do not create again<br>'; }
}
else
{
! if ($debug_logins) { echo 'email: functions.inc.php: is_object
test: $GLOBALS[phpgw]->msg is NOT set, creating mail_msg object<br>'; }
$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
}
--- 182,192 ----
// ---- Create the mail_msg Class -----
//$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
! if(is_object($GLOBALS['phpgw']->msg))
{
! if($debug_logins) { echo 'email: functions.inc.php: is_object
test: $GLOBALS[phpgw]->msg is already set, do not create again<br>'; }
}
else
{
! if($debug_logins) { echo 'email: functions.inc.php: is_object
test: $GLOBALS[phpgw]->msg is NOT set, creating mail_msg object<br>'; }
$GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
}
***************
*** 202,206 ****
}
*/
!
// UNKNOWN if $totalerrors and $errors are still used or not
// $args_array['totalerrors'] = $totalerrors;
--- 202,206 ----
}
*/
!
// UNKNOWN if $totalerrors and $errors are still used or not
// $args_array['totalerrors'] = $totalerrors;
***************
*** 208,217 ****
// ---- CONNECT TO MAILSERVER - IF IT'S OK -------
! if ((($in_email) || ($in_mainscreen))
! && ($login_allowed))
{
// this will expose sensitive data, beter to comment it out
when not debugging
//if ($debug_logins) { echo 'CALL TO LOGIN IN
FUNCTIONS.INC.PHP'.'<br>'.'userid='.$GLOBALS['phpgw_info']['user']['preferences']['email']['userid'];
}
!
/*
// DEPRECIATED - not happens aytomatically in
"->begin_request()"
--- 208,216 ----
// ---- CONNECT TO MAILSERVER - IF IT'S OK -------
! if ((($in_email) || ($in_mainscreen)) && ($login_allowed))
{
// this will expose sensitive data, beter to comment it out
when not debugging
//if ($debug_logins) { echo 'CALL TO LOGIN IN
FUNCTIONS.INC.PHP'.'<br>'.'userid='.$GLOBALS['phpgw_info']['user']['preferences']['email']['userid'];
}
!
/*
// DEPRECIATED - not happens aytomatically in
"->begin_request()"
***************
*** 219,223 ****
$GLOBALS['phpgw']->msg->grab_class_args_gpc();
*/
!
// ---- INITIALIZE SIMPLE REQUEST ARGS ARRAY HOLDER VARIABLE
-------
// needed whether you intend to login or not
--- 218,222 ----
$GLOBALS['phpgw']->msg->grab_class_args_gpc();
*/
!
// ---- INITIALIZE SIMPLE REQUEST ARGS ARRAY HOLDER VARIABLE
-------
// needed whether you intend to login or not
***************
*** 234,244 ****
// Otherwise, just let the "->grab_class_args_*()" set these
arg values.
// NOTE: you can supply the "folder" and "do_login" values from
any data source, xml-rpc is planned
!
// (1) ---- do_login: true/false ----
// if true: class dcom is created and a login is attaemted, and
a reopen to the "foler" var is attempted
// if false: used for information only, such as to fill
preferences for squirrelmail,
! // or for the preferences page, where info necessary for
logino may not yet be filled in
$args_array['do_login'] = True;
!
// "begin_request" will obtain the email preferences from the db
// currently db table "phpgw_preferences", accessed via object
$GLOBALS['phpgw']->preferences
--- 233,243 ----
// Otherwise, just let the "->grab_class_args_*()" set these
arg values.
// NOTE: you can supply the "folder" and "do_login" values from
any data source, xml-rpc is planned
!
// (1) ---- do_login: true/false ----
// if true: class dcom is created and a login is attaemted, and
a reopen to the "foler" var is attempted
// if false: used for information only, such as to fill
preferences for squirrelmail,
! // or for the preferences page, where info necessary for
logino may not yet be filled in
$args_array['do_login'] = True;
!
// "begin_request" will obtain the email preferences from the db
// currently db table "phpgw_preferences", accessed via object
$GLOBALS['phpgw']->preferences
***************
*** 252,256 ****
// ---- Error Msg And Exit If Mailbox Connection Not
Established -----
! if (!$some_stream)
{
$GLOBALS['phpgw']->msg->login_error('email_(slash)_functions.inc.php');
--- 251,255 ----
// ---- Error Msg And Exit If Mailbox Connection Not
Established -----
! if(!$some_stream)
{
$GLOBALS['phpgw']->msg->login_error('email_(slash)_functions.inc.php');
***************
*** 273,277 ****
$args_array = Array();
-
// FROM HERE DOWN IS ALL DEPRECIATED CODE
// ---- Various Functions Used To Support Email -----
--- 272,275 ----
***************
*** 281,287 ****
function mime_is_packagelist($part_nice)
{
! if ((stristr($part_nice['subtype'], 'MIXED'))
! || (stristr($part_nice['type'], 'multipart'))
! || (stristr($part_nice['param_attribute'], 'boundry')))
{
return True;
--- 279,285 ----
function mime_is_packagelist($part_nice)
{
! if ((stristr($part_nice['subtype'], 'MIXED')) ||
! (stristr($part_nice['type'], 'multipart')) ||
! (stristr($part_nice['param_attribute'], 'boundry')))
{
return True;
***************
*** 292,295 ****
}
}
-
?>
--- 290,292 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc hook_admin.inc.php,1.3,1.4 hook_email_add_def_pref.inc.php,1.3,1.4 hook_home.inc.php,1.50,1.51 hook_manual.inc.php,1.3,1.4 hook_notifywindow_simple.inc.php,1.5,1.6 hook_preferences.inc.php,1.11,1.12 functions.inc.php,1.111,1.112,
Miles Lott <address@hidden> <=