Added setting for proxy exceptions. xibosignage/xibo#465.

install/database/87.sql

@@ -1,6 +1,11 @@
 ALTER TABLE  `display` CHANGE  `storageAvailableSpace`  `storageAvailableSpace` BIGINT NULL DEFAULT NULL ,
 CHANGE  `storageTotalSpace`  `storageTotalSpace` BIGINT NULL DEFAULT NULL;
 
+INSERT INTO  `setting` (`setting` ,`value` ,`fieldType` ,`helptext` ,`options` ,`cat` ,`userChange` ,`title` ,`validation` ,`ordering` ,`default` ,`userSee` ,`type`)
+VALUES (
+  'PROXY_EXCEPTIONS', '', 'text', 'Hosts that should not be loaded via the Proxy Specified. These should be comma separated.', '', 'network', 1, 'Proxy Exceptions',  '',  '32',  '',  '1',  'text'
+);
+
 UPDATE `version` SET `app_ver` = '1.7.3', `XmdsVersion` = 4, `XlfVersion` = 2;
 UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
 UPDATE `version` SET `DBVersion` = '87';

install/master/data.sql

@@ -273,7 +273,8 @@ INSERT INTO `setting` (`settingid`, `setting`, `value`, `fieldType`, `helptext`,
 (81, 'CALENDAR_TYPE', 'Gregorian', 'dropdown', 'Which Calendar Type should the CMS use?', 'Gregorian|Jalali', 'regional', 1, 'Calendar Type', '', 50, 'Gregorian', 1, 'string'),
 (82, 'DASHBOARD_LATEST_NEWS_ENABLED', '1', 'checkbox', 'Should the Dashboard show latest news? The address is provided by the theme.', '', 'general', 1, 'Enable Latest News?', '', 110, '1', 1, 'checkbox'),
 (83, 'LIBRARY_MEDIA_DELETEOLDVER_CHECKB','Unchecked','dropdown','Default the checkbox for Deleting Old Version of media when a new file is being uploaded to the library.','Checked|Unchecked','defaults',1,'Default for "Delete old version of Media" checkbox. Shown when Editing Library Media.', '', 50, 'Unchecked', 1, 'dropdown'),
-(84, 'USE_INTL_DATEFORMAT', '0', 'checkbox', 'Should dates be internationalised where possible.', '', 'regional', 1, 'Show international dates?', '', 60, '0', 1, 'checkbox');
+(84, 'USE_INTL_DATEFORMAT', '0', 'checkbox', 'Should dates be internationalised where possible.', '', 'regional', 1, 'Show international dates?', '', 60, '0', 1, 'checkbox'),
+(85, 'PROXY_EXCEPTIONS', '', 'text', 'Hosts that should not be loaded via the Proxy Specified. These should be comma separated.', '', 'network', 1, 'Proxy Exceptions', '', 32, '', 1, 'text');
 
 INSERT INTO `usertype` (`usertypeid`, `usertype`) VALUES
 (1, 'Super Admin'),

locale/dbtranslate.php

@@ -125,8 +125,10 @@
 echo __('Set the level of logging the CMS should record. In production systems "error" is recommended.');
 echo __('Which Calendar Type should the CMS use?');
 echo __('Enable Latest News?');
-echo __('Default for "Delete old version of Media" checkbox. Showen when Editing Library Media.');
+echo __('Default for "Delete old version of Media" checkbox. Shown when Editing Library Media.');
 echo __('Should the Dashboard show latest news? The address is provided by the theme.');
+echo __('Proxy Exceptions');
+echo __('Hosts that should not be loaded via the Proxy Specified. These should be comma separated.');
 
 // Transitions
 echo __('Fade In');