[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_nntp.inc.php,1.1,1.2 clas
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_nntp.inc.php,1.1,1.2 class.msg_nntp_sock.inc.php,1.1,1.2 |
|
Date: |
Sun, 26 May 2002 16:22:26 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv3968
Modified Files:
class.msg_nntp.inc.php class.msg_nntp_sock.inc.php
Log Message:
formatting
Index: class.msg_nntp.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.msg_nntp.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.msg_nntp.inc.php 6 May 2002 09:05:44 -0000 1.1
--- class.msg_nntp.inc.php 26 May 2002 20:22:24 -0000 1.2
***************
*** 1,6 ****
<?php
/**************************************************************************\
! * phpGroupWare Email - POP3 Mail Wrapper for Imap Enabled PHP
*
! * http://www.phpgroupware.org/ *
*
* -------------------------------------------------------------------------*
* This library is part of phpGroupWare (http://www.phpgroupware.org) *
--- 1,6 ----
<?php
/**************************************************************************\
! * phpGroupWare Email - POP3 Mail Wrapper for Imap Enabled PHP *
! * http://www.phpgroupware.org/ *
* -------------------------------------------------------------------------*
* This library is part of phpGroupWare (http://www.phpgroupware.org) *
***************
*** 162,166 ****
echo 'CALL TO LOGIN IN CLASS MSG
POP3'.'<br>'.'userid='.$GLOBALS['phpgw_info']['user']['preferences']['email']['userid'];
}
!
error_reporting(error_reporting() - 2);
if($folder!='INBOX')
--- 162,166 ----
echo 'CALL TO LOGIN IN CLASS MSG
POP3'.'<br>'.'userid='.$GLOBALS['phpgw_info']['user']['preferences']['email']['userid'];
}
!
error_reporting(error_reporting() - 2);
if($folder!='INBOX')
***************
*** 206,208 ****
}
} // end of class msg
-
--- 206,207 ----
Index: class.msg_nntp_sock.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.msg_nntp_sock.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.msg_nntp_sock.inc.php 6 May 2002 09:05:44 -0000 1.1
--- class.msg_nntp_sock.inc.php 26 May 2002 20:22:24 -0000 1.2
***************
*** 22,197 ****
\**************************************************************************/
! class msg extends msg_base
! {
! var $db;
! var $folder;
! var $start_msg;
! var $end_msg;
! function mode_reader()
{
! return $this->msg2socket('mode reader','^20[01]',&$response);
! }
!
! function login ($user,$passwd,$server,$port,$folder = '')
! {
! global $phpgw;
!
! $this->db = $phpgw->db;
! if(@!$server)
! {
! echo 'Error: Configuration Error! The administrator has
not configured the NNTP Server.';
! }
!
! if(@!$port)
{
! $port = 119;
}
! if (!$this->open_port($server,$port,15))
{
! $this->error();
! }
! $this->read_port();
! if ($user <> '' && $passwd <> '')
! {
! if (!$this->msg2socket('authinfo user
'.$user,'^381',&$response))
{
$this->error();
}
! if (!$this->msg2socket('authinfo pass
'.$passwd,'^281',&$response))
{
$this->error();
}
- }
- if (!$this->mode_reader())
- {
- $this->error();
- }
- if(!$folder)
- {
- $folder = $this->get_first_folder();
if(!$folder)
{
! $this->error();
}
}
- $this->folder = $folder;
- $this->mailbox = $this->get_mailbox_name($folder);
- $this->num_msgs = $this->num_msg($this->mailbox);
- $this->start_msg = $this->first_message($this->mailbox);
- $this->end_msg = $this->last_message($this->mailbox);
- echo 'Successful connection to '.$this->mailbox."<br>\n";
- }
! function fix_folder($folder='')
! {
! if($folder=='')
{
! $mailbox = $this->mailbox;
! }
! elseif(is_int($folder))
! {
! $mailbox = $this->get_mailbox_name($folder);
! }
! else
! {
! $mailbox = $folder;
}
! return $mailbox;
! }
!
! function get_first_folder()
! {
! if(@!$GLOBALS['phpgw_info']['user']['preferences']['nntp'])
{
! $this->set_error('Configuration','User
Preferences','You have not set your user preferences in NNTP.');
! $this->error();
}
! else
{
! $pref =
@each($GLOBALS['phpgw_info']['user']['preferences']['nntp']);
! return $pref[0];
! }
! }
! function get_mailbox_name($folder)
! {
! $active = False;
! $this->db->query('SELECT name,active FROM newsgroups WHERE
con='.$folder,_LINE__,__FILE__);
! if ($this->db->num_rows() > 0)
! {
! $this->db->next_record();
! $mailbox = $this->db->f('name');
! }
! if ($this->db->f('active') != 'Y')
! {
! $GLOBALS['phpgw']->preferences->delete('nntp',$folder);
! $GLOBALS['phpgw']->preferences->save_repository();
!
! $this->set_error('Administration','Automatic
Disabling','The newsgroup '.$mailbox.' is not activated by the Administrator.');
! $this->error();
}
- return $mailbox;
- }
! function get_mailbox_counts($folder='',$index=1)
! {
! $mailbox = $this->fix_folder($folder);
! if (!$this->msg2socket('group '.$mailbox,'^211',&$response))
{
! $this->error();
}
- $temp_array = explode(' ',$response);
- return $temp_array[$index];
- }
! function num_msg($folder='')
! {
! if(($folder == '' || $folder == $this->mailbox) &&
isset($this->num_msgs))
{
! return $this->num_msgs;
}
- return $this->get_mailbox_counts($folder,1);
- }
! function first_message($folder='')
! {
! if(($folder == '' || $folder == $this->mailbox) &&
isset($this->start_msg))
{
! return $this->start_msg;
}
- return $this->get_mailbox_counts($folder,2);
- }
! function last_message($folder='')
! {
! if(($folder == '' || $folder == $this->mailbox) &&
isset($this->end_msg))
{
! return $this->end_msg;
}
- return $this->get_mailbox_counts($folder,3);
- }
! function mailboxmsginfo($folder='')
! {
! $info = new msg_mb_info;
! if($folder=='' || $folder==$this->mailbox ||
$folder==$this->folder)
{
! if(isset($this->num_msgs))
{
! $info->messages = $this->num_msgs;
}
else
{
! if($folder==$this->folder)
! {
! $this->mailbox =
$this->get_mailbox_name($folder);
! }
! $info->messages =
$this->num_msg($this->mailbox);
}
$info->size = 0;
if ($info->messages)
{
--- 22,216 ----
\**************************************************************************/
! /* $Id$ */
! class msg extends msg_base
{
! var $db;
! var $folder;
! var $start_msg;
! var $end_msg;
! function mode_reader()
{
! return $this->msg2socket('mode
reader','^20[01]',&$response);
}
! function login ($user,$passwd,$server,$port,$folder = '')
{
! $this->db = $GLOBALS['phpgw']->db;
! if(@!$server)
! {
! echo 'Error: Configuration Error! The
administrator has not configured the NNTP Server.';
! }
!
! if(@!$port)
! {
! $port = 119;
! }
!
! if (!$this->open_port($server,$port,15))
{
$this->error();
}
! $this->read_port();
!
! if ($user <> '' && $passwd <> '')
! {
! if (!$this->msg2socket('authinfo user
'.$user,'^381',&$response))
! {
! $this->error();
! }
! if (!$this->msg2socket('authinfo pass
'.$passwd,'^281',&$response))
! {
! $this->error();
! }
! }
! if (!$this->mode_reader())
{
$this->error();
}
if(!$folder)
{
! $folder = $this->get_first_folder();
! if(!$folder)
! {
! $this->error();
! }
}
+ $this->folder = $folder;
+ $this->mailbox = $this->get_mailbox_name($folder);
+ $this->num_msgs = $this->num_msg($this->mailbox);
+ $this->start_msg = $this->first_message($this->mailbox);
+ $this->end_msg = $this->last_message($this->mailbox);
+ echo 'Successful connection to
'.$this->mailbox."<br>\n";
}
! function fix_folder($folder='')
{
! if($folder=='')
! {
! $mailbox = $this->mailbox;
! }
! elseif(is_int($folder))
! {
! $mailbox = $this->get_mailbox_name($folder);
! }
! else
! {
! $mailbox = $folder;
! }
! return $mailbox;
}
!
! function get_first_folder()
{
!
if(@!$GLOBALS['phpgw_info']['user']['preferences']['nntp'])
! {
! $this->set_error('Configuration','User
Preferences','You have not set your user preferences in NNTP.');
! $this->error();
! }
! else
! {
! $pref =
@each($GLOBALS['phpgw_info']['user']['preferences']['nntp']);
! return $pref[0];
! }
}
!
! function get_mailbox_name($folder)
{
! $active = False;
! $this->db->query('SELECT name,active FROM newsgroups
WHERE con='.$folder,_LINE__,__FILE__);
! if ($this->db->num_rows() > 0)
! {
! $this->db->next_record();
! $mailbox = $this->db->f('name');
! }
! if ($this->db->f('active') != 'Y')
! {
!
$GLOBALS['phpgw']->preferences->delete('nntp',$folder);
!
$GLOBALS['phpgw']->preferences->save_repository();
! $this->set_error('Administration','Automatic
Disabling','The newsgroup '.$mailbox.' is not activated by the Administrator.');
! $this->error();
! }
! return $mailbox;
}
! function get_mailbox_counts($folder='',$index=1)
{
! $mailbox = $this->fix_folder($folder);
! if (!$this->msg2socket('group
'.$mailbox,'^211',&$response))
! {
! $this->error();
! }
! $temp_array = explode(' ',$response);
! return $temp_array[$index];
}
! function num_msg($folder='')
{
! if(($folder == '' || $folder == $this->mailbox) &&
isset($this->num_msgs))
! {
! return $this->num_msgs;
! }
! return $this->get_mailbox_counts($folder,1);
}
! function first_message($folder='')
{
! if(($folder == '' || $folder == $this->mailbox) &&
isset($this->start_msg))
! {
! return $this->start_msg;
! }
! return $this->get_mailbox_counts($folder,2);
}
! function last_message($folder='')
{
! if(($folder == '' || $folder == $this->mailbox) &&
isset($this->end_msg))
! {
! return $this->end_msg;
! }
! return $this->get_mailbox_counts($folder,3);
}
! function mailboxmsginfo($folder='')
{
! $info = new msg_mb_info;
! if($folder=='' || $folder==$this->mailbox ||
$folder==$this->folder)
{
! if(isset($this->num_msgs))
! {
! $info->messages = $this->num_msgs;
! }
! else
! {
! if($folder==$this->folder)
! {
! $this->mailbox =
$this->get_mailbox_name($folder);
! }
! $info->messages =
$this->num_msg($this->mailbox);
! }
! $info->size = 0;
! if ($info->messages)
! {
! return $info;
! }
! else
! {
! return False;
! }
}
else
{
! $mailbox = $this->fix_folder($folder);
}
+
+ $info->messages = $this->num_msgs($mailbox);
$info->size = 0;
+
+ $this->num_msgs($this->mailbox);
+
if ($info->messages)
{
***************
*** 203,324 ****
}
}
- else
- {
- $mailbox = $this->fix_folder($folder);
- }
! $info->messages = $this->num_msgs($mailbox);
! $info->size = 0;
! $this->num_msgs($this->mailbox);
! if ($info->messages)
! {
! return $info;
! }
! else
! {
! return False;
}
- }
! function fetch_field($start,$stop,$element)
! {
! if (!$this->msg2socket('XHDR '.$element.'
'.$start.'-'.$stop,'^221',&$response))
{
! $this->error();
}
! $field_element = Array();
! while ($line = $this->read_port())
{
! $line = chop($line);
! if ($line == '.')
{
! break;
}
- $breakpos = strpos($line,' ');
-
- $field_element[intval(substr($line,0,$breakpos-1))] =
$this->phpGW_quoted_printable_decode2(substr($line,$breakpos+1));
- }
- return $field_element;
- }
-
- function status($folder='',$options=SA_ALL)
- {
- $info = new mailbox_status;
- $info->messages = $this->num_msg($folder);
- return $info;
- }
! function sort($folder='',$criteria=SORTDATE,$reverse=False,$options='')
! {
! if($folder == '' || $folder == $this->mailbox)
! {
! $mailbox = $this->mailbox;
! $start_msg = $this->start_msg;
! $end_msg = $this->end_msg;
! }
! else
! {
! $mailbox = $this->fix_folder($folder);
! $start_msg = $this->first_message($mailbox);
! $end_msg = $this->last_message($mailbox);
! }
!
! switch($criteria)
! {
! case SORTDATE:
! $old_list =
$this->fetch_field($start_msg,$end_msg,'Date');
! $field_list =
$this->convert_date_array($old_list);
! break;
! case SORTARRIVAL:
! break;
! case SORTFROM:
! $field_list =
$this->fetch_field($start_msg,$end_msg,'From');
! break;
! case SORTSUBJECT:
! $field_list =
$this->fetch_field($start_msg,$end_msg,'Subject');
! break;
! case SORTTO:
! $field_list =
$this->fetch_field($start_msg,$end_msg,'To');
! break;
! case SORTCC:
! $field_list =
$this->fetch_field($start_msg,$end_msg,'cc');
! break;
! case SORTSIZE:
! break;
! }
! @reset($field_list);
! if($criteria == SORTSUBJECT)
! {
! if(!$reverse)
{
!
uasort($field_list,array($this,"ssort_ascending"));
}
else
{
!
uasort($field_list,array($this,"ssort_decending"));
! }
! }
! elseif(!$reverse)
! {
! asort($field_list);
! }
! else
! {
! arsort($field_list);
! }
! $return_array = Array();
! @reset($field_list);
! $i = 1;
! while(list($key,$value) = each($field_list))
! {
! $return_array[] = $key;
! echo '('.$i++.') Field: <b>'.$value."</b>\t\tMsg Num:
<b>".$key."</b><br>\n";
}
- @reset($return_array);
- return $return_array;
}
- }
?>
--- 222,324 ----
}
}
! function fetch_field($start,$stop,$element)
! {
! if (!$this->msg2socket('XHDR '.$element.'
'.$start.'-'.$stop,'^221',&$response))
! {
! $this->error();
! }
! $field_element = Array();
! while ($line = $this->read_port())
! {
! $line = chop($line);
! if ($line == '.')
! {
! break;
! }
! $breakpos = strpos($line,' ');
!
$field_element[intval(substr($line,0,$breakpos-1))] =
$this->phpGW_quoted_printable_decode2(substr($line,$breakpos+1));
! }
! return $field_element;
}
! function status($folder='',$options=SA_ALL)
{
! $info = new mailbox_status;
! $info->messages = $this->num_msg($folder);
! return $info;
}
! function
sort($folder='',$criteria=SORTDATE,$reverse=False,$options='')
{
! if($folder == '' || $folder == $this->mailbox)
{
! $mailbox = $this->mailbox;
! $start_msg = $this->start_msg;
! $end_msg = $this->end_msg;
! }
! else
! {
! $mailbox = $this->fix_folder($folder);
! $start_msg = $this->first_message($mailbox);
! $end_msg = $this->last_message($mailbox);
}
! switch($criteria)
{
! case SORTDATE:
! $old_list =
$this->fetch_field($start_msg,$end_msg,'Date');
! $field_list =
$this->convert_date_array($old_list);
! break;
! case SORTARRIVAL:
! break;
! case SORTFROM:
! $field_list =
$this->fetch_field($start_msg,$end_msg,'From');
! break;
! case SORTSUBJECT:
! $field_list =
$this->fetch_field($start_msg,$end_msg,'Subject');
! break;
! case SORTTO:
! $field_list =
$this->fetch_field($start_msg,$end_msg,'To');
! break;
! case SORTCC:
! $field_list =
$this->fetch_field($start_msg,$end_msg,'cc');
! break;
! case SORTSIZE:
! break;
! }
! @reset($field_list);
! if($criteria == SORTSUBJECT)
! {
! if(!$reverse)
! {
!
uasort($field_list,array($this,"ssort_ascending"));
! }
! else
! {
!
uasort($field_list,array($this,"ssort_decending"));
! }
! }
! elseif(!$reverse)
! {
! asort($field_list);
}
else
{
! arsort($field_list);
! }
! $return_array = Array();
! @reset($field_list);
! $i = 1;
! while(list($key,$value) = each($field_list))
! {
! $return_array[] = $key;
! echo '('.$i++.') Field:
<b>'.$value."</b>\t\tMsg Num: <b>".$key."</b><br>\n";
! }
! @reset($return_array);
! return $return_array;
}
}
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_nntp.inc.php,1.1,1.2 class.msg_nntp_sock.inc.php,1.1,1.2,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_imap_sock.inc.php,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_pop3_sock.inc.php,1.1,1.2 class.msg_pop3.inc.php,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_imap_sock.inc.php,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg_pop3_sock.inc.php,1.1,1.2 class.msg_pop3.inc.php,1.1,1.2
- Index(es):