Commit Graph

135 Commits

Author SHA1 Message Date
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
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 121c58ebe7 Move contact_exists to a method in the provision class. 2016-03-15 12:22:57 -06: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
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 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
markjcrane 882333a1b0 Add personal directory array for provisioning. 2016-01-19 22:14:02 -07: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
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
blackc2004 28aec4f0a9 start of local extensions as remote phone book 2016-01-13 10:08:38 -08: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 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 6689017bc1 Fix the mode definition for the Grandstream expansion keys. 2015-11-30 13:09:02 -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
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 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
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 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 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 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 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 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 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 d42d8f4da4 2015-02-25 09:10:12 +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
Mark Crane cc4a4ab8d2 Only write the provisioning files if switch provision dir path is set. 2015-01-10 01:02:39 +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
Mark Crane a75cc0fccd Add a lines array for provisioning. 2014-07-20 09:14:51 +00:00
Mark Crane ad0a5b9a72 Fix a security vulnerability for provisioning 2014-06-09 17:47:37 +00:00
Mark Crane 7f6ec439bb Change the package path from /etc/fusionpbx/templates/provision to /etc/fusionpbx/resources/templates/provision 2014-06-03 17:45:24 +00:00
Mark Crane c469e283e5 Fix the snom device_vendor detection. 2014-03-24 16:56:38 +00:00
Mark Crane 5d199ba3e1 Fix the mac address being added when a new phone is provisioning with HTTP. 2014-03-13 20:32:20 +00:00
Mark Crane 65e9f8ec1f Remove device_time_zone from provision the time zone instead should be set in default settings, category: provision 2014-02-25 17:36:56 +00:00
Mark Crane 2d99efc796 Prevent inserting the a new device if the domain does not exist. 2014-02-23 00:20:29 +00:00
Mark Crane c6e5aae050 Fix the provision directory path for those not using /etc/fusionpbx template directory. 2014-02-21 16:47:23 +00:00
Mark Crane df3dd784b5 Add a optional provision template directory in /etc/fusionpbx/templates/provision for Linux and /usr/local/etc/fusionpbx/templates/provision for FreeBSD. 2014-02-20 17:54:02 +00:00
Mark Crane 5b55418197 Update the provision PHP class to normalize the Mac Address before checking if it exists in the devices table in the database. 2014-02-05 14:13:02 +00:00
Mark Crane bd5892fc80 One more adjustment to get the domain_name for the provisioning. 2014-01-31 19:36:11 +00:00
Mark Crane 5b458626b4 Make sure that the domain_name is correct when rendering the provisioning template. 2014-01-31 19:02:05 +00:00
Mark Crane 40729b9247 Grandstream translate the name to to the number required to set the mode. 2014-01-31 12:52:08 +00:00
Mark Crane bc266b0c8a Add a provision write method to the provision function and use it to write the provisioning files for tftp/ftp provisioning. 2014-01-29 10:18:25 +00:00
Mark Crane 95b60d1817 Move the provisionin code into the new provision class. 2014-01-29 04:50:50 +00:00
Mark Crane 730a26a13d Add provision/resources/classes directory 2014-01-20 17:56:19 +00:00