let users set their SSL logo through the admin panel
This commit is contained in:
parent
1a4dc03bfe
commit
fc6711327b
@ -140,7 +140,7 @@ class DesignadminpanelAction extends AdminPanelAction
|
|||||||
$themeChanged = ($this->trimmed('theme') != $oldtheme);
|
$themeChanged = ($this->trimmed('theme') != $oldtheme);
|
||||||
}
|
}
|
||||||
|
|
||||||
static $settings = array('theme', 'logo');
|
static $settings = array('theme', 'logo', 'ssllogo');
|
||||||
|
|
||||||
$values = array();
|
$values = array();
|
||||||
|
|
||||||
@ -230,6 +230,7 @@ class DesignadminpanelAction extends AdminPanelAction
|
|||||||
function restoreDefaults()
|
function restoreDefaults()
|
||||||
{
|
{
|
||||||
$this->deleteSetting('site', 'logo');
|
$this->deleteSetting('site', 'logo');
|
||||||
|
$this->deleteSetting('site', 'ssllogo');
|
||||||
$this->deleteSetting('site', 'theme');
|
$this->deleteSetting('site', 'theme');
|
||||||
|
|
||||||
$settings = array(
|
$settings = array(
|
||||||
@ -331,6 +332,11 @@ class DesignadminpanelAction extends AdminPanelAction
|
|||||||
$this->clientError(_('Invalid logo URL.'));
|
$this->clientError(_('Invalid logo URL.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!empty($values['ssllogo']) &&
|
||||||
|
!Validate::uri($values['ssllogo'], array('allowed_schemes' => array('https')))) {
|
||||||
|
$this->clientError(_('Invalid SSL logo URL.'));
|
||||||
|
}
|
||||||
|
|
||||||
if (!in_array($values['theme'], Theme::listAvailable())) {
|
if (!in_array($values['theme'], Theme::listAvailable())) {
|
||||||
$this->clientError(sprintf(_("Theme not available: %s."), $values['theme']));
|
$this->clientError(sprintf(_("Theme not available: %s."), $values['theme']));
|
||||||
}
|
}
|
||||||
@ -444,6 +450,10 @@ class DesignAdminPanelForm extends AdminForm
|
|||||||
$this->input('logo', _('Site logo'), 'Logo for the site (full URL)');
|
$this->input('logo', _('Site logo'), 'Logo for the site (full URL)');
|
||||||
$this->unli();
|
$this->unli();
|
||||||
|
|
||||||
|
$this->li();
|
||||||
|
$this->input('ssllogo', _('SSL logo'), 'Logo to show on SSL pages');
|
||||||
|
$this->unli();
|
||||||
|
|
||||||
$this->out->elementEnd('ul');
|
$this->out->elementEnd('ul');
|
||||||
|
|
||||||
$this->out->elementEnd('fieldset');
|
$this->out->elementEnd('fieldset');
|
||||||
|
Loading…
Reference in New Issue
Block a user