Extended profile - move some files around and rename stuff to follow plugin conventions

This commit is contained in:
Zach Copley 2011-03-16 16:08:49 -07:00
parent 2bad1d0cd9
commit 88d31a7933
7 changed files with 20 additions and 14 deletions

View File

@ -53,22 +53,26 @@ class ExtendedProfilePlugin extends Plugin
*/ */
function onAutoload($cls) function onAutoload($cls)
{ {
$lower = strtolower($cls); $dir = dirname(__FILE__);
switch ($lower) switch (strtolower($cls))
{ {
case 'extendedprofile':
case 'extendedprofilewidget':
case 'profiledetailaction': case 'profiledetailaction':
case 'profiledetailsettingsaction': case 'profiledetailsettingsaction':
require_once dirname(__FILE__) . '/' . $lower . '.php';
return false;
case 'userautocompleteaction': case 'userautocompleteaction':
require_once dirname(__FILE__) . '/action/' . mb_substr($lower, 0, -6) . '.php'; include_once $dir . '/actions/'
. strtolower(mb_substr($cls, 0, -6)) . '.php';
return false; return false;
break; // Safety first!
case 'extendedprofile':
case 'extendedprofilewidget':
include_once $dir . '/lib/' . strtolower($cls) . '.php';
return false;
break;
case 'profile_detail': case 'profile_detail':
require_once dirname(__FILE__) . '/' . ucfirst($lower) . '.php'; include_once $dir . '/classes/' . ucfirst($cls) . '.php';
return false; return false;
break;
default: default:
return true; return true;
} }

View File

@ -139,12 +139,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
function parseDate($fieldname, $datestr, $required = false) function parseDate($fieldname, $datestr, $required = false)
{ {
if (empty($datestr) && $required) { if (empty($datestr)) {
$msg = sprintf( if ($required) {
_m('You must supply a date for "%s".'), $msg = sprintf(
$fieldname _m('You must supply a date for "%s".'),
); $fieldname
throw new Exception($msg); );
throw new Exception($msg);
}
} else { } else {
$ts = strtotime($datestr); $ts = strtotime($datestr);
if ($ts === false) { if ($ts === false) {