summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2454 from phil-davis/patch-2Renato Botelho2016-01-181-22/+24
|\
| * diag_testport change some tabs to spacePhil Davis2016-01-181-2/+2
| |
| * diag_testport alert message logic re-factoringPhil Davis2016-01-181-21/+20
| | | | | | as suggested by @rbgarga
| * Rationalize message display on diag_testportPhil Davis2016-01-171-23/+26
| | | | | | | | | | | | 1) The logic of the various tests that determined which messages were displayed was all a bit odd, and there were ways that things could happen and no message was displayed. Now it displays the "warning" information message the first time, and 1 of the 4 possible result messages depending on the result status and if showtest was on. 2) Internationalize - put the gettext() into calls with full sentences and sprintf() wrappers as necessary. Now I can get each of the 4 possible result messages, and always get a result message.
* | Merge pull request #2456 from phil-davis/gt2Renato Botelho2016-01-183-5/+5
|\ \
| * | Internationalize remaining diag* codePhil Davis2016-01-173-5/+5
| | |
* | | Merge pull request #2458 from phil-davis/gt3Renato Botelho2016-01-182-8/+8
|\ \ \
| * | | Internationalize edit and execPhil Davis2016-01-172-8/+8
| |/ / | | | | | | | | | Note: in the end, edit.php has only whitespace format changes.
* | | Merge pull request #2460 from NOYB/Firewall_/_Schedules_/_Edit_-_Add_Minutes_45Renato Botelho2016-01-181-2/+2
|\ \ \
| * | | Firewall / Schedules / Edit - Add Minutes 45NOYB2016-01-181-2/+2
| | | |
* | | | Merge pull request #2461 from NewEraCracker/php-standardsRenato Botelho2016-01-181-7/+9
|\ \ \ \
| * | | | Minor corrections to guiconfig.incNewEraCracker2016-01-181-7/+9
| |/ / / | | | | | | | | | | | | Set logarr as array() per default, default invert to empty string, improve variable representation within strings
* | | | Merge pull request #2462 from NOYB/Alias_Name_ConsistencyRenato Botelho2016-01-182-3/+3
|\ \ \ \
| * | | | fix typoNOYB2016-01-181-1/+1
| | | | |
| * | | | s/schedule/aliasNOYB2016-01-181-1/+1
| | | | |
| * | | | Alias name consistency in Firewall alias edit and schedules edit.NOYB2016-01-182-3/+3
| |/ / /
* | | | Revert "add all of /usr/local/lib/lighttpd to obsoletedfiles"Renato Botelho2016-01-181-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | pfBlockerNG is going to use lighttpd This reverts commit c74719cde73c8ce19465e1887f8c519c4818147c.
* | | | Revert "Add more lighttpd pieces to obsoletedfiles list"Renato Botelho2016-01-181-5/+0
|/ / / | | | | | | | | | | | | | | | pfBlockerNG is going to use lighttpd This reverts commit 4bebb56a23658eac8791df7c1a44927e66c6d51c.
* | | Show interface description in traffic graph widget settingsPhil Davis2016-01-181-1/+1
| | | | | | | | | Forum: https://forum.pfsense.org/index.php?topic=105448.0
* | | Test for an array here to avoid an error if the var isn't an arrayjim-p2016-01-171-0/+3
| | |
* | | Put this htmlspecialchars back, I found a better workaround for the ↵jim-p2016-01-171-1/+1
| | | | | | | | | | | | inconsistent handling of checkboxes in packages.
* | | Merge pull request #2458 from phil-davis/patch-5Stephen Beaver2016-01-171-13/+16
|\ \ \
| * | | Fix easyrule fbegin.inc echoed textPhil Davis2016-01-171-13/+16
| | |/ | |/| | | | | | | | | | | | | | | | If you manually navigate directly to easyrule.php you get a bit of rubbish text displayed before the actual message about "This is the Easy Rule status page...". That is due to having too many closing PHP tags. Also, fbegin.inc does not need to be included anyway. I also changed the message to be in a print_info_box() warning and sorted the internationalization a bit more. There could be a bit more formatting done here after this - the page has a help icon that looks a bit lonely without the other usual panel-heading panel-title stuff.
* | | Cleanup of diag_traceroutePhil Davis2016-01-171-35/+34
|/ / | | | | | | | | | | | | 1) Internationalize 2) If there was a problem, then display it with print_info_box() up the top of the page. 3) Redisplay the user-selected IP protocol and source IP after a test. Previously those user selections always got reset to IPv4, any. 4) Remove some useless code that unset($do_traceroute) when it had happily been set to false a little earlier. 5) Remove some useless code that set $host when it had already been set a little earlier.
* | Merge pull request #2451 from ↵Stephen Beaver2016-01-171-2/+10
|\ \ | | | | | | | | | NOYB/Status_/_System_Logs_-_Raw_Mode_Search_Inversion
| * | Status / System Logs - Raw Mode Search InversionNOYB2016-01-171-2/+10
| |/ | | | | | | Add search inversion to dump_clog and dump_clog_no_table functions for raw mode logs filter.
* | Merge pull request #2452 from heper/patch-1Stephen Beaver2016-01-171-1/+1
|\ \
| * | fix Bug #5776heper2016-01-171-1/+1
| |/
* | Fix inconsistencies in Form_InputSjon Hortensius2016-01-172-4/+4
|/ | | | | renamed get_type to getType fix capitalisation in getTagName
* Fix dns test for localhost inclusion, when saving now the port value can be ↵jim-p2016-01-161-2/+2
| | | | set but empty. Fixes #5775
* Final Fixd #5774Stephen Beaver2016-01-161-5/+3
|
* Temporarily fixed #5774Stephen Beaver2016-01-161-1/+1
|
* Don't run the checkbox label through htmlspecialchars, it breaks several ↵jim-p2016-01-161-1/+1
| | | | packages.
* Don't automatically run strings that are too long through gettext here.jim-p2016-01-161-1/+6
|
* Allow /31 to be used for CARP IPs. Ticket #5533Chris Buechler2016-01-151-1/+1
|
* Reverting change of label. It broke the displayStephen Beaver2016-01-151-3/+3
|
* Revise sorting to accommodate firewall logs name (logs)Stephen Beaver2016-01-151-1/+6
|
* Fix graph scale settingStephen Beaver2016-01-151-2/+2
|
* Reverting #5771 - No longer requiredStephen Beaver2016-01-151-20/+7
|
* Fix typoStephen Beaver2016-01-151-1/+1
|
* Fixed #5771Stephen Beaver2016-01-151-7/+20
| | | | EXCEPT that the link in the help text does not point to the correct place (yet)
* Merge pull request #2448 from phil-davis/gt1Renato Botelho2016-01-157-21/+21
|\
| * Internationalization batch 1Phil Davis2016-01-167-21/+21
| |
* | Display additional ooptions if value not emptyStephen Beaver2016-01-151-3/+7
| |
* | Merge pull request #2447 from phil-davis/patch-7Renato Botelho2016-01-151-3/+3
|\ \
| * | Internationalization of diag_defaultsPhil Davis2016-01-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of typical fixes here: 1) Actually wrap the "Are you sure...?" question in gettext() 2) Use a single gettext() call combined with sprintf() and %s etc to construct a sentence in a single go. 3) Use %s rather than just appending a variable at the end of a sentence of text. That way there is no assumption that the variable text must go at the end in every language. Once I have got the feel of the variations I come across, I will make myself a branch and change a whole bunch of files. But for now I have submitted a few things individually so it is easy for people to comment and give any helpful advice on how to do it better, before I go editing lots of files. IMHO it will be good to cleanup and optimize the internationalized code, then life should be easier for future translators.
* | | Merge pull request #2446 from phil-davis/patch-6Renato Botelho2016-01-151-1/+1
|\ \ \
| * | | diag_confbak make a single gettextPhil Davis2016-01-151-1/+1
| |/ / | | | | | | | | | | | | Sentences that are constructed in pieces like this are a potential problem for translation, if the target language needs to use a different grammatical word order. e.g. in Nepali we would say datetime-dekhi datetime-samma (datetime-from datetime-to). Organize it into a single gettext() that has the whole sentence in one go with numbering of the parameters so they can also be potentially re-ordered as needed in a translation. I am having a look at a few places where the gettext() translation is missing, and noticed this kind of thing also. When I see this sort of sentence construction using sentence fragments built up with multiple gettext() calls I will fix them up like this and make PRs.
* | | Fixed #5772Stephen Beaver2016-01-151-58/+42
|/ /
* | Fixes some hide/show issues. An lucky bug in 2.2 was not duplicated in 2.3 ↵Stephen Beaver2016-01-151-8/+5
| | | | | | | | so the page operated as written rather that as desired.
OpenPOWER on IntegriCloud