Commit Graph

335 Commits

Author SHA1 Message Date
FusionPBX c0c7a8cd4d Delete provision_write.php 2016-12-06 11:30:48 -07:00
Alexey Melnichuk 611a70099d Fix. Sync building `$provision` array in all places. (#2226) 2016-12-02 12:11:47 -07:00
FusionPBX f14f2fe57d Update provision.php
Prevent a warning on the provisioning class.
2016-11-30 20:50:17 -07:00
FusionPBX 96720a7825 Update provision.php
Add if is_array statements before using the array to prevent warnings if the array isn't defined.
2016-11-26 18:42:22 -07:00
FusionPBX cc06a78543 Update index.php 2016-11-26 18:35:10 -07:00
FusionPBX 4ff9f0c756 Update provision.php
Allow provision variables of type boolean and numeric.
2016-11-23 22:42:46 -07:00
konradSC a7b76b7a84 Device profile settings (#2165)
* Update app_config.php

* Update device_profile_edit.php

* Update device_setting_delete.php

* Update provision.php
2016-11-23 12:28:59 -07:00
FusionPBX 536b7d0ed8 Update app_defaults.php 2016-11-12 20:48:16 -07:00
FusionPBX fef88f0873 Update app_defaults.php
Add number_as_presence_id in default settings provision category.
2016-10-23 13:13:34 -06:00
FusionPBX 5ca5ac72a3 Update app_defaults.php 2016-10-22 21:13:51 -06:00
FusionPBX 420696b65f Update app_defaults.php 2016-10-22 18:51:45 -06:00
FusionPBX 10c3fbe600 Update app_defaults.php 2016-10-22 17:20:24 -06:00
FusionPBX 3a8f14e1ea Update index.php 2016-09-20 16:51:17 -06:00
FusionPBX 8f7665c2d8 Update provision.php
Allow the key variables to work for memory, expansion and programmable keys.
2016-09-02 10:08:45 -06:00
FusionPBX 75b36f0cf0 Update provision.php
Fix the variables in the device_keys array.
2016-08-31 00:29:20 -06:00
FusionPBX b38e237082 Update provision.php
First step to fix the conflict between category: line, memory, expansion and programmable keys.
2016-08-25 23:22:02 -06:00
minotaur01 4bb8559a36 Added functionality to show when a devices was last provisioned (#1831)
* Added functionality to show when a devices was last provisioned

Added functionality to show when a devices was last provisioned

Need addition to database: v_devices table:
device_provisioned_on -> datetime
device_provisioned_by -> char(10)

* Revert "Added functionality to show when a devices was last provisioned"

This reverts commit c3e40d68fa.

* Revert "Revert "Added functionality to show when a devices was last provisioned""

This reverts commit 8c27a46565.

* Changed field names as requested

Changed field names as requested for last provisioned data

* Added database fields for device provisoned functionality

Added provisioned_date, provisioned_method, provisioned_ip

* Added ability to search device provisioned info

* Added ip tracking to device provisoned functionality

Added ip tracking to device provisoned functionality and moved the code
to before rendering to register the contact even on unseccessful render

* Added IP address to status column
2016-08-25 11:10:39 -06:00
FusionPBX a16483adb3 Update provision.php 2016-08-23 14:21:27 -06:00
FusionPBX dfd23a3257 Update provision.php
Improve provision support for outbound proxy primary and secondary in the provision class.
2016-08-23 13:17:17 -06:00
FusionPBX 76d7044b4f Update provision.php
Fix the user assigned contacts for the directory.
2016-08-23 11:37:51 -06:00
FusionPBX 06f1b7fcec Update provision.php
Simplify the code where device keys can override keys assigned to the device profile keys.
2016-07-16 03:37:46 -06:00
Alexey Melnichuk 032872f5b3 Fix. Disable device provision. (#1700)
Close #1389
Rewrite code to write config file to file.
2016-06-23 12:47:06 -06:00
Alexey Melnichuk 510c7665a4 Fix. Provision for devices without (#1689) 2016-06-21 08:06:45 -06:00
Alexey Melnichuk 736519f3cd Fix. Export valid values for settings in provision template. (#1685) 2016-06-20 11:40:22 -06:00
markjcrane 6991bd7649 Rename user_uuid device_user_uuid in the devices table. Add an apply button to the key dashboard and provision button to the device edit. 2016-06-17 17:34:31 -06:00
Alexey Melnichuk ede2f8f57d Add. Support provision programmable keys for Escene devices. (#1674) 2016-06-17 10:43:27 -06:00
markjcrane 2b3213f9df Create yealink_time_zone_start_time and yealink_time_zone_end_time automatically. 2016-05-19 12:47:03 -06:00
Chris Black 804565549b Yealink directory listing for extensions, groups, users contacts (#1588)
* Fix Yealink provisioning for contacts/groups

Fix the Yealink provision templates to allow for directory_extensions,
groups and users.

* Fix group_uuid and user_uuid messup

* Yealink directory and provisioning changes

Includes the changes from PR 1582 with some fixes to the SQL.

Also merged all the directory_* options into ONE directory.xml

Will need to call the it with any of these:

http://mydomain/app/provision/?file=directory.xml&contacts=groups

http://mydomain/app/provision/?file=directory.xml&contacts=users

http://mydomain/app/provision/?file=directory.xml&contacts=extensions

http://mydomain/app/provision/?file=directory.xml&contacts=all
2016-05-12 11:22:40 -06:00
Alexey Melnichuk f828c1c56b Escene provision (#1140)
* Add. Provision to Escene ES330/ES320

* Add. Look up Escene device by ext+domain.

* Update Escene template.

* Add. `provision` section in config.

Found than ES330 some time hangup when it try get software/core and get error from fusion.
2016-05-06 01:49:43 -06:00
markjcrane 3abaff004c Check the missing array has content before processing it. 2016-05-04 00:22:35 -06:00
markjcrane bc51cd7d1d Cleanup the indentation ... tabs and whitespace after the last pull request. 2016-04-28 16:56:44 -06:00
markjcrane 18df3effec Fix a filesize warning for provisioning using strlen instead. 2016-04-28 15:06:16 -06:00
Harry G. Coin fd313a7c66 fixes so cli installs/upgrades work.
Also another step along the way allowing freeswitch to run -u -g freeswitch and fusionpbx to run -u -g www-data
2016-04-25 21:26:26 -05:00
Harry G. Coin 91a92d8e5e \r\n --> \n
Cause all the .php files containing lines ending with \r\n to instead end with \n.

DYI with:

find fusionpbx -type f -name '*.php' -exec dos2unix '{}' \;
2016-04-25 20:30:23 -05:00
Harry G. Coin 89e5ecbcdf The goal is to increase confidence in fusionpbx, one step is to run by default with error_reporting (E_ALL ^ E_NOTICE);
So, please find in this set numerous small changes which eliminate numerous php warning messages.

Also, a small bug fix in an sql statistics routine, naming a count(*) field as count, so displaying correct detail.

If any of the proposed changes are omitted, the relevant page will experience php warnings.

There are no doubt fusionpbx pages I've yet to visit that still generate warnings, this set is nearly certainly not comprehensive.
2016-04-25 20:19:58 -05:00
FusionPBX a0e736fb34 Merge pull request #1500 from moteus/provision_contact_sql
Fix. SQL text to query user contact in provision class
2016-03-24 21:44:32 -06:00
markjcrane 459a5931fa Fix some of the elements in the contacts array. 2016-03-24 21:43:03 -06:00
Alexey Melnichuk 62c4618259 Fix. SQL in group contacts 2016-03-24 17:59:01 +03:00
Alexey Melnichuk 2ab96611ef Fix. Export `contact_category` for provisioning template
Add. Export `contact_type` and `phone_label` for provisioning template
2016-03-24 17:54:31 +03:00
Alexey Melnichuk 4bb595f797 Fix. SQL text to query user contact in provision class 2016-03-24 15:54:29 +03:00
markjcrane 36d8c7815d Change daylight_savings_start_date to daylight_savings_start_day as it is more accurate for representing the data. Add daylight_savings_start_time and daylight_savings_stop_time 2016-03-15 16:15:32 -06:00
markjcrane 6e4be852ad Update default settings add daylight_savings_start_month and date for the polycom templates. 2016-03-15 13:51:01 -06:00
markjcrane 926cda4a97 Add polycom_digitmap to provision category in default settings. 2016-03-15 12:50:04 -06:00
markjcrane 121c58ebe7 Move contact_exists to a method in the provision class. 2016-03-15 12:22:57 -06:00
FusionPBX b53164ac93 Merge pull request #1468 from mafoo/WhitespaceClean-app/batch_1
WhitespaceClean-app/batch_1
2016-03-11 13:35:41 -07:00
markjcrane b135f6b120 Change device_provision_enable to device_enabled to make it consistent with the rest of the fields that are used for to enable and disable something. 2016-03-11 11:46:02 -07:00
mafoo d408cf2fbc WhitespaceClean-app/batch_1
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 11:56:29 +00:00
markjcrane 81e0a9c7c2 Add new default settings for http_auth_type, contact_extensions, contact_groups, and contact_users. 2016-03-07 21:35:38 -07:00
markjcrane f475437a9d Add http digest authentication and make it the default with an option to use basic if required. 2016-03-07 21:31:37 -07:00
markjcrane 75780c1ec1 Add the contacts array to provisioning template to be used for the phone directory. 2016-03-04 18:37:01 -07:00
markjcrane 5a06f486af Rename .project.ROOT to project_root.php this conforms better with current file naming standards. 2016-02-22 14:01:18 -07:00
markjcrane aa9717518f Change the category to provision for provision ntp_server_primary, and ntp_server_secondary. 2016-02-06 14:53:31 -07:00
markjcrane 9546782a68 Add Cisco and Linksys to the format_mac list. 2016-01-25 21:27:21 -07:00
markjcrane c49e47e61f More work on user assigned contacts. 2016-01-25 20:38:45 -07:00
markjcrane 3984218fb5 Fix the provisioning class. 2016-01-20 12:26:01 -07:00
Mafoo ad324f4744 changed throw Exception to die
nothing ever eval runs the root.php so changed to die to cause a immediate report of error and stop code processing.
2016-01-20 11:30:31 +00:00
markjcrane 882333a1b0 Add personal directory array for provisioning. 2016-01-19 22:14:02 -07:00
Mafoo 2669f6f1a9 Added check for if .project.ROOT is missing
If a installation is missing the .project.ROOT previously it would just use the last search path as the project root (wrong) this will cause a Exception should it be unable to find it
2016-01-18 09:38:16 +00:00
markjcrane 3eda2664fd Set the mac address to lower case in a different location. 2016-01-16 12:02:32 -07:00
markjcrane afd92882c9 Set the mac address to lower case. 2016-01-16 11:58:22 -07:00
FusionPBX 76b1ea734e Merge pull request #1331 from mafoo/BugFix-root.php_logic
Rollout new root.php
2016-01-16 10:09:44 -07:00
markjcrane 74ca9eb980 Consolidate the SQL Queries for better performance. 2016-01-16 09:54:01 -07:00
FusionPBX 88a10cbea8 Merge pull request #1139 from joernott/master
Allow provisioning with internal addressbook and update snom320 tpl
2016-01-15 22:45:32 -07:00
Matthew Vale b20a38f454 added logic in cli mode to chdir to the correct directory first
the webserver would normally do this for us, but we need to do it
2016-01-14 16:25:05 +00:00
blackc2004 28aec4f0a9 start of local extensions as remote phone book 2016-01-13 10:08:38 -08:00
Matthew Vale 173ae7001d Added full logic to support cli as well 2016-01-13 17:38:54 +00:00
Matthew Vale b81748bd22 change to use '/' instead of DIRECTOR_SEPERATOR 2016-01-12 14:47:50 +00:00
Matthew Vale 1ad1c31b27 Rollout of root.php 2016-01-12 13:55:39 +00:00
markjcrane fe9c46c0d0 Change array extensins to contact_extensions and add a new extension array. Remove trailing spaces. And add a new cisco 79xx directory called Our Phones. 2016-01-12 02:42:59 -07:00
markjcrane 8ac40de88f Set the mac address variable. 2016-01-11 07:58:57 -07:00
markjcrane a35d442dfa Change the vendor ID hex number to lower case and re-use prov object that already exists. 2016-01-09 11:50:49 -07:00
markjcrane 7c9c6acc82 Continued work on formatting the mac address for upper or lower case. 2016-01-09 11:10:37 -07:00
markjcrane 3fddd940ec Add a missing keyword function. 2016-01-09 09:46:43 -07:00
markjcrane 97ab1c9c87 Add a new method call format_mac to make the code more reusable. 2016-01-09 09:43:14 -07:00
markjcrane 01edbb30b8 Set the mitel mac address to upper case. 2016-01-09 09:29:39 -07:00
markjcrane 2b5abc867c Get the MAC address from the Panasonic User Agent string. 2015-12-09 17:19:05 -07:00
markjcrane 6689017bc1 Fix the mode definition for the Grandstream expansion keys. 2015-11-30 13:09:02 -07:00
markjcrane e0e7c90d97 Set the mac address to lower case. 2015-11-28 20:08:24 -07:00
markjcrane ce709c6617 Add option to get the mac address from &name=SEPxxxxx 2015-11-28 19:48:45 -07:00
markjcrane 9782723b1d Add a missing = so that the file is only provided as a download when the content type is set to application/octet-stream in the url. 2015-11-28 19:15:29 -07:00
markjcrane e41519478b Add the contact_category to contacts array in the provision class. 2015-11-28 18:29:15 -07:00
markjcrane e49ba553b6 Fix the provision path. 2015-11-27 14:10:49 -07:00
markjcrane 83dac1faa0 Add ability to download the provisioning files from the device edit page for those users that have the device_files permission. 2015-11-25 00:10:49 -07:00
Matthew Vale 26c749edb0 BugFix + Optional Enable extensions appear in directory
BugFix to respect http_domain_filter when auto creating
setting provision> directory_extensions populates $extensions as a
contacts array in provisioning
2015-11-19 13:17:01 +00:00
markjcrane f87195204c Add the provision.path.text to default settings. 2015-11-04 20:01:11 -07:00
markjcrane 503461fca1 Change switch.provision.dir to provision.path.text. This indicates where to save the provisioning files on the file system. 2015-11-04 19:59:27 -07:00
markjcrane f69728befc Force the device_key_vendor to lower case so the key vendor can be case insenstive. 2015-10-02 23:39:12 -06:00
markjcrane 67159897dc Set content lenght to prevent chunking when providing HTTP 401. This should fix Yealink provisioning for the new firmware changes. 2015-09-29 14:28:48 -06:00
roman.dissauer ae4ec80038 fixed provisioning with http_domain_filter off 2015-09-24 09:38:26 +02:00
Jörn Ott 546220f912 Allow provisioning with internal addressbook and update snom320 template for it 2015-09-03 15:57:57 +02:00
markjcrane 62a11caa62 Don't override the device vendor type. 2015-07-08 01:43:52 -03:00
markjcrane ad3145ba19 Add several provision default settings. 2015-07-07 18:07:25 -03:00
markjcrane f52f7999a0 Add device key vendor to assign a key to a vendor. 2015-07-07 14:25:00 -03:00
reliberate 73f2c21674 Upgrade: Converted Advanced > Upgrade to use Git instead of SVN (untested).
Misc: Added provisions elsewhere to account for .git/* files, as currently done with .svn/* files.
2015-07-02 17:25:41 -06:00
Mark Crane 5a58a9c3d4 Add auto_insert_enabled to the provision variables in default settings. 2015-06-19 15:54:13 +00:00
Mark Crane 5bc0ccd7ed Fix the domain filter on provisioning. 2015-06-11 17:42:47 +00:00
Mark Crane 4a85e9e33a Add an option for a default setting that uses provision -> auto_insert_enabled type: boolean value: true.
This will not be set by default so the provision auto insert will be disabled by default.
2015-05-30 07:35:50 +00:00
Mark Crane f16a6270cc Change the default setting from enabled false to true. 2015-05-29 01:10:19 +00:00
Mark Crane 9de9ba1391 Add 3 more variables to device settings for the provision category and make it check default settings with one query rather than multiple making it more efficient. 2015-05-29 00:42:31 +00:00
Mark Crane 314e16f823 Revert changes of test code that were accidently committed in revision r8208 because it was breaking provisioning when device key extension is set. 2015-05-20 06:40:24 +00:00
Nate Jones 33df3bbe6f Devices: Add Enabled field to Lines. 2015-05-19 16:09:04 +00:00
Mark Crane 38f7850c30 Remove the word polycom from the if statement. 2015-05-19 01:46:13 +00:00
Mark Crane b6704f99fe Add another attribute to the 'if statement' on provisioning. 2015-05-19 01:43:58 +00:00
Mark Crane c6c30841f9 Specify the correct table. 2015-05-19 00:52:29 +00:00
Mark Crane 68a8a9b02f Add the missing 'and' in the sql query. 2015-05-19 00:51:03 +00:00
Mark Crane 71bc24631b Add the specific fields to the contacts array. 2015-05-19 00:48:36 +00:00
Mark Crane c31bdc26f9 Add phone number to the contacts array. 2015-05-19 00:38:40 +00:00
Mark Crane 31107b6aed Change $db to $this->db because its in the PHP class. 2015-05-18 23:00:45 +00:00
Mark Crane 3cba7737bc Add contacts array to provisioning. 2015-05-18 22:45:31 +00:00
Mark Crane 59b7e3078b Change device_model to device_uuid_alternate for the provision override. 2015-04-30 10:25:00 +00:00
Mark Crane dd8f9e9dd9 Remove the Yealink hot desking as I believe I have created a better way that is more secure. 2015-04-12 01:22:02 +00:00
Mark Crane 0fa4f2047d 2015-04-10 05:36:09 +00:00
Mark Crane 2900fdeeba Device UUID work still needs permanent home for the UUID. 2015-04-10 03:25:53 +00:00
luis daniel lucio quiroz 582843dc70 /tmp/provisioning_log.txt only when debug is on 2015-04-09 17:03:50 +00:00
luis daniel lucio quiroz 97e4a0ead4 debug must be turned on manually with a default setting 2015-04-09 16:13:21 +00:00
luis daniel lucio quiroz f79c83ee29 just a little more debug info when provisioning fails 2015-04-09 14:26:47 +00:00
Mark Crane 8afee33689 If the MAC address is set then validate it is a Mac address. 2015-04-06 23:39:19 +00:00
Mark Crane 689d5d39ab Check to see if domain_uuid has a value. 2015-04-06 22:27:16 +00:00
Mark Crane cc5b2fac66 One final adjustment to get it all working again. 2015-04-06 09:30:30 +00:00
Mark Crane ab1ebf581b Fix code that allowed userid / passwd as well as user_id / password. 2015-04-06 09:08:57 +00:00
Mark Crane 1265011c1d Remove redundant equal signs. 2015-04-06 08:53:00 +00:00
Mark Crane f734e4983c Fix a syntax error with the new code. 2015-04-06 08:51:12 +00:00
Mark Crane f6d197b8ea Add key variables to provisioning. 2015-04-06 08:37:06 +00:00
Mark Crane f3b14c28ab Add user_id and template variables for provisioning. 2015-04-06 07:38:24 +00:00
Mark Crane 62bba24350 Don't require the MAC address. 2015-04-05 22:29:56 +00:00
Mark Crane 6d249d0b61 Update the provision class. 2015-04-05 22:28:02 +00:00
Mark Crane 513e23403a Remove a PDO parameter that is not used. 2015-04-03 19:04:30 +00:00
Mark Crane 127adbf7a5 Get a new set of default and domain settings for use when http_domain_filter is set to false. Remove debug numbers from access denied messages in provisioning and remove other redundant code. 2015-03-28 11:37:56 +00:00
Mark Crane 8760d75c04 Fix a bug added when adding the key profiles feature. Device key id would conflict with other categories of keys like line, memory and expansion keys. If only using the line keys you wouldn't experience this problem. 2015-03-28 04:42:24 +00:00
Mark Crane ac2c7146b7 Sometimes the Yealink fails to provide the 'p' therefor filter only for 'vp530'. 2015-03-16 17:46:34 +00:00
Mark Crane d5ddddefd5 Fix the provisioning for Yealink vp530. 2015-03-16 16:37:19 +00:00
Mark Crane d42d8f4da4 2015-02-25 09:10:12 +00:00
Mark Crane a3a623aa35 Ensure the mac address is only hexadecimal value. Add provision http_domain_filter values of false as an option for provisioning. 2015-02-24 07:24:50 +00:00
Mark Crane fbd0d4fd8d Rebuild the array to allow profile keys to be overridden by keys assigned to this device. 2015-02-15 20:57:43 +00:00
Mark Crane 6bd812b9f4 Integrate the device profile keys with the provisioning templates. 2015-02-15 20:26:08 +00:00
luis daniel lucio quiroz 0bc858bffa debug messages for conference center 2015-02-13 18:51:19 +00:00
luis daniel lucio quiroz a1ed5c5d54 spa support 2015-02-04 03:53:34 +00:00
Mark Crane b98a475d80 Unset the generic $array variable to prevent duplicates in app -> default settings. 2015-01-24 20:56:10 +00:00
Mark Crane 7bbac16e9e Remove some extra line feeds. 2015-01-17 07:50:43 +00:00
Mark Crane cc4a4ab8d2 Only write the provisioning files if switch provision dir path is set. 2015-01-10 01:02:39 +00:00
Mark Crane ddca77629e Move the menu array to app_menu.php 2014-12-26 03:27:54 +00:00
Mark Crane 6d98ffc320 Add app_menu.php files for the menu. 2014-12-25 19:32:57 +00:00
luis daniel lucio quiroz bc479c6053 my bad, it was polycom 2014-12-22 23:49:41 +00:00
luis daniel lucio quiroz 16e6e0aa08 yealink needs mac without dashes 2014-12-22 23:47:41 +00:00
Mark Crane 4e6d29924f Update the provision class to change the switch statement to the if/elseif/else to again fix a problem iwth php fpm on Ubuntu 14.04 LTS 2014-09-29 08:05:10 +00:00
Nate Jones b11eb26f3e Provisioning: Reordered provision/app_defaults.php so App Defaults now detects and restores each Provision default setting individually/ 2014-08-17 05:53:32 +00:00
Nate Jones ba8a1de67b Enhanced Theme: Added Default Settings to control footer colors and opacity.
Other minor code enhancements.
2014-08-17 04:33:57 +00:00
James Rose 0ebde731cd add support for alternate voicemail numbers so you can subscribe to different mailboxes. requires user to create their own dialplan to support it. 2014-08-15 00:36:56 +00:00
Mark Crane 0d4c1cb129 Fix the voicemail view so that they are marked as read 2014-07-29 07:25:28 +00:00
Mark Crane c04b3d4707 By default provision enabled should be set to false. 2014-07-29 06:34:34 +00:00