sync with 8378

rccess · Aug 31, 2014 · 90af01d · 90af01d
1 parent b5daf3b
commit 90af01d
Show file tree

Hide file tree

Showing 11 changed files with 194 additions and 20 deletions.
diff --git a/etc/locale.cfg b/etc/locale.cfg
@@ -1,5 +1,5 @@
 #
-# $Id: locale.cfg,v 1.17 2013-11-03 18:29:24 gosha Exp $
+# $Id: locale.cfg,v 1.18 2014/08/31 10:54:15 gosha Exp $
 #
 [ru_RU.UTF-8]
 # DB
@@ -174,7 +174,7 @@ UpdateClick2Call                      === Обновление ссылки Clic
 CreateMultiDialoutItem                === Создание пункта автоматического обзвона
 DeleteMultiDialoutItem                === Удаление пункта автоматического обзвона
 UpdateMultiDialoutItem                === Обновление пункта автоматического обзвона
-ResetMultiDialouttItem                === Сброс статуса автоматического обзвона
+ResetMultiDialout                    === Сброс статуса автоматического обзвона
 #  Day of week
 0 - Sunday                            === Воскресенье
 1 - Monday                            === Понедельник

diff --git a/lib/XVBHooks/CIDNorm.pm b/lib/XVBHooks/CIDNorm.pm
@@ -1,6 +1,6 @@
 ########################################################################
 #
-# $Id: CIDNorm.pm,v 1.2 2014/07/19 18:30:19 gosha Exp $
+# $Id: CIDNorm.pm,v 1.3 2014/08/28 11:15:26 gosha Exp $
 #
 #	Copyright (c) Igor Okunev <igor[at]prv.mts-nn.ru>
 #
@@ -25,7 +25,7 @@ sub call_start {
 	my $obj = shift;
 
 	if ( $obj->{'_CDR'}->{'CALL_TYPE'} ne 'transit' and $obj->{'_CDR'}->{'CALL_TYPE'} ne 'internal' ) {
-		$obj->{'_AGI'}->set_variable( 'CALLERID(num)', $obj->{'_CDR'}->{'CALLER_ID'} );
+		$obj->{'_AGI'}->set_variable( 'CALLERID(num)', (split(/\@/,$obj->{'_CDR'}->{'CALLER_ID'}))[0] );
 	}
 }
 

diff --git a/templates/admin/journal_list.tt b/templates/admin/journal_list.tt
@@ -0,0 +1,159 @@
+<html>
+<!-- $Id: journal_list.tt,v 1.1 2014/08/31 10:54:45 gosha Exp $ -->
+<head>
+	<title>Virtual PBX - Actions journal</title>
+
+	<link rel="stylesheet" type="text/css" media="all" href="/xvb/css/calendar-blue.css"  />
+
+	[% IF USER_CREDS.CSS_HREF eq '' %]
+	<link rel="stylesheet" type="text/css" href="/xvb/xvb.css" />
+	[% ELSE %]
+	<link rel="stylesheet" type="text/css" href="[% USER_CREDS.CSS_HREF %]" />
+	[% END %]
+
+	<script language="JavaScript" src="/xvb/js/xvb.js"></script>
+	<script type="text/javascript" src="/xvb/js/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="/xvb/js/jquery/calendar/jquery.dynDateTime.min.js"></script>
+	<script type="text/javascript" src="/xvb/js/jquery/calendar/lang/calendar-en.min.js"></script>
+</head>
+
+<body onLoad="XVBInit()">
+	<center>
+
+	<p>
+	<table width='95%' class='logo'>
+		<tr>
+			<td align='left' width='20%'>
+				<img border='0' src='/xvb/images/logo-small.png' alt='Virtual PBX' />
+			</td>
+			<td align='center'><h2>Actions journal</h2></td>
+			<td align='right' width='20%'>
+				<a href='/xvb/XVB-AI.pdf?a=msg_download'><img border='0' src='/xvb/images/help.png' alt='about' /></a>
+				[% INCLUDE version.tt %]
+			</td>
+		</tr>
+	</table>
+	</p>
+
+	<p>	
+	<table width='95%' class='top_hr'>
+		<tr align='left'>
+			<td>
+				[% INCLUDE main_menu.tt-inc %]
+				[% INCLUDE main_menu.tt-inc-custom %]
+			</td>
+		</tr>
+	</table>
+	</p>
+
+	<p>
+	<table width='95%' class='list_data' id='d-tbl'>
+		<tr class='list_data'>
+			<th width='10%'>Access code</th>
+			<th width='5%'>Ext</th>
+			<th width='20%'>Date</th>
+			<th width='10%'>Action</th>
+			<th width='15%'>Remote IP</th>
+			<th width='40%'>Data</th>
+		</tr>
+		[% IF MSG_PREV ne '' %]
+		<tr>
+			<td align='left' colspan='6'>
+				<a title='previous page' href='?action=j_list&from=[% MSG_PREV %]&ac=[% J_AC %]&ext_num=[% J_EXT_NUM %]&data=[% J_DATA | html %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><img border='0'  src='/xvb/images/msg_prev.png' alt='[% MSG_PREV %] &lt;=' /></a>
+			</td>
+		</tr>
+		[% END %]
+
+		[% FOREACH msg = J_LIST %]
+			<tr class='nocolor'>
+				<td><a title='edit user settings' href='?ac=[% p.ACCESS_CODE %]&action=user_info'>[% msg.ACCESS_CODE %]</a></td>
+				<td>[% msg.EXT_NUMBER | html %]</td>
+				<td align='center'>[% msg.J_DATE | html %]</td>
+				<td>[% msg.ACTION | html %]</td>
+				<td align='center'>[% msg.CID | html %]</td>
+				<td>[% msg.DESCRIPTION | html %]</td>
+			</tr>
+		[% END %]
+
+		<tr>
+		[% IF MSG_NEXT ne '' %]
+			<td align='right' colspan='6'>
+				<a title='next page' href='?action=j_list&from=[% MSG_NEXT %]&ac=[% J_AC %]&ext_num=[% J_EXT_NUM %]&data=[% J_DATA | html %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><img border='0'  src='/xvb/images/msg_next.png' alt='[% MSG_NEXT %] &lt;=' /></a>
+			</td>
+		[% ELSE %]
+			<td colspan='6'>&nbsp;</td>
+		[% END %]
+		</tr>
+	</table>
+	</p>
+
+	<script language='JavaScript'>listcolorer( 'd-tbl' );</script>
+
+	<p>	
+	<table width='95%' class='bottom_hr'>
+		<tr align='right'>
+			<form method="get" action="[% CGI_URL %]">
+			<td width='100%'>
+				From date:
+				<script type="text/javascript">
+					jQuery(document).ready(function() {
+						jQuery("#from_time").dynDateTime({
+							showsTime: true,
+							ifFormat: "%Y/%m/%d %H:%M",
+							align: "TL",
+							electric: false,
+							singleClick: false,
+							button: ".next()"
+						});
+				});
+				</script>
+				<input size='16' type='text' name='from_time' value='[% FROM_TIME | html %]' id='from_time'>
+				<button type="button">...</button>
+				&nbsp;
+				To date:
+				<script type="text/javascript">
+					jQuery(document).ready(function() {
+						jQuery("#to_time").dynDateTime({
+							showsTime: true,
+							ifFormat: "%Y/%m/%d %H:%M",
+							align: "TL",
+							electric: false,
+							singleClick: false,
+							button: ".next()"
+						});
+				});
+				</script>
+				<input size='16' type='text' name='to_time' value='[% TO_TIME | html %]' id='to_time'>
+				<button type="button">...</button>
+				&nbsp;
+				<input name='action' value='j_list' type='hidden'>
+				<input size='12' placeholder='Access code' type='text' name='ac' value='[% J_AC %]'>
+				&nbsp;
+				<input size='12' placeholder='exten' type='text' name='ext_num' value='[% J_EXT_NUM %]'>
+				&nbsp;
+				<select name="action_type")">
+					[% IF J_ACTION %]
+						<option value="[% J_ACTION %]" selected>[% J_ACTION %]</option>
+						<option value="" >all</option>
+					[% ELSE %]
+						<option value="" selected>all</option>
+					[% END %]
+				[% FOREACH at = ACTIONS %]
+					<option value="[% at %]">[% at %]</option>
+				[% END %]
+				</select>
+				&nbsp;
+				<input size='18' placeholder='data' type='text' name='data' value='[% J_DATA | html %]'>
+				<input name='uniq' value='[% USER_CREDS.UNIQ %]' type='hidden'>
+				&nbsp;
+				<input value='Search' type='submit'>
+				&nbsp;&nbsp;
+			</td>
+		</tr>
+	</table>
+	</p>
+	</center>
+	<div id='shadow'><div id='loading'></div></div><div id='center'></div>
+</body>
+</html>
+
diff --git a/templates/admin/main_menu.tt-inc b/templates/admin/main_menu.tt-inc
@@ -20,6 +20,8 @@
 				&nbsp;&nbsp;|&nbsp;&nbsp;
 				<a href='?action=cdr_list'>CDRs</a>
 				&nbsp;&nbsp;|&nbsp;&nbsp;
+				<a href='?action=j_list'>Journals</a>
+				&nbsp;&nbsp;|&nbsp;&nbsp;
 				<a href='?action=phone_list'>SIP phones</a>
 				&nbsp;&nbsp;|&nbsp;&nbsp;
 				<a href='?action=peer_list'>SIP peers</a>

diff --git a/templates/admin/main_menu2.tt-inc b/templates/admin/main_menu2.tt-inc
@@ -30,6 +30,9 @@
 			<td>
 				<a class='headers' href='?action=cdr_list'>CDRs</a>
 			</td>
+			<td>
+				<a class='headers' href='?action=j_list'>Journals</a>
+			</td>
 			<td>
 				<a class='headers' href='?action=phone_list'>SIP phones</a>
 			</td>

diff --git a/templates/click2call.tt b/templates/click2call.tt
@@ -1,5 +1,5 @@
 <html>
-<!-- $Id: click2call.tt,v 1.11 2014-02-05 07:35:09 gosha Exp $ -->
+<!-- $Id: click2call.tt,v 1.12 2014/08/18 07:03:07 gosha Exp $ -->
 <head>
 	<title>Virtual PBX - Click2Call - Ac:[% USER_CREDS.ACCESS_CODE | html %], Ext: [% VBOX_PREF.EXT_NUMBER | html %]</title>
 

diff --git a/templates/voicebox_info.tt b/templates/voicebox_info.tt
@@ -1,5 +1,5 @@
 <html>
-<!-- $Id: voicebox_info.tt,v 1.261 2014/08/15 19:26:11 gosha Exp $ -->
+<!-- $Id: voicebox_info.tt,v 1.262 2014/08/18 07:03:07 gosha Exp $ -->
 <head>
 	<title>Virtual PBX - Extension info - Ac:[% USER_CREDS.ACCESS_CODE | html %], Ext: [% VBOX_PREF.EXT_NUMBER | html %]</title>
 
@@ -11,12 +11,16 @@
 	<script language="JavaScript" src="/xvb/js/xvb.js"></script>
 	<script language="JavaScript">
 		var e_list = [];
-		e_list['hangup'] = [ null, null,'Exit from PBX' ];
-		e_list['back'] = [ null, null, 'GoTo previous ext' ];
-		e_list['repeat'] = [ null, null, 'Repeat current ext' ];
+		e_list['hangup'] = [ null, null,'Exit from PBX',-2];
+		e_list['back'] = [ null, null, 'GoTo previous ext',-1];
+		e_list['repeat'] = [ null, null, 'Repeat current ext',0];
 		[% FOREACH vb = VB_LIST %]
-		e_list['[% vb.EXT_NUMBER | html %]'] = ['[% vb.ID %]','[% vb.DESCRIPTION | html %]','[% vb.NAME | html %]'];
+		e_list['[% vb.EXT_NUMBER | html %]'] = ['[% vb.ID %]','[% vb.DESCRIPTION | html %]','[% vb.NAME | html %]',[% vb.VB_IND %]];
 		[% END %]
+		var e_menu = [];
+		for ( var m_num in e_list ) {
+			e_menu[2+e_list[m_num][3]] = m_num;
+		}
 	</script>
 </head>
 

diff --git a/templates/xvb.RU-Male/click2call.tt b/templates/xvb.RU-Male/click2call.tt
@@ -1,5 +1,5 @@
 <html>
-<!-- $Id: click2call.tt,v 1.10 2014-02-05 07:35:10 gosha Exp $ -->
+<!-- $Id: click2call.tt,v 1.11 2014/08/18 07:03:09 gosha Exp $ -->
 <head>
 	<title>Virtual PBX - Click2Call - Ac:[% USER_CREDS.ACCESS_CODE | html %], Ext: [% VBOX_PREF.EXT_NUMBER | html %]</title>
 

diff --git a/templates/xvb.RU-Male/voicebox_info.tt b/templates/xvb.RU-Male/voicebox_info.tt
@@ -1,5 +1,5 @@
 <html>
-<!-- $Id: voicebox_info.tt,v 1.24 2014/08/15 19:26:11 gosha Exp $ -->
+<!-- $Id: voicebox_info.tt,v 1.25 2014/08/18 07:03:09 gosha Exp $ -->
 <head>
 	<title>Virtual PBX - Информация о внутреннем номере - Ac:[% USER_CREDS.ACCESS_CODE | html %], Ext: [% VBOX_PREF.EXT_NUMBER | html %]</title>
 	[% IF USER_CREDS.CSS_HREF eq '' %]
@@ -10,12 +10,16 @@
 	<script language="JavaScript" src="/xvb/js/xvb.js"></script>
 	<script language="JavaScript">
 		var e_list = [];
-		e_list['hangup'] = [ null, null,'Выход из PBX' ];
-		e_list['back'] = [ null, null, 'Вернуться к предыдущему' ];
-		e_list['repeat'] = [ null, null, 'Повторить текущий' ];
+		e_list['hangup'] = [ null, null,'Выход из PBX',-2 ];
+		e_list['back'] = [ null, null, 'Вернуться к предыдущему',-1 ];
+		e_list['repeat'] = [ null, null, 'Повторить текущий',0 ];
 		[% FOREACH vb = VB_LIST %]
-		e_list['[% vb.EXT_NUMBER | html %]'] = ['[% vb.ID %]','[% vb.DESCRIPTION | locale_msg %]','[% vb.NAME | html %]'];
+		e_list['[% vb.EXT_NUMBER | html %]'] = ['[% vb.ID %]','[% vb.DESCRIPTION | locale_msg %]','[% vb.NAME | html %]',[% vb.VB_IND %]];
 		[% END %]
+		var e_menu = [];
+		for ( var m_num in e_list ) {
+			e_menu[2+e_list[m_num][3]] = m_num;
+		}
 	</script>
 </head>
 

diff --git a/virtual-pbx.spec b/virtual-pbx.spec
@@ -271,6 +271,7 @@ cd - > /dev/null
 # clean contrib/utils
 #
 rm -rf $RPM_BUILD_ROOT/%CORE_DIR/contrib/utils/build
+rm -rf $RPM_BUILD_ROOT/%CORE_DIR/contrib/utils/nonfree
 rm -f $RPM_BUILD_ROOT/%CORE_DIR/contrib/Diagram.dia
 
 #

diff --git a/web/js/xvb.js b/web/js/xvb.js
@@ -1,5 +1,5 @@
 /*
-    <!-- $Id: xvb.js,v 1.73 2014/08/15 19:49:40 gosha Exp $ -->
+    <!-- $Id: xvb.js,v 1.74 2014/08/18 07:03:29 gosha Exp $ -->
 */
 var aryClassElements = new Array();
 var isMSIE = /*@cc_on!@*/false;
@@ -721,7 +721,8 @@ function listcolorer( element_id ) {
 /* dropdown creaters */
 function exten_dropdown( prefix ) {
 	document.write(prefix);
-	for ( ext_num in e_list ) {
+	for( var i=0, l=e_menu.length; i<l; ++i ) {
+		var ext_num = e_menu[i];
 		/* by ID */
 		if ( e_list[ext_num][0] != null ) {
 			document.write('<option value="'+ e_list[ext_num][0] +'">' + ext_num + ' - ');
@@ -736,8 +737,8 @@ function exten_dropdown( prefix ) {
 }
 function exten_dropdown2( select_name, extension, prefix ) {
 	document.write('<select onchange=\'exten_dropdown2_hook(this.value,"'+ select_name +'")\' name="'+ select_name +'-DD">' + prefix);
-
-	for ( ext_num in e_list ) {
+	for( var i=0, l=e_menu.length; i<l; ++i ) {
+		var ext_num = e_menu[i];
 		/* by Ext Name */
 		if ( select_name == 'NEXTEXTENSION' || ( ext_num != 'hangup' && ext_num != 'back' && ext_num != 'repeat' ) ) {
 			document.write('<option value="'+ ext_num +'"');
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,9 @@ @@
     			<td>
     				<a class='headers' href='?action=cdr_list'>CDRs</a>
     			</td>
+    			<td>
+    				<a class='headers' href='?action=j_list'>Journals</a>
+    			</td>
     			<td>
     				<a class='headers' href='?action=phone_list'>SIP phones</a>
     			</td>
@@ Expand Down @@