extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Format and switch to egw_info, et al.

Browse Source
This commit is contained in:
Miles Lott 2005-08-23 17:49:49 +00:00
parent 0f40bc6b02
commit 9438655ca5
2 changed files with 188 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
phpgwapi/inc/class.nextmatchs.inc.php
View File

@ -40,7 +40,7 @@
{ {
if(!$website) if(!$website)
{ {
$this->template = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); $this->template = createobject('phpgwapi.Template',EGW_TEMPLATE_DIR);
$this->template->set_file(array( $this->template->set_file(array(
'_nextmatchs' => 'nextmatchs.tpl' '_nextmatchs' => 'nextmatchs.tpl'
)); ));
@ -55,10 +55,10 @@
$this->template->set_block('_nextmatchs','cats_search_filter'); $this->template->set_block('_nextmatchs','cats_search_filter');
} }
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) && if(isset($GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) &&
(int)$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0) (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] > 0)
{ {
$this->maxmatches = (int)$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']; $this->maxmatches = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
} }
else else
{ {
@ -76,9 +76,9 @@
$this->$var = ''; $this->$var = '';
} }
} }
if (!is_object($GLOBALS['phpgw']->html)) if (!is_object($GLOBALS['egw']->html))
{ {
$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html'); $GLOBALS['egw']->html = CreateObject('phpgwapi.html');
} }
} }
@ -93,7 +93,7 @@
{ {
$var = array( $var = array(
'align' => $align, 'align' => $align,
'img' => $GLOBALS['phpgw']->common->image('phpgwapi',$img), 'img' => $GLOBALS['egw']->common->image('phpgwapi',$img),
'label' => lang($label), 'label' => lang($label),
'border' => 0 'border' => 0
); );
@ -123,7 +123,7 @@
$extras = implode($t_extras,'&'); $extras = implode($t_extras,'&');
} }
return $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->_menuaction.$extras); return $GLOBALS['egw']->link('/index.php','menuaction='.$this->_menuaction.$extras);
} }
/*! /*!
@ -138,10 +138,10 @@
{ {
$var = Array( $var = Array(
'align' => $align, 'align' => $align,
'action' => ($this->_menuaction?$this->page():$GLOBALS['phpgw']->link($link)), 'action' => ($this->_menuaction?$this->page():$GLOBALS['egw']->link($link)),
'form_name' => $img, 'form_name' => $img,
'hidden' => $GLOBALS['phpgw']->html->input_hidden($extravars), 'hidden' => $GLOBALS['egw']->html->input_hidden($extravars),
'img' => $GLOBALS['phpgw']->common->image('phpgwapi',$img), 'img' => $GLOBALS['egw']->common->image('phpgwapi',$img),
'label' => $alt, 'label' => $alt,
'border' => 0, 'border' => 0,
'start' => $extravars['start'] 'start' => $extravars['start']
@ -165,20 +165,20 @@
*/ */
function show_tpl($sn,$localstart,$total,$extra, $twidth, $bgtheme,$search_obj=0,$filter_obj=1,$showsearch=1,$yours=0,$cat_id=0,$cat_field='fcat_id') function show_tpl($sn,$localstart,$total,$extra, $twidth, $bgtheme,$search_obj=0,$filter_obj=1,$showsearch=1,$yours=0,$cat_id=0,$cat_field='fcat_id')
{ {
if (!is_object($GLOBALS['phpgw']->categories)) if (!is_object($GLOBALS['egw']->categories))
{ {
$GLOBALS['phpgw']->categories = CreateObject('phpgwapi.categories'); $GLOBALS['egw']->categories = CreateObject('phpgwapi.categories');
} }
$extravars = $this->split_extras($extravars,$extra); $extravars = $this->split_extras($extravars,$extra);
$var = array( $var = array(
'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['phpgw']->link($sn, $extra)), 'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['egw']->link($sn, $extra)),
'lang_category' => lang('Category'), 'lang_category' => lang('Category'),
'lang_all' => lang('All'), 'lang_all' => lang('All'),
'lang_select' => lang('Select'), 'lang_select' => lang('Select'),
'cat_field' => $cat_field, 'cat_field' => $cat_field,
'categories' => $GLOBALS['phpgw']->categories->formated_list('select','all',$cat_id,'True'), 'categories' => $GLOBALS['egw']->categories->formated_list('select','all',$cat_id,'True'),
'hidden' => $GLOBALS['phpgw']->html->input_hidden(array( 'hidden' => $GLOBALS['egw']->html->input_hidden(array(
'filter' => $this->_filter, 'filter' => $this->_filter,
'qfield' => $this->_qfield, 'qfield' => $this->_qfield,
'start' => (int)$localstart, 'start' => (int)$localstart,
@ -186,9 +186,9 @@
'sort' => $this->_sort, 'sort' => $this->_sort,
'query' => $GLOBALS['query'], 'query' => $GLOBALS['query'],
)), )),
'query_value' => $GLOBALS['phpgw']->html->htmlspecialchars($GLOBALS['query']), 'query_value' => $GLOBALS['egw']->html->htmlspecialchars($GLOBALS['query']),
'table_width' => $twidth, 'table_width' => $twidth,
'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'th_bg' => $GLOBALS['egw_info']['theme']['th_bg'],
'left' => $this->left($sn,(int)$localstart,$total,$extra), 'left' => $this->left($sn,(int)$localstart,$total,$extra),
'search' => ($showsearch?$this->search($search_obj):''), 'search' => ($showsearch?$this->search($search_obj):''),
'filter' => ($filter_obj?$this->filter($filter_obj,$yours):''), 'filter' => ($filter_obj?$this->filter($filter_obj,$yours):''),
@ -329,9 +329,9 @@
function search_filter($search_obj=0,$filter_obj=1,$yours=0,$link='',$extra='') function search_filter($search_obj=0,$filter_obj=1,$yours=0,$link='',$extra='')
{ {
$var = array( $var = array(
'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['phpgw']->link($sn, $extra)), 'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['egw']->link($sn, $extra)),
'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'th_bg' => $GLOBALS['egw_info']['theme']['th_bg'],
'hidden' => $GLOBALS['phpgw']->html->input_hidden(array( 'hidden' => $GLOBALS['egw']->html->input_hidden(array(
'filter' => $this->_filter, 'filter' => $this->_filter,
'qfield' => $this->_qfield, 'qfield' => $this->_qfield,
'start' => 0, 'start' => 0,
@ -353,18 +353,18 @@
*/ */
function cats_search_filter($search_obj=0,$filter_obj=1,$yours=0,$cat_id=0,$cat_field='fcat_id',$link='',$extra='') function cats_search_filter($search_obj=0,$filter_obj=1,$yours=0,$cat_id=0,$cat_field='fcat_id',$link='',$extra='')
{ {
if (!is_object($GLOBALS['phpgw']->categories)) if (!is_object($GLOBALS['egw']->categories))
{ {
$GLOBALS['phpgw']->categories = CreateObject('phpgwapi.categories'); $GLOBALS['egw']->categories = CreateObject('phpgwapi.categories');
} }
$var = array( $var = array(
'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['phpgw']->link($sn, $extra)), 'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['egw']->link($sn, $extra)),
'lang_category' => lang('Category'), 'lang_category' => lang('Category'),
'lang_all' => lang('All'), 'lang_all' => lang('All'),
'lang_select' => lang('Select'), 'lang_select' => lang('Select'),
'cat_field' => $cat_field, 'cat_field' => $cat_field,
'categories' => $GLOBALS['phpgw']->categories->formated_list('select','all',(int)$cat_id,'True'), 'categories' => $GLOBALS['egw']->categories->formated_list('select','all',(int)$cat_id,'True'),
'hidden' => $GLOBALS['phpgw']->html->input_hidden(array( 'hidden' => $GLOBALS['egw']->html->input_hidden(array(
'filter' => $this->_filter, 'filter' => $this->_filter,
'qfield' => $this->_qfield, 'qfield' => $this->_qfield,
'start' => 0, 'start' => 0,
@ -372,7 +372,7 @@
'sort' => $this->_sort, 'sort' => $this->_sort,
'query' => $GLOBALS['query'], 'query' => $GLOBALS['query'],
)), )),
'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'th_bg' => $GLOBALS['egw_info']['theme']['th_bg'],
'search' => $this->search($search_obj), 'search' => $this->search($search_obj),
'filter' => ($filter_obj?$this->filter($filter_obj,$yours):'') 'filter' => ($filter_obj?$this->filter($filter_obj,$yours):'')
); );
@ -406,7 +406,7 @@
} }
$var = array $var = array
( (
'query_value' => $GLOBALS['phpgw']->html->htmlspecialchars($_query), 'query_value' => $GLOBALS['egw']->html->htmlspecialchars($_query),
'lang_search' => lang('Search') 'lang_search' => lang('Search')
); );
@ -431,12 +431,12 @@
$filter_obj = array(array('none','show all')); $filter_obj = array(array('none','show all'));
$index = 0; $index = 0;
$GLOBALS['phpgw']->db->query("SELECT $idxfieldname, $strfieldname FROM $filtertable",__LINE__,__FILE__); $GLOBALS['egw']->db->query("SELECT $idxfieldname, $strfieldname FROM $filtertable",__LINE__,__FILE__);
while($GLOBALS['phpgw']->db->next_record()) while($GLOBALS['egw']->db->next_record())
{ {
$index++; $index++;
$filter_obj[$index][0] = $GLOBALS['phpgw']->db->f($idxfieldname); $filter_obj[$index][0] = $GLOBALS['egw']->db->f($idxfieldname);
$filter_obj[$index][1] = $GLOBALS['phpgw']->db->f($strfieldname); $filter_obj[$index][1] = $GLOBALS['egw']->db->f($strfieldname);
} }
return $filter_obj; return $filter_obj;
@ -484,7 +484,7 @@
{ {
if ($filter_obj == 1) if ($filter_obj == 1)
{ {
// $user_groups = $GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']); // $user_groups = $GLOBALS['egw']->accounts->membership($GLOBALS['egw_info']['user']['account_id']);
$indexlimit = count($user_groups); $indexlimit = count($user_groups);
if ($yours) if ($yours)
@ -612,13 +612,13 @@
$currentcolor = @$GLOBALS['tr_color']; $currentcolor = @$GLOBALS['tr_color'];
} }
if ($currentcolor == $GLOBALS['phpgw_info']['theme']['row_on']) if ($currentcolor == $GLOBALS['egw_info']['theme']['row_on'])
{ {
$GLOBALS['tr_color'] = $GLOBALS['phpgw_info']['theme'][$class='row_off']; $GLOBALS['tr_color'] = $GLOBALS['egw_info']['theme'][$class='row_off'];
} }
else else
{ {
$GLOBALS['tr_color'] = $GLOBALS['phpgw_info']['theme'][$class='row_on']; $GLOBALS['tr_color'] = $GLOBALS['egw_info']['theme'][$class='row_on'];
} }
return $do_class ? $class : $GLOBALS['tr_color']; return $do_class ? $class : $GLOBALS['tr_color'];
@ -652,7 +652,7 @@
{ {
$sort = $sort == 'ASC' ? 'DESC' : 'ASC'; $sort = $sort == 'ASC' ? 'DESC' : 'ASC';
$text = '<b>'.$text.'</b> <img border="0" src="'.$GLOBALS['phpgw']->common->image('phpgwapi',$sort=='ASC'?'up':'down').'">'; $text = '<b>'.$text.'</b> <img border="0" src="'.$GLOBALS['egw']->common->image('phpgwapi',$sort=='ASC'?'up':'down').'">';
} }
else else
{ {
@ -666,7 +666,7 @@
$extravar = 'order='.$var.'&sort='.$sort.'&filter='.$this->_filter.'&qfield='.$this->_qfield.'&start='.$this->_start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra; $extravar = 'order='.$var.'&sort='.$sort.'&filter='.$this->_filter.'&qfield='.$this->_qfield.'&start='.$this->_start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra;
$link = ($this->_menuaction?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar)); $link = ($this->_menuaction?$this->page($extravar):$GLOBALS['egw']->link($program,$extravar));
if ($build_a_href) if ($build_a_href)
{ {
@ -740,7 +740,7 @@
$extravar = 'order='.$our_order.'&sort='.$new_sort.$extra; $extravar = 'order='.$our_order.'&sort='.$new_sort.$extra;
$link = ($this->_menuaction?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar)); $link = ($this->_menuaction?$this->page($extravar):$GLOBALS['egw']->link($program,$extravar));
return '<a href="' .$link .'">' .$text .'</a>'; return '<a href="' .$link .'">' .$text .'</a>';
} }
@ -842,14 +842,14 @@
*/ */
function set_link_imap($align,$img,$alt_text,$out_vars) function set_link_imap($align,$img,$alt_text,$out_vars)
{ {
$img_full = $GLOBALS['phpgw']->common->image('phpgwapi',$img); $img_full = $GLOBALS['egw']->common->image('phpgwapi',$img);
$image_part = '<img src="'.$img_full.'" border="0" alt="'.$alt_text.'" width="12" height="12">'; $image_part = '<img src="'.$img_full.'" border="0" alt="'.$alt_text.'" width="12" height="12">';
return '<a href="'.$out_vars['common_uri'].'&start='.$out_vars['start'].'">'.$image_part.'</a>'; return '<a href="'.$out_vars['common_uri'].'&start='.$out_vars['start'].'">'.$image_part.'</a>';
} }
function set_icon_imap($align,$img,$alt_text) function set_icon_imap($align,$img,$alt_text)
{ {
$img_full = $GLOBALS['phpgw']->common->image('phpgwapi',$img); $img_full = $GLOBALS['egw']->common->image('phpgwapi',$img);
return '<img src="'.$img_full.'" border="0" width="12" height="12" alt="'.$alt_text.'">'."\r\n"; return '<img src="'.$img_full.'" border="0" width="12" height="12" alt="'.$alt_text.'">'."\r\n";
} }
} // End of nextmatchs class } // End of nextmatchs class

24
phpgwapi/inc/class.send.inc.php
View File

@ -18,7 +18,7 @@
/* $Id$ */ /* $Id$ */
require_once(PHPGW_API_INC.'/class.phpmailer.inc.php'); require_once(EGW_API_INC.'/class.phpmailer.inc.php');
/** /**
* New eGW send-class. It implements the old interface (msg-method) on top of PHPMailer. * New eGW send-class. It implements the old interface (msg-method) on top of PHPMailer.
@ -44,9 +44,9 @@ class send extends PHPMailer
{ {
return PHPMailer::Send(); return PHPMailer::Send();
} }
$this->CharSet = $GLOBALS['phpgw']->translation->charset(); $this->CharSet = $GLOBALS['egw']->translation->charset();
list($lang,$nation) = explode('-',$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']); list($lang,$nation) = explode('-',$GLOBALS['egw_info']['user']['preferences']['common']['lang']);
$lang_path = PHPGW_SERVER_ROOT.'/phpgwapi/setup/'; $lang_path = EGW_SERVER_ROOT.'/phpgwapi/setup/';
if ($nation && file_exists($lang_path."phpmailer.lang-$nation.php")) // atm. only for pt-br => br if ($nation && file_exists($lang_path."phpmailer.lang-$nation.php")) // atm. only for pt-br => br
{ {
$lang = $nation; $lang = $nation;
@ -54,13 +54,13 @@ class send extends PHPMailer
$this->SetLanguage($lang,$lang_path); $this->SetLanguage($lang,$lang_path);
$this->IsSmtp(); $this->IsSmtp();
$this->Host = $GLOBALS['phpgw_info']['server']['smtp_server']?$GLOBALS['phpgw_info']['server']['smtp_server']:'localhost'; $this->Host = $GLOBALS['egw_info']['server']['smtp_server']?$GLOBALS['egw_info']['server']['smtp_server']:'localhost';
$this->Port = $GLOBALS['phpgw_info']['server']['smtp_port']?$GLOBALS['phpgw_info']['server']['smtp_port']:25; $this->Port = $GLOBALS['egw_info']['server']['smtp_port']?$GLOBALS['egw_info']['server']['smtp_port']:25;
$this->SMTPAuth = !empty($GLOBALS['phpgw_info']['server']['smtp_auth_user']); $this->SMTPAuth = !empty($GLOBALS['egw_info']['server']['smtp_auth_user']);
$this->Username = $GLOBALS['phpgw_info']['server']['smtp_auth_user']; $this->Username = $GLOBALS['egw_info']['server']['smtp_auth_user'];
$this->Password = $GLOBALS['phpgw_info']['server']['smtp_auth_passwd']; $this->Password = $GLOBALS['egw_info']['server']['smtp_auth_passwd'];
$this->Hostname = $GLOBALS['phpgw_info']['server']['hostname']; $this->Hostname = $GLOBALS['egw_info']['server']['hostname'];
} }
/** /**
@ -76,8 +76,8 @@ class send extends PHPMailer
$this->ClearAttachments(); $this->ClearAttachments();
$this->ClearCustomHeaders(); $this->ClearCustomHeaders();
$this->FromName = $GLOBALS['phpgw_info']['user']['fullname']; $this->FromName = $GLOBALS['egw_info']['user']['fullname'];
$this->From = $GLOBALS['phpgw_info']['user']['email']; $this->From = $GLOBALS['egw_info']['user']['email'];
$this->Sender = ''; $this->Sender = '';
$this->AddCustomHeader('X-Mailer:eGroupWare (http://www.eGroupWare.org)'); $this->AddCustomHeader('X-Mailer:eGroupWare (http://www.eGroupWare.org)');