Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR Reduced unnecessary autoloading

  • Loading branch information...
commit 7d245c3803b260c4cd9e23da407982edda1ea82d 1 parent 255c110
@chillu chillu authored
View
13 admin/code/CMSMenu.php
@@ -290,14 +290,13 @@ public static function get_cms_classes($root = 'LeftAndMain', $recursive = true)
$subClasses = array_unique($subClasses);
foreach($subClasses as $key => $className) {
// Remove abstract classes and LeftAndMain
- $classReflection = new ReflectionClass($className);
- if(
- !$classReflection->isInstantiable()
- || 'LeftAndMain' == $className
- || ClassInfo::classImplements($className, 'TestOnly')
- ) {
+ if('LeftAndMain' == $className || ClassInfo::classImplements($className, 'TestOnly')) {
unset($subClasses[$key]);
- }
+ } else {
+ // Separate conditional to avoid autoloading the class
+ $classReflection = new ReflectionClass($className);
+ if(!$classReflection->isInstantiable()) unset($subClasses[$key]);
+ }
}
return $subClasses;
View
109 forms/MemberDatetimeOptionsetField.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package sapphire
+ * @subpackage security
+ */
+class MemberDatetimeOptionsetField extends OptionsetField {
+
+ function Field() {
+ Requirements::javascript(THIRDPARTY_DIR . '/thirdparty/jquery/jquery.js');
+ Requirements::javascript(SAPPHIRE_DIR . '/javascript/MemberDatetimeOptionsetField.js');
+
+ $options = '';
+ $odd = 0;
+ $source = $this->getSource();
+
+ foreach($source as $key => $value) {
+ // convert the ID to an HTML safe value (dots are not replaced, as they are valid in an ID attribute)
+ $itemID = $this->id() . '_' . preg_replace('/[^\.a-zA-Z0-9\-\_]/', '_', $key);
+ if($key == $this->value) {
+ $useValue = false;
+ $checked = " checked=\"checked\"";
+ } else {
+ $checked = "";
+ }
+
+ $odd = ($odd + 1) % 2;
+ $extraClass = $odd ? "odd" : "even";
+ $extraClass .= " val" . preg_replace('/[^a-zA-Z0-9\-\_]/', '_', $key);
+ $disabled = ($this->disabled || in_array($key, $this->disabledItems)) ? "disabled=\"disabled\"" : "";
+ $ATT_key = Convert::raw2att($key);
+
+ $options .= "<li class=\"".$extraClass."\"><input id=\"$itemID\" name=\"$this->name\" type=\"radio\" value=\"$key\"$checked $disabled class=\"radio\" /> <label title=\"$ATT_key\" for=\"$itemID\">$value</label></li>\n";
+ }
+
+ // Add "custom" input field
+ $value = ($this->value && !array_key_exists($this->value, $this->source)) ? $this->value : null;
+ $checked = ($value) ? " checked=\"checked\"" : '';
+ $options .= "<li class=\"valCustom\">"
+ . sprintf("<input id=\"%s_custom\" name=\"%s\" type=\"radio\" value=\"__custom__\" class=\"radio\" %s />", $itemID, $this->name, $checked)
+ . sprintf('<label for="%s_custom">%s:</label>', $itemID, _t('MemberDatetimeOptionsetField.Custom', 'Custom'))
+ . sprintf("<input class=\"customFormat\" name=\"%s_custom\" value=\"%s\" />\n", $this->name, $value)
+ . sprintf("<input type=\"hidden\" class=\"formatValidationURL\" value=\"%s\" />", $this->Link() . '/validate');
+ $options .= ($value) ? sprintf(
+ '<span class="preview">(%s: "%s")</span>',
+ _t('MemberDatetimeOptionsetField.Preview', 'Preview'),
+ Zend_Date::now()->toString($value)
+ ) : '';
+ $options .= "<a class=\"formattingHelpToggle\" href=\"#\">" . _t('MemberDatetimeOptionsetField.TOGGLEHELP', 'Toggle formatting help') . "</a>";
+ $options .= "<div class=\"formattingHelpText\">";
+ $options .= $this->getFormattingHelpText();
+ $options .= "</div>";
+ $options .= "</li>\n";
+
+ $id = $this->id();
+ return "<ul id=\"$id\" class=\"optionset {$this->extraClass()}\">\n$options</ul>\n";
+ }
+
+ /**
+ * @todo Put this text into a template?
+ */
+ function getFormattingHelpText() {
+ $output = '<ul>';
+ $output .= '<li>YYYY = ' . _t('MemberDatetimeOptionsetField.FOURDIGITYEAR', 'Four-digit year', 40, 'Help text describing what "YYYY" means in ISO date formatting') . '</li>';
+ $output .= '<li>YY = ' . _t('MemberDatetimeOptionsetField.TWODIGITYEAR', 'Two-digit year', 40, 'Help text describing what "YY" means in ISO date formatting') . '</li>';
+ $output .= '<li>MMMM = ' . _t('MemberDatetimeOptionsetField.FULLNAMEMONTH', 'Full name of month (e.g. June)', 40, 'Help text describing what "MMMM" means in ISO date formatting') . '</li>';
+ $output .= '<li>MMM = ' . _t('MemberDatetimeOptionsetField.SHORTMONTH', 'Short name of month (e.g. Jun)', 40, 'Help text letting describing what "MMM" means in ISO date formatting') . '</li>';
+ $output .= '<li>MM = ' . _t('MemberDatetimeOptionsetField.TWODIGITMONTH', 'Two-digit month (01=January, etc.)', 40, 'Help text describing what "MM" means in ISO date formatting') . '</li>';
+ $output .= '<li>M = ' . _t('MemberDatetimeOptionsetField.MONTHNOLEADING', 'Month digit without leading zero', 40, 'Help text describing what "M" means in ISO date formatting') . '</li>';
+ $output .= '<li>dd = ' . _t('MemberDatetimeOptionsetField.TWODIGITDAY', 'Two-digit day of month', 40, 'Help text describing what "dd" means in ISO date formatting') . '</li>';
+ $output .= '<li>d = ' . _t('MemberDatetimeOptionsetField.DAYNOLEADING', 'Day of month without leading zero', 40, 'Help text describing what "d" means in ISO date formatting') . '</li>';
+ $output .= '<li>hh = ' . _t('MemberDatetimeOptionsetField.TWODIGITHOUR', 'Two digits of hour (00 through 23)', 40, 'Help text describing what "hh" means in ISO date formatting') . '</li>';
+ $output .= '<li>h = ' . _t('MemberDatetimeOptionsetField.HOURNOLEADING', 'Hour without leading zero', 40, 'Help text describing what "h" means in ISO date formatting') . '</li>';
+ $output .= '<li>mm = ' . _t('MemberDatetimeOptionsetField.TWODIGITMINUTE', 'Two digits of minute (00 through 59)', 40, 'Help text describing what "mm" means in ISO date formatting') . '</li>';
+ $output .= '<li>m = ' . _t('MemberDatetimeOptionsetField.MINUTENOLEADING', 'Minute without leading zero', 40, 'Help text describing what "m" means in ISO date formatting') . '</li>';
+ $output .= '<li>ss = ' . _t('MemberDatetimeOptionsetField.TWODIGITSECOND', 'Two digits of second (00 through 59)', 40, 'Help text describing what "ss" means in ISO date formatting') . '</li>';
+ $output .= '<li>s = ' . _t('MemberDatetimeOptionsetField.DIGITSDECFRACTIONSECOND', 'One or more digits representing a decimal fraction of a second', 40, 'Help text describing what "s" means in ISO date formatting') . '</li>';
+ $output .= '<li>a = ' . _t('MemberDatetimeOptionsetField.AMORPM', 'AM (Ante meridiem) or PM (Post meridiem)', 40, 'Help text describing what "a" means in ISO date formatting') . '</li>';
+ $output .= '</ul>';
+ return $output;
+ }
+
+ function setValue($value) {
+ if($value == '__custom__') {
+ $value = isset($_REQUEST[$this->name . '_custom']) ? $_REQUEST[$this->name . '_custom'] : null;
+ }
+ if($value) {
+ parent::setValue($value);
+ }
+ }
+
+ function validate() {
+ $value = isset($_POST[$this->name . '_custom']) ? $_POST[$this->name . '_custom'] : null;
+ if(!$value) return true; // no custom value, don't validate
+
+ // Check that the current date with the date format is valid or not
+ $validator = $this->form ? $this->form->getValidator() : null;
+ require_once 'Zend/Date.php';
+ $date = Zend_Date::now()->toString($value);
+ $valid = Zend_Date::isDate($date, $value);
+ if($valid) {
+ return true;
+ } else {
+ if($validator) {
+ $validator->validationError($this->name, _t('MemberDatetimeOptionsetField.DATEFORMATBAD',"Date format is invalid"), "validation", false);
+ }
+ return false;
+ }
+ }
+}
View
112 security/Member.php
@@ -1173,7 +1173,7 @@ public function getCMSFields() {
$dateFormatMap[$defaultDateFormat] = Zend_Date::now()->toString($defaultDateFormat)
. sprintf(' (%s)', _t('Member.DefaultDateTime', 'default'));
$mainFields->push(
- $dateFormatField = new Member_DatetimeOptionsetField(
+ $dateFormatField = new MemberDatetimeOptionsetField(
'DateFormat',
$this->fieldLabel('DateFormat'),
$dateFormatMap
@@ -1189,7 +1189,7 @@ public function getCMSFields() {
$timeFormatMap[$defaultTimeFormat] = Zend_Date::now()->toString($defaultTimeFormat)
. sprintf(' (%s)', _t('Member.DefaultDateTime', 'default'));
$mainFields->push(
- $timeFormatField = new Member_DatetimeOptionsetField(
+ $timeFormatField = new MemberDatetimeOptionsetField(
'TimeFormat',
$this->fieldLabel('TimeFormat'),
$timeFormatMap
@@ -1781,112 +1781,4 @@ function javascript() {
return $js;
}
-}
-/**
- * @package sapphire
- * @subpackage security
- */
-class Member_DatetimeOptionsetField extends OptionsetField {
-
- function Field() {
- Requirements::javascript(THIRDPARTY_DIR . '/thirdparty/jquery/jquery.js');
- Requirements::javascript(SAPPHIRE_DIR . '/javascript/MemberDatetimeOptionsetField.js');
-
- $options = '';
- $odd = 0;
- $source = $this->getSource();
-
- foreach($source as $key => $value) {
- // convert the ID to an HTML safe value (dots are not replaced, as they are valid in an ID attribute)
- $itemID = $this->id() . '_' . preg_replace('/[^\.a-zA-Z0-9\-\_]/', '_', $key);
- if($key == $this->value) {
- $useValue = false;
- $checked = " checked=\"checked\"";
- } else {
- $checked = "";
- }
-
- $odd = ($odd + 1) % 2;
- $extraClass = $odd ? "odd" : "even";
- $extraClass .= " val" . preg_replace('/[^a-zA-Z0-9\-\_]/', '_', $key);
- $disabled = ($this->disabled || in_array($key, $this->disabledItems)) ? "disabled=\"disabled\"" : "";
- $ATT_key = Convert::raw2att($key);
-
- $options .= "<li class=\"".$extraClass."\"><input id=\"$itemID\" name=\"$this->name\" type=\"radio\" value=\"$key\"$checked $disabled class=\"radio\" /> <label title=\"$ATT_key\" for=\"$itemID\">$value</label></li>\n";
- }
-
- // Add "custom" input field
- $value = ($this->value && !array_key_exists($this->value, $this->source)) ? $this->value : null;
- $checked = ($value) ? " checked=\"checked\"" : '';
- $options .= "<li class=\"valCustom\">"
- . sprintf("<input id=\"%s_custom\" name=\"%s\" type=\"radio\" value=\"__custom__\" class=\"radio\" %s />", $itemID, $this->name, $checked)
- . sprintf('<label for="%s_custom">%s:</label>', $itemID, _t('MemberDatetimeOptionsetField.Custom', 'Custom'))
- . sprintf("<input class=\"customFormat\" name=\"%s_custom\" value=\"%s\" />\n", $this->name, $value)
- . sprintf("<input type=\"hidden\" class=\"formatValidationURL\" value=\"%s\" />", $this->Link() . '/validate');
- $options .= ($value) ? sprintf(
- '<span class="preview">(%s: "%s")</span>',
- _t('MemberDatetimeOptionsetField.Preview', 'Preview'),
- Zend_Date::now()->toString($value)
- ) : '';
- $options .= "<a class=\"formattingHelpToggle\" href=\"#\">" . _t('MemberDatetimeOptionsetField.TOGGLEHELP', 'Toggle formatting help') . "</a>";
- $options .= "<div class=\"formattingHelpText\">";
- $options .= $this->getFormattingHelpText();
- $options .= "</div>";
- $options .= "</li>\n";
-
- $id = $this->id();
- return "<ul id=\"$id\" class=\"optionset {$this->extraClass()}\">\n$options</ul>\n";
- }
-
- /**
- * @todo Put this text into a template?
- */
- function getFormattingHelpText() {
- $output = '<ul>';
- $output .= '<li>YYYY = ' . _t('MemberDatetimeOptionsetField.FOURDIGITYEAR', 'Four-digit year', 40, 'Help text describing what "YYYY" means in ISO date formatting') . '</li>';
- $output .= '<li>YY = ' . _t('MemberDatetimeOptionsetField.TWODIGITYEAR', 'Two-digit year', 40, 'Help text describing what "YY" means in ISO date formatting') . '</li>';
- $output .= '<li>MMMM = ' . _t('MemberDatetimeOptionsetField.FULLNAMEMONTH', 'Full name of month (e.g. June)', 40, 'Help text describing what "MMMM" means in ISO date formatting') . '</li>';
- $output .= '<li>MMM = ' . _t('MemberDatetimeOptionsetField.SHORTMONTH', 'Short name of month (e.g. Jun)', 40, 'Help text letting describing what "MMM" means in ISO date formatting') . '</li>';
- $output .= '<li>MM = ' . _t('MemberDatetimeOptionsetField.TWODIGITMONTH', 'Two-digit month (01=January, etc.)', 40, 'Help text describing what "MM" means in ISO date formatting') . '</li>';
- $output .= '<li>M = ' . _t('MemberDatetimeOptionsetField.MONTHNOLEADING', 'Month digit without leading zero', 40, 'Help text describing what "M" means in ISO date formatting') . '</li>';
- $output .= '<li>dd = ' . _t('MemberDatetimeOptionsetField.TWODIGITDAY', 'Two-digit day of month', 40, 'Help text describing what "dd" means in ISO date formatting') . '</li>';
- $output .= '<li>d = ' . _t('MemberDatetimeOptionsetField.DAYNOLEADING', 'Day of month without leading zero', 40, 'Help text describing what "d" means in ISO date formatting') . '</li>';
- $output .= '<li>hh = ' . _t('MemberDatetimeOptionsetField.TWODIGITHOUR', 'Two digits of hour (00 through 23)', 40, 'Help text describing what "hh" means in ISO date formatting') . '</li>';
- $output .= '<li>h = ' . _t('MemberDatetimeOptionsetField.HOURNOLEADING', 'Hour without leading zero', 40, 'Help text describing what "h" means in ISO date formatting') . '</li>';
- $output .= '<li>mm = ' . _t('MemberDatetimeOptionsetField.TWODIGITMINUTE', 'Two digits of minute (00 through 59)', 40, 'Help text describing what "mm" means in ISO date formatting') . '</li>';
- $output .= '<li>m = ' . _t('MemberDatetimeOptionsetField.MINUTENOLEADING', 'Minute without leading zero', 40, 'Help text describing what "m" means in ISO date formatting') . '</li>';
- $output .= '<li>ss = ' . _t('MemberDatetimeOptionsetField.TWODIGITSECOND', 'Two digits of second (00 through 59)', 40, 'Help text describing what "ss" means in ISO date formatting') . '</li>';
- $output .= '<li>s = ' . _t('MemberDatetimeOptionsetField.DIGITSDECFRACTIONSECOND', 'One or more digits representing a decimal fraction of a second', 40, 'Help text describing what "s" means in ISO date formatting') . '</li>';
- $output .= '<li>a = ' . _t('MemberDatetimeOptionsetField.AMORPM', 'AM (Ante meridiem) or PM (Post meridiem)', 40, 'Help text describing what "a" means in ISO date formatting') . '</li>';
- $output .= '</ul>';
- return $output;
- }
-
- function setValue($value) {
- if($value == '__custom__') {
- $value = isset($_REQUEST[$this->name . '_custom']) ? $_REQUEST[$this->name . '_custom'] : null;
- }
- if($value) {
- parent::setValue($value);
- }
- }
-
- function validate() {
- $value = isset($_POST[$this->name . '_custom']) ? $_POST[$this->name . '_custom'] : null;
- if(!$value) return true; // no custom value, don't validate
-
- // Check that the current date with the date format is valid or not
- $validator = $this->form ? $this->form->getValidator() : null;
- require_once 'Zend/Date.php';
- $date = Zend_Date::now()->toString($value);
- $valid = Zend_Date::isDate($date, $value);
- if($valid) {
- return true;
- } else {
- if($validator) {
- $validator->validationError($this->name, _t('MemberDatetimeOptionsetField.DATEFORMATBAD',"Date format is invalid"), "validation", false);
- }
- return false;
- }
- }
}
View
6 tests/forms/MemberDatetimeOptionsetFieldTest.php
@@ -17,7 +17,7 @@ protected function createDateFormatFieldForMember($member) {
'dd/MM/yyyy' => Zend_Date::now()->toString('dd/MM/yyyy'),
);
$dateFormatMap[$defaultDateFormat] = Zend_Date::now()->toString($defaultDateFormat) . ' (default)';
- $field = new Member_DatetimeOptionsetField(
+ $field = new MemberDatetimeOptionsetField(
'DateFormat',
'Date format',
$dateFormatMap
@@ -34,7 +34,7 @@ protected function createTimeFormatFieldForMember($member) {
'H:mm' => Zend_Date::now()->toString('H:mm'),
);
$timeFormatMap[$defaultTimeFormat] = Zend_Date::now()->toString($defaultTimeFormat) . ' (default)';
- $field = new Member_DatetimeOptionsetField(
+ $field = new MemberDatetimeOptionsetField(
'TimeFormat',
'Time format',
$timeFormatMap
@@ -82,7 +82,7 @@ function testDateFormatCustomFormatAppearsInCustomInputInField() {
}
function testDateFormValid() {
- $field = new Member_DatetimeOptionsetField('DateFormat', 'DateFormat');
+ $field = new MemberDatetimeOptionsetField('DateFormat', 'DateFormat');
$this->assertTrue($field->validate());
$_POST['DateFormat_custom'] = 'dd MM yyyy';
$this->assertTrue($field->validate());
Please sign in to comment.
Something went wrong with that request. Please try again.