[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.10,1.11 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.10,1.11 class.boproperty.inc.php,1.1,1.2 class.bostandard_2.inc.php,1.1,1.2 class.soinvoice.inc.php,1.10,1.11 class.soproperty.inc.php,1.2,1.3 class.sostandard_2.inc.php,1.3,1.4 class.uibuilding.inc.php,1.5,1.6 class.uiinvoice.inc.php,1.10,1.11 class.uiproperty.inc.php,1.6,1.7 class.uistandard_2.inc.php,1.3,1.4 class.uitts.inc.php,1.6,1.7 |
|
Date: |
Tue, 11 Feb 2003 05:02:00 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv1544/inc
Modified Files:
class.bocommon.inc.php class.boproperty.inc.php
class.bostandard_2.inc.php class.soinvoice.inc.php
class.soproperty.inc.php class.sostandard_2.inc.php
class.uibuilding.inc.php class.uiinvoice.inc.php
class.uiproperty.inc.php class.uistandard_2.inc.php
class.uitts.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.bocommon.inc.php 10 Feb 2003 16:46:15 -0000 1.10
--- class.bocommon.inc.php 11 Feb 2003 10:01:57 -0000 1.11
***************
*** 352,356 ****
if (!$sub)
{
! $sub =
$GLOBALS['phpgw']->session->appsession('sub','property');
}
--- 352,356 ----
if (!$sub)
{
! $sub =
$GLOBALS['phpgw']->session->appsession('sub',$currentapp);
}
Index: class.boproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproperty.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.boproperty.inc.php 11 Dec 2002 19:31:22 -0000 1.1
--- class.boproperty.inc.php 11 Feb 2003 10:01:57 -0000 1.2
***************
*** 113,139 ****
}
! function save($property,$action='')
{
! if ($property['access'])
{
! $property['access'] = 'private';
}
else
{
! $property['access'] = 'public';
}
if ($action=='edit')
{
! if ($property['property_id'] != 0)
{
! $message = $this->so->edit($property);
}
}
else
{
! $message = $this->so->add($property);
}
! return $message;
}
--- 113,146 ----
}
! function save($values,$action='')
{
! $errorcount = 0;
! if(!$values['property_id'])
{
!
$receipt['error'][$errorcount++]=array('msg'=>lang('Please enter a Property ID
!'));
! return $receipt;
! }
!
! if ($values['access'])
! {
! $values['access'] = 'private';
}
else
{
! $values['access'] = 'public';
}
if ($action=='edit')
{
! if ($values['property_id'] != 0)
{
! $receipt = $this->so->edit($values);
}
}
else
{
! $receipt = $this->so->add($values);
}
! return $receipt;
}
Index: class.bostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bostandard_2.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.bostandard_2.inc.php 12 Dec 2002 18:15:33 -0000 1.1
--- class.bostandard_2.inc.php 11 Feb 2003 10:01:57 -0000 1.2
***************
*** 56,59 ****
--- 56,60 ----
$filter = get_var('filter',array('POST','GET'));
$cat_id = get_var('cat_id',array('POST','GET'));
+ $allrows= get_var('allrows',array('POST','GET'));
if ($start)
***************
*** 86,89 ****
--- 87,94 ----
$this->cat_id = $cat_id;
}
+ if(isset($allrows))
+ {
+ $this->allrows = $allrows;
+ }
}
***************
*** 92,96 ****
{
$standard = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'type' => $type));
$this->total_records = $this->so->total_records;
--- 97,101 ----
{
$standard = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'type' => $type,'allrows'=>$this->allrows));
$this->total_records = $this->so->total_records;
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.soinvoice.inc.php 27 Jan 2003 10:40:31 -0000 1.10
--- class.soinvoice.inc.php 11 Feb 2003 10:01:57 -0000 1.11
***************
*** 177,183 ****
}
-
- // $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
-
while ($this->db->next_record())
{
--- 177,180 ----
***************
*** 190,197 ****
}
-
if ($invoice_temp)
{
- $j=0;
$i = 0;
while(each($invoice_temp))
--- 187,192 ----
***************
*** 301,304 ****
--- 296,300 ----
}
//_debug_array($invoice);
+ //_debug_array($invoice_temp);
return $invoice;
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soproperty.inc.php 2 Jan 2003 22:03:57 -0000 1.2
--- class.soproperty.inc.php 11 Feb 2003 10:01:57 -0000 1.3
***************
*** 161,166 ****
. "','" . $property['generaladdress'] ."','" .
$property['cat_id'] ."','" . $property['generellinfo']. "')",__LINE__,__FILE__);
! $message = lang('Property has been saved');
! return $message;
}
--- 161,166 ----
. "','" . $property['generaladdress'] ."','" .
$property['cat_id'] ."','" . $property['generellinfo']. "')",__LINE__,__FILE__);
!
$receipt['message'][$errorcount++]=array('msg'=>lang('Property has been
saved'));
! return $receipt;
}
***************
*** 173,178 ****
. "' WHERE objekt_id="
. intval($property['property_id']),__LINE__,__FILE__);
! $message = lang('Property has been edited');
! return $message;
}
--- 173,178 ----
. "' WHERE objekt_id="
. intval($property['property_id']),__LINE__,__FILE__);
!
$receipt['message'][$errorcount++]=array('msg'=>lang('Property has been
edited'));
! return $receipt;
}
Index: class.sostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_2.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sostandard_2.inc.php 10 Feb 2003 22:33:01 -0000 1.3
--- class.sostandard_2.inc.php 11 Feb 2003 10:01:57 -0000 1.4
***************
*** 43,50 ****
$start=0;
}
! $query =
(isset($data['query'])?$data['query']:'');
! $sort =
(isset($data['sort'])?$data['sort']:'DESC');
! $order =
(isset($data['order'])?$data['order']:'');
! $type = (isset($data['type'])?$data['type']:0);
}
--- 43,51 ----
$start=0;
}
! $query =
(isset($data['query'])?$data['query']:'');
! $sort =
(isset($data['sort'])?$data['sort']:'DESC');
! $order =
(isset($data['order'])?$data['order']:'');
! $type =
(isset($data['type'])?$data['type']:0);
! $allrows =
(isset($data['allrows'])?$data['allrows']:'');
}
***************
*** 73,77 ****
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
! $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
while ($this->db->next_record())
--- 74,86 ----
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
!
! if(!$allrows)
! {
! $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
! }
! else
! {
! $this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
! }
while ($this->db->next_record())
Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uibuilding.inc.php 10 Feb 2003 16:46:15 -0000 1.5
--- class.uibuilding.inc.php 11 Feb 2003 10:01:57 -0000 1.6
***************
*** 48,51 ****
--- 48,53 ----
$this->cat_id =
$this->bo->cat_id;
$this->part_of_town_id =
$this->bocommon->part_of_town_id;
+
+
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'property');
}
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uiinvoice.inc.php 27 Jan 2003 10:40:31 -0000 1.10
--- class.uiinvoice.inc.php 11 Feb 2003 10:01:57 -0000 1.11
***************
*** 51,54 ****
--- 51,56 ----
$this->user_lid =
$this->bo->user_lid;
$this->allrows =
$this->bo->allrows;
+
+
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'invoice');
}
***************
*** 124,127 ****
--- 126,130 ----
$content[$i]['lang_period_help']
= lang('Klick this link to edit the period');
+
$i++;
}
***************
*** 209,213 ****
}
-
$data['sum']
= number_format($sum, 2, ',', ' ');
$data['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
--- 212,215 ----
***************
*** 284,288 ****
else
{
-
$data['user_list']
= $this->bo->get_invoice_user_list('filter',$this->user_lid);
$data['cat_list']
= $this->bo->select_category('filter',$this->cat_id);
--- 286,289 ----
***************
*** 303,306 ****
--- 304,308 ----
}
$this->save_sessiondata();
+ //_debug_array($data);
}
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uiproperty.inc.php 10 Feb 2003 16:46:15 -0000 1.6
--- class.uiproperty.inc.php 11 Feb 2003 10:01:57 -0000 1.7
***************
*** 48,51 ****
--- 48,53 ----
$this->cat_id =
$this->bo->cat_id;
$this->part_of_town_id =
$this->bocommon->part_of_town_id;
+
+
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'property');
}
***************
*** 194,199 ****
$property_id = $values['property_id'];
}
!
! $message = $this->bo->save($values,$action);
}
--- 196,200 ----
$property_id = $values['property_id'];
}
! $receipt = $this->bo->save($values,$action);
}
***************
*** 244,248 ****
'value_access'
=> $property['access'],
'value_cat'
=> $property['cat'],
! 'message'
=> $message,
'lang_property_id_statustext' => lang('Enter
the Property ID'),
'lang_name_statustext' =>
lang('Enter the name of the property'),
--- 245,250 ----
'value_access'
=> $property['access'],
'value_cat'
=> $property['cat'],
! 'message'
=> $receipt['message'],
! 'error'
=> $receipt['error'],
'lang_property_id_statustext' => lang('Enter
the Property ID'),
'lang_name_statustext' =>
lang('Enter the name of the property'),
Index: class.uistandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_2.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uistandard_2.inc.php 10 Feb 2003 22:33:01 -0000 1.3
--- class.uistandard_2.inc.php 11 Feb 2003 10:01:57 -0000 1.4
***************
*** 40,43 ****
--- 40,44 ----
$this->sort =
$this->bo->sort;
$this->order =
$this->bo->order;
+ $this->allrows =
$this->bo->allrows;
}
***************
*** 58,65 ****
$type = get_var('type',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('standard_2',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'nextmatchs'));
$standard_list = $this->bo->read($type);
--- 59,65 ----
$type = get_var('type',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_2','nextmatchs',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
$standard_list = $this->bo->read($type);
***************
*** 114,123 ****
);
$data = array
(
! 'allow_allrows'
=> False,
'start_record'
=> $this->start,
! 'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
'num_records'
=> count($standard_list),
'all_records'
=> $this->bo->total_records,
--- 114,133 ----
);
+ if(!$this->allrows)
+ {
+ $record_limit =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ }
+ else
+ {
+ $record_limit = $this->bo->total_records;
+ }
+
$data = array
(
! 'allow_allrows'
=> True,
! 'allrows'
=> $this->allrows,
'start_record'
=> $this->start,
! 'record_limit'
=> $record_limit,
'num_records'
=> count($standard_list),
'all_records'
=> $this->bo->total_records,
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uitts.inc.php 10 Feb 2003 16:46:15 -0000 1.6
--- class.uitts.inc.php 11 Feb 2003 10:01:57 -0000 1.7
***************
*** 49,52 ****
--- 49,54 ----
$this->cat_id =
$this->bo->cat_id;
$this->part_of_town_id =
$this->bocommon->part_of_town_id;
+
+
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'ticket');
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.10,1.11 class.boproperty.inc.php,1.1,1.2 class.bostandard_2.inc.php,1.1,1.2 class.soinvoice.inc.php,1.10,1.11 class.soproperty.inc.php,1.2,1.3 class.sostandard_2.inc.php,1.3,1.4 class.uibuilding.inc.php,1.5,1.6 class.uiinvoice.inc.php,1.10,1.11 class.uiproperty.inc.php,1.6,1.7 class.uistandard_2.inc.php,1.3,1.4 class.uitts.inc.php,1.6,1.7,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default property.xsl,1.2,1.3 standard_2.xsl,1.2,1.3
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default location.xsl,1.2,1.3 lookup.xsl,1.8,1.9
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default property.xsl,1.2,1.3 standard_2.xsl,1.2,1.3
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default location.xsl,1.2,1.3 lookup.xsl,1.8,1.9
- Index(es):