bcc993c537
Rename the EventSocket file to math current naming standard.
2016-04-02 19:24:32 -06:00
7d61371bc9
Rename the EventSocket class.
2016-04-02 19:23:16 -06:00
52ff8fae68
Fix a syntax problem on the new class.
2016-04-02 19:13:49 -06:00
d9e00f2be3
Add a new switch class with a method to get the directories needed for FreeSWITCH and add them to default settings -> switch category.
2016-04-02 17:53:51 -06:00
11f4fea479
Change expire["sofia_conf"] to expire["sofia"] and expire["acl_conf"] to expire["acl"]. Then add a default value to prevent nil errors when the conf.lua script has not been updated.
2016-04-02 08:32:43 -06:00
827c9d5a50
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-04-02 08:23:18 -06:00
14973b5c97
Functions: Enhance img_spacer() function.
...
Dialplan Edit: Integrate img_spacer() to fix row divider.
Default/Domain/User Settings: Use img_spacer() function for color swatches.
Contact Times: Adjust for recent changes on img_spacer() function.
2016-04-01 19:44:26 -06:00
ddb1cbd705
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-04-01 13:37:30 -06:00
8f1a8667f4
Fix the cisco load or image on the 7940 and 7960 templates.
2016-04-01 13:37:22 -06:00
2ca72bd99d
Function: Created key_press function to dynamically generate key detection javascript.
...
Voicemail: Ctrl+A checks all checkboxes, pressing Delete deletes the checked Voicemails.
Editor: Integrated key_press function.
Command: Integrated key_press function.
2016-03-31 17:11:37 -06:00
b6775e44c5
Merge pull request #1521 from moteus/mysql_escape
...
Fix. use `mysqli_real_escape_string` instead or deprecated `mysql_real_escape_string`
2016-03-31 09:04:35 -06:00
ee100c6769
Default Settings: Enhance swatch display on color values.
2016-03-30 17:43:57 -06:00
1e9837f77b
Merge pull request #1527 from moteus/menu_array_default_arg
...
Fix. Use default value in function definition.
2016-03-30 08:49:29 -06:00
28afa5ef35
Merge pull request #1528 from moteus/no_menu_warning
...
Fix. warning about using NULL as first argument in `foreach`.
2016-03-30 08:46:46 -06:00
2786099d11
Merge pull request #1529 from moteus/select_language
...
Fix. Display language name on Install page.
2016-03-30 08:41:39 -06:00
a24359d667
Fix. Display language name on Install page.
...
This is special case because all this names should be displayed
in same time on single page on different languages.
So not translate in strict way.
2016-03-30 10:27:04 +03:00
43a023575a
Fix. warning about using NULL as first argument in `foreach`.
...
Problem now in `tepmplate.php`
```PHP
$menu_array = $menu->menu_array();
...
foreach ($menu_array as $index_main => $menu_parent) {
```
It appear while install process because in this moment there not `$db`
and `$menu->menu_array()` returns nothing.
This problem also can be solved in `tepmplate.php` like
```PHP
if(is_array($menu_array)){
foreach ($menu_array as $index_main => $menu_parent) {
...
```
2016-03-30 10:15:49 +03:00
ec95fc5f24
Fix. Use default value in function definition.
...
On `themes/default/template.php` it called without args
```PHP
$menu_array = $menu->menu_array();
```
And it produce PHP warning.
2016-03-30 09:39:15 +03:00
d307132b82
Functions: Added color adjustment and color format conversion functions.
2016-03-30 00:34:15 -06:00
5f5ae59c41
Remove the the condition on the direct dial.
2016-03-29 20:57:47 -06:00
7508828b16
Fix. use `mysqli_real_escape_string` instead or deprecated `mysql_real_escape_string`
...
From PHP.net
```
Warning
This extension was deprecated in PHP 5.5.0, and it was removed in PHP 7.0.0.
Instead, the MySQLi or PDO_MySQL extension should be used.
...
Alternatives to this function include:
* mysqli_real_escape_string()
* PDO::quote()
```
2016-03-29 16:34:36 +03:00
7df0324382
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-29 02:35:59 -06:00
2b1f01bd16
Add http authentication option to all Cisco SPA phones.
2016-03-29 02:35:33 -06:00
cd7843b7f3
Apps: Integrate ability to set paging via a Default/Domain/User Setting (domain > paging > numeric).
2016-03-28 23:02:11 -06:00
0e73d0d3dc
Rollback changes to is_local.lua determined that switching to regex would lower perfomance adding an 'or' with a search for prefix would perform better.
2016-03-27 20:44:14 -06:00
abef8c5d3c
A global domain is optional. Using public context instead.
2016-03-27 04:46:01 -06:00
b03d978bb0
Merge pull request #1512 from schraegervogel/master
...
initialize call_context
2016-03-27 04:25:22 -06:00
ac36bf07f7
Only call the scripts class if its installed.
2016-03-27 00:33:19 -06:00
812f41b48e
Add the menu_default method to app_defaults.php.
2016-03-26 22:59:00 -06:00
c7e90ebd26
Change the method name to menu_default.
2016-03-26 21:22:52 -06:00
f7aa8725e8
Add methoed 'default' to the menu class.
2016-03-26 21:18:02 -06:00
2a565e9f98
Remove the include to the resources/menu.php file that is no longer in use.
2016-03-26 19:37:42 -06:00
651f9806fb
Update the install.php.
2016-03-26 19:17:33 -06:00
100932656a
Fix the reference to the prepared statement.
2016-03-26 14:03:44 -06:00
ac4aef20b0
Change the code in the menu to return immediately if the database object is not ready in this case its not ready until the install.php is finished.
2016-03-26 13:36:00 -06:00
5eef464cf3
Additional work to improve the install, template and the menu.
2016-03-26 12:22:15 -06:00
aa89c4fe26
Don't error if the menu is not available for the install.php.
2016-03-26 11:45:57 -06:00
7fa8226f8d
Added (Really!): Moment.js - used by jQuery DateTimePicker plugin.
2016-03-25 16:52:07 -06:00
e3fb32e1a2
Added: Moment.js - used by jQuery DateTimePicker plugin.
2016-03-25 16:39:19 -06:00
5b58196c16
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 16:33:54 -06:00
9aae7bdd79
Added: Moment.js framework (used by jQuery DateTimePicker plugin)
2016-03-25 16:33:05 -06:00
6631061d70
Set the default theme as the default.
2016-03-25 16:30:35 -06:00
13e3aa4fa8
Added: Bootstrap Framework - initial integration.
...
Added: Bootstrap Plugins - DateTimePicker, ColorPicker (in multiple apps)
Added: Default Theme - responsive
Removed: RightJS Framework - no longer needed.
Removed: Accessible Theme - superseded by Default theme.
Removed: Minimized Theme - superseded by Default theme.
Enhanced: Menu - responsiveness added.
Enhanced: Dashboard - responsiveness added.
Etc.
2016-03-25 16:29:20 -06:00
5906618ff3
Merge pull request #1510 from moteus/databas_role
...
Add. `role` to be able select database backend in constructor.
2016-03-25 15:52:47 -06:00
39754a505e
initialize call_context
...
If you use xml_locate dialplan from fs_cli, you get an error, to prevent this I intialized call_context with the "domain"-var
2016-03-25 17:28:10 +01:00
423e0ab503
Add. `role` to be able select database backend in constructor.
...
To configure use `database.backend` option
It can be a string value like `database.backend = 'native'`.
So it will always use same backend.
Or it can be a table value like
```Lua
database.backend = {
main = 'native';
base64 = '';
}
```
Role `database.backend.main` is predefined and it equal to `native` if not set.
If there no role when Database class creates or role unknown role `main` is used
```Lua
dbh = Database.new('system') -- uses role `main`
dbh = Database.new('system', 'main') -- same as previews
dbh = Database.new('system', 'base64') -- uses role `base64`
dbh = Database.new('system', 'test') -- uses role `main`
```
2016-03-25 10:04:48 +03:00
c5e804cb3c
Update acl.conf.lua
...
Change expire acl.conf to acl_conf
2016-03-25 01:00:43 -06:00
ab7bd4a3d3
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-24 23:08:45 -06:00
66e01ef9dc
Change to the new context require renaming two variables to be consistent and to prevent a problem.
2016-03-24 23:08:23 -06:00
eb81998165
Revert "Revert "Revert "search selects"""
2016-03-24 22:25:18 -06:00
markjcrane
reliberate
Alexey Melnichuk
schraegervogel