[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email addressbook.php,1.32.2.2,1.32.2.3 attach_f
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email addressbook.php,1.32.2.2,1.32.2.3 attach_file.php,1.24.2.1,1.24.2.2 index.php,1.86.2.1,1.86.2.2 view_image.php,1.13.2.1,1.13.2.2 |
|
Date: |
Thu, 14 Feb 2002 08:12:53 -0500 |
Update of /cvsroot/phpgroupware/email
In directory subversions:/tmp/cvs-serv20088
Modified Files:
Tag: Version-0_9_14-branch
addressbook.php attach_file.php index.php view_image.php
Log Message:
formatting cleanup
Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/addressbook.php,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -C2 -r1.32.2.2 -r1.32.2.3
*** addressbook.php 14 Feb 2002 06:57:22 -0000 1.32.2.2
--- addressbook.php 14 Feb 2002 13:12:51 -0000 1.32.2.3
***************
*** 86,91 ****
}
! if
(($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
! &&
($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0))
{
$offset =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
--- 86,91 ----
}
! if
(($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) &&
! ($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] >
0))
{
$offset =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
***************
*** 152,164 ****
$personal_lastname = '';
$personal_part = '';
! if ((isset($firstname))
! && ($firstname != '')
! && ($firstname != ' '))
{
$personal_firstname = $firstname.' ';
}
! if ((isset($lastname))
! && ($lastname != '')
! && ($lastname != ' '))
{
$personal_lastname = $lastname;
--- 152,164 ----
$personal_lastname = '';
$personal_part = '';
! if ((isset($firstname)) &&
! ($firstname != '') &&
! ($firstname != ' '))
{
$personal_firstname = $firstname.' ';
}
! if ((isset($lastname)) &&
! ($lastname != '') &&
! ($lastname != ' '))
{
$personal_lastname = $lastname;
***************
*** 166,171 ****
$personal_part = $personal_firstname.$personal_lastname;
! if (($personal_part == '')
! || ($include_personal == False))
{
$id = $entries[$i]['id'];
--- 166,171 ----
$personal_part = $personal_firstname.$personal_lastname;
! if (($personal_part == '') ||
! ($include_personal == False))
{
$id = $entries[$i]['id'];
***************
*** 176,181 ****
{
$id = $entries[$i]['id'];
! if ((isset($entries[$i]['email']))
! && (trim($entries[$i]['email']) != ''))
{
$email = '"'.$personal_part.'"
<'.$entries[$i]['email'].'>';
--- 176,181 ----
{
$id = $entries[$i]['id'];
! if ((isset($entries[$i]['email'])) &&
! (trim($entries[$i]['email']) != ''))
{
$email = '"'.$personal_part.'"
<'.$entries[$i]['email'].'>';
***************
*** 185,190 ****
$email = $entries[$i]['email'];
}
! if ((isset($entries[$i]['email_home']))
! && (trim($entries[$i]['email_home']) != ''))
{
$hemail = '"'.$personal_part.'"
<'.$entries[$i]['email_home'].'>';
--- 185,190 ----
$email = $entries[$i]['email'];
}
! if ((isset($entries[$i]['email_home'])) &&
! (trim($entries[$i]['email_home']) != ''))
{
$hemail = '"'.$personal_part.'"
<'.$entries[$i]['email_home'].'>';
Index: attach_file.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/attach_file.php,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -r1.24.2.1 -r1.24.2.2
*** attach_file.php 14 Feb 2002 06:57:22 -0000 1.24.2.1
--- attach_file.php 14 Feb 2002 13:12:51 -0000 1.24.2.2
***************
*** 14,19 ****
$phpgw_flags = Array(
! 'currentapp' => 'email',
! 'enable_network_class' => True,
'noheader' => True,
'nonavbar' => True
--- 14,19 ----
$phpgw_flags = Array(
! 'currentapp' => 'email',
! 'enable_network_class' => True,
'noheader' => True,
'nonavbar' => True
***************
*** 25,29 ****
$GLOBALS['phpgw']->template->set_file(
! Array(
'T_attach_file' => 'attach_file.tpl',
'T_attach_file_blocks' => 'attach_file_blocks.tpl'
--- 25,29 ----
$GLOBALS['phpgw']->template->set_file(
! Array(
'T_attach_file' => 'attach_file.tpl',
'T_attach_file_blocks' => 'attach_file_blocks.tpl'
***************
*** 50,57 ****
{
$alert_msg .= 'Error:'.'<br>'
! .'Server is unable to access phpgw tmp directory'.'<br>'
! .$GLOBALS['phpgw_info']['server']['temp_dir'].'<br>'
! .'Please check your configuration'.'<br>'
! .'<br>';
}
--- 50,57 ----
{
$alert_msg .= 'Error:'.'<br>'
! . 'Server is unable to access phpgw tmp
directory'.'<br>'
! . $GLOBALS['phpgw_info']['server']['temp_dir'].'<br>'
! . 'Please check your configuration'.'<br>'
! . '<br>';
}
***************
*** 68,75 ****
{
$alert_msg .= 'Error:'.'<br>'
! .'Server is unable to access phpgw email tmp
directory'.'<br>'
! .$uploaddir.'<br>'
! .'Please check your configuration'.'<br>'
! .'<br>';
}
--- 68,75 ----
{
$alert_msg .= 'Error:'.'<br>'
! . 'Server is unable to access phpgw email tmp
directory'.'<br>'
! . $uploaddir.'<br>'
! . 'Please check your configuration'.'<br>'
! . '<br>';
}
***************
*** 104,108 ****
$file_type =
$GLOBALS['phpgw']->msg->stripslashes_gpc(trim($uploadedfile_type));
}
!
// sometimes PHP is very clue-less about MIME types, and gives NO
file_type
// rfc default for unknown MIME type is:
--- 104,108 ----
$file_type =
$GLOBALS['phpgw']->msg->stripslashes_gpc(trim($uploadedfile_type));
}
!
// sometimes PHP is very clue-less about MIME types, and gives NO
file_type
// rfc default for unknown MIME type is:
***************
*** 122,126 ****
return $input;
}
!
for($i=0; $i < strlen($input); $i++ )
{
--- 122,126 ----
return $input;
}
!
for($i=0; $i < strlen($input); $i++ )
{
***************
*** 137,141 ****
$file_name = wbasename($file_name);
-
// Some of the methods were borrowed from
// Squirrelmail <Luke Ehresman> http://www.squirrelmail.org
--- 137,140 ----
***************
*** 150,156 ****
//if ($action == 'Attach File')
! if (($action == lang('Attach File'))
! && ($file_tmp_name != '')
! && ($file_tmp_name != 'none'))
{
srand((double)microtime()*1000000);
--- 149,155 ----
//if ($action == 'Attach File')
! if (($action == lang('Attach File')) &&
! ($file_tmp_name != '') &&
! ($file_tmp_name != 'none'))
{
srand((double)microtime()*1000000);
***************
*** 173,184 ****
fclose($ftp);
}
! elseif (($action == lang('Attach File'))
! && (($file_tmp_name == '') || ($file_tmp_name == 'none')))
{
$langed_attach_file = lang("Attach File");
$alert_msg = lang('Input Error:').'<br>'
! .lang('Please submit a filename to attach').'<br>'
! .lang('You must click').' "'.lang('Attach File').'"
'.lang('for the file to actually upload').'<br>'
! .'<br>';
}
--- 172,183 ----
fclose($ftp);
}
! elseif (($action == lang('Attach File')) &&
! (($file_tmp_name == '') || ($file_tmp_name == 'none')))
{
$langed_attach_file = lang("Attach File");
$alert_msg = lang('Input Error:').'<br>'
! . lang('Please submit a filename to attach').'<br>'
! . lang('You must click').' "'.lang('Attach File').'"
'.lang('for the file to actually upload').'<br>'
! . '<br>';
}
***************
*** 186,192 ****
while ($file = readdir($dh))
{
! if (($file != '.')
! && ($file != '..')
! && (ereg("\.info",$file)))
{
$file_info = file($uploaddir.SEP.$file);
--- 185,191 ----
while ($file = readdir($dh))
{
! if (($file != '.') &&
! ($file != '..') &&
! (ereg("\.info",$file)))
{
$file_info = file($uploaddir.SEP.$file);
***************
*** 228,242 ****
// begin DEBUG INFO
$debuginfo .= '--uploadedfile info: <br>'
! .'$GLOBALS[phpgw_info][server][temp_dir]:
'.$GLOBALS['phpgw_info']['server']['temp_dir'].'<br>'
! .'$GLOBALS[phpgw_info][user][sessionid]:
'.$GLOBALS['phpgw_info']['user']['sessionid'].'<br>'
! .'uploaddir: '.$uploaddir.'<br>'
! .'file_tmp_name: ' .$file_tmp_name .'<br>'
! .'file_name: ' .$file_name .'<br>'
! .'file_size: ' .$file_size .'<br>'
! .'file_type: ' .$file_type .'<br>'
! .'<br>'
! .'totalfiles: ' .$totalfiles .'<br>'
! .'file_info_count: '.count($file_info) .'<br>'
! .'<br>';
if (count($file_info) > 0)
{
--- 227,241 ----
// begin DEBUG INFO
$debuginfo .= '--uploadedfile info: <br>'
! . '$GLOBALS[phpgw_info][server][temp_dir]:
'.$GLOBALS['phpgw_info']['server']['temp_dir'].'<br>'
! . '$GLOBALS[phpgw_info][user][sessionid]:
'.$GLOBALS['phpgw_info']['user']['sessionid'].'<br>'
! . 'uploaddir: '.$uploaddir.'<br>'
! . 'file_tmp_name: ' .$file_tmp_name .'<br>'
! . 'file_name: ' .$file_name .'<br>'
! . 'file_size: ' .$file_size .'<br>'
! . 'file_type: ' .$file_type .'<br>'
! . '<br>'
! . 'totalfiles: ' .$totalfiles .'<br>'
! . 'file_info_count: '.count($file_info) .'<br>'
! . '<br>';
if (count($file_info) > 0)
{
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/index.php,v
retrieving revision 1.86.2.1
retrieving revision 1.86.2.2
diff -C2 -r1.86.2.1 -r1.86.2.2
*** index.php 14 Feb 2002 06:48:06 -0000 1.86.2.1
--- index.php 14 Feb 2002 13:12:51 -0000 1.86.2.2
***************
*** 1,18 ****
<?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');
--- 1,18 ----
<?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');
***************
*** 20,35 ****
$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
--- 20,36 ----
$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
***************
*** 38,45 ****
*/
$is_modular = False;
!
header('Location: '.$GLOBALS['phpgw']->link(
! '/index.php',
! 'menuaction=email.uiindex.index'));
return;
/*
--- 39,46 ----
*/
$is_modular = False;
!
header('Location: '.$GLOBALS['phpgw']->link(
! '/index.php',
! 'menuaction=email.uiindex.index'));
return;
/*
Index: view_image.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/view_image.php,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** view_image.php 14 Feb 2002 06:57:22 -0000 1.13.2.1
--- view_image.php 14 Feb 2002 13:12:51 -0000 1.13.2.2
***************
*** 15,22 ****
$GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'email',
! 'enable_network_class' => True,
! 'noheader' => True,
! 'nonavbar' => True
);
include('../header.inc.php');
--- 15,22 ----
$GLOBALS['phpgw_info']['flags'] = array(
! 'currentapp' => 'email',
! 'enable_network_class' => True,
! 'noheader' => True,
! 'nonavbar' => True
);
include('../header.inc.php');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email addressbook.php,1.32.2.2,1.32.2.3 attach_file.php,1.24.2.1,1.24.2.2 index.php,1.86.2.1,1.86.2.2 view_image.php,1.13.2.1,1.13.2.2,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: mediadb/inc artist.inc.php,1.6,1.7
- Next by Date:
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.1.1.1,1.2 class.db_tools.inc.php,1.1.1.1,1.2 class.editor.inc.php,1.1.1.1,1.2 class.html.inc.php,1.1.1.1,1.2 class.soetemplate.inc.php,1.1.1.1,1.2 class.uietemplate.inc.php,1.1.1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: mediadb/inc artist.inc.php,1.6,1.7
- Next by thread:
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.1.1.1,1.2 class.db_tools.inc.php,1.1.1.1,1.2 class.editor.inc.php,1.1.1.1,1.2 class.html.inc.php,1.1.1.1,1.2 class.soetemplate.inc.php,1.1.1.1,1.2 class.uietemplate.inc.php,1.1.1.1,1.2
- Index(es):