[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.sbox2.inc.php,1.10,1.11
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.sbox2.inc.php,1.10,1.11 |
|
Date: |
Sun, 24 Feb 2002 16:21:55 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv22046
Modified Files:
class.sbox2.inc.php
Log Message:
Updating to ralf's latest version
Index: class.sbox2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sbox2.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.sbox2.inc.php 24 Dec 2001 15:34:08 -0000 1.10
--- class.sbox2.inc.php 24 Feb 2002 21:21:53 -0000 1.11
***************
*** 7,11 ****
* -------------------------------------------------------------------------*
* This library is part of the phpGroupWare API *
! * http://www.phpgroupware.org/api
*
* ------------------------------------------------------------------------ *
* This library is free software; you can redistribute it and/or modify it *
--- 7,11 ----
* -------------------------------------------------------------------------*
* This library is part of the phpGroupWare API *
! * http://www.phpgroupware.org/api *
* ------------------------------------------------------------------------ *
* This library is free software; you can redistribute it and/or modify it *
***************
*** 24,28 ****
/* $Id$ */
! include(PHPGW_API_INC . '/class.sbox.inc.php');
class sbox2 extends sbox
--- 24,32 ----
/* $Id$ */
! if(!isset($GLOBALS['phpgw_info']['flags']['included_classes']['sbox']))
! {
! include(PHPGW_API_INC . '/class.sbox.inc.php');
! $GLOBALS['phpgw_info']['flags']['included_classes']['sbox'] =
True;
! }
class sbox2 extends sbox
***************
*** 51,55 ****
{
// echo
"<p>getId('$name','$lang_name','$prompt',$id_name,'$content') =";
! $ret['doSearchFkt'] =
'<script language="JavaScript">'."\n".
" function doSearch(field,ask) {\n".
--- 55,59 ----
{
// echo
"<p>getId('$name','$lang_name','$prompt',$id_name,'$content') =";
! $ret['doSearchFkt'] =
'<script language="JavaScript">'."\n".
" function doSearch(field,ask) {\n".
***************
*** 64,68 ****
'</script>';
! $ret[$name.'_title'] = is_array($content) &&
count($content) ? $lang_name :
'<script language="JavaScript">'."\n".
" document.writeln('<input type=\"hidden\" name=\"query_$name\"
value=\"\">');\n".
--- 68,72 ----
'</script>';
! $ret[$name.'_title'] = is_array($content) &&
count($content) ? $lang_name :
'<script language="JavaScript">'."\n".
" document.writeln('<input type=\"hidden\" name=\"query_$name\"
value=\"\">');\n".
***************
*** 74,80 ****
if (is_array($content))
! { // result from search
if (!count($content))
! { // search was unsuccsessful
$ret[$name] = lang('no entries found,
try again ...');
}
--- 78,86 ----
if (is_array($content))
! {
! // result from search
if (!count($content))
! {
! // search was unsuccsessful
$ret[$name] = lang('no entries found,
try again ...');
}
***************
*** 112,116 ****
$ret[$name.'_nojs'] =
"<noscript>\n".
! " <input name=\"query_$name\" value=\"\" size=10> <input
type=\"submit\" value=\"?\">\n".
"</noscript>";
--- 118,122 ----
$ret[$name.'_nojs'] =
"<noscript>\n".
! " <input name=\"query_$name\" value=\"\" size=10> <input
type=\"submit\" value=\"?\">\n".
"</noscript>";
***************
*** 152,156 ****
* Note As query's for an address are
submitted, you have to check $query_XXX if it is a search or a regular submit
(!$query_string)
*/
-
function getAddress(
$name,$id_name,$query_name,$title='',$multiple=False)
{
--- 158,161 ----
***************
*** 271,278 ****
if ($id_name || $query_name)
{
! $projects = createobject('projects.projects');
if ($query_name)
{
! $projs = $projects->read_projects(
0,0,$query_name,'','','','',0 );
$content = array();
while ($projs && list( $key,$proj ) =
each( $projs ))
--- 276,287 ----
if ($id_name || $query_name)
{
! $projects = createobject('projects.boprojects');
! if (!is_object($projects))
! {
! return '';
! }
if ($query_name)
{
! $projs = $projects->list_projects(
0,0,$query_name,'','','','',0,'mains','' );
$content = array();
while ($projs && list( $key,$proj ) =
each( $projs ))
***************
*** 302,332 ****
* Function: Allows to show and select one item from
an array
* Parameters: $name string with
name of the submitted var which holds the key of the selected item form array
! * $key
key of already selected item from $arr
* $arr
array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' =>
'maybe');
! * $no_lang
if !$no_lang send items through lang()
! * On submit $XXX is the key of the
selected item (XXX is the content of $name)
! * Returns: string to set for a template or
to echo into html page
*/
! function getArrayItem($name, $key, $arr=0,$no_lang=0)
! { // should be in class common.sbox
if (!is_array($arr))
{
$arr = array('no','yes');
}
!
! $out = "<select name=\"$name\">\n";
while (list($k,$text) = each($arr))
{
$out .= '<option value="'.$k.'"';
! if($k == $key) $out .= " SELECTED";
! $out .= ">" . ($no_lang ? $text : lang($text))
. "</option>\n";
}
$out .= "</select>\n";
!
return $out;
}
! function accountInfo($id,$account_data=0,$longname=0)
{
if (!$id)
--- 311,404 ----
* Function: Allows to show and select one item from
an array
* Parameters: $name string with
name of the submitted var which holds the key of the selected item form array
! * $key
key(s) of already selected item(s) from $arr, eg. '1' or '1,2' or array with
keys
* $arr
array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' =>
'maybe');
! * $no_lang
if !$no_lang send items through lang()
! * $options
additional options (e.g. 'multiple')
! * On submit $XXX is the key of the
selected item (XXX is the content of $name)
! * Returns: string to set for a template or
to echo into html page
*/
! function getArrayItem($name, $key,
$arr=0,$no_lang=0,$options='',$multiple=0)
! {
! // should be in class common.sbox
if (!is_array($arr))
{
$arr = array('no','yes');
}
! if (0+$multiple > 0)
! {
! $options .= ' MULTIPLE SIZE='.(0+$multiple);
! if (substr($name,-2) != '[]')
! {
! $name .= '[]';
! }
! }
! $out = "<select name=\"$name\" $options>\n";
+ if (is_array($key))
+ {
+ $key = implode(',',$key);
+ }
while (list($k,$text) = each($arr))
{
$out .= '<option value="'.$k.'"';
! if($k == $key || strstr(",$key,",",$k,"))
! {
! $out .= " SELECTED";
! }
! $out .= ">" . ($no_lang || $text == '' ? $text
: lang($text)) . "</option>\n";
}
$out .= "</select>\n";
!
return $out;
}
! function getPercentage($name, $selected=0,$options='')
! {
! // reimplemented using getArrayItem
! for ($i=0; $i <= 100; $i+=10)
! {
! $arr[$i] = "$i%";
! }
! return
$this->getArrayItem($name,$selected,$arr,1,$options);
! }
!
! function getPriority($name, $selected=2,$options='')
! {
! // reimplemented using getArrayItem
! $arr = array('','low','normal','high');
!
! return
$this->getArrayItem($name,$selected,$arr,0,$options);
! }
!
! function getAccessList($name,$selected='private',$options='')
! {
! // reimplemented using getArrayItem
! $arr = array(
! 'private' => 'Private',
! 'public' => 'Global public',
! 'group' => 'Group public'
! );
!
! if (strstr($selected,','))
! {
! $selected = "group";
! }
!
! return
$this->getArrayItem($name,$selected,$arr,0,$options);
! }
!
! function getCountry($name='country',$selected=' ',$options='')
! {
! // reimplemented using getArrayItem
! return
$this->getArrayItem($name,$selected,$this->country_array,0,$options);
! }
!
! function form_select($name='country',$selected=' ',$options='')
! {
! // reimplemented using getArrayItem (stupid name!!!)
! return getCountry($name,$selected,$options);
! }
!
! function
accountInfo($id,$account_data=0,$longnames=0,$show_type=0)
{
if (!$id)
***************
*** 342,351 ****
$account_data = $accounts->data;
}
! if ($longnames)
{
! return $account_data['firstname'].'
'.$account_data['lastname'];
}
!
! return $account_data['account_lid'];
}
--- 414,426 ----
$account_data = $accounts->data;
}
! $info = $show_type ?
'('.$account_data['account_type'].') ' : '';
!
! switch ($longnames)
{
! case 2: $info .=
'<'.$account_data['account_lid'].'> '; // fall-through
! case 1: $info .=
$account_data['account_firstname'].' '.$account_data['account_lastname']; break;
! default: $info .= $account_data['account_lid'];
break;
}
! return $info;
}
***************
*** 354,378 ****
* Parameters: $name string with
name of the submitted var, which holds the account_id or 0 after submit
* $id
account_id of already selected account
! *
$id2text($id,$acct_data) fkt that translates account_id $id in text to
show
*/
!
! function getAccount($name,$id,$longnames=0)
{
$accounts = createobject('phpgwapi.accounts');
$accounts->db = $GLOBALS['phpgw']->db;
! $accs = $accounts->get_list('accounts');
! $aarr = Array(lang('not assigned'));
while ($a = current($accs))
{
! $aarr[$a['account_id']] =
$this->accountInfo($a['account_id'],$a,$longnames);
next($accs);
}
! return $this->getArrayItem($name,$id,$aarr,1);
}
! function getDate($n_year,$n_month,$n_day,$date)
{
! if (!$date)
{
$day = $month = $year = 0;
--- 429,459 ----
* Parameters: $name string with
name of the submitted var, which holds the account_id or 0 after submit
* $id
account_id of already selected account
! * $longnames
0=account_lid 1=firstname lastname
*/
! function
getAccount($name,$id,$longnames=0,$type='accounts',$multiple=0,$options='')
{
$accounts = createobject('phpgwapi.accounts');
$accounts->db = $GLOBALS['phpgw']->db;
! $accs = $accounts->get_list($type);
! if ($multiple < 0)
! {
! $aarr[] = lang('not assigned');
! }
while ($a = current($accs))
{
! $aarr[$a['account_id']] =
$this->accountInfo($a['account_id'],$a,$longnames,$type=='both');
next($accs);
}
! return
$this->getArrayItem($name,$id,$aarr,1,$options,$multiple);
}
! function getDate($n_year,$n_month,$n_day,$date,$options='')
{
! if (is_array($date))
! {
! list($year,$month,$day) = $date;
! }
! elseif (!$date)
{
$day = $month = $year = 0;
***************
*** 384,392 ****
$year = date('Y',$date);
}
! return
$GLOBALS['phpgw']->common->dateformatorder($this->getYears($n_year,$year),
$this->getMonthText($n_month,$month),
! $this->getDays($n_day,$day));
}
- }
! ?>
--- 465,511 ----
$year = date('Y',$date);
}
! return $GLOBALS['phpgw']->common->dateformatorder(
! $this->getYears($n_year,$year),
$this->getMonthText($n_month,$month),
! $this->getDays($n_day,$day)
! );
}
! function
getCategory($name,$cat_id='',$notall=False,$jscript=True,$multiple=0,$options='')
! {
! if (!is_object($this->cat))
! {
! $this->cat =
CreateObject('phpgwapi.categories');
! }
! if ($jscript)
! {
! $options .= ' onChange="this.form.submit();"';
! }
! if (0+$multiple > 0)
! {
! $options .= ' MULTIPLE SIZE='.(0+$multiple);
! if (substr($name,-2) != '[]')
! {
! $name .= '[]';
! }
! }
! /* Setup all and none first */
! $cats_link = "\n<SELECT NAME=\"$name\" $options>\n";
!
! if (!$notall)
! {
! $cats_link .= '<option value=""';
! if ($cat_id=='all')
! {
! $cats_link .= ' selected';
! }
! $cats_link .= '>'.lang("all")."</option>\n";
! }
!
! /* Get global and app-specific category listings */
! $cats_link .=
$this->cat->formated_list('select','all',$cat_id,True);
! $cats_link .= '</select>'."\n";
!
! return $cats_link;
! }
! }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.sbox2.inc.php,1.10,1.11,
Miles Lott <address@hidden> <=