# HG changeset patch # User Matti Hamalainen # Date 1485548106 -7200 # Node ID bbc0a3d0b51e3af63b0e69c64fe6e8912f232ae4 # Parent faa835271dfdaab2ca5a89389f51d8f6c65990fb Major renaming / refactor of site messages. Some that were previously modifiable from admin interface are now "hardcoded" in the configuration file. Having these settings made modifiable from there made no sense and just took space in the UI. diff -r faa835271dfd -r bbc0a3d0b51e dbdefs.inc.php --- a/dbdefs.inc.php Fri Jan 27 22:11:40 2017 +0200 +++ b/dbdefs.inc.php Fri Jan 27 22:15:06 2017 +0200 @@ -5,140 +5,54 @@ // // Site settings and defaults we put in // -$siteSettingsGroups = array( - "general" => array("General", "General settings"), - "html" => array("Site HTML", "Global HTML blurbs"), - "news" => array("News", "News related settings"), - "register" => array("Registration", "Visitor registration"), - "event" => array("Event / Schedule", "Event and schedule related settings"), - "compos" => array("Compos", "Compo related settings"), - "voting" => array("Voting", "Voting related settings"), -); +$siteSettingsGroups = [ + "general" => ["General", "General settings"], + "news" => ["News", "News related settings"], + "event" => ["Event / Schedule", "Event and schedule related settings"], + "compos" => ["Compos", "Compo related settings"], +]; -$siteDefaultSettings = array( +$siteDefaultSettings = [ // // General site settings // - "general" => array( - "maxAttendeesHard" => array(VT_INT, 60, "Maximum attendees (HARD limit, <= 0 means no limit)"), - "maxAttendeesSoft" => array(VT_INT, 50, "Maximum attendees (soft limit, <= 0 means no limit)"), - - "userTimeout" => array(VT_INT, 120, "User pages (voting) timeout in minutes"), - "admTimeout" => array(VT_INT, 15, "Administration interface timeout in minutes"), - - "showAdmin" => array(VT_BOOL, false, "Always show administration interface link on the menu"), - "showAttendees" => array(VT_BOOL, true, "Show attendees list"), - - "showResults" => array(VT_BOOL, false, "Enable results page"), + "general" => [ + "maxAttendeesHard" => [VT_INT, 60, "Maximum attendees (HARD limit, <= 0 means no limit)"], + "maxAttendeesSoft" => [VT_INT, 50, "Maximum attendees (soft limit, <= 0 means no limit)"], - "showInfoTextOnAbout" => array(VT_BOOL, false, "Show site info HTML on About page"), - - "requireEMail" => array(VT_BOOL, false, "Require e-mail address in registrations"), - "allowRegister" => array(VT_BOOL, false, "Enable event registration"), + "userTimeout" => [VT_INT, 120, "User pages (voting) timeout in minutes"], + "admTimeout" => [VT_INT, 15, "Administration interface timeout in minutes"], - "allowVoting" => array(VT_BOOL, false, "Enable voting (individual compos must be enabled as well)"), - ), - - "html" => array( - "siteMenuHeader" => array(VT_TEXT, "
13.FAP:>
", "Site menu header text"), - "siteMenuFooter" => array(VT_TEXT, "", "Site menu footer text"), - "siteExtraHTML" => array(VT_TEXT, "
Gentle Eye
", "Extra global HTML code (f.e. sponsors box)"), + "showAdmin" => [VT_BOOL, false, "Always show administration interface link on the menu"], + "showAttendees" => [VT_BOOL, true, "Show attendees list"], - "siteInfoText" => array(VT_TEXT, " - -\"Finnish -
-5.-8.12.2014
-Helsinki, Finland
-@ old location
-Entry 15 EUR + prod -
", "Site header text"), + "showResults" => [VT_BOOL, false, "Enable results page"], + + "showInfoTextOnAbout" => [VT_BOOL, false, "Show site info HTML on About page"], - "aboutDescription" => array(VT_TEXT, " -
-\"FAP\" -

-Pure Amiga demoscene party, all traditional Amiga compos and purely Amiga-oriented program. -
- -YOU MUST HAVE AT LEAST ONE ENTRY TO COMPETITIONS IF YOU COME TO THE PARTY. - -

-
", - "About page text"), + "requireEMail" => [VT_BOOL, false, "Require e-mail address in registrations"], + "allowRegister" => [VT_BOOL, false, "Enable event registration"], - ), + "allowVoting" => [VT_BOOL, false, "Enable voting (individual compos must be enabled as well)"], + ], // // News related // - "news" => array( - "showNews" => array(VT_BOOL, true, "Enable News link on main menu + News page"), - "showNewsOnAbout" => array(VT_BOOL, true, "Show latest news item on About page"), - "newsHeader" => array(VT_TEXT, "", "News page header text"), - ), + "news" => [ + "showNews" => [VT_BOOL, true, "Enable News link on main menu + News page"], + "showNewsOnAbout" => [VT_BOOL, true, "Show latest news item on About page"], + ], // - // Attendee/visitor registration - // - "register" => array( - "visitorsPageRegLink" => array(VT_TEXT, " -
-To register, use this form. -
- ", "Visitors page registration link blurb"), - - "registerPageBlurb" => array(VT_TEXT, " -

Registration

- ", "Registration page header"), - - "registerInfoText" => array(VT_TEXT, "

-Only your handle and the answer to the botcheck are strictly required. -If you plan on joining the IRC channel -(#fap2014 @ IRCNet) or staying up to date by other means, -e-mail is not required either. -

", "Registration page info text"), - - "registerPostText" => array(VT_TEXT, " -

Registration successful

-

Now go make a demo about it!

", - "Successful post-registration note text"), - - "registerLimitExceeded" => array(VT_TEXT, " -

Sorry, registration disabled!

-

-Registration to the event is not available at this time due to -number of attendees limit having been reached. :( -

-", - "Registration attendee limit exceeded note text"), - - "registerNotEnabled" => array(VT_TEXT, " -

Sorry, registration disabled!

-

-Registration to the event is not enabled at this time. -

-", - "Registration not enabled note text"), - - "registerPostNoEmail" => array(VT_TEXT, " -

By the way ...

-

As you did not specify an e-mail contact address, you'll have to get updates -and information about the location (if you don't already know it) by -some other means (IRC, for example.)

-", "No e-mail address registration note"), - - ), - - // // Event / schedule information // - "event" => array( - "showSchedule" => array(VT_BOOL, true, "Enable Schedule link on main menu + Schedule page"), + "event" => [ + "showSchedule" => [VT_BOOL, true, "Enable Schedule link on main menu + Schedule page"], - "eventDescription" => array(VT_TEXT, " + "msgEventDescription" => [VT_TEXT, "

Event program & schedule