Skip to content
Snippets Groups Projects
Commit 437a8990 authored by totten's avatar totten
Browse files

CRM-11160 - verifySSL - Display warning next to this config option

----------------------------------------
* CRM-11160:
  http://issues.civicrm.org/jira/browse/CRM-11160
parent c107abd0
No related branches found
No related tags found
No related merge requests found
......@@ -49,6 +49,9 @@ class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
*/
public function buildQuickForm() {
CRM_Utils_System::setTitle(ts('Settings - Resource URLs'));
$settingFields = civicrm_api('setting', 'getfields', array(
'version' => 3
));
$this->addElement('text', 'userFrameworkResourceURL', ts('CiviCRM Resource URL'));
$this->addElement('text', 'imageUploadURL', ts('Image Upload URL'));
......@@ -56,6 +59,8 @@ class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
$this->addElement('text', 'extensionsURL', ts('Extension Resource URL'));
$this->addYesNo('enableSSL', ts('Force Secure URLs (SSL)'));
$this->addYesNo('verifySSL', ts('Verify SSL Certs'));
// FIXME: verifySSL should use $_settings instead of manually adding fields
$this->assign('verifySSL_description', $settingFields['values']['verifySSL']['description']);
$this->addFormRule(array('CRM_Admin_Form_Setting_Url', 'formRule'));
......
......@@ -74,7 +74,8 @@
{$form.verifySSL.label}
</td>
<td>
{$form.verifySSL.html} {help id='id-verify_ssl'}
{$form.verifySSL.html} {help id='id-verify_ssl'}<br/>
<p class="description font-red">{ts}{$verifySSL_description}{/ts}</p>
</td>
</tr>
<tr class="crm-miscellaneous-form-block-cvv-backoffice-required">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment