[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6838] Merge 6827:6837 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6838] Merge 6827:6837 from trunk |
|
Date: |
Tue, 25 Jan 2011 07:37:08 +0000 |
Revision: 6838
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6838
Author: sigurdne
Date: 2011-01-25 07:37:07 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
Merge 6827:6837 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/admin/inc/class.boaccess_history.inc.php
branches/Version-1_0-branch/admin/inc/class.bocurrentsessions.inc.php
branches/Version-1_0-branch/login.php
branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837
Modified: branches/Version-1_0-branch/admin/inc/class.boaccess_history.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.boaccess_history.inc.php
2011-01-24 20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/admin/inc/class.boaccess_history.inc.php
2011-01-25 07:37:07 UTC (rev 6838)
@@ -54,9 +54,9 @@
$record['lo'] = ''; // dont
show a 0 for not loged out
}
- if (ereg('@',$record['loginid']))
+ if (preg_match('/#/',$record['loginid']))
{
- $t = split('@',$record['loginid']);
+ $t = explode('#',$record['loginid']);
$record['loginid'] = $t[0];
}
Modified: branches/Version-1_0-branch/admin/inc/class.bocurrentsessions.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.bocurrentsessions.inc.php
2011-01-24 20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/admin/inc/class.bocurrentsessions.inc.php
2011-01-25 07:37:07 UTC (rev 6838)
@@ -44,7 +44,7 @@
$values =
$GLOBALS['phpgw']->session->list_sessions($start, $sort, $order);
foreach ( $values as &$value )
{
- if ( preg_match('/^(.*)@(.*)$/', $value['lid'],
$m) )
+ if ( preg_match('/^(.*)#(.*)$/', $value['lid'],
$m) )
{
$value['lid'] = $m[1];
}
Modified: branches/Version-1_0-branch/login.php
===================================================================
--- branches/Version-1_0-branch/login.php 2011-01-24 20:07:18 UTC (rev
6837)
+++ branches/Version-1_0-branch/login.php 2011-01-25 07:37:07 UTC (rev
6838)
@@ -172,9 +172,9 @@
}
$logindomain = phpgw::get_var('logindomain', 'string', 'POST');
- if ( strstr($login,'@') === false && $logindomain )
+ if ( strstr($login,'#') === false && $logindomain )
{
- $login .= "@{$logindomain}";
+ $login .= "#{$logindomain}";
}
$receipt = array();
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
2011-01-24 20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
2011-01-25 07:37:07 UTC (rev 6838)
@@ -352,7 +352,7 @@
$GLOBALS['phpgw']->interserver =
createObject('phpgwapi.interserver');
$this->_login = $login;
$this->_passwd = $passwd;
- $login_array = explode('@', $login);
+ $login_array = explode('#', $login);
$this->_account_lid = $login_array[0];
$now = time();
@@ -1125,7 +1125,7 @@
$this->_session_flags = $session['session_flags'];
- $lid_data = explode('@', $session['session_lid']);
+ $lid_data = explode('#', $session['session_lid']);
$this->_account_lid = $lid_data[0];
if ( isset($lid_data[1]) )
@@ -1359,7 +1359,7 @@
{
$filename = $file->getFilename();
// only try php session files
- if ( !preg_match('/^sess_([a-f0-9]+)$/',
$filename) )
+ if ( !preg_match('/^sess_([a-z0-9]+)$/',
$filename) )
{
continue;
}
@@ -1457,7 +1457,7 @@
}
$login = $this->_db->db_addslashes($login);
$sql = 'SELECT COUNT(*) AS cnt FROM phpgw_access_log'
- . " WHERE account_id = 0 AND
(loginid='{$login}' OR loginid LIKE 'address@hidden')"
+ . " WHERE account_id = 0 AND
(loginid='{$login}' OR loginid LIKE '$login#%')"
. " AND li > {$block_time}";
$this->_db->query($sql, __LINE__, __FILE__);
@@ -1558,7 +1558,7 @@
$this->_data['domain'] = $this->_account_domain;
$this->_data['sessionid'] = $this->_sessionid;
$this->_data['session_ip'] = $this->_get_user_ip();
- $this->_data['session_lid'] =
$this->_account_lid.'@'.$this->_account_domain;
+ $this->_data['session_lid'] =
$this->_account_lid.'#'.$this->_account_domain;
$this->_data['account_id'] = $this->_account_id;
$this->_data['account_lid'] = $this->_account_lid;
$this->_data['userid'] = $this->_account_lid;
@@ -1580,7 +1580,7 @@
protected function _set_login($login)
{
$m = array();
- if ( preg_match('/(.*)@(.*)/', $login, $m) )
+ if ( preg_match('/(.*)#(.*)/', $login, $m) )
{
$this->_account_lid = $m[1];
$this->_account_domain = $m[2];
Modified: branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2011-01-24
20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2011-01-25
07:37:07 UTC (rev 6838)
@@ -397,11 +397,11 @@
if (isset($_POST['login'])) // on login
{
$GLOBALS['login'] = $_POST['login'];
- if (strstr($GLOBALS['login'],'@') === False)
+ if (strstr($GLOBALS['login'],'#') === False)
{
- $GLOBALS['login'] .= '@' .
phpgw::get_var('logindomain', 'string', 'POST',
$GLOBALS['phpgw_info']['server']['default_domain']);
+ $GLOBALS['login'] .= '#' .
phpgw::get_var('logindomain', 'string', 'POST',
$GLOBALS['phpgw_info']['server']['default_domain']);
}
- list(,$GLOBALS['phpgw_info']['user']['domain']) =
explode('@',$GLOBALS['login']);
+ list(,$GLOBALS['phpgw_info']['user']['domain']) =
explode('#',$GLOBALS['login']);
}
else if (phpgw::get_var('domain', 'string', 'REQUEST', false))
{
@@ -630,7 +630,7 @@
{
if ( isset($_POST['login']) && $_POST['login'] != '')
{
- list($login) = explode("@",$_POST['login']);
+ list($login) = explode("#",$_POST['login']);
print_debug('LID',$login,'app');
$login_id =
$GLOBALS['phpgw']->accounts->name2id($login);
print_debug('User ID',$login_id,'app');
Modified: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2011-01-24 20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2011-01-25 07:37:07 UTC (rev 6838)
@@ -340,7 +340,7 @@
if ($_COOKIE['last_domain'] != $default_domain
&& !empty($_COOKIE['last_domain']) &&
!$GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
{
- $last_loginid .= '@' .
$_COOKIE['last_domain'];
+ $last_loginid .= '#' .
$_COOKIE['last_domain'];
}
}
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-01-24 20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-01-25 07:37:07 UTC (rev 6838)
@@ -1953,8 +1953,9 @@
* @param array $insert_record array containing fields to
collect from post
* @return updated values
*/
- function collect_locationdata($values = '',$insert_record = '')
+ function collect_locationdata($values = '',$insert_record =
array())
{
+//_debug_array($insert_record);die();
if($insert_record)
{
for ($i=0;
$i<count($insert_record['location']); $i++)
@@ -1975,6 +1976,13 @@
}
}
}
+ if(isset($insert_record['additional_info']) &&
is_array($insert_record['additional_info']))
+ {
+ foreach
($insert_record['additional_info'] as $additional_info)
+ {
+
$values['additional_info'][$additional_info['input_text']] =
phpgw::get_var($additional_info['input_name'], 'string', 'POST');
+ }
+ }
}
$values['street_name'] =
phpgw::get_var('street_name');
Modified: branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2011-01-24 20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2011-01-25 07:37:07 UTC (rev 6838)
@@ -377,6 +377,11 @@
$location['location'][$i]['name']
= $fm_location_cols[$j]['input_text'];
$location['location'][$i]['value']
=
isset($data['values'][$fm_location_cols[$j]['column_name']]) ?
$data['values'][$fm_location_cols[$j]['column_name']] : '';
$location['location'][$i]['statustext']
= lang('click this link to select') . ' ' .
$location_types[($fm_location_cols[$j]['location_type']-1)]['name'];
+ $insert_record['additional_info'][]
= array
+ (
+ 'input_name' =>
$location['location'][$i]['input_name'],
+ 'input_text' =>
$fm_location_cols[$j]['input_text']
+ );
$i++;
}
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2011-01-24 20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2011-01-25 07:37:07 UTC (rev 6838)
@@ -348,25 +348,38 @@
if($query)
{
$query = $this->db->db_addslashes($query);
- $query = str_replace(",",'.',$query);
- if(stristr($query, '.') && !$p_num)
+ $querymethod = " $where ((subject $this->like
'%$query%'"
+ . " OR address $this->like '%$query%' "
+ . " OR fm_location1.loc1_name
$this->like '%$query%'"
+ . " OR fm_tts_tickets.location_code
$this->like '%$query%'";
+
+ if(ctype_digit($query))
{
- $query=explode(".",$query);
- $querymethod = " $where
(fm_tts_tickets.loc1='" . $query[0] . "' AND fm_tts_tickets.loc4='" . $query[1]
. "')";
+ $querymethod .= " OR
fm_tts_tickets.order_id =" . (int)$query
+ . " OR fm_tts_tickets.id =" .
(int)$query . ')';
}
- else if(stristr($query, '.') && $p_num)
+ else
{
- $query=explode(".",$query);
- $querymethod = " $where
(fm_tts_tickets.p_entity_id='" . (int)$query[1] . "' AND
fm_tts_tickets.p_cat_id='" . (int)$query[2] . "' AND fm_tts_tickets.p_num='" .
(int)$query[3] . "')";
+ $querymethod .= ')';
}
+
+ $query = str_replace(",",'.',$query);
+ if(stristr($query, '.'))
+ {
+ if(!$p_num)
+ {
+ $query=explode(".",$query);
+ $querymethod .= " OR
(fm_tts_tickets.loc1='{$query[0]}' AND fm_tts_tickets.loc4='{$query[1]}'))";
+ }
+ else
+ {
+ $query=explode(".",$query);
+ $querymethod .= " OR
(fm_tts_tickets.p_entity_id='" . (int)$query[1] . "' AND
fm_tts_tickets.p_cat_id='" . (int)$query[2] . "' AND fm_tts_tickets.p_num='" .
(int)$query[3] . "'))";
+ }
+ }
else
{
- $querymethod = " $where (subject
$this->like '%$query%'"
- . " OR address $this->like
'%$query%' "
- . " OR fm_location1.loc1_name
$this->like '%$query%'"
- . " OR
fm_tts_tickets.location_code $this->like '%$query%'"
- . " OR fm_tts_tickets.order_id
=" . (int)$query
- . " OR fm_tts_tickets.id =" .
(int)$query . ')';
+ $querymethod .= ')';
}
}
@@ -378,15 +391,8 @@
. " LEFT OUTER JOIN fm_tts_views ON
(fm_tts_tickets.id = fm_tts_views.id AND
fm_tts_views.account_id='{$this->account}')"
. " $filtermethod $querymethod";
-/*
- $sql2 = "SELECT fm_tts_tickets.*
,fm_location1.loc1_name, fm_tts_views.id as view FROM fm_tts_tickets"
- . " $this->join fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
- . " $this->join fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
- . " $order_join"
- . " $filtermethod $querymethod";
+//_debug_array($sql);
- $sql2 = 'SELECT count(*) as cnt ' .
substr($sql2,strripos($sql2,'FROM'));
- */
$sql2 = "SELECT count(*) as cnt FROM ({$sql}) as t";
$this->db->query($sql2,__LINE__,__FILE__);
$this->db->next_record();
@@ -417,7 +423,7 @@
while ($this->db->next_record())
{
$tickets[]= array
- (
+ (
'id'
=> (int) $this->db->f('id'),
'subject'
=> $this->db->f('subject',true),
'loc1_name'
=> $this->db->f('loc1_name',true),
@@ -439,21 +445,8 @@
'estimate'
=> $this->db->f('budget'),
'new_ticket'
=> $this->db->f('view') ? false : true,
'billable_hours'
=> $this->db->f('billable_hours'),
- );
+ );
}
-/*
- foreach ($tickets as &$ticket)
- {
- $this->db->query("SELECT count(*) as
hits FROM fm_tts_views where id={$ticket['id']}"
- . " AND
account_id='{$this->account}'",__LINE__,__FILE__);
- $this->db->next_record();
-
- if(! $this->db->f('hits'))
- {
- $ticket['new_ticket'] = true;
- }
- }
- */
}
return $tickets;
@@ -560,8 +553,7 @@
{
if(isset($value) && $value)
{
- $cols[] = $input_name;
- $vals[] = $value;
+ $value_set[$input_name] =
$value;
}
}
}
@@ -572,61 +564,59 @@
{
if(isset($value) && $value)
{
- $cols[] = $input_name;
- $vals[] = $value;
+ $value_set[$input_name] =
$value;
}
}
}
- if($cols)
+ $address = '';
+ if(isset($ticket['street_name']) &&
$ticket['street_name'])
{
- $cols = "," . implode(",", $cols);
- $vals = ",'" . implode("','", $vals) . "'";
+ $_address = array($ticket['street_name'],
$ticket['street_number']);
+ $address =
$this->db->db_addslashes(implode(" ", $_address));
+ unset($_address);
}
- $address = '';
- if(isset($ticket['street_name']) &&
$ticket['street_name'])
+ if(isset($ticket['location_name']) &&
$ticket['location_name'])
{
- $address[]= $ticket['street_name'];
- $address[]= $ticket['street_number'];
- $address =
$this->db->db_addslashes(implode(" ", $address));
+ $address .= '::' .
$this->db->db_addslashes($ticket['location_name']);
}
- if(!$address)
+ if(isset($ticket['additional_info']) &&
$ticket['additional_info'])
{
- $address =
$this->db->db_addslashes($ticket['location_name']);
+ foreach($ticket['additional_info'] as $key =>
$value)
+ {
+ $address .= "::{$key}|{$value}";
+ }
}
- $values= array
- (
-
isset($ticket['priority'])?$ticket['priority']:0,
-
$GLOBALS['phpgw_info']['user']['account_id'],
- $ticket['assignedto'],
- $ticket['group_id'],
-
$this->db->db_addslashes($ticket['subject']),
- $ticket['cat_id'],
- $ticket['status'],
-
$this->db->db_addslashes($ticket['details']),
- $ticket['location_code'],
- $address,
- time(),
- $ticket['finnish_date'],
- $ticket['contact_id'],
- 1
- );
+ $value_set['priority'] =
isset($ticket['priority'])?$ticket['priority']:0;
+ $value_set['user_id'] =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $value_set['assignedto'] = $ticket['assignedto'];
+ $value_set['group_id'] = $ticket['group_id'];
+ $value_set['subject'] =
$this->db->db_addslashes($ticket['subject']);
+ $value_set['cat_id'] = $ticket['cat_id'];
+ $value_set['status'] = $ticket['status'];
+ $value_set['details'] =
$this->db->db_addslashes($ticket['details']);
+ $value_set['location_code'] =
$ticket['location_code'];
+ $value_set['address'] = $address;
+ $value_set['entry_date'] = time();
+ $value_set['finnish_date'] =
$ticket['finnish_date'];
+ $value_set['contact_id'] = $ticket['contact_id'];
+ $value_set['publish_note'] = 1;
- $values = $this->db->validate_insert($values);
+
+ $cols = implode(',', array_keys($value_set));
+ $values =
$this->db->validate_insert(array_values($value_set));
$this->db->transaction_begin();
- $this->db->query("insert into fm_tts_tickets
(priority,user_id,"
- .
"assignedto,group_id,subject,cat_id,status,details,location_code,"
- .
"address,entry_date,finnish_date,contact_id,publish_note $cols)"
- . "VALUES ($values $vals )",__LINE__,__FILE__);
+ $table = 'fm_tts_tickets';
+ $this->db->query("INSERT INTO {$table} ({$cols}) VALUES
({$values})",__LINE__,__FILE__);
- $id =
$this->db->get_last_insert_id('fm_tts_tickets','id');
+ $id = $this->db->get_last_insert_id($table,'id');
if(isset($ticket['extra']['contact_phone']) &&
$ticket['extra']['contact_phone'] && isset($ticket['extra']['tenant_id']) &&
$ticket['extra']['tenant_id'])
{
- $this->db->query("update fm_tenant set
contact_phone='". $ticket['extra']['contact_phone']. "' where id='".
$ticket['extra']['tenant_id']. "'",__LINE__,__FILE__);
+ $this->db->query("UPDATE fm_tenant SET
contact_phone='{$ticket['extra']['contact_phone']}' WHERE
id='{$ticket['extra']['tenant_id']}'",__LINE__,__FILE__);
}
if(isset($ticket['origin']) &&
is_array($ticket['origin']))
@@ -1013,22 +1003,29 @@
{
$value_set = array();
+ $address = '';
if(isset($ticket['street_name']) &&
$ticket['street_name'])
{
- $address[]=
$ticket['street_name'];
- $address[]=
$ticket['street_number'];
- $value_set['address'] =
$this->db->db_addslashes(implode(" ", $address));
+ $_address =
array($ticket['street_name'], $ticket['street_number']);
+ $address =
$this->db->db_addslashes(implode(" ", $_address));
+ unset($_address);
}
- if(!isset($address) || !$address)
+ if(isset($ticket['location_name']) &&
$ticket['location_name'])
{
- $address =
isset($ticket['location_name']) ?
$this->db->db_addslashes($ticket['location_name']) : '';
- if($address)
+ $address .= '::' .
$this->db->db_addslashes($ticket['location_name']);
+ }
+
+ if(isset($ticket['additional_info']) &&
$ticket['additional_info'])
+ {
+
foreach($ticket['additional_info'] as $key => $value)
{
- $value_set['address'] =
$address;
+ $address .=
"::{$key}|{$value}";
}
}
+ $value_set['address'] = $address;
+
if (isset($ticket['location_code']) &&
$ticket['location_code'])
{
$value_set['location_code'] =
$ticket['location_code'];
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-01-24 20:07:18 UTC (rev 6837)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-01-25 07:37:07 UTC (rev 6838)
@@ -1555,6 +1555,8 @@
if($location_code)
{
$values['location_data'] =
$bolocation->read_single($location_code,array('tenant_id'=>$tenant_id,'p_num'=>$p_num,
'view' => true));
+ $values['street_name'] =
$values['location_data']['street_name'];
+ $values['street_number'] =
$values['location_data']['street_number'];
}
}
@@ -1718,7 +1720,6 @@
'entity_data' =>
(isset($values['p'])?$values['p']:'')
));
-
$contact_data=$this->bocommon->initiate_ui_contact_lookup(array(
'contact_id' =>
$ticket['contact_id'],
'field' => 'contact',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6838] Merge 6827:6837 from trunk,
Sigurd Nes <=