Skip to content

Commit

Permalink
sync with 9544
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed Feb 5, 2015
1 parent 1b02b35 commit d7af0a5
Show file tree
Hide file tree
Showing 17 changed files with 220 additions and 127 deletions.
Binary file modified XVB-AI.pdf
Binary file not shown.
1 change: 1 addition & 0 deletions contrib/BOM-RU.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ dialout-confirm : "Если вы хотите ответить на звонок
directory-intro0 : "Добро пожаловать в справочную службу компании. Пожалуйста введите первые три буквы фамилии, того кого вы ищите... Например, используйте семь для буквы 'Q' и девять для буквы 'Z'"
directory-intro1 : "Добро пожаловать в справочную службу компании. Пожалуйста введите первые три буквы имени, того кого вы ищите... Например, используйте семь для буквы 'Q' и девять для буквы 'Z'"
directory-intro2 : "Добро пожаловать в справочную службу компании. Пожалуйста введите первые три буквы имени или фамилии, того кого вы ищите... Например, используйте семь для буквы 'Q' и девять для буквы 'Z'"
directory-intro3 : "Добро пожаловать в справочную службу компании. Пожалуйста введите имя и фамилию, того кого вы ищите... Например, используйте семь для буквы 'Q' и девять для буквы 'Z'"
directory-multi : "Если это тот, кого вы ищите нажмите один, иначе нажмите звёздочку для продолжения поиска или решётку для выхода в главное меню."
directory-nomatch : "Совпадений нет"
directory-nomore : "Совпадений больше нет"
Expand Down
1 change: 1 addition & 0 deletions contrib/BOM.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ dialout-confirm : "To accept this call press 0, to decline this call press 7, t
directory-intro0 : "Welcome to the directory. Please enter the first three letters of your party's last name using your touch tone keypad. Use the 7 key for Q and the 9 key for Z"
directory-intro1 : "Welcome to the directory. Please enter the first three letters of your party's first name using your touch tone keypad. Use the 7 key for Q and the 9 key for Z"
directory-intro2 : "Welcome to the directory. Please enter the first three letters of your party's first or last name using your touch tone keypad. Use the 7 key for Q and the 9 key for Z"
directory-intro3 : "Welcome to the directory. Please enter first and last name using your touch tone keypad. Use the 7 key for Q and the 9 key for Z"
directory-multi : "If this is the person you are looking for press 1 now, otherwise please press * to continue or # to go to the main menu."
directory-nomatch : "No directory entries match your search."
directory-nomore : "There are no more compatible entries in the directory. "
Expand Down
21 changes: 13 additions & 8 deletions contrib/xvb.sql
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,11 @@ create table VPBX_GROUPS
MAX_CALL_DURATION INT(10) not null default 0,

PH_FEATURES VARCHAR(255) not null default '*',

HOOKS VARCHAR(255) not null default '',

ASR_ENGINE VARCHAR(16),

VBL_1 INT(10) not NULL default -1,
VBL_2 INT(10) not NULL default -1,
VBL_3 INT(10) not NULL default -1,
Expand Down Expand Up @@ -964,14 +966,14 @@ create table VPBX_VBOXES_GC_EXPLORER

create table VPBX_VBOXES_DIRECTORY
(
ID INT(16) not null,
USE_FIRSTNAME INT(1) default 0,
USE_TTS_NAME INT(1) default 0,

KEY_LEN INT(4) not null default 3,
ID INT(16) not null,
USE_FIRSTNAME INT(1) default 0,
USE_TTS_NAME INT(1) default 0,
USE_VOICE_SEARCH INT(1) default 0,
KEY_LEN INT(4) not null default 3,

DIR_LANG INT(16) not null default 0,
DIR_HELPEXT VARCHAR(255),
DIR_LANG INT(16) not null default 0,
DIR_HELPEXT VARCHAR(255),

unique(ID),

Expand Down Expand Up @@ -2525,6 +2527,9 @@ BEGIN
IF NEW.regseconds is not null THEN
IF NEW.regseconds > 0 THEN
SET NEW.REG_TIME = UNIX_TIMESTAMP();
ELSE
SET NEW.useragent = OLD.useragent;
SET NEW.ipaddr = OLD.ipaddr;
END IF;
END IF;
END;
Expand Down
12 changes: 12 additions & 0 deletions etc/xvb.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,18 @@ SPEED_GTranslate_RU = 1.1
MSTRANSLATOR_BINGID=
#CHUNK_LEN_GTranslate_RU = 140

####################################################
# ASR FEATURES
[ASR]
INPUT_DURATION=3
# https://console.developers.google.com
GOOGLE_KEY=
GOOGLE_REFER=
GOOGLE_MIN_CONFIDENCE=0.50
# https://developer.tech.yandex.ru/
YANDEX_KEY=
YANDEX_MIN_CONFIDENCE=

####################################################
# CUSTOM DATA
[CUSTOM]
Expand Down
17 changes: 17 additions & 0 deletions templates/admin/group_info.tt
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,23 @@
</select>
</td>
</tr>
<tr>
<td>ASR engine: </td>
<td>
<select name="GR_ASR_ENGINE">
[% IF GROUP.ASR_ENGINE eq "" %]
<option value="">none</option>
[% ELSIF GROUP.ASR_ENGINE eq "Google" %]
<option value="Google">Google</option>
[% ELSIF GROUP.ASR_ENGINE eq "Yandex" %]
<option value="Yandex">Yandex</option>
[% END %]
<option value="">none</option>
<option value="Google">Google</option>
<option value="Yandex">Yandex</option>
</select>
</td>
</tr>
</table>
</td>
</tr>
Expand Down
8 changes: 5 additions & 3 deletions templates/admin/journal_list.tt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<html>
<!-- $Id: journal_list.tt,v 1.14 2015/01/17 20:03:57 gosha Exp $ -->
<!-- $Id: journal_list.tt,v 1.15 2015/01/30 13:10:52 gosha Exp $ -->
<head>
<title>Virtual PBX - Actions journal</title>

Expand Down Expand Up @@ -83,6 +83,8 @@
[% END %]
</select>
&nbsp;
<input size='15' placeholder='Remote IP' type='text' name='cid' value='[% J_CID | html %]'>
&nbsp;
<input size='18' placeholder='Data' type='text' name='data' value='[% J_DATA | html %]'>
<input name='uniq' value='[% USER_CREDS.UNIQ %]' type='hidden'>
&nbsp;
Expand All @@ -108,7 +110,7 @@
[% IF MSG_PREV ne '' %]
<tr>
<td align='left' colspan='6'>
<a title='previous page' href='?action=j_list&action_type=[% J_ACTION %]&from=[% MSG_PREV %]&ac=[% J_AC %]&ext_num=[% J_EXT_NUM %]&data=[% J_DATA | htmlstrict %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><span class='fs0'>◄</span></a>
<a title='previous page' href='?action=j_list&cid=[% J_CID | html %]&action_type=[% J_ACTION %]&from=[% MSG_PREV %]&ac=[% J_AC %]&ext_num=[% J_EXT_NUM %]&data=[% J_DATA | htmlstrict %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><span class='fs0'>◄</span></a>
</td>
</tr>
[% END %]
Expand All @@ -127,7 +129,7 @@
[% IF MSG_NEXT ne '' %]
<tr>
<td align='right' colspan='6'>
<a title='next page' href='?action=j_list&action_type=[% J_ACTION %]&from=[% MSG_NEXT %]&ac=[% J_AC %]&ext_num=[% J_EXT_NUM %]&data=[% J_DATA | htmlstrict %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><span class='fs0'>►</span></a>
<a title='next page' href='?action=j_list&cid=[% J_CID | html %]&action_type=[% J_ACTION %]&from=[% MSG_NEXT %]&ac=[% J_AC %]&ext_num=[% J_EXT_NUM %]&data=[% J_DATA | htmlstrict %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><span class='fs0'>►</span></a>
</td>
</tr>
[% END %]
Expand Down
1 change: 1 addition & 0 deletions templates/admin/partner_list.tt
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<a href='#' onclick="xmlhttpPost(document.getElementById('f-[% p.ID %]'),1);"><span class='icon-floppy-disk fs0 blink' title='save changes'></span></a>
<noscript><input value='change' type='submit'></noscript>
</span>
<a title='login to partner account' href='/pi?partner=[% p.NAME | html %]&password=[% p.PASSWORD | html %]'><span class='icon-enter fs0'></span></a>
<a title='delete partner account' href='?action=partner_del&partner_id=[% p.ID %]&from=[% MSG_FROM %]' onclick="return DelConfirm('en')"><span class='icon-bin fs0'></span></a>
</td>
</form>
Expand Down
13 changes: 10 additions & 3 deletions templates/admin/phone_list.tt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<html>
<!-- $Id: phone_list.tt,v 1.19 2015/01/17 20:35:20 gosha Exp $ -->
<!-- $Id: phone_list.tt,v 1.20 2015/02/02 15:42:33 gosha Exp $ -->
<head>
<title>Virtual PBX - SIP Phones</title>
[% IF USER_CREDS.CSS_HREF eq '' %]
Expand Down Expand Up @@ -45,9 +45,16 @@
&nbsp;
<input size='11' name='ua' type='text' placeholder='User agent' value='[% UA | html %]'>
&nbsp;
<select name="rst" id='rst_selector'>
<option value="" selected>reg status</option>
<option value="1">registered</option>
<option value="0">unregistered</option>
</select>
&nbsp;
<input type='hidden' value='phone_list' name='action'>
<input value='Search' type='submit'>
</form>
<script language='JavaScript'>setActiveSelector('rst_selector',"[% RST %]");</script>
</td>
</tr>
</table>
Expand All @@ -70,7 +77,7 @@
[% IF MSG_PREV ne '' %]
<tr>
<td align='left' colspan='9'>
<a title='previous page' href='?action=phone_list&ua=[% UA | htmlstrict %]&ac=[% AC | html %]&ip=[% IP | html %]&from=[% MSG_PREV %]&phone=[% PHONE | htmlstrict %]&authname=[% NAME | html %]'><span class='fs0'>◄</span></a>
<a title='previous page' href='?action=phone_list&rst=[% RST %]&ua=[% UA | htmlstrict %]&ac=[% AC | html %]&ip=[% IP | html %]&from=[% MSG_PREV %]&phone=[% PHONE | htmlstrict %]&authname=[% NAME | html %]'><span class='fs0'>◄</span></a>
</td>
</tr>
[% END %]
Expand Down Expand Up @@ -125,7 +132,7 @@
[% IF MSG_NEXT ne '' %]
<tr>
<td align='right' colspan='10'>
<a title='previous page' href='?action=phone_list&ua=[% UA | htmlstrict %]&ac=[% AC | html %]&ip=[% IP | html %]&from=[% MSG_NEXT %]&phone=[% PHONE | htmlstrict %]&authname=[% NAME | html %]'><span class='fs0'>►</span></a>
<a title='previous page' href='?action=phone_list&rst=[% RST %]&&ua=[% UA | htmlstrict %]&ac=[% AC | html %]&ip=[% IP | html %]&from=[% MSG_NEXT %]&phone=[% PHONE | htmlstrict %]&authname=[% NAME | html %]'><span class='fs0'>►</span></a>
</td>
</tr>
[% END %]
Expand Down
13 changes: 9 additions & 4 deletions templates/admin/report_list.tt
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@
<table width='98%' id='list-data'>
<tr>
<th>N</th>
<th>&nbsp;</th>
<th width='30px'>&nbsp;</th>
<th>Report name</th>
<th width='30px'>&nbsp;</th>
<th>Create date</th>
<th>Owner</th>
<th>Cache TTL</th>
Expand All @@ -69,7 +70,7 @@

[% IF MSG_PREV ne '' %]
<tr>
<td align='left' colspan='7'>
<td align='left' colspan='8'>
<a title='previous page' href='?action=reports_list&name=[% SEARCH_NAME | htmlstrict %]&from=[% MSG_PREV %]'><span class='fs0'>◄</span></a>
</td>
</tr>
Expand All @@ -80,9 +81,13 @@
<td>[% t.ID %]</td>
<td>
<a title='get excel table' href='?action=report_run&report_id=[% t.ID %]&need_excel=1'><span class='icon-file-excel fs0'></span></a>
</td>
<td align='left'>
<a title='run report' href='?action=report_run&report_id=[% t.ID %]'>[% t.NAME | html %]</a>
</td>
<td>
<a title='edit report' href='?action=report_info&report_id=[% t.ID %]'><span class='icon-cogs fs0'></span></a>
</td>
<td align='left'><a title='run report' href='?action=report_run&report_id=[% t.ID %]'>[% t.NAME | html %]</a></td>
<td>[% t.CREATE_DATE %]</td>
<td>
[% IF t.TYPE eq '1' %]
Expand All @@ -99,7 +104,7 @@
[% END %]

<tr>
<td align='left' colspan='3'>
<td align='left' colspan='4'>
<form method="post" onSubmit='return checkChanges(this)'>
&nbsp;
<input placeholder='Report name' size='20' name='R_NAME' type='text'>
Expand Down
8 changes: 5 additions & 3 deletions templates/journal_list.tt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<html>
<!-- $Id: journal_list.tt,v 1.29 2015/01/17 20:03:57 gosha Exp $ -->
<!-- $Id: journal_list.tt,v 1.30 2015/01/30 13:10:52 gosha Exp $ -->
<head>
<title>Virtual PBX - Actions journal - Ac:[% USER_CREDS.ACCESS_CODE | html %]</title>

Expand Down Expand Up @@ -81,6 +81,8 @@
[% END %]
</select>
&nbsp;
<input size='15' placeholder='Remote IP' type='text' name='cid' value='[% J_CID | html %]'>
&nbsp;
<input placeholder='Data' size='18' type='text' name='data' value='[% J_DATA | html %]'>
<input name='uniq' value='[% USER_CREDS.UNIQ %]' type='hidden'>
&nbsp;
Expand All @@ -105,7 +107,7 @@
[% IF MSG_PREV ne '' %]
<tr>
<td align='left' colspan='5'>
<a title='previous page' href='?action=j_list&action_type=[% J_ACTION %]&from=[% MSG_PREV %]&ext_id=[% J_EXT_ID %]&ext_num=[% J_EXT_NUM | htmlstrict %]&data=[% J_DATA | htmlstrict %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><span class='fs0'>◄</span></a>
<a title='previous page' href='?action=j_list&cid=[% J_CID | html %]&action_type=[% J_ACTION %]&from=[% MSG_PREV %]&ext_id=[% J_EXT_ID %]&ext_num=[% J_EXT_NUM | htmlstrict %]&data=[% J_DATA | htmlstrict %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><span class='fs0'>◄</span></a>
</td>
</tr>
[% END %]
Expand All @@ -127,7 +129,7 @@
<tr>
[% IF MSG_NEXT ne '' %]
<td align='right' colspan='5'>
<a title='next page' href='?action=j_list&action_type=[% J_ACTION %]&from=[% MSG_NEXT %]&ext_id=[% J_EXT_ID %]&ext_num=[% J_EXT_NUM | htmlstrict %]&data=[% J_DATA | htmlstrict %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><span class='fs0'>►</span></a>
<a title='next page' href='?action=j_list&cid=[% J_CID | html %]&action_type=[% J_ACTION %]&from=[% MSG_NEXT %]&ext_id=[% J_EXT_ID %]&ext_num=[% J_EXT_NUM | htmlstrict %]&data=[% J_DATA | htmlstrict %]&from_time=[% FROM_TIME | html %]&to_time=[% TO_TIME | html %]&uniq=[% USER_CREDS.UNIQ %]'><span class='fs0'>►</span></a>
</td>
[% ELSE %]
<td colspan='5'>&nbsp;</td>
Expand Down
82 changes: 49 additions & 33 deletions templates/voicebox_info.tt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<html>
<!-- $Id: voicebox_info.tt,v 1.286 2015/01/17 20:23:30 gosha Exp $ -->
<!-- $Id: voicebox_info.tt,v 1.289 2015/01/31 20:23:23 gosha Exp $ -->
<head>
<title>Virtual PBX - Extension info - Ac:[% USER_CREDS.ACCESS_CODE | html %], Ext: [% VBOX_PREF.EXT_NUMBER | html %]</title>

Expand Down Expand Up @@ -687,33 +687,33 @@

[% IF VBOX_PREF.TYPE eq '4' %]
<tr>
<td>Use First name: </td>
<td>Search by : </td>
<td>
[% IF VBOX_PREF.USE_FIRSTNAME == '1' %]
<input name="USE_FIRSTNAME" type="radio" value="1" checked>
[% ELSE %]
<input name="USE_FIRSTNAME" type="radio" value="1">
[% END %]
</td>
</tr>
<tr>
<td>Use Last name: </td>
<td>
[% IF VBOX_PREF.USE_FIRSTNAME == '0' %]
<input name="USE_FIRSTNAME" type="radio" value="0" checked>
[% ELSE %]
<input name="USE_FIRSTNAME" type="radio" value="0">
[% END %]
</td>
</tr>
<tr>
<td>Use First or Last name: </td>
<td>
[% IF VBOX_PREF.USE_FIRSTNAME == '2' %]
<input name="USE_FIRSTNAME" type="radio" value="2" checked>
[% ELSE %]
<input name="USE_FIRSTNAME" type="radio" value="2">
[% END %]
<select name="USE_FIRSTNAME">
<option value="1"
[% IF VBOX_PREF.USE_FIRSTNAME == '1' %]
selected
[% END %]
>First name</option>
<option value="0"
[% IF VBOX_PREF.USE_FIRSTNAME == '0' %]
selected
[% END %]
>Last name</option>
<option value="2"
[% IF VBOX_PREF.USE_FIRSTNAME == '2' %]
selected
[% END %]
>First or Last name</option>

[% IF USER_CREDS.ASR_ENGINE ne '' %]
<option value="3"
[% IF VBOX_PREF.USE_FIRSTNAME == '3' %]
selected
[% END %]
>First and Last name</option>
[% END %]
</select>
</td>
</tr>
[% IF USER_CREDS.TTS_GREETING ne '0' %]
Expand All @@ -728,6 +728,18 @@
</td>
</tr>
[% END %]
[% IF USER_CREDS.ASR_ENGINE ne '' %]
<tr class='addon_info'>
<td>Use Voice Input: </td>
<td>
[% IF VBOX_PREF.USE_VOICE_SEARCH %]
<input name="USE_VOICE_SEARCH" type="checkbox" checked>
[% ELSE %]
<input name="USE_VOICE_SEARCH" type="checkbox">
[% END %]
</td>
</tr>
[% END %]
<tr class='addon_info'>
<td>Number of characters: </td>
<td>
Expand Down Expand Up @@ -2829,12 +2841,14 @@
<td><input class='in_t0' size='7' name='dayofmonth' type='text' value='[% param.DAYOFMONTH | html %]'></td>
<td><input class='in_t0' size='5' name='month' type='text' value='[% param.MONTH | html %]'></td>
<td><input class='in_t0' size='9' name='year' vtype='text' value='[% param.YEAR | html %]'></td>
<td><input class='in_t0' size='11' name='redirect_to' type='text' value='[% param.REDIRECT_TO | html %]'></td>
<td align='left' nowrap='nowrap'>
<a href='?action=schedule_del&id=[% VBOX_PREF.ID %]&data_id=[% param.DATA_ID | html %]&uniq=[% USER_CREDS.UNIQ %]' onclick="return xmlhttpDel(this,'en','d-tr-[% param.DATA_ID %]')" title='delete schedule item'><span class='icon-bin fs0'></span></a>
<td>
<input class='in_t0' size='11' name='redirect_to' type='text' value='[% param.REDIRECT_TO | html %]'>
<script language="JavaScript">
exten_icon( '[% param.REDIRECT_TO | html %]', '[% USER_CREDS.UNIQ | html %]', 'edit extension' );
</script>
</td>
<td align='left' nowrap='nowrap'>
<a href='?action=schedule_del&id=[% VBOX_PREF.ID %]&data_id=[% param.DATA_ID | html %]&uniq=[% USER_CREDS.UNIQ %]' onclick="return xmlhttpDel(this,'en','d-tr-[% param.DATA_ID %]')" title='delete schedule item'><span class='icon-bin fs0'></span></a>
<span class='in_t' id='in_t_id-[% param.DATA_ID %]'>
<a href='#' onclick="xmlhttpPost(document.getElementById('f-[% param.DATA_ID %]'),1);"><span class='icon-floppy-disk fs0 blink' title='save changes'></span></a>
<noscript><input value='change' type='submit'></noscript>
Expand Down Expand Up @@ -3103,12 +3117,14 @@
</select>
</td>
<td><input class='in_t0' size='15' name='var_value' type='text' value='[% param.VAR_VALUE | html %]'></td>
<td><input class='in_t0' size='11' name='redirect_to' type='text' value='[% param.REDIRECT_TO | html %]'></td>
<td align='left' nowrap='nowrap'>
<a href='?action=gotoif_del&id=[% VBOX_PREF.ID %]&data_id=[% param.DATA_ID | html %]&uniq=[% USER_CREDS.UNIQ %]' onclick="return xmlhttpDel(this,'en','d-tr-[% param.DATA_ID %]')" title='delete gotoif item'><span class='icon-bin fs0'></span></a>
<td>
<input class='in_t0' size='11' name='redirect_to' type='text' value='[% param.REDIRECT_TO | html %]'>
<script language="JavaScript">
exten_icon( '[% param.REDIRECT_TO | html %]', '[% USER_CREDS.UNIQ | html %]', 'edit extension' );
</script>
</td>
<td align='left' nowrap='nowrap'>
<a href='?action=gotoif_del&id=[% VBOX_PREF.ID %]&data_id=[% param.DATA_ID | html %]&uniq=[% USER_CREDS.UNIQ %]' onclick="return xmlhttpDel(this,'en','d-tr-[% param.DATA_ID %]')" title='delete gotoif item'><span class='icon-bin fs0'></span></a>
<span class='in_t' id='in_t_id-[% param.DATA_ID %]'>
<a href='#' onclick="xmlhttpPost(document.getElementById('f-[% param.DATA_ID %]'),1);"><span class='icon-floppy-disk fs0 blink' title='save changes'></span></a>
<noscript><input value='change' type='submit'></noscript>
Expand Down
Loading

0 comments on commit d7af0a5

Please sign in to comment.