We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 88d31a79 authored by Zach Copley's avatar Zach Copley

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

parent 2bad1d0c
......@@ -53,22 +53,26 @@ class ExtendedProfilePlugin extends Plugin
*/
function onAutoload($cls)
{
$lower = strtolower($cls);
$dir = dirname(__FILE__);
switch ($lower)
switch (strtolower($cls))
{
case 'extendedprofile':
case 'extendedprofilewidget':
case 'profiledetailaction':
case 'profiledetailsettingsaction':
require_once dirname(__FILE__) . '/' . $lower . '.php';
return false;
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;
break; // Safety first!
case 'extendedprofile':
case 'extendedprofilewidget':
include_once $dir . '/lib/' . strtolower($cls) . '.php';
return false;
break;
case 'profile_detail':
require_once dirname(__FILE__) . '/' . ucfirst($lower) . '.php';
include_once $dir . '/classes/' . ucfirst($cls) . '.php';
return false;
break;
default:
return true;
}
......
......@@ -139,12 +139,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
function parseDate($fieldname, $datestr, $required = false)
{
if (empty($datestr) && $required) {
$msg = sprintf(
_m('You must supply a date for "%s".'),
$fieldname
);
throw new Exception($msg);
if (empty($datestr)) {
if ($required) {
$msg = sprintf(
_m('You must supply a date for "%s".'),
$fieldname
);
throw new Exception($msg);
}
} else {
$ts = strtotime($datestr);
if ($ts === false) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment