summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Encode 'from' and 'to' before output on pkg_mgr_install.php. Fixes #7225jim-p2017-02-071-1/+1
|
* Revert "setHelp formatting for interfaces.php"Renato Botelho2017-02-071-45/+45
| | | | This reverts commit e6068596baf4307fe3eb9866072800e4c23b6840.
* setHelp formatting for interfaces.phpPhil Davis2017-02-071-45/+45
| | | | | | | | There was a fair bit of it, so I have put this in its own pull request. 1) Gets HTML out of the strings that go for translation. 2) Line 3365 - the words here about "hexadecimal" now go in the text directly in the setHelp so the translators will get access to them. 3) Line 2213 - a couple of backslash that were attempts at escaping the next char were not actually needed, and were displaying literally in the GUI. (cherry picked from commit 4d0c9c5946aeecad851511521d0310075ab4ebdd)
* fbegin.inc and fend.inc obsoletePhil Davis2017-02-071-0/+2
| | | | (cherry picked from commit 5af0922d75724e1eac89017173457f57842387f8)
* fbegin.inc and fend.inc are no longer usedPhil Davis2017-02-072-4/+0
| | | | (cherry picked from commit c09188a21938f7b1d19fd845fa7e5b0712dd4a83)
* Internationalization graph.phpPhil Davis2017-02-071-4/+6
| | | | | | | 1) A few extra strings to be translated. 2) The scale_type code values 'up' and 'follow' need to be kept as those strings in the JS scale_type variable. The text to be translated needs to be in a different variable that can be in translated form for display. Otherwise things go wrong when in a different language. e.g. switch to Brazilian Portuguese, then the Autoscale. The first times it switches then gets "stuck". (cherry picked from commit 678f11313b31b28d12d806032b6359a00d6b89a1)
* Update help message for Zone ID for new region requirementJason D. McCormick2017-02-071-1/+1
| | | | (cherry picked from commit 49f90f17bfaf2422d56160ad06ef5e2513beb1ba)
* implement AWS API v4 signingJason D. McCormick2017-02-072-29/+17
| | | | (cherry picked from commit ac5ee07ee1daef2f43e728895290ca6d11efe0f3)
* commit initial fix; need to add hooks for region to zone idJason D. McCormick2017-02-072-14/+50
| | | | (cherry picked from commit cb5961d1fa64a45cbec5ef5d677b57f8d62f50b5)
* Revert PERL related default options from net-mgmt/net-snmpDanilo G. Baio (dbaio)2017-02-061-1/+1
| | | | (cherry picked from commit 282d025d9756ba8ace2bcfa092e87d5ad6d338da)
* certificatemanager, don't show information from previous certificate if no ↵PiBa-NL2017-02-061-1/+8
| | | | | | cert or csr is present in the cert (cherry picked from commit 1048585a08ac824057eea35c57fe359b9e6a48fe)
* Use unique var names in Input.class.phpPhil Davis2017-02-061-2/+2
| | | | (cherry picked from commit a66177645191359e5ce854d733e9be40ada3535b)
* Simplify logicRenato Botelho2017-02-031-14/+11
|
* Set ntp gps mode for pgrmf even if no other modes are being set.jskyboo2017-02-031-1/+1
| | | | (cherry picked from commit 821110e8ff76564c23783c554fc89cd9458683ac)
* Add to NTP GPS processing of PGRMF sentencejskyboo2017-02-034-0/+45
| | | | (cherry picked from commit 6924a2bf34a70cd33284a28ca3575f33f9834375)
* Build acme pkgjim-p2017-02-021-0/+1
|
* Provide info on services_checkip.php about what the server must return, and ↵jim-p2017-02-021-3/+24
| | | | provide two examples of server-side code to return the client address. Fixes #6374
* Allow to build variant ISO image as done for memstickRenato Botelho2017-02-022-8/+23
|
* diag_reseststate sourcetablehelp escape of double-quotes not neededPhil Davis2017-02-011-1/+1
| | | | | The backslash escaping of the double-quotes here displays the backslashes literal on the GUI. Escaping is not needed in this single-quoted string. (cherry picked from commit 4ede308c615508a7b70074f56a3ca77cae7b68f1)
* get_service_status_icon fix description_state formatPhil Davis2017-02-011-59/+3
| | | | | | | | | If "description_state" is requested here, there are too many "%s" substitutions in the string for sprintf(). Also, to help translators, number all the "%s" substitutions. Then translators can rearrange the text and variable order if they need to. I removed the commented-out get_service_control_GET_links() while I am here, because it also contained sprintf() strings that had multiple "%s" substitutions. So I had found it when searching for lines containing multiple "%s". Might as well remove it "in the next version" as the comment says. (cherry picked from commit b3119a61c8f5841f92e2c1fe945f90d9e98a843c)
* Redmine #7173 Do not allow pkg_ for If, IfGroup, AliasPhil Davis2017-02-013-4/+22
| | | | (cherry picked from commit c9d93b62b0cc559d1ed4326212b6385cae2eb398)
* Fix #7183 Do not allow Interface Groups with the same namePhil Davis2017-02-011-5/+3
| | | | | I should stop trying bad stuff, there seem to be so many holes to find in the validation :) (cherry picked from commit 89ac71d38a4c49e1537e4afe2b34b2457d9817a7)
* Merge pull request #3455 from VPSrv/v2_3-patch-1Renato Botelho2017-02-011-0/+1
|\
| * vpn_openvpn_server: fix missing parameterNewEraCracker2017-01-311-0/+1
| |
* | Remove unused broken functionsdoktornotor2017-02-011-47/+0
|/ | | | | Not sure what was the idea here, but these are not used anywhere, do nothing as they immediately call ```return false;``` plus the second one is also misnamed. (cherry picked from commit edba33b5a567ab8c9d4827fa26a25bd9649e3fac)
* Fixed #7180Steve Beaver2017-01-311-1/+1
|
* Required fields for VPN pagesPhil Davis2017-01-319-64/+68
| | | | (cherry picked from commit 1bbdab13e436f5f2b9e381886be4d9c2d1a4e44f)
* Fix #7173 Interface Group Name cannot contain dashRenato Botelho2017-01-311-2/+2
|
* Add .zanata-cache to .gitignoreRenato Botelho2017-01-311-0/+1
|
* Required fields for System pagesPhil Davis2017-01-3016-87/+111
| | | | (cherry picked from commit 153c3aa61fe65c51d584a57c032a4805048e3062)
* Misc cleanups at get_pkg_info()stilez2017-01-301-34/+34
| | | | | | | | * rename function args to be clearer what they do ($local_only was quite ambiguous, at first sight it could mean any of: "don't update local catalog copy", "only check local catalog copy", or "only report local installed pkgs") * merge nested if () conditions * refactor minor code stuff * rewrite explanatory comment (cherry picked from commit 04daf8b1f016e17bede4ad00db46f2855d3e7c1f)
* fix copy/paste - I think!stilez2017-01-301-32/+6
| | | | (cherry picked from commit 2f633b526075b2ed5e0e160ef6f0d025b509bd70)
* use wrapped version of pkg info -e insteadstilez2017-01-301-5/+31
| | | | (cherry picked from commit e5f96a2cb3c0cad0c828148bd7b8d45c130a9b17)
* get_pkg_info() fallback using pkg info if no local copy of repo catalog ↵stilez2017-01-301-6/+34
| | | | | | | | | | | | | | | (resubmit) Resubmit of PR #3157 with fix. The issue in #3157 was that `pkg info` and `pkg search`, undocumented in man pages, seem to handle things differently if no packages match the pattern string. `pkg search` gives an error "No packages match [$pkgs]", whereas `pkg search` doesn't give an error. I didn't come across this because it's not stated in the man pages for pkg info, and because I tested it with a bare install but at least one pkg, while @NYOB used it on a bare install. The fix which I've tested and seems to work nicely, is to test using `pkg info -e` whether the pkg info call will hit a "no packages exist" issue or not. If `pkg info -e` returns 0 then it's safe as there's at least one matching pkg (any other errors are allowed to occur and be detected as usual). If it returns anything else, then there's no matching pkgs, so the main `pkg info` is skipped leaving $out and other variables at the correct values they need anyway, showing a null match/none found. For details of the underlying issue being fixed, and the issue that this resubmit fixes, see the original PR. (cherry picked from commit 587988f6df7e1d3b1a369b93a5634620129e3d9d)
* More required fields for NAT pagesPhil Davis2017-01-304-9/+9
| | | | (cherry picked from commit 877be5e6205ada2608b364f57150010ba473e66d)
* Required fields in NAT pagesPhil Davis2017-01-304-9/+9
| | | | (cherry picked from commit f2e58c16307795f572ff443e999c54eb6a9839e7)
* Required fields in diagnosticsPhil Davis2017-01-305-7/+7
| | | | (cherry picked from commit 3e2028f4dca359e715058d2c35ae0df5b939657e)
* More required fields for Interface pagesPhil Davis2017-01-306-9/+9
| | | | (cherry picked from commit fb572e810abe247c273c27ffafb129430b13be1f)
* Use gettext on Username and PasswordPhil Davis2017-01-301-2/+2
| | | | (cherry picked from commit e52b5a409faa41222a4ff0c917355eb66d0ff19a)
* Required fields in Interfaces pagesPhil Davis2017-01-309-27/+46
| | | | (cherry picked from commit 1095b20410963e748fe13268e6fa8f35ccce2319)
* Required fields in Status pagesPhil Davis2017-01-302-2/+2
| | | | (cherry picked from commit f311d3ba11572364488ee25ca9df08a33e42a089)
* Remaining required fields for Diag pagesPhil Davis2017-01-305-10/+10
| | | | (cherry picked from commit fe54f09154f4116ceea6897bff54a624f1eb63bc)
* Required fields for firewall*.phpPhil Davis2017-01-303-13/+23
| | | | (cherry picked from commit 8a1b5c561f93611b711eb4e7b58ccb4990577d8e)
* Required fields for Captive PortalPhil Davis2017-01-306-17/+17
| | | | (cherry picked from commit c06865be6de6b164d06ee9bb1768dfe6829d783c)
* Required fields in Services pagesPhil Davis2017-01-3020-47/+71
| | | | (cherry picked from commit 24b82516e0baac87316245427e870a36fbcda4ac)
* Fix indentationjskyboo2017-01-272-13/+13
| | | | (cherry picked from commit c18d0d12b3e683f07b4bac933240332cd4d95829)
* Changed max repeat alert to use sprintf get textjskyboo2017-01-271-1/+1
| | | | (cherry picked from commit 950342400bdc75b35c01442c400bd53a18015818)
* Bug #7164 Limit NTP time source fields to the maximum number saved to ↵jskyboo2017-01-272-2/+13
| | | | | | configuration. (cherry picked from commit 5a1d67b17d485697e19ef49d66e8e5f91e7e884d)
* Typo in pppoe_subnet input error messagePhil Davis2017-01-261-1/+1
| | | | (cherry picked from commit 01799e5bd5f363e21c744752760ab0cc591713da)
* Captive Portal auth method is requiredPhil Davis2017-01-251-2/+6
| | | | | | When creating a new Captive Portal Zone the user can fail to select any of the Authorization Method radio buttons. No default radio button is selected - that is probably good, as the user has to think and click to decide which authorization method they will use. But the form validation should check that some valid value is POSTed when the CP is enabled. (cherry picked from commit 0ee22f364ca62b8305ff36447954dacdbc3c3cce)
OpenPOWER on IntegriCloud