Commit graph

145 commits

Author SHA1 Message Date
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
steve-lad 649b717ce7 Correct SQL for SET DEFAULT 2021-06-20 13:06:53 +02:00
steve-lad be8aa5cd92 Initialise Defaults in Driver
Add Constructor to get and set line_defaults
Add defaults to SCCP tab
2021-06-20 11:53:24 +02:00
steve-lad 55285cf625 Move install functions from sccp_manager to installer
Change core driver to be an include
Move driver to sccpManClasses to improve maintainability and eliminate possible version issues
Add driver in installer (remove
from extConfigs)
Create sccp.conf in installer if it does not exist (remove from extconfigs)

Update extconfigs.class.php

Update Sccp.class.php.v433
2021-06-20 09:24:19 +02:00
steve-lad 57bc13f782 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
2021-06-18 11:58:00 +02:00
steve-lad efdf2d0469 Added sccpline fields
WIP Still have issue with def_modify in installer
2021-06-17 18:39:32 +02:00
steve-lad 5df918a04b Save Defaults to Db Defaults
Initial changes. Need to update other tables and fields

Minor bugfix in dbinterface

Correct XML version
2021-06-17 15:10:31 +02:00
steve-lad b2ee6ad853 Correct NOT NULL fields
Ensure all enums are NOT NULL
Correct variable name to lowercase
2021-06-16 10:27:28 +02:00
steve-lad 922ae3eaf7 Update fields so that ignored by chan-sccp
To avoid unnecessary changes to chan-sccp, these fields are prefixed with an underscore and should be ignored.
They are used to create the SEPXXXX file
2021-06-16 10:13:29 +02:00
steve-lad 4c40809071 Update installer for new db version
Define new sccpdevice fields
Remove obsolete code
Remove duplicate code
2021-06-16 09:22:43 +02:00
steve-lad 09db30fe9f Update Uninstaller
Create Backup of SCCP tables
Remove all tables
Remove views and keys
2021-06-14 11:47:09 +02:00
steve-lad 878dd7c29a Update install.php
Remove extra .
2021-06-12 10:07:14 +02:00
steve-lad 1182d65971 Correct file names
cnf_read and cnf_wr can only write to a filename (not a path) inside /etc/asterisk
2021-06-12 09:56:59 +02:00
steve-lad 5b67c8d6f9 Fix issue 12
Remove empty defaults from database definitions - Doctrine parses incorrectly
Add case in installer to create extconfig.conf if does not exist
2021-06-11 11:08:32 +02:00
steve-lad e97dc89a49 Update install.php
Check realtime configuration
Impose correct version
2021-06-06 11:00:00 +02:00
steve-lad d7ebf7d0ec Simplify logic and correct SQL
Correct SQL for modify defaults
Remove unnecessary tests
Simplify remaining tests
2021-06-06 08:16:41 +02:00
steve-lad e8dae84512 Update install.php 2021-06-04 16:20:52 +02:00
steve-lad 98a0f4e8b7 Update installer
Change default values in Sccp.class
Change SQL statements
Change DB schema
2021-06-04 16:20:18 +02:00
steve-lad f4927793ee Modify installer
Change load sequence
Delegate table creation to module.xml
Correct module.xml tables
Correct timezone typo
2021-06-03 13:07:26 +02:00
steve-lad 80cc601da4 Update Installer - WIP
Add database definitions in module.xml
Catch exception if PHP Zip not installed
2021-06-02 08:17:35 +02:00
steve-lad 09a5daa593 Clean up install.php
Remove obsolete/non-applicable code
2021-05-31 18:45:48 +02:00
steve-lad 97c02f125f Add error message for chan-sccp compatibility
Ad error message in install if chan-sccp version is too low
Minor formatting
2021-05-31 12:52:56 +02:00
steve-lad ee0fda775e Retire Old Interface
Use exclusively AMI interface
Delete oldinterface
Delete srvinterface and move aminterface to Sccp_manager.inc
All calls now pass directly to aminterface
2021-05-31 12:33:35 +02:00
steve-lad ac71164055 Update install.php
Clean up formatting and remove unnecessary quotations
2021-05-31 10:00:06 +02:00
steve-lad b138c3ac81 Enable edit of phones as per 9e95071
Reintegrate edit of phones as per original patch by @dkgroot
Corrections in HTML
Simplify Installer mods
2021-05-30 16:01:02 +02:00
Diederik de Groot 51dad690ef Fix: Default models should have at least 1 button if number is currently no known
Enh: allow all model information to be edited.
Fix: edit/load loadinformationid
Fix: Modal Title -> Model

With help from @steve-lad

References: #91

Signed-off-by: Diederik de Groot <dkgroot@talon.nl>
2021-05-30 15:03:38 +02:00
steve-lad 4ce789cd3e Fix reversion errors
When rebasing, errors were introduced. This commit reverses those errors. It may also revert some commits
2021-05-29 15:50:04 +02:00
Diederik de Groot 0011581fc0
Merge branch 'PR108' into extension_mobility_rebased_on_develop 2021-05-24 13:46:19 +02:00
Diederik de Groot 9e95071bad
Fix: Default models should have at least 1 button if number is currently no known
Enh: allow all model information to be edited.
Fix: edit/load loadinformationid
Fix: Modal Title -> Model

With help from @steve-lad

References: #91

Signed-off-by: Diederik de Groot <dkgroot@talon.nl>
2021-04-02 15:30:03 +02:00
steve-lad c4cd6cbdbf
Update install.php
Populate sccpdevmodel if empty
2021-04-02 15:29:36 +02:00