[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.5,1.6 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.5,1.6 class.boentrance.inc.php,1.3,1.4 class.boproperty.inc.php,1.5,1.6 class.soapartment.inc.php,1.3,1.4 class.sobuilding.inc.php,1.9,1.10 class.soentrance.inc.php,1.3,1.4 class.soproperty.inc.php,1.15,1.16 class.uiapartment.inc.php,1.9,1.10class.uibuilding.inc.php,1.17,1.18 class.uientrance.inc.php,1.10,1.11class.uiproperty.inc.php,1.21,1.22 |
|
Date: |
Sun, 18 May 2003 06:59:16 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv16920/inc
Modified Files:
class.bobuilding.inc.php class.boentrance.inc.php
class.boproperty.inc.php class.soapartment.inc.php
class.sobuilding.inc.php class.soentrance.inc.php
class.soproperty.inc.php class.uiapartment.inc.php
class.uibuilding.inc.php class.uientrance.inc.php
class.uiproperty.inc.php
Log Message:
no message
Index: class.bobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bobuilding.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.bobuilding.inc.php 1 May 2003 18:28:04 -0000 1.5
--- class.bobuilding.inc.php 18 May 2003 10:59:14 -0000 1.6
***************
*** 51,54 ****
--- 51,60 ----
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ if ($session)
+ {
+ $this->read_sessiondata();
+ $this->use_session = True;
+ }
+
$start = get_var('start',array('POST','GET'));
$query = get_var('query',array('POST','GET'));
***************
*** 71,75 ****
$this->query = $query;
}
! if(!empty($filter))
{
$this->filter = $filter;
--- 77,81 ----
$this->query = $query;
}
! if(isset($filter))
{
$this->filter = $filter;
***************
*** 89,92 ****
--- 95,120 ----
}
+ function read_sessiondata()
+ {
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data','building');
+
+ // _debug_array($data);
+
+ $this->start = $data['start'];
+ $this->query = $data['query'];
+ $this->filter = $data['filter'];
+ $this->sort = $data['sort'];
+ $this->order = $data['order'];
+ $this->cat_id = $data['cat_id'];
+ $this->part_of_town_id = $data['part_of_town_id'];
+ }
+
+ function save_sessiondata($data)
+ {
+ if ($this->use_session)
+ {
+
$GLOBALS['phpgw']->session->appsession('session_data','building',$data);
+ }
+ }
function read()
Index: class.boentrance.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boentrance.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.boentrance.inc.php 1 May 2003 18:28:04 -0000 1.3
--- class.boentrance.inc.php 18 May 2003 10:59:14 -0000 1.4
***************
*** 51,54 ****
--- 51,60 ----
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ if ($session)
+ {
+ $this->read_sessiondata();
+ $this->use_session = True;
+ }
+
$start = get_var('start',array('POST','GET'));
$query = get_var('query',array('POST','GET'));
***************
*** 71,75 ****
$this->query = $query;
}
! if(!empty($filter))
{
$this->filter = $filter;
--- 77,81 ----
$this->query = $query;
}
! if(isset($filter))
{
$this->filter = $filter;
***************
*** 89,92 ****
--- 95,120 ----
}
+ function read_sessiondata()
+ {
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data','entrance');
+
+ // _debug_array($data);
+
+ $this->start = $data['start'];
+ $this->query = $data['query'];
+ $this->filter = $data['filter'];
+ $this->sort = $data['sort'];
+ $this->order = $data['order'];
+ $this->cat_id = $data['cat_id'];
+ $this->part_of_town_id = $data['part_of_town_id'];
+ }
+
+ function save_sessiondata($data)
+ {
+ if ($this->use_session)
+ {
+
$GLOBALS['phpgw']->session->appsession('session_data','entrance',$data);
+ }
+ }
function read()
Index: class.boproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproperty.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.boproperty.inc.php 27 Feb 2003 19:40:01 -0000 1.5
--- class.boproperty.inc.php 18 May 2003 10:59:14 -0000 1.6
***************
*** 50,53 ****
--- 50,59 ----
$this->socommon =
CreateObject($this->currentapp.'.socommon');
+ if ($session)
+ {
+ $this->read_sessiondata();
+ $this->use_session = True;
+ }
+
$start = get_var('start',array('POST','GET'));
$query = get_var('query',array('POST','GET'));
***************
*** 70,74 ****
$this->query = $query;
}
! if(!empty($filter))
{
$this->filter = $filter;
--- 76,80 ----
$this->query = $query;
}
! if(isset($filter))
{
$this->filter = $filter;
***************
*** 86,89 ****
--- 92,191 ----
$this->cat_id = $cat_id;
}
+ }
+
+ function read_sessiondata()
+ {
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data','property');
+
+ // _debug_array($data);
+
+ $this->start = $data['start'];
+ $this->query = $data['query'];
+ $this->filter = $data['filter'];
+ $this->sort = $data['sort'];
+ $this->order = $data['order'];
+ $this->cat_id = $data['cat_id'];
+ $this->part_of_town_id = $data['part_of_town_id'];
+ }
+
+ function save_sessiondata($data)
+ {
+ if ($this->use_session)
+ {
+
$GLOBALS['phpgw']->session->appsession('session_data','property',$data);
+ }
+ }
+
+ function get_filter_list($format='',$selected='')
+ {
+ switch($format)
+ {
+ case 'select':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_select'));
+ break;
+ case 'filter':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_filter'));
+ break;
+ }
+
+ $filters = $this->so->get_filter_list();
+
+ while (is_array($filters) && list(,$filter) =
each($filters))
+ {
+ $sel_filter = '';
+ if ($filter['id']==$selected)
+ {
+ $sel_filter = 'selected';
+ }
+
+ $filter_list[] = array
+ (
+ 'id' => $filter['id'],
+ 'name' => $filter['name'],
+ 'selected' => $sel_filter
+ );
+ }
+
+ for ($i=0;$i<count($filter_list);$i++)
+ {
+ if ($filter_list[$i]['selected'] != 'selected')
+ {
+ unset($filter_list[$i]['selected']);
+ }
+ }
+
+ return $filter_list;
+ }
+
+ function get_owner_list($selected='')
+ {
+
+ $owners = $this->so->get_owner_list();
+
+ while (is_array($owners) && list(,$owner) =
each($owners))
+ {
+ $sel_owner = '';
+ if ($owner['id']==$selected)
+ {
+ $sel_owner = 'selected';
+ }
+
+ $owner_list[] = array
+ (
+ 'id' => $owner['id'],
+ 'name' => $owner['name'],
+ 'selected' => $sel_owner
+ );
+ }
+
+ for ($i=0;$i<count($owner_list);$i++)
+ {
+ if ($owner_list[$i]['selected'] != 'selected')
+ {
+ unset($owner_list[$i]['selected']);
+ }
+ }
+
+ return $owner_list;
}
Index: class.soapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soapartment.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.soapartment.inc.php 4 Apr 2003 19:07:33 -0000 1.3
--- class.soapartment.inc.php 18 May 2003 10:59:14 -0000 1.4
***************
*** 48,52 ****
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'none');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
--- 48,52 ----
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
***************
*** 61,101 ****
else
{
! $ordermethod = ' order by property_id DESC';
}
! if ($filter == 'none')
! {
! $filtermethod = ' ( fm_apartment.owner=' .
$this->account;
! if (is_array($this->grants))
! {
! $grants = $this->grants;
! while (list($user) = each($grants))
! {
! $public_user_list[] = $user;
! }
! reset($public_user_list);
! $filtermethod .= " OR
(fm_apartment.access='public' OR fm_apartment.owner IN(" .
implode(',',$public_user_list) . ")))";
! }
! else
! {
! $filtermethod .= ' )';
! }
! }
! elseif ($filter == 'yours')
{
! $filtermethod = " fm_apartment.owner='" .
$this->account . "'";
}
else
{
! $filtermethod = " fm_apartment.owner='" .
$this->account . "' AND fm_apartment.access='private'";
}
! if ($cat_id > 0)
! {
! $filtermethod .= " AND
fm_apartment.cat_id='$cat_id' ";
! }
! else
{
! $filtermethod .= " AND
fm_apartment.cat_id!='99' ";
}
--- 61,79 ----
else
{
! $ordermethod = ' order by
fm_apartment.property_id DESC';
}
! if ($cat_id > 0)
{
! $filtermethod .= " WHERE
fm_apartment.cat_id='$cat_id' ";
}
else
{
! $filtermethod .= " WHERE
fm_apartment.cat_id!='99' ";
}
! if ($filter)
{
! $filtermethod .= " AND
fm_owner.category='$filter' ";
}
***************
*** 109,118 ****
$sql = "SELECT
fm_apartment.location_code,fm_apartment.property_id,fm_property.name,building_id,entrance_id,floor,apartment_id,street_number,street_name"
! . " FROM fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
. " fm_part_of_town ON
fm_property.part_of_town_id = fm_part_of_town.id $this->join"
. " fm_streetaddress ON fm_apartment.street_id
= fm_streetaddress.street_id $this->join"
! . " fm_apartment_category ON
fm_apartment.cat_id = fm_apartment_category.id "
! . " WHERE $filtermethod $querymethod ";
$this->db2->query($sql,__LINE__,__FILE__);
--- 87,96 ----
$sql = "SELECT
fm_apartment.location_code,fm_apartment.property_id,fm_property.name,building_id,entrance_id,floor,apartment_id,street_number,street_name"
! . " FROM (fm_apartment $this->join"
. " fm_property ON fm_apartment.property_id =
fm_property.property_id $this->join"
. " fm_part_of_town ON
fm_property.part_of_town_id = fm_part_of_town.id $this->join"
. " fm_streetaddress ON fm_apartment.street_id
= fm_streetaddress.street_id $this->join"
! . " fm_apartment_category ON
fm_apartment.cat_id = fm_apartment_category.id) $this->join fm_owner on
fm_property.owner_id = fm_owner.owner_id "
! . " $filtermethod $querymethod ";
$this->db2->query($sql,__LINE__,__FILE__);
Index: class.sobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sobuilding.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sobuilding.inc.php 25 Apr 2003 11:36:53 -0000 1.9
--- class.sobuilding.inc.php 18 May 2003 10:59:14 -0000 1.10
***************
*** 48,52 ****
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'none');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
--- 48,52 ----
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
***************
*** 57,101 ****
if ($order)
{
! $ordermethod = " order by $order $sort";
}
else
{
! $ordermethod = ' order by property_id DESC';
}
! if ($filter == 'none')
! {
! $filtermethod = ' ( owner=' . $this->account;
! if (is_array($this->grants))
! {
! $grants = $this->grants;
! while (list($user) = each($grants))
! {
! $public_user_list[] = $user;
! }
! reset($public_user_list);
! $filtermethod .= " OR (access='public'
OR owner IN(" . implode(',',$public_user_list) . ")))";
! }
! else
! {
! $filtermethod .= ' )';
! }
! }
! elseif ($filter == 'yours')
{
! $filtermethod = " owner='" . $this->account .
"'";
}
else
{
! $filtermethod = " owner='" . $this->account .
"' AND access='private'";
}
! if ($cat_id > 0)
! {
! $filtermethod .= " AND cat_id='$cat_id' ";
! }
! else
{
! $filtermethod .= " AND cat_id!='99' ";
}
--- 57,79 ----
if ($order)
{
! $ordermethod = " order by fm_building.$order
$sort";
}
else
{
! $ordermethod = ' order by
fm_building.property_id DESC';
}
! if ($cat_id > 0)
{
! $filtermethod .= " WHERE
fm_building.cat_id='$cat_id' ";
}
else
{
! $filtermethod .= " WHERE
fm_building.cat_id!='99' ";
}
! if ($filter)
{
! $filtermethod .= " AND
fm_owner.category='$filter' ";
}
***************
*** 108,112 ****
}
! $sql = "SELECT * FROM fm_building WHERE $filtermethod
$querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 86,91 ----
}
! $sql = "SELECT fm_building.* , fm_property.name as
property_name FROM (fm_building $this->join fm_property on
fm_building.property_id=fm_property.property_id)"
! . " $this->join fm_owner on fm_property.owner_id =
fm_owner.owner_id $filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 122,127 ****
'building_id' =>
$this->db->f('building_id'),
'owner' =>
$this->db->f('owner'),
! 'owner_id' =>
(int)$this->db->f('owner'),
! 'access' =>
$this->db->f('access'),
'date' =>
$this->db->f('entry_date'),
'cat_id' =>
(int)$this->db->f('cat_id'),
--- 101,105 ----
'building_id' =>
$this->db->f('building_id'),
'owner' =>
$this->db->f('owner'),
! 'property_name' =>
$this->db->f('property_name'),
'date' =>
$this->db->f('entry_date'),
'cat_id' =>
(int)$this->db->f('cat_id'),
Index: class.soentrance.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentrance.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.soentrance.inc.php 27 Feb 2003 09:53:36 -0000 1.3
--- class.soentrance.inc.php 18 May 2003 10:59:14 -0000 1.4
***************
*** 57,101 ****
if ($order)
{
! $ordermethod = " order by $order $sort";
}
else
{
! $ordermethod = ' order by property_id DESC';
}
! if ($filter == 'none')
! {
! $filtermethod = ' ( owner=' . $this->account;
! if (is_array($this->grants))
! {
! $grants = $this->grants;
! while (list($user) = each($grants))
! {
! $public_user_list[] = $user;
! }
! reset($public_user_list);
! $filtermethod .= " OR (access='public'
OR owner IN(" . implode(',',$public_user_list) . ")))";
! }
! else
! {
! $filtermethod .= ' )';
! }
! }
! elseif ($filter == 'yours')
{
! $filtermethod = " owner='" . $this->account .
"'";
}
else
{
! $filtermethod = " owner='" . $this->account .
"' AND access='private'";
}
! if ($cat_id > 0)
! {
! $filtermethod .= " AND cat_id='$cat_id' ";
! }
! else
{
! $filtermethod .= " AND cat_id!='99' ";
}
--- 57,79 ----
if ($order)
{
! $ordermethod = " order by fm_entrance.$order
$sort";
}
else
{
! $ordermethod = ' order by
fm_entrance.property_id DESC';
}
! if ($cat_id > 0)
{
! $filtermethod .= " WHERE
fm_entrance.cat_id='$cat_id' ";
}
else
{
! $filtermethod .= " WHERE
fm_entrance.cat_id!='99' ";
}
! if ($filter)
{
! $filtermethod .= " AND
fm_owner.category='$filter' ";
}
***************
*** 105,112 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND property_id LIKE
'%$query%' or descr LIKE '%$query%'";
}
! $sql = "SELECT * FROM fm_entrance WHERE $filtermethod
$querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 83,91 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_entrance.property_id
LIKE '%$query%' or fm_entrance.descr LIKE '%$query%'";
}
! $sql = "SELECT fm_entrance.* , fm_property.name as
property_name FROM (fm_entrance $this->join fm_property on
fm_entrance.property_id=fm_property.property_id)"
! . " $this->join fm_owner on fm_property.owner_id =
fm_owner.owner_id $filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 116,120 ****
while ($this->db->next_record())
{
! $ngrants =
(int)$this->grants[$this->db->f('entrance_owner')];
$entrance[] = array
(
--- 95,99 ----
while ($this->db->next_record())
{
! $ngrants =
(int)$this->grants[$this->db->f('owner')];
$entrance[] = array
(
***************
*** 123,128 ****
'building_id' =>
$this->db->f('building_id'),
'entrance_id' =>
$this->db->f('entrance_id'),
! 'owner' =>
$this->db->f('owner'),
! 'owner_id' =>
(int)$this->db->f('owner'),
'access' =>
$this->db->f('access'),
'date' =>
$this->db->f('entry_date'),
--- 102,106 ----
'building_id' =>
$this->db->f('building_id'),
'entrance_id' =>
$this->db->f('entrance_id'),
! 'property_name' =>
$this->db->f('property_name'),
'access' =>
$this->db->f('access'),
'date' =>
$this->db->f('entry_date'),
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.soproperty.inc.php 6 May 2003 20:01:01 -0000 1.15
--- class.soproperty.inc.php 18 May 2003 10:59:14 -0000 1.16
***************
*** 31,34 ****
--- 31,62 ----
}
+ function get_filter_list()
+ {
+ $this->db->query("SELECT id,descr FROM
fm_owner_category ORDER BY descr ");
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $filters[$i]['id'] =
$this->db->f('id');
+ $filters[$i]['name'] =
stripslashes($this->db->f('descr'));
+ $i++;
+ }
+ return $filters;
+ }
+
+ function get_owner_list()
+ {
+ $this->db->query("SELECT fm_owner.*
,fm_owner_category.descr as category FROM fm_owner $this->join
fm_owner_category on fm_owner.category=fm_owner_category.id ORDER BY descr ");
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $owners[$i]['id'] =
$this->db->f('owner_id');
+ $owners[$i]['name'] =
stripslashes($this->db->f('name')) . ' ['. $this->db->f('category') . ']';
+ $i++;
+ }
+ return $owners;
+ }
+
function get_district($property_id)
{
***************
*** 57,61 ****
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'none');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
--- 85,89 ----
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
***************
*** 73,110 ****
}
! if ($filter == 'none')
! {
! $filtermethod = ' ( owner=' . $this->account;
! if (is_array($this->grants))
! {
! $grants = $this->grants;
! while (list($user) = each($grants))
! {
! $public_user_list[] = $user;
! }
! reset($public_user_list);
! $filtermethod .= " OR (access='public'
OR owner IN(" . implode(',',$public_user_list) . ")))";
! }
! else
! {
! $filtermethod .= ' )';
! }
! }
! elseif ($filter == 'yours')
{
! $filtermethod = " owner='" . $this->account .
"'";
}
else
{
! $filtermethod = " owner='" . $this->account .
"' AND access='private'";
}
! if ($cat_id > 0)
! {
! $filtermethod .= " AND cat_id='$cat_id' ";
! }
! else
{
! $filtermethod .= " AND cat_id!='99' ";
}
--- 101,117 ----
}
! $where = 'WHERE';
! if ($cat_id > 0)
{
! $filtermethod .= " $where cat_id='$cat_id' ";
}
else
{
! $filtermethod .= " $where cat_id!='99' ";
}
! if ($filter)
{
! $filtermethod .= " AND
fm_owner.category='$filter' ";
}
***************
*** 118,122 ****
$sql = "SELECT fm_property.* , fm_part_of_town.name as
part_of_town, fm_part_of_town.district_id FROM fm_property $this->join
fm_part_of_town on fm_property.part_of_town_id = fm_part_of_town.id "
! . " WHERE $filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 125,129 ----
$sql = "SELECT fm_property.* , fm_part_of_town.name as
part_of_town, fm_part_of_town.district_id FROM fm_property $this->join
fm_part_of_town on fm_property.part_of_town_id = fm_part_of_town.id "
! . " $this->join fm_owner on
fm_property.owner_id = fm_owner.owner_id $filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 145,149 ****
function read_single($property_id)
{
! $sql = "SELECT fm_property.*,fm_part_of_town.name as
part_of_town ,fm_part_of_town.id as part_of_town_id FROM fm_property
$this->join fm_part_of_town on fm_property.part_of_town_id = fm_part_of_town.id
where property_id='$property_id'";
$this->db->query($sql,__LINE__,__FILE__);
--- 152,156 ----
function read_single($property_id)
{
! $sql = "SELECT fm_property.*,fm_part_of_town.name as
part_of_town ,fm_part_of_town.id as part_of_town_id,
fm_part_of_town.district_id FROM fm_property $this->join fm_part_of_town on
fm_property.part_of_town_id = fm_part_of_town.id where
property_id='$property_id'";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 152,156 ****
{
$property['property_id'] =
$this->db->f('property_id');
! $property['owner']
= $this->db->f('owner');
$property['name']
= stripslashes($this->db->f('name'));
$property['general_address'] =
stripslashes($this->db->f('general_address'));
--- 159,163 ----
{
$property['property_id'] =
$this->db->f('property_id');
! $property['owner_id'] =
$this->db->f('owner_id');
$property['name']
= stripslashes($this->db->f('name'));
$property['general_address'] =
stripslashes($this->db->f('general_address'));
***************
*** 173,179 ****
$property['generellinfo'] =
$this->db->db_addslashes($property['generellinfo']);
! $this->db->query("INSERT INTO fm_property
(location_code,
property_id,part_of_town_id,owner,access,entry_date,name,general_address,cat_id,generellinfo)
"
. "VALUES ('" . $property['property_id'] .
"','" . $property['property_id'] . "','" . $property['part_of_town_id'] . "','"
. $this->account . "','" . $property['access'] . "','" . time() . "','" .
$property['name']
! . "','" . $property['general_address'] ."','" .
$property['cat_id'] ."','" . $property['generellinfo']. "')",__LINE__,__FILE__);
$receipt['message'][]=array('msg'=>lang('Property has
been saved'));
--- 180,186 ----
$property['generellinfo'] =
$this->db->db_addslashes($property['generellinfo']);
! $this->db->query("INSERT INTO fm_property
(location_code,
property_id,part_of_town_id,owner,access,entry_date,name,general_address,cat_id,generellinfo,owner_id)
"
. "VALUES ('" . $property['property_id'] .
"','" . $property['property_id'] . "','" . $property['part_of_town_id'] . "','"
. $this->account . "','" . $property['access'] . "','" . time() . "','" .
$property['name']
! . "','" . $property['general_address'] ."','" .
$property['cat_id'] ."','" . $property['generellinfo'] ."','" .
$property['owner_id']. "')",__LINE__,__FILE__);
$receipt['message'][]=array('msg'=>lang('Property has
been saved'));
***************
*** 186,190 ****
$this->db->query("UPDATE fm_property set name='" .
$property['name'] . "', entry_date='" . time() . "', cat_id='"
! . $property['cat_id'] .
"', general_address='" . $property['general_address'] . "', access='" .
$property['access'] . "', part_of_town_id='" . $property['part_of_town_id'].
"', generellinfo='" . $property['generellinfo']
. "' WHERE
property_id='" . $property['property_id'] . "'",__LINE__,__FILE__);
--- 193,197 ----
$this->db->query("UPDATE fm_property set name='" .
$property['name'] . "', entry_date='" . time() . "', cat_id='"
! . $property['cat_id'] .
"', general_address='" . $property['general_address'] . "', access='" .
$property['access'] . "', part_of_town_id='" . $property['part_of_town_id'].
"', generellinfo='" . $property['generellinfo']. "', owner_id='" .
$property['owner_id']
. "' WHERE
property_id='" . $property['property_id'] . "'",__LINE__,__FILE__);
Index: class.uiapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiapartment.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uiapartment.inc.php 11 May 2003 15:55:09 -0000 1.9
--- class.uiapartment.inc.php 18 May 2003 10:59:14 -0000 1.10
***************
*** 36,41 ****
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.boapartment',True);
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
! $this->socommon =
CreateObject($this->currentapp.'.socommon',True);
$this->start =
$this->bo->start;
--- 36,42 ----
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.boapartment',True);
! $this->boproperty =
CreateObject($this->currentapp.'.boproperty');
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->start =
$this->bo->start;
***************
*** 45,49 ****
$this->filter =
$this->bo->filter;
$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');
--- 46,50 ----
$this->filter =
$this->bo->filter;
$this->cat_id =
$this->bo->cat_id;
! $this->part_of_town_id =
$this->bo->part_of_town_id;
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'property');
***************
*** 70,74 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 71,74 ----
***************
*** 89,93 ****
'street_number'
=> $apartment['street_number'],
'descr'
=> $apartment['descr'],
! 'owner'
=> $apartment['owner'],
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiapartment.view&location_code='
. $apartment['location_code']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiapartment.edit&location_code='
. $apartment['location_code']),
--- 89,93 ----
'street_number'
=> $apartment['street_number'],
'descr'
=> $apartment['descr'],
! 'property_name'
=> $apartment['property_name'],
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiapartment.view&location_code='
. $apartment['location_code']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiapartment.edit&location_code='
. $apartment['location_code']),
***************
*** 154,159 ****
$data = array
(
'links'
=> $links,
! 'allow_allrows' =>
false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 154,161 ----
$data = array
(
+ 'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
+ 'lang_property_name' =>
lang('Property name'),
'links'
=> $links,
! 'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
***************
*** 166,171 ****
'select_name'
=> 'cat_id',
'cat_list'
=>
$this->bocommon->select_category_apartment_list('filter',$this->cat_id),
! 'select_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiapartment.index'),
! 'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 168,175 ----
'select_name'
=> 'cat_id',
'cat_list'
=>
$this->bocommon->select_category_apartment_list('filter',$this->cat_id),
! 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'filter_name'
=> 'filter',
! 'filter_list'
=> $this->boproperty->get_filter_list('filter', $this->filter),
! 'lang_show_all'
=> lang('Show all'),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uibuilding.inc.php 11 May 2003 15:55:09 -0000 1.17
--- class.uibuilding.inc.php 18 May 2003 10:59:14 -0000 1.18
***************
*** 40,45 ****
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.bobuilding',True);
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
! $this->socommon =
CreateObject($this->currentapp.'.socommon',True);
$this->start =
$this->bo->start;
--- 40,46 ----
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.bobuilding',True);
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->boproperty =
CreateObject($this->currentapp.'.boproperty');
$this->start =
$this->bo->start;
***************
*** 49,53 ****
$this->filter =
$this->bo->filter;
$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');
--- 50,53 ----
***************
*** 65,69 ****
'cat_id' => $this->cat_id
);
! $this->bocommon->save_sessiondata($data);
}
--- 65,69 ----
'cat_id' => $this->cat_id
);
! $this->bo->save_sessiondata($data);
}
***************
*** 74,78 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 74,77 ----
***************
*** 90,94 ****
'name'
=> $building['name'],
'date'
=> $building['date'],
! 'owner'
=> $building['owner'],
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.view&property_id='
. $building['property_id'].'&building_id=' . $building['building_id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.edit&property_id='
. $building['property_id'].'&building_id=' . $building['building_id']),
--- 89,93 ----
'name'
=> $building['name'],
'date'
=> $building['date'],
! 'property_name'
=> $building['property_name'],
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.view&property_id='
. $building['property_id'].'&building_id=' . $building['building_id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.edit&property_id='
. $building['property_id'].'&building_id=' . $building['building_id']),
***************
*** 129,133 ****
'lang_property_id' =>
lang('property id'),
'lang_building_id' =>
lang('building id'),
! 'lang_owner' => lang('owner')
);
--- 128,132 ----
'lang_property_id' =>
lang('property id'),
'lang_building_id' =>
lang('building id'),
! 'lang_property_name' => lang('Property name')
);
***************
*** 145,149 ****
'order'
=>$this->order,
'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
'filter'
=>$this->filter,
'query'
=>$this->query
--- 144,147 ----
***************
*** 154,158 ****
(
'links'
=> $links,
! 'allow_allrows' =>
false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
--- 152,156 ----
(
'links'
=> $links,
! 'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
***************
*** 165,170 ****
'select_name'
=> 'cat_id',
'cat_list'
=>
$this->bocommon->select_category_building_list('filter',$this->cat_id),
! 'select_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.index'),
! 'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 163,170 ----
'select_name'
=> 'cat_id',
'cat_list'
=>
$this->bocommon->select_category_building_list('filter',$this->cat_id),
! 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'filter_name'
=> 'filter',
! 'filter_list'
=> $this->boproperty->get_filter_list('filter', $this->filter),
! 'lang_show_all'
=> lang('Show all'),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
Index: class.uientrance.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientrance.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uientrance.inc.php 11 May 2003 15:55:09 -0000 1.10
--- class.uientrance.inc.php 18 May 2003 10:59:14 -0000 1.11
***************
*** 36,41 ****
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.boentrance',True);
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
! $this->socommon =
CreateObject($this->currentapp.'.socommon',True);
$this->start =
$this->bo->start;
--- 36,42 ----
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.boentrance',True);
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->boproperty =
CreateObject($this->currentapp.'.boproperty');
$this->start =
$this->bo->start;
***************
*** 45,49 ****
$this->filter =
$this->bo->filter;
$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');
--- 46,50 ----
$this->filter =
$this->bo->filter;
$this->cat_id =
$this->bo->cat_id;
! $this->part_of_town_id =
$this->bo->part_of_town_id;
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'property');
***************
*** 61,65 ****
'cat_id' => $this->cat_id
);
! $this->bocommon->save_sessiondata($data);
}
--- 62,66 ----
'cat_id' => $this->cat_id
);
! $this->bo->save_sessiondata($data);
}
***************
*** 70,74 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 71,74 ----
***************
*** 159,164 ****
'select_name'
=> 'cat_id',
'cat_list'
=>
$this->bocommon->select_category_entrance_list('filter',$this->cat_id),
! 'select_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientrance.index'),
! 'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 159,166 ----
'select_name'
=> 'cat_id',
'cat_list'
=>
$this->bocommon->select_category_entrance_list('filter',$this->cat_id),
! 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'filter_name'
=> 'filter',
! 'filter_list'
=> $this->boproperty->get_filter_list('filter', $this->filter),
! 'lang_show_all'
=> lang('Show all'),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.uiproperty.inc.php 11 May 2003 15:55:09 -0000 1.21
--- class.uiproperty.inc.php 18 May 2003 10:59:14 -0000 1.22
***************
*** 65,69 ****
'cat_id' => $this->cat_id
);
! $this->bocommon->save_sessiondata($data);
}
--- 65,69 ----
'cat_id' => $this->cat_id
);
! $this->bo->save_sessiondata($data);
}
***************
*** 74,78 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 74,77 ----
***************
*** 176,181 ****
'select_name'
=> 'cat_id',
'cat_list'
=>
$this->bocommon->select_category_property_list('filter',$this->cat_id),
! 'select_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index'),
! 'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 175,182 ----
'select_name'
=> 'cat_id',
'cat_list'
=>
$this->bocommon->select_category_property_list('filter',$this->cat_id),
! 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'filter_name'
=> 'filter',
! 'filter_list'
=> $this->bo->get_filter_list('filter', $this->filter),
! 'lang_show_all'
=> lang('Show all'),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
***************
*** 330,333 ****
--- 331,340 ----
'lang_no_part_of_town' =>
lang('No part of town'),
'cat_list'
=>
$this->bocommon->select_category_property_list('select',$this->cat_id),
+
+ 'lang_owner'
=> lang('Owner'),
+ 'owner_list'
=> $this->bo->get_owner_list($property['owner_id']),
+ 'lang_select_owner'
=> lang('Select owner'),
+ 'lang_owner_statustext' =>
lang('Select the owner'),
+
'part_of_town_list'
=> $this->bocommon->select_part_of_town('select',$this->part_of_town_id),
'select_name_part_of_town' =>
'values[part_of_town_id]',
***************
*** 423,426 ****
--- 430,437 ----
'value_category' =>
$this->bo->read_category_name($property['cat_id']),
'value_generellinfo' =>
$property['generellinfo'],
+
+ 'lang_owner' =>
lang('Owner'),
+ 'owner_list' =>
$this->bo->get_owner_list($property['owner_id']),
+
'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index'),
'lang_content' =>
lang('content'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.5,1.6 class.boentrance.inc.php,1.3,1.4 class.boproperty.inc.php,1.5,1.6 class.soapartment.inc.php,1.3,1.4 class.sobuilding.inc.php,1.9,1.10 class.soentrance.inc.php,1.3,1.4 class.soproperty.inc.php,1.15,1.16 class.uiapartment.inc.php,1.9,1.10class.uibuilding.inc.php,1.17,1.18 class.uientrance.inc.php,1.10,1.11class.uiproperty.inc.php,1.21,1.22,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc functions.inc.php,1.121.2.13.2.7,1.121.2.13.2.8
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default apartment.xsl,1.4,1.5 building.xsl,1.8,1.9 entrance.xsl,1.4,1.5 property.xsl,1.10,1.11
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc functions.inc.php,1.121.2.13.2.7,1.121.2.13.2.8
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default apartment.xsl,1.4,1.5 building.xsl,1.8,1.9 entrance.xsl,1.4,1.5 property.xsl,1.10,1.11
- Index(es):