Commit graph

176 commits

Author SHA1 Message Date
steve-lad 6567923ff1 Add chan-sccp build info to Sccp Info 2021-08-06 08:24:53 +02:00
steve-lad f1cc0f1bf6 Remove IF EXISTS condition on rename
Know that the column exists so this is unnecessary and fails in MariaDb 5.5
2021-08-04 12:36:18 +02:00
steve-lad b133b2bc3a Change sccpdeviceconfig view create statement
Should not use ALGORITHM=MERGE when using GROUP BY
2021-08-04 10:55:26 +02:00
steve-lad 2c8842d21a Correct initialisation
res_conf is an array
2021-08-04 07:24:28 +02:00
steve-lad ab7b295b87 switch basedir path source
Use $amp_conf['AMPWEBROOT'] instead of $_SERVER['DOCUMENT_ROOT'] as at least in one case the latter appears to be empty
2021-07-31 17:07:37 +02:00
steve-lad 43a656cebc Correct XML Path in installer and optimise findAllFiles
XML Path in installer was in single quotes - corrected
Remove unnecessary tests in findallfiles
2021-07-31 12:30:24 +02:00
steve-lad e313b9da3f Change pathname style from {} to .
Instability seen when pathnames with globals enclosed in {} - revert to . style pathnames
2021-07-30 22:43:35 +02:00
steve-lad 3ea36f5459 add keepalive 2021-07-30 14:39:15 +02:00
steve-lad 1338336dd9 Add phonecodepage column to sccpdeviceconfig 2021-07-30 12:04:32 +02:00
steve-lad d8287157bd Remove videomode field from sccplineconfig
Not recognised by chan-sccp
2021-07-30 11:23:13 +02:00
steve-lad 85e77ab34c Insert missing field in sccplineconfig view 2021-07-30 11:04:01 +02:00
steve-lad 40cace04e4 Increase granularity of backup name 2021-07-30 10:36:38 +02:00
steve-lad 97c1f6d5d4 Minor settings changes 2021-07-30 10:18:27 +02:00
steve-lad b659f55170 Remove _ prefixes in db column names
Mariadb does not accept _prefixed fields by spec, and these columns may give future issues. Migrate all fields in installer to remove this prefix (without data loss) and:
Create new view sccplineconfig for chan-sccp where only accepted fields are shown
Update sccpdeviceconfig to only show accepted fields
Update extconfigs.conf to use sccplineconfig
Remove references to _ prefixed fields
2021-07-28 15:48:57 +02:00
steve-lad 4151b4fdae Restructure languages and locales management
Base off of provision file structure
Store netlang and devlang
Stop usage of extconfig ->sccplang
2021-07-23 12:14:46 +02:00
steve-lad 477eb69146 Fix phonepersonalisation
Set expected numeric value for phonepersonalization
WIP fix - adv.ini
2021-07-20 12:53:29 +02:00
steve-lad 2898f5e3c9 Fix bug codecs storage
codecs were stored as a ',' separated list while chan-sccp expects a ';' separated list
Correct all existing db values when running installer
make sure that disallow is not unset in installer (set to all)
make sure that disallow is not empty
correct help text
2021-07-20 09:32:01 +02:00
steve-lad d7fd77dfe8 Get locales from provisioner
Add progress bar and xhr handler
2021-07-18 11:30:19 +02:00
steve-lad 6e26428b1d Update rewrite rules
Add header with credits
Add specific rule for sccp_manager
Add correct fields to parse xml for sccpvalues
Add new option to update files from @dkgroot/provision
2021-07-12 13:50:09 +02:00
steve-lad 651f3adb44 Finalise TFTP Mapping treatment
User no longer can select on or pro: If remapping is enabled and rules are set, then must use pro or phones will not find files
Otherwise is Off (flat directory)
2021-07-12 12:26:56 +02:00
steve-lad 5a184ededb Integrate Provision functionality into Sccp_Manager
Create required directory structure
Check if mapping support is enabled
Check if mapping rules are defined
Change options available based on above
Create index.cnf and sccpManagerRewrite.rules
2021-07-11 16:52:24 +02:00
steve-lad 2a98d8cfdb Override chan-sccp default context 2021-07-10 12:17:46 +02:00
steve-lad acb0141d99 Refine Sccp.class
Move help and other defs to sccpgeneral so that have one interface across system
Correct defaults in line with chan-sccp
Standardise db object, and move sql to dbinterface to remove second dependancy
2021-07-08 17:22:50 +02:00
steve-lad 6429b6add9 Finalise Codec Management
Add video codec treatment
Correct missing defaults
Simplify defaults in Sccp.class
2021-07-08 08:56:42 +02:00
steve-lad f929267910 Provide mechanism to reset codecs to system defaults
Unchecking all codecs will return to chan-sccp defaults
Document this behaviour
Remove various debug code
2021-07-06 16:12:25 +02:00
steve-lad 8b06495938 Update installer to handle chan-sccp parsable fields
chan-sccp has parsable fields where two values are separated by a |.
Parse these fields and their associated values and create two fields.
Remove the unparsed field if it exists.
2021-07-06 11:54:46 +02:00
steve-lad fea6d88aa5 Modify default values
Change sccpgeneral to remove inherit - now inherit default values automatically
Add default values to form groups
Revert changes informShow
Update getTableDefaults to better manage underscores with chan-sccp
Change Defaults in Install

Remove Inherit processing

Remove functionality added to hide inherit in default configs - Inherit has been removed from sccpgeneral.xml
2021-07-06 09:31:44 +02:00
steve-lad b15729a340 Change earlyrtp enum
chan-sccp enum is now yes / no and all older values equate to one of these. Help updated in chan-sccp revision: 566c8695
2021-07-05 11:17:03 +02:00
steve-lad 6ecc981a02 Align more defaults 2021-07-03 16:44:52 +02:00
steve-lad dd9888e55e (re)Align Defaults and Default values with chan-sccp
Ensure all defaults use same vales as chan-sccp (partial revert of earlier changes)
Initialise UsingSysDefaults
Clarify html
2021-07-03 16:29:31 +02:00
steve-lad 93fe6d45e1 Extend defaults to all pages
Change enum in installer to correspond to chan-sccp
2021-07-02 12:27:06 +02:00
steve-lad 22d845ced3 Initialise all chan_sccp defaults in sccp_settings
Get default system settings from chan_sccp and add to sccpsettings
Remove legacy settings from sccpsettings
Change tftpReadTestFile to accept host as argument
Change sccpsettings structure to include systemdefaults
2021-06-28 11:51:05 +02:00
steve-lad f882a66eb4 Tighten TFTP read controls
Avoid hanging if no data received by setting timeout. Thanks to @dkgroot  for soulution
2021-06-28 07:17:51 +02:00
steve-lad ee419ae193 Change SQL for adding system defaults 2021-06-27 17:46:00 +02:00
steve-lad f74978c1b3 Add timer on TFTP read; Get Metadata
TFTP read caused a hang if no server available

Set to DONTWAIT and loop and then check for valid data

Use metadat to set system defaults
2021-06-27 17:12:10 +02:00
steve-lad 7721e7a8a0
Tidy up installer
Clean SQL statements
Solidify dbsettings management
2021-06-27 12:48:24 +02:00
steve-lad b1a7fe3510
Update db exception handling in installer
DB object returns errors on warnings, so was failing.

Ignore the warnings and only die on exceptions (usually violations) as it is normal that there are warnings if we are changing VARCHAR to ENUM
2021-06-27 11:42:21 +02:00
steve-lad 4fcf16b317
Do not die on SQL warning
If we change a field from VARCHAR to enum, we will get warnings as possibly truncating data. Accept this and carry on.

Only fail on an error.
2021-06-27 11:06:33 +02:00
steve-lad d8cc6f3ba1
Remove empty - checking to find actual and overwrite any existing 2021-06-27 10:43:01 +02:00
steve-lad bab83c7e3e
Change TFTP detection logic
Accept first hit
2021-06-27 10:19:20 +02:00
dkgroot 4da4f391d6 Fixes based on review by @steve-lad 2021-06-27 07:54:00 +00:00
dkgroot 838ff633aa Reverse the logic when detecting tftpserver existence and path
- write a sentinel probe file to the known/possible distro tftp directories
 - try fetching it through tftp
 - if we manage to fetch the file, we have the correct path
 - remove sentinel probe file

When creating directories in tftpboot directory we should not set write permissions, using 0755 instead.
2021-06-26 23:19:53 +00:00
steve-lad fb9ea64134 Fix SQL in Install Rename
Change SQL in Installer rename column
Change TFTP variable name for better clarity
2021-06-25 06:35:51 +02:00
steve-lad 9be50bab5c Update Create_SEP_XML and defaults
Merge data_values and dev_config so that device specific settings are written to the SEP file
Add sccp general device defaults
Allow saving empty sccpvalues
Add new fields to sccpdevice
move phonepersonalization to sccpdevice from sccpline
Change advanced display block for personalisation to correctly pickup defaults
2021-06-24 15:25:26 +02:00
steve-lad ff1c451fe1 Update Installer and Sccp_manager Construct
Move initial defaults reading from Construct to Install
Move initVarFromXml to helper functions - no longer used as defaults should come from db
Remove extraneous initialisations from Sccp_manager - these are now handled in Installer
Save TFTP structure to sccpsettings in Installer
Pass tftp_root to extconfigs ( if changed or uninitialised, was not written back to settingsFromDb before being passed to extconfigs
2021-06-24 10:02:26 +02:00
steve-lad d7e196cf21 Clean up installer and partially revert externconfigs
Remove ancillary function to traits
Move tftp directory management back to extern configs
Remove call to extern configs from InitialiseSccpPath and so from Construct
Need to add call to updateTftpStructure when settings changed ---WIP ---
2021-06-23 17:03:24 +02:00
steve-lad ec79925661 add asterisk etc dir to sccp settings 2021-06-23 13:21:19 +02:00
steve-lad d422776ad6 Create full TFTP Pro structure and save relevant settings
Default structure now created is ready for pro use and settings have been moved to sccp settings and not stored in array sccppath
2021-06-23 12:35:33 +02:00
steve-lad 4e15376181 Update install.php 2021-06-22 20:53:41 +02:00
steve-lad cb890aa264 Update installer to check TFTP server is running and usable
Use dummy put to test and locate the TFTP server
Move all TFTP tests from extconfigs to install (reduces module constructor)
2021-06-22 17:18:01 +02:00