diff -ruN ./a/siremis/modules/ser/mod.xml ./b/siremis/modules/ser/mod.xml --- ./a/siremis/modules/ser/mod.xml 2011-09-01 16:22:48.000000000 +0100 +++ ./b/siremis/modules/ser/mod.xml 2011-09-01 16:19:16.000000000 +0100 @@ -77,12 +77,14 @@ URL="{@home:url}/ser/watchers_list" Order="20"/> + + URL="{@home:url}/ser/rls_watchers_list" Order="50"/> + URL="{@home:url}/ser/rls_presentity_list" Order="60"/> + URL="{@home:url}/ser/xcap_list" Order="70"/> _run_search($this->m_Limit); + if ($resultSet !== null) + { + $recroutefields = array('record_route','record_route_detail'); + while ($recArray = $this->_fetch_record($resultSet)) + { + 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->fields as $datefield) + { + if(isset($recArray[$datefield])) + { + $time = $recArray[$datefield]; + $recArray[$datefield] = 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/PuaDO.xml ./b/siremis/modules/ser/prs/presence/do/PuaDO.xml --- ./a/siremis/modules/ser/prs/presence/do/PuaDO.xml 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/do/PuaDO.xml 2011-09-01 16:19:16.000000000 +0100 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PuaCopyForm.xml ./b/siremis/modules/ser/prs/presence/form/PuaCopyForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PuaCopyForm.xml 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PuaCopyForm.xml 2011-09-01 16:19:16.000000000 +0100 @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PuaDetailForm.xml ./b/siremis/modules/ser/prs/presence/form/PuaDetailForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PuaDetailForm.xml 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PuaDetailForm.xml 2011-09-01 16:19:16.000000000 +0100 @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PuaEditForm.xml ./b/siremis/modules/ser/prs/presence/form/PuaEditForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PuaEditForm.xml 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PuaEditForm.xml 2011-09-01 16:19:16.000000000 +0100 @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PuaListForm.xml ./b/siremis/modules/ser/prs/presence/form/PuaListForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PuaListForm.xml 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PuaListForm.xml 2011-09-01 16:19:16.000000000 +0100 @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PuaNewForm.xml ./b/siremis/modules/ser/prs/presence/form/PuaNewForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PuaNewForm.xml 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PuaNewForm.xml 2011-09-01 16:19:16.000000000 +0100 @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + diff -ruN ./a/siremis/modules/ser/prs/presence/form/PuaSearchForm.xml ./b/siremis/modules/ser/prs/presence/form/PuaSearchForm.xml --- ./a/siremis/modules/ser/prs/presence/form/PuaSearchForm.xml 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/prs/presence/form/PuaSearchForm.xml 2011-09-01 16:19:16.000000000 +0100 @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + diff -ruN ./a/siremis/modules/ser/view/PuaListView.xml ./b/siremis/modules/ser/view/PuaListView.xml --- ./a/siremis/modules/ser/view/PuaListView.xml 1970-01-01 01:00:00.000000000 +0100 +++ ./b/siremis/modules/ser/view/PuaListView.xml 2011-09-01 16:19:16.000000000 +0100 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file