diff -ruN ./a/siremis/modules/ser/prs/presence/do/ActiveWatchersDO.php ./b/siremis/modules/ser/prs/presence/do/ActiveWatchersDO.php --- ./a/siremis/modules/ser/prs/presence/do/ActiveWatchersDO.php 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/do/ActiveWatchersDO.php 2011-08-31 09:18:00.000000000 +0100 @@ -0,0 +1,74 @@ +_run_search($this->m_Limit); // regular search or page search + if ($resultSet !== null) + { + while ($recArray = $this->_fetch_record($resultSet)) + { + $recroutefields = array('record_route','record_route_detail'); + if(isset($recArray[$recroutefields[0]])) + { + $tmp = $recArray[$recroutefields[0]]; + $tmp = str_replace("<", "<", $tmp); + $tmp = str_replace(">", ">", $tmp); + $recArray[$recroutefields[0]] = $tmp; + $tmp = preg_replace('#([A-Z]+ sip:[^ ]+ SIP/2.0)%%#i', '${1}%%', $tmp, -1); + $tmp = preg_replace('#(SIP/2.0 [1-6][0-9][0-9] [^%]+)%%#i', '${1}%%', $tmp, -1); + $tmp = preg_replace('#%%([^ :%]+): (.+)%%#im', '%%$1: $2%%', $tmp, -1, $count); + while($count>0) + $tmp = preg_replace('#%%([^ :%<]+): (.+)%%#im', '%%$1: $2%%', $tmp, -1, $count); + $recArray[$recroutefields[1]] = "
" . $tmp . "
"; + } + + foreach($this->datefields as $field){ + if(isset($recArray[$field])) + { + $time = $recArray[$field]; + $recArray[$field] = date('Y-m-d H:i:s',$time); + } + } + $resultRecords[] = $recArray; + } + } + else + return null; + + return $resultRecords; + } + + + public function updateRecord($recArr, $oldRecord=null) + { + foreach($this->datefields as $field){ + if(isset($recArr[$field])){ + $datetime = explode(' ',$recArr[$field]); + $date = explode('-',$datetime[0]); + $time = explode(':',$datetime[1]); + $recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]); + } + } + return parent::updateRecord($recArr, $oldRecord); + } + + public function insertRecord($recArr) + { + foreach($this->datefields as $field){ + if(isset($recArr[$field])){ + $datetime = explode(' ',$recArr[$field]); + $date = explode('-',$datetime[0]); + $time = explode(':',$datetime[1]); + $recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]); + } + } + return parent::insertRecord($recArr); + } +} +?> diff -ruN ./a/siremis/modules/ser/prs/presence/do/ActiveWatchersDO.xml ./b/siremis/modules/ser/prs/presence/do/ActiveWatchersDO.xml --- ./a/siremis/modules/ser/prs/presence/do/ActiveWatchersDO.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/do/ActiveWatchersDO.xml 2011-08-31 09:18:00.000000000 +0100 @@ -1,5 +1,5 @@ - + diff -ruN ./a/siremis/modules/ser/prs/presence/do/PresentityDO.php ./b/siremis/modules/ser/prs/presence/do/PresentityDO.php --- ./a/siremis/modules/ser/prs/presence/do/PresentityDO.php 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/do/PresentityDO.php 2011-08-31 09:18:00.000000000 +0100 @@ -3,6 +3,7 @@ class PresentityDO extends BizDataObj { + var $fields = array('expires','received_time'); /** * Fetches SQL result rows as a sequential array according the query rules set before. * @@ -14,23 +15,29 @@ $resultSet = $this->_run_search($this->m_Limit); // regular search or page search if ($resultSet !== null) { - $field = 'body'; while ($recArray = $this->_fetch_record($resultSet)) { - if(isset($recArray[$field])) + $bodyfields = array('body','body_detail'); + if(isset($recArray[$bodyfields[0]])) { - $tmp = $recArray[$field]; - $tmp = str_replace("\r\n", "%%EOL%%", $tmp); - $tmp = str_replace("<", "&lt;", $tmp); - $tmp = str_replace(">", "&gt;", $tmp); + $tmp = $recArray[$bodyfields[0]]; + $tmp = str_replace("<", "<", $tmp); + $tmp = str_replace(">", ">", $tmp); + $recArray[$bodyfields[0]] = $tmp; $tmp = preg_replace('#([A-Z]+ sip:[^ ]+ SIP/2.0)%%#i', '${1}%%', $tmp, -1); $tmp = preg_replace('#(SIP/2.0 [1-6][0-9][0-9] [^%]+)%%#i', '${1}%%', $tmp, -1); - // echo "------ [[$tmp]]"; $tmp = preg_replace('#%%([^ :%]+): (.+)%%#im', '%%$1: $2%%', $tmp, -1, $count); while($count>0) $tmp = preg_replace('#%%([^ :%<]+): (.+)%%#im', '%%$1: $2%%', $tmp, -1, $count); - $tmp = str_replace("%%EOL%%", "
", $tmp); - $recArray[$field] = $tmp; + $recArray[$bodyfields[1]] = "
" . $tmp . "
"; + } + foreach($this->fields as $field) + { + if(isset($recArray[$field])) + { + $time = $recArray[$field]; + $recArray[$field] = date('Y-m-d H:i:s',$time); + } } $resultRecords[] = $recArray; } @@ -41,5 +48,34 @@ return $resultRecords; } + public function updateRecord($recArr, $oldRecord=null) + { + foreach($this->fields as $field) + { + if(isset($recArr[$field])) + { + $datetime = explode(' ',$recArr[$field]); + $date = explode('-',$datetime[0]); + $time = explode(':',$datetime[1]); + $recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]); + } + } + return parent::updateRecord($recArr, $oldRecord); + } + + public function insertRecord($recArr) + { + foreach($this->fields as $field) + { + if(isset($recArr[$field])) + { + $datetime = explode(' ',$recArr[$field]); + $date = explode('-',$datetime[0]); + $time = explode(':',$datetime[1]); + $recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]); + } + } + return parent::insertRecord($recArr); + } } ?> diff -ruN ./a/siremis/modules/ser/prs/presence/do/WatchersDO.php ./b/siremis/modules/ser/prs/presence/do/WatchersDO.php --- ./a/siremis/modules/ser/prs/presence/do/WatchersDO.php 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/do/WatchersDO.php 2011-08-31 09:18:00.000000000 +0100 @@ -0,0 +1,64 @@ +_run_search($this->m_Limit); // regular search or page search + if ($resultSet !== null) + { + while ($recArray = $this->_fetch_record($resultSet)) + { + foreach($this->fields as $field) + { + if(isset($recArray[$field])) + { + $time = $recArray[$field]; + $recArray[$field] = date('Y-m-d H:i:s',$time); + } + } + $resultRecords[] = $recArray; + } + } + else + return null; + + return $resultRecords; + } + + + public function updateRecord($recArr, $oldRecord=null) + { + foreach($this->fields as $field) + { + if(isset($recArr[$field])) + { + $datetime = explode(' ',$recArr[$field]); + $date = explode('-',$datetime[0]); + $time = explode(':',$datetime[1]); + $recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]); + } + } + return parent::updateRecord($recArr, $oldRecord); + } + + public function insertRecord($recArr) + { + foreach($this->fields as $field) + { + if(isset($recArr[$field])) + { + $datetime = explode(' ',$recArr[$field]); + $date = explode('-',$datetime[0]); + $time = explode(':',$datetime[1]); + $recArr[$field] = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0]); + } + } + return parent::insertRecord($recArr); + } +} +?> diff -ruN ./a/siremis/modules/ser/prs/presence/do/WatchersDO.xml ./b/siremis/modules/ser/prs/presence/do/WatchersDO.xml --- ./a/siremis/modules/ser/prs/presence/do/WatchersDO.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/do/WatchersDO.xml 2011-08-31 09:18:00.000000000 +0100 @@ -1,5 +1,5 @@ - + diff -ruN ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersCopyForm.xml ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersCopyForm.xml --- ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersCopyForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersCopyForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -15,8 +15,8 @@ - - + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersDetailForm.xml ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersDetailForm.xml --- ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersDetailForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersDetailForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -15,7 +15,7 @@ - + diff -ruN ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersEditForm.xml ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersEditForm.xml --- ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersEditForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersEditForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -15,8 +15,8 @@ - - + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersNewForm.xml ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersNewForm.xml --- ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersNewForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersNewForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -14,8 +14,8 @@ - - + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersSearchForm.xml ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersSearchForm.xml --- ./a/siremis/modules/ser/prs/presence/form/ActiveWatchersSearchForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/ActiveWatchersSearchForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -14,8 +14,8 @@ - - + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PresentityCopyForm.xml ./b/siremis/modules/ser/prs/presence/form/PresentityCopyForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PresentityCopyForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PresentityCopyForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -6,9 +6,9 @@ - - - + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PresentityDetailForm.xml ./b/siremis/modules/ser/prs/presence/form/PresentityDetailForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PresentityDetailForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PresentityDetailForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -9,7 +9,7 @@ - + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PresentityEditForm.xml ./b/siremis/modules/ser/prs/presence/form/PresentityEditForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PresentityEditForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PresentityEditForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -6,9 +6,9 @@ - - - + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PresentityNewForm.xml ./b/siremis/modules/ser/prs/presence/form/PresentityNewForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PresentityNewForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PresentityNewForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -5,9 +5,9 @@ - - - + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PresentitySearchForm.xml ./b/siremis/modules/ser/prs/presence/form/PresentitySearchForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PresentitySearchForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PresentitySearchForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -5,9 +5,9 @@ - - - + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/WatchersCopyForm.xml ./b/siremis/modules/ser/prs/presence/form/WatchersCopyForm.xml --- ./a/siremis/modules/ser/prs/presence/form/WatchersCopyForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/WatchersCopyForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -8,7 +8,7 @@ - + diff -ruN ./a/siremis/modules/ser/prs/presence/form/WatchersEditForm.xml ./b/siremis/modules/ser/prs/presence/form/WatchersEditForm.xml --- ./a/siremis/modules/ser/prs/presence/form/WatchersEditForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/WatchersEditForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -8,7 +8,7 @@ - + diff -ruN ./a/siremis/modules/ser/prs/presence/form/WatchersNewForm.xml ./b/siremis/modules/ser/prs/presence/form/WatchersNewForm.xml --- ./a/siremis/modules/ser/prs/presence/form/WatchersNewForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/WatchersNewForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -7,7 +7,7 @@ - + diff -ruN ./a/siremis/modules/ser/prs/presence/form/WatchersSearchForm.xml ./b/siremis/modules/ser/prs/presence/form/WatchersSearchForm.xml --- ./a/siremis/modules/ser/prs/presence/form/WatchersSearchForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/WatchersSearchForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -7,7 +7,7 @@ - + diff -ruN ./a/siremis/modules/ser/prs/xcapserver/do/XcapDO.php ./b/siremis/modules/ser/prs/xcapserver/do/XcapDO.php --- ./a/siremis/modules/ser/prs/xcapserver/do/XcapDO.php 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/xcapserver/do/XcapDO.php 2011-08-31 09:18:00.000000000 +0100 @@ -14,23 +14,22 @@ $resultSet = $this->_run_search($this->m_Limit); // regular search or page search if ($resultSet !== null) { - $field = 'doc'; + $docfield = array('doc','docdetail'); while ($recArray = $this->_fetch_record($resultSet)) { - if(isset($recArray[$field])) + if(isset($recArray[$docfield[0]])) { - $tmp = $recArray[$field]; - $tmp = str_replace("\r\n", "%%EOL%%", $tmp); - $tmp = str_replace("<", "&lt;", $tmp); - $tmp = str_replace(">", "&gt;", $tmp); + $tmp = $recArray[$docfield[0]]; + $tmp = str_replace("<", "<", $tmp); + $tmp = str_replace(">", ">", $tmp); + $recArray[$docfield[0]] = $tmp; $tmp = preg_replace('#([A-Z]+ sip:[^ ]+ SIP/2.0)%%#i', '${1}%%', $tmp, -1); $tmp = preg_replace('#(SIP/2.0 [1-6][0-9][0-9] [^%]+)%%#i', '${1}%%', $tmp, -1); - // echo "------ [[$tmp]]"; $tmp = preg_replace('#%%([^ :%]+): (.+)%%#im', '%%$1: $2%%', $tmp, -1, $count); while($count>0) $tmp = preg_replace('#%%([^ :%<]+): (.+)%%#im', '%%$1: $2%%', $tmp, -1, $count); - $tmp = str_replace("%%EOL%%", "
", $tmp); - $recArray[$field] = $tmp; + $recArray[$docfield[1]] = "
" . $tmp . "
"; + } $resultRecords[] = $recArray; } diff -ruN ./a/siremis/modules/ser/prs/xcapserver/form/XcapCopyForm.xml ./b/siremis/modules/ser/prs/xcapserver/form/XcapCopyForm.xml --- ./a/siremis/modules/ser/prs/xcapserver/form/XcapCopyForm.xml 2011-08-23 22:58:21.000000000 +0100 +++ ./b/siremis/modules/ser/prs/xcapserver/form/XcapCopyForm.xml 2011-08-31 09:18:00.000000000 +0100 @@ -4,7 +4,7 @@