diff --git a/wire/core/Session.php b/wire/core/Session.php index 6e954056..69afc7c1 100644 --- a/wire/core/Session.php +++ b/wire/core/Session.php @@ -906,8 +906,9 @@ class Session extends Wire implements \IteratorAggregate { if(!$user || !$user instanceof User) { $name = $this->wire('sanitizer')->pageNameUTF8($name); $user = $this->wire('users')->get("name=" . $this->wire('sanitizer')->selectorValue($name)); - if(!$user || !$user->id) return false; } + if(!$user || !$user->id || !$user instanceof User) return false; + if($user->isGuest()) return false; $xroles = $this->wire('config')->loginDisabledRoles; if(!is_array($xroles) && !empty($xroles)) $xroles = array($xroles); if($name) {} diff --git a/wire/modules/Fieldtype/FieldtypeModule.module b/wire/modules/Fieldtype/FieldtypeModule.module index 345295d2..792476df 100644 --- a/wire/modules/Fieldtype/FieldtypeModule.module +++ b/wire/modules/Fieldtype/FieldtypeModule.module @@ -87,8 +87,12 @@ class FieldtypeModule extends Fieldtype { } if(!$found) continue; if($field->labelField == 'title') { - $info = $this->wire('modules')->getModuleInfo($module); + $info = $this->wire('modules')->getModuleInfo($module); $label = !empty($info['title']) ? $info['title'] : (string) $module; + } else if($field->labelField == 'title-summary') { + $info = $this->wire('modules')->getModuleInfoVerbose($module); + $label = !empty($info['title']) ? $info['title'] : (string) $module; + if(!empty($info['summary'])) $label .= " [span.detail] • " . $info['summary'] . ' [/span]'; } else { $label = (string) $module; } @@ -151,8 +155,9 @@ class FieldtypeModule extends Fieldtype { $f = $this->modules->get('InputfieldRadios'); $f->label = $this->_('Options Label'); $f->attr('name', 'labelField'); - $f->addOption('', $this->_('Module Class Name')); - $f->addOption('title', $this->_('Module Title')); + $f->addOption('', $this->_('Name')); + $f->addOption('title', $this->_('Title')); + $f->addOption('title-summary', $this->_('Title and summary')); $f->attr('value', $field->labelField); $f->columnWidth = 50; $inputfields->add($f);