nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-31 09:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,006 Commits 4 Branches 11 Tags
f08094dea16969b3aa1e3099334568e403f4e477
Commit Graph

2076 Commits

Author SHA1 Message Date
markjcrane
6aea821381 Build the apps array so that the groups class defaults method can use it for the group permissions. 2016-04-03 13:18:45 -06:00
markjcrane
f6920838c7 Add a default group check. 2016-04-03 11:54:09 -06:00
markjcrane
4292386b6c Add users and groups php class. 2016-04-03 11:47:06 -06:00
markjcrane
233fb08d32 Prevent switch duplicates. 2016-04-02 20:28:45 -06:00
markjcrane
2156d17da8 Rename to the switch_settings class. 2016-04-02 20:11:51 -06:00
markjcrane
3fff96ee68 Set some of the switch directories to enabled false. 2016-04-02 19:57:37 -06:00
markjcrane
e3d1514f2b Add a missing semi-colon. 2016-04-02 19:42:18 -06:00
markjcrane
0eafc921b7 Update the database connection. 2016-04-02 19:41:16 -06:00
markjcrane
b5fbf389dd Change the switch class to freeswitch. 2016-04-02 19:37:37 -06:00
markjcrane
637a3fadb5 Rename the EventSocket file to math current naming standard. 2016-04-02 19:24:32 -06:00
markjcrane
51ea37ed18 Rename the EventSocket class. 2016-04-02 19:23:16 -06:00
markjcrane
7fa92ef54f Fix a syntax problem on the new class. 2016-04-02 19:13:49 -06:00
markjcrane
562f000356 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
markjcrane
3ad26f1965 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
markjcrane
ed6bba7250 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-04-02 08:23:18 -06:00
reliberate
4a4517a5ab 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
markjcrane
c7ac0febda Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-04-01 13:37:30 -06:00
markjcrane
0e74ce140b Fix the cisco load or image on the 7940 and 7960 templates. 2016-04-01 13:37:22 -06:00
reliberate
9cfedbf2e9 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
FusionPBX
688b65867e 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
reliberate
5ad7291333 Default Settings: Enhance swatch display on color values. 2016-03-30 17:43:57 -06:00
FusionPBX
e241bd383a 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
FusionPBX
7228cf2c62 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
FusionPBX
6b917d7fbd Merge pull request #1529 from moteus/select_language 
Fix. Display language name on Install page.
 2016-03-30 08:41:39 -06:00
Alexey Melnichuk
987eebdf7d 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
Alexey Melnichuk
594a353fab 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
Alexey Melnichuk
645f493b11 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
reliberate
93a4f00e8b Functions: Added color adjustment and color format conversion functions. 2016-03-30 00:34:15 -06:00
markjcrane
38858b3f6b Remove the the condition on the direct dial. 2016-03-29 20:57:47 -06:00
Alexey Melnichuk
b2c5bd85a3 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
markjcrane
13792ebd59 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-29 02:35:59 -06:00
markjcrane
ac853eebaa Add http authentication option to all Cisco SPA phones. 2016-03-29 02:35:33 -06:00
reliberate
5974b686e9 Apps: Integrate ability to set paging via a Default/Domain/User Setting (domain > paging > numeric). 2016-03-28 23:02:11 -06:00
markjcrane
ec4f523caf 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
markjcrane
2cd979b30c A global domain is optional. Using public context instead. 2016-03-27 04:46:01 -06:00
FusionPBX
71cdf97e5a Merge pull request #1512 from schraegervogel/master 
initialize call_context
 2016-03-27 04:25:22 -06:00
markjcrane
4fa0649eba Only call the scripts class if its installed. 2016-03-27 00:33:19 -06:00
markjcrane
fa2b753e62 Add the menu_default method to app_defaults.php. 2016-03-26 22:59:00 -06:00
markjcrane
c0b93e849c Change the method name to menu_default. 2016-03-26 21:22:52 -06:00
markjcrane
d5b3fffda8 Add methoed 'default' to the menu class. 2016-03-26 21:18:02 -06:00
markjcrane
a836d7985b Remove the include to the resources/menu.php file that is no longer in use. 2016-03-26 19:37:42 -06:00
markjcrane
d71f1323c3 Update the install.php. 2016-03-26 19:17:33 -06:00
markjcrane
e3175814bd Fix the reference to the prepared statement. 2016-03-26 14:03:44 -06:00
markjcrane
c6f0759a5c 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
markjcrane
ba095f3852 Additional work to improve the install, template and the menu. 2016-03-26 12:22:15 -06:00
markjcrane
0e649f9020 Don't error if the menu is not available for the install.php. 2016-03-26 11:45:57 -06:00
reliberate
87f598d6e7 Added (Really!): Moment.js - used by jQuery DateTimePicker plugin. 2016-03-25 16:52:07 -06:00
reliberate
31ff4e69a8 Added: Moment.js - used by jQuery DateTimePicker plugin. 2016-03-25 16:39:19 -06:00
reliberate
c37520cb6f Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 16:33:54 -06:00
reliberate
0f11beead9 Added: Moment.js framework (used by jQuery DateTimePicker plugin) 2016-03-25 16:33:05 -06:00