diff --git a/wire/core/AdminTheme.php b/wire/core/AdminTheme.php
index 5e82906d..951960e0 100644
--- a/wire/core/AdminTheme.php
+++ b/wire/core/AdminTheme.php
@@ -98,6 +98,8 @@ abstract class AdminTheme extends WireData implements Module {
* Initialize the admin theme systme and determine which admin theme should be used
*
* All admin themes must call this init() method to register themselves.
+ *
+ * Note: this should be called after API ready.
*
*/
public function init() {
@@ -116,6 +118,11 @@ abstract class AdminTheme extends WireData implements Module {
// if admin theme has already been set, then no need to continue
if($this->wire('adminTheme')) return;
+ /** @var Config $config */
+ $config = $this->wire('config');
+ /** @var Session $session */
+ $session = $this->wire('session');
+ /** @var string $adminTheme */
$adminTheme = $this->wire('user')->admin_theme;
if($adminTheme) {
@@ -129,19 +136,20 @@ abstract class AdminTheme extends WireData implements Module {
}
// adjust $config adminThumbOptions[scale] for auto detect when requested
- $o = $this->wire('config')->adminThumbOptions;
+ $o = $config->adminThumbOptions;
if($o && isset($o['scale']) && $o['scale'] === 1) {
- $o['scale'] = $this->wire('session')->hidpi ? 0.5 : 1.0;
- $this->wire('config')->adminThumbOptions = $o;
+ $o['scale'] = $session->hidpi ? 0.5 : 1.0;
+ $config->adminThumbOptions = $o;
}
- $this->config->js('modals', $this->config->modals);
+ $config->js('modals', $config->modals);
+
+ if($session->hidpi) $this->addBodyClass('hidpi-device');
+ if($session->touch) $this->addBodyClass('touch-device');
- if($this->wire('session')->hidpi) $this->addBodyClass('hidpi-device');
- if($this->wire('session')->touch) $this->addBodyClass('touch-device');
$this->addBodyClass($this->className());
}
-
+
public function get($key) {
if($key == 'version') return $this->version;
return parent::get($key);
diff --git a/wire/core/AdminThemeFramework.php b/wire/core/AdminThemeFramework.php
index 45d0a4e9..ca9dba3d 100644
--- a/wire/core/AdminThemeFramework.php
+++ b/wire/core/AdminThemeFramework.php
@@ -84,6 +84,8 @@ abstract class AdminThemeFramework extends AdminTheme {
/**
* Initialize and attach hooks
+ *
+ * Note: descending classes should call this after API ready
*
*/
public function init() {
@@ -98,13 +100,32 @@ abstract class AdminThemeFramework extends AdminTheme {
$this->isLoggedIn = $user->isLoggedin();
$this->isSuperuser = $this->isLoggedIn && $user->isSuperuser();
$this->isEditor = $this->isLoggedIn && ($this->isSuperuser || $user->hasPermission('page-edit'));
+ $this->includeInitFile();
$modal = $this->wire('input')->get('modal');
if($modal) $this->isModal = $modal == 'inline' ? 'inline' : true;
// test notices when requested
- if($this->wire('input')->get('test_notices')) $this->testNotices();
+ if($this->wire('input')->get('test_notices') && $this->isLoggedIn) $this->testNotices();
}
+
+ /**
+ * Include the admin theme init file
+ *
+ */
+ public function includeInitFile() {
+ $config = $this->wire('config');
+ $initFile = $config->paths->adminTemplates . 'init.php';
+ if(file_exists($initFile)) {
+ if(strpos($initFile, $config->paths->site) === 0) {
+ // admin themes in /site/modules/ may be compiled
+ $initFile = $this->wire('files')->compile($initFile);
+ }
+ /** @noinspection PhpIncludeInspection */
+ include_once($initFile);
+ }
+ }
+
/**
* Perform a translation, based on text from shared admin file: /wire/templates-admin/default.php
@@ -584,10 +605,12 @@ abstract class AdminThemeFramework extends AdminTheme {
// if(!count($notices)) return '';
+ /*
if($this->isLoggedIn && $this->wire('modules')->isInstalled('SystemNotifications')) {
$systemNotifications = $this->wire('modules')->get('SystemNotifications');
if(!$systemNotifications->placement) return '';
}
+ */
$defaults = array(
'messageClass' => 'NoticeMessage', // class for messages
diff --git a/wire/core/Modules.php b/wire/core/Modules.php
index 307afcaf..ce93ed00 100644
--- a/wire/core/Modules.php
+++ b/wire/core/Modules.php
@@ -742,8 +742,6 @@ class Modules extends WireArray {
/**
* Retrieve the installed module info as stored in the database
*
- * @return array Indexed by module class name => array of module info
- *
*/
protected function loadModulesTable() {
$database = $this->wire('database');
@@ -2648,8 +2646,11 @@ class Modules extends WireArray {
// if $info[requires] or $info[installs] isn't already an array, make it one
if(!is_array($info['requires'])) {
$info['requires'] = str_replace(' ', '', $info['requires']); // remove whitespace
- if(strpos($info['requires'], ',') !== false) $info['requires'] = explode(',', $info['requires']);
- else $info['requires'] = array($info['requires']);
+ if(strpos($info['requires'], ',') !== false) {
+ $info['requires'] = explode(',', $info['requires']);
+ } else {
+ $info['requires'] = array($info['requires']);
+ }
}
// populate requiresVersions
@@ -2669,8 +2670,11 @@ class Modules extends WireArray {
// what does it install?
if(!is_array($info['installs'])) {
$info['installs'] = str_replace(' ', '', $info['installs']); // remove whitespace
- if(strpos($info['installs'], ',') !== false) $info['installs'] = explode(',', $info['installs']);
- else $info['installs'] = array($info['installs']);
+ if(strpos($info['installs'], ',') !== false) {
+ $info['installs'] = explode(',', $info['installs']);
+ } else {
+ $info['installs'] = array($info['installs']);
+ }
}
// misc
diff --git a/wire/core/ProcessWire.php b/wire/core/ProcessWire.php
index 2db741a0..dc786642 100644
--- a/wire/core/ProcessWire.php
+++ b/wire/core/ProcessWire.php
@@ -45,7 +45,7 @@ class ProcessWire extends Wire {
* Reversion revision number
*
*/
- const versionRevision = 77;
+ const versionRevision = 78;
/**
* Version suffix string (when applicable)
diff --git a/wire/core/admin.php b/wire/core/admin.php
index 538a4cd9..e10d0ca0 100644
--- a/wire/core/admin.php
+++ b/wire/core/admin.php
@@ -107,7 +107,7 @@ if($page->process && $page->process != 'ProcessPageView') {
$initFile = $wire->files->compile($initFile);
}
/** @noinspection PhpIncludeInspection */
- include($initFile);
+ include_once($initFile);
}
if($input->get('modal')) $session->addHookBefore('redirect', null, '_hookSessionRedirectModal');
$content = $controller->execute();
diff --git a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module
index 14a7c14e..adc662a4 100644
--- a/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module
+++ b/wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module
@@ -49,6 +49,9 @@
* @property string $subfieldIdentifier ...
* @property string $groupIdentifier (1)
* @property int $maxUsers [20] Maximum number of users selectable. If more than regular text input used rather than select.
+ * @property string $selectClass
+ * @property string $inputClass
+ * @property string $checkboxClass
*
*
*/
@@ -131,6 +134,13 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
*/
protected $initTemplate = null;
+ /**
+ * Has the ready method been called?
+ * @var bool
+ *
+ */
+ protected $isReady = false;
+
/**
* Variable names that should be picked up through the session each time
*
@@ -202,7 +212,7 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
$this->setting('timeFormat', $this->_('H:i')); // time format
$this->setting('timePlaceholder', $this->_('hh:mm')); // time format placeholder (what users see)
$this->setting('maxUsers', 20); // text input rather than select used when useres qty is greater than this
-
+
parent::__construct();
}
@@ -247,6 +257,21 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
*
*/
public function ready() {
+
+ if($this->isReady) return;
+ $this->isReady = true;
+
+ // settings specified in $config->InputfieldSelector
+ $configDefaults = array(
+ 'selectClass' => '',
+ 'inputClass' => '',
+ 'checkboxClass' => '',
+ );
+ $configSettings = $this->wire('config')->InputfieldSelector;
+ $configSettings = is_array($configSettings) ? array_merge($configDefaults, $configSettings) : $configDefaults;
+ foreach($configSettings as $key => $value) {
+ $this->setting($key, $value);
+ }
$input = $this->wire('input');
$name = $input->get('name');
@@ -902,7 +927,8 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
$outSections['adjust'] = "";
$inputName = $this->attr('name') . "__" . $settings['name'] . "[]";
- $out = "