diff --git a/common.inc.php b/common.inc.php index 8c49b35f..8a7064fd 100644 --- a/common.inc.php +++ b/common.inc.php @@ -26,7 +26,7 @@ // ////echo phpinfo(); header('Content-Type: text/html; charset=utf8'); -include_once ('helper.inc.php'); +include_once('helper.inc.php'); // set error reporting to not show notices, for some reason some people's installation dont set this by default // so we will set it in the code instead just to make sure error_reporting(E_ALL); @@ -70,7 +70,7 @@ if (!is_writable($prependdir . 'data')) { } if (file_exists($prependdir . 'data/config.inc.php')) { - require_once ($prependdir . 'data/config.inc.php'); + require_once($prependdir . 'data/config.inc.php'); } else { echo 'SFIAB'; echo '

Science Fair In A Box - Installation

'; @@ -173,10 +173,10 @@ while ($r = $q->fetch()) { } // and now pull the theme -require_once ("theme/{$config['theme']}/theme.php"); -require_once ("theme/{$config['theme_icons']}/icons.php"); +require_once("theme/{$config['theme']}/theme.php"); +require_once("theme/{$config['theme_icons']}/icons.php"); -require_once ('committee.inc.php'); +require_once('committee.inc.php'); if ($config['SFIABDIRECTORY'] == '') { session_name('SFIABSESSID'); @@ -276,7 +276,7 @@ function i18n($str, $args = array(), $argsdesc = array(), $forcelang = '') if (count($argsdesc)) { $argsdescstring = ''; $n = 1; - foreach ($argsdesc AS $ad) { + foreach ($argsdesc as $ad) { $argsdescstring .= "%$n=$ad, "; $n++; } @@ -351,632 +351,651 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated = else $HEADER_SENT = true; ?> - - - - - -<? if ($title && !$titletranslated) echo i18n($title); else if ($title) echo $title; else echo i18n($config['fairname']); ?> + + - - - - + + + + <? if ($title && !$titletranslated) echo i18n($title); + else if ($title) echo $title; + else echo i18n($config['fairname']); ?> - - - - - + + + + - + - - - - - - + + + + -
- +
+ '; + if (isset($_SESSION['users_type'])) { + $types = array( + 'volunteer' => 'Volunteer', + 'judge' => 'Judge', + 'student' => 'Participant', + 'committee' => 'Committee Member', + 'fair' => 'Science Fair' + ); + if ($_SESSION['users_type'] != false) { + echo i18n($types[$_SESSION['users_type']]); + } + echo ' {' . get_value_from_array($_SESSION, 'email') . '}: '; + if ($_SESSION['multirole'] == true) { + echo "[" . i18n('Switch Roles') . '] '; + } + echo "[" . i18n('Logout') . ']'; + } else if (isset($_SESSION['email'])) { + /* Backwards compatible login settings */ + if (isset($_SESSION['registration_id'])) { + echo i18n('Participant'); + echo " {$_SESSION['email']}: "; + echo "[" . i18n('Logout') . ']'; + } else { + echo ' '; + } } else { - echo ' '; + echo i18n('Not Logged In'); } - } else { - echo i18n('Not Logged In'); - } - echo ''; -?> + echo ''; + ?> - - + + '; + + if ($icon && theme_icon($icon)) { + echo ''; + echo '
+ ' . i18n('You are here:') . ' '; + foreach ($nav as $t => $l) { + echo "" . i18n($t) . ' » '; + } + if (!$titletranslated) + echo i18n($title); + else + echo $title; + echo ''; + } + ?> + +
+
'; + echo theme_icon($icon); + echo ''; + } else + echo ''; + + if ($title && !$titletranslated) + echo '

' . i18n($title) . '

'; + else if ($title) + echo '

' . $title . '

'; + + // if we're under /admin or /config then we want to show the ? help icon + if (substr(getcwd(), -6) == '/admin' || substr(getcwd(), -7) == '/config' || substr(getcwd(), -6) == '\admin' || substr(getcwd(), -7) == '\config') { + if (get_value_from_array($_SERVER, 'REDIRECT_SCRIPT_URL')) + $fname = substr($_SERVER['REDIRECT_SCRIPT_URL'], strlen($config['SFIABDIRECTORY']) + 1); + else + $fname = substr($_SERVER['PHP_SELF'], strlen($config['SFIABDIRECTORY']) + 1); + echo "		'; + } + '
'; + + display_messages(); + } + + /* END OF send_header */ + + function send_footer() + { + global $config; + ?> + + + + + +
Debug...
+ + + + + + +\n"; ?> -
- -
- 1) { - echo '
'; - echo '
'; - echo "'; - echo '
'; - } + function emit_month_selector($name, $selected = '') + { + echo "\n"; + } -
- -\n"; + echo '\n"; - if (is_array($nav)) { - echo '
' . i18n('You are here:') . ' '; - foreach ($nav as $t => $l) { - echo "" . i18n($t) . ' » '; - } - if (!$titletranslated) - echo i18n($title); - else - echo $title; - echo '
'; - } -?> + for ($x = 1; $x <= 31; $x++) + echo '\n"; -
-\n"; + } - if (committee_auth_has_access('config') || committee_auth_has_access('admin')) - committee_warnings(); - if (committee_auth_has_access('config')) - config_warnings(); - if (committee_auth_has_access('admin')) - admin_warnings(); + function emit_year_selector($name, $selected = '', $min = 0, $max = 0) + { + $curyear = date('Y'); + echo "\n"; + } - if ($icon && theme_icon($icon)) { - echo ''; - echo theme_icon($icon); - echo ''; - } else - echo ''; + function emit_date_selector($name, $selected = '') + { + if ($selected) { + list($year, $month, $day) = explode('-', $selected); + } + echo ''; + echo ''; + echo '
'; + emit_year_selector($name . '_year', $year); + echo ''; + emit_month_selector($name . '_month', $month); + echo ''; + emit_day_selector($name . '_day', $day); + echo '
'; + } - if ($title && !$titletranslated) - echo '

' . i18n($title) . '

'; - else if ($title) - echo '

' . $title . '

'; + function emit_hour_selector($name, $selected = '') + { + if ($selected != '') + $selected = (int) $selected; + echo "\n"; + } -/* END OF send_header */ + function emit_minute_selector($name, $selected = '') + { + $mins = array('00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55'); + echo "\n"; + } - // echo "Science-ation Version ".$config['version']."{$extra}"; - echo 'Science-ation Version 3'; -?> -
-
Debug...
- + function emit_time_selector($name, $selected = '') + { + global $hour; + global $minute; + if ($selected) { + list($hour, $minute, $second) = explode(':', $selected); + } + echo ''; + echo ''; + echo '
'; + emit_hour_selector($name . '_hour', $hour); + echo ''; + emit_minute_selector($name . '_minute', $minute); + echo '
'; + } - - + function emit_province_selector($name, $selected = '', $extra = '') + { + global $config; -prepare("SELECT * FROM provinces WHERE countries_code='" . $config['country'] . "' ORDER BY province"); + $q->execute(); -function send_popup_header($title = '') -{ - global $HEADER_SENT; - global $config; + if ($q->rowCount() == 1) { + $r = $q->fetch(PDO::FETCH_OBJ); - // do this so we can use send_header() a little more loosly and not worry about it being sent more than once. - if ($HEADER_SENT) - return; - else - $HEADER_SENT = true; + echo "code\">"; + echo i18n($r->province); + } else { + echo "\n"; + } + } -function send_popup_footer() -{ -?> -
-
- -
Debug...
- + function outputStatus($status) + { + $ret = ''; + switch ($status) { + case 'incomplete': + $ret .= '
'; + $ret .= i18n('Incomplete'); + $ret .= '
'; + break; + case 'complete': + $ret .= '
'; + $ret .= i18n('Complete'); + $ret .= '
'; + break; + case 'empty': + $ret .= '
'; + $ret .= i18n('Empty'); + $ret .= '
'; + break; - - -\n"; - $months = array('', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); - echo '\n"; - for ($x = 1; $x <= 12; $x++) { - if ($x == $selected) - $s = 'selected="selected"'; - else - $s = ''; - echo "\n"; - } + // returns true if its a valid email address, false if its not + function isEmailAddress($str) + { + if (preg_match('/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.([a-zA-Z]{2,4})$/i', $str)) + return true; + else + return false; + } - echo "\n"; -} + function communication_get_user_replacements(&$u) + { + global $config; + $rep = array( + 'FAIRNAME' => $config['fairname'], + 'NAME' => $u['name'], + 'EMAIL' => $u['email'], + 'PASSWORD' => $u['password'], + 'SALUTATION' => $u['salutation'], + 'FIRSTNAME' => $u['firstname'], + 'LASTNAME' => $u['lastname'], + 'ORGANIZATION' => $u['sponsor']['organization'], + ); + return $rep; + } -function emit_day_selector($name, $selected = '') -{ - echo "\n"; -} + function email_send($val, $to, $sub_subject = array(), $sub_body = array()) + { + global $config, $pdo; -function emit_year_selector($name, $selected = '', $min = 0, $max = 0) -{ - $curyear = date('Y'); - echo "\n"; -} - -function emit_date_selector($name, $selected = '') -{ - if ($selected) { - list($year, $month, $day) = explode('-', $selected); - } - echo ''; - echo ''; - echo '
'; - emit_year_selector($name . '_year', $year); - echo ''; - emit_month_selector($name . '_month', $month); - echo ''; - emit_day_selector($name . '_day', $day); - echo '
'; -} - -function emit_hour_selector($name, $selected = '') -{ - if ($selected != '') - $selected = (int) $selected; - echo "\n"; -} - -function emit_minute_selector($name, $selected = '') -{ - $mins = array('00', '05', '10', '15', '20', '25', '30', '35', '40', '45', '50', '55'); - echo "\n"; -} - -function emit_time_selector($name, $selected = '') -{ - global $hour; - global $minute; - if ($selected) { - list($hour, $minute, $second) = explode(':', $selected); - } - echo ''; - echo ''; - echo '
'; - emit_hour_selector($name . '_hour', $hour); - echo ''; - emit_minute_selector($name . '_minute', $minute); - echo '
'; -} - -function emit_province_selector($name, $selected = '', $extra = '') -{ - global $config; - - global $pdo; - $q = $pdo->prepare("SELECT * FROM provinces WHERE countries_code='" . $config['country'] . "' ORDER BY province"); - $q->execute(); - - if ($q->rowCount() == 1) { - $r = $q->fetch(PDO::FETCH_OBJ); - - echo "code\">"; - echo i18n($r->province); - } else { - echo "\n"; - } -} - -function outputStatus($status) -{ - $ret = ''; - switch ($status) { - case 'incomplete': - $ret .= '
'; - $ret .= i18n('Incomplete'); - $ret .= '
'; - break; - case 'complete': - $ret .= '
'; - $ret .= i18n('Complete'); - $ret .= '
'; - break; - case 'empty': - $ret .= '
'; - $ret .= i18n('Empty'); - $ret .= '
'; - break; - - default: - $ret .= i18n('Unknown'); - break; - } - return $ret; -} - -// returns true if its a valid email address, false if its not -function isEmailAddress($str) -{ - if (preg_match('/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.([a-zA-Z]{2,4})$/i', $str)) - return true; - else - return false; -} - -function communication_get_user_replacements(&$u) -{ - global $config; - $rep = array( - 'FAIRNAME' => $config['fairname'], - 'NAME' => $u['name'], - 'EMAIL' => $u['email'], - 'PASSWORD' => $u['password'], - 'SALUTATION' => $u['salutation'], - 'FIRSTNAME' => $u['firstname'], - 'LASTNAME' => $u['lastname'], - 'ORGANIZATION' => $u['sponsor']['organization'], - ); - return $rep; -} - -function communication_replace_vars($text, &$u, $otherrep = array()) -{ - global $config; - if ($u) { - $userrep = communication_get_user_replacements($u); - } else { - $userrep = array(); - } - - $rep = array_merge($userrep, $otherrep); - foreach ($rep AS $k => $v) { - $text = preg_replace("\[$k\]", $v, $text); - } - return $text; -} - -function email_send($val, $to, $sub_subject = array(), $sub_body = array()) -{ - global $config, $pdo; - - /* + /* * Standard substitutions that are constant no matter who * the $to is */ - $urlproto = $_SERVER['SERVER_PORT'] == 443 ? 'https://' : 'http://'; - $urlmain = "$urlproto{$_SERVER['HTTP_HOST']}{$config['SFIABDIRECTORY']}"; - $urllogin = "$urlmain/login.php"; - $stdsub = array( - 'FAIRNAME' => i18n($config['fairname']), - 'URLMAIN' => $urlmain, - 'URLLOGIN' => $urllogin, - ); - /* Add standard subs to existing sub arrays */ - $sub_subject = array_merge($sub_subject, $stdsub); - $sub_body = array_merge($sub_body, $stdsub); + $urlproto = $_SERVER['SERVER_PORT'] == 443 ? 'https://' : 'http://'; + $urlmain = "$urlproto{$_SERVER['HTTP_HOST']}{$config['SFIABDIRECTORY']}"; + $urllogin = "$urlmain/login.php"; + $stdsub = array( + 'FAIRNAME' => i18n($config['fairname']), + 'URLMAIN' => $urlmain, + 'URLLOGIN' => $urllogin, + ); + /* Add standard subs to existing sub arrays */ + $sub_subject = array_merge($sub_subject, $stdsub); + $sub_body = array_merge($sub_body, $stdsub); - // if our "to" doesnt look like a valid email, then forget about sending it. - if (!isEmailAddress($to)) { - return false; - } + // if our "to" doesnt look like a valid email, then forget about sending it. + if (!isEmailAddress($to)) { + return false; + } - $q = $pdo->prepare("SELECT * FROM emails WHERE val='$val'"); - if ($r = $q->fetch(PDO::FETCH_ASSOC)) { - // we dont want to translate these, the messages themselves shoudl contain whatever languages they need - $subject = $r->subject; - $body = $r->body; - $bodyhtml = $r->bodyhtml; + $q = $pdo->prepare("SELECT * FROM emails WHERE val='$val'"); + if ($r = $q->fetch(PDO::FETCH_ASSOC)) { + // we dont want to translate these, the messages themselves shoudl contain whatever languages they need + $subject = $r->subject; + $body = $r->body; + $bodyhtml = $r->bodyhtml; - /* Eventually we should just do this with communication_replace_vars() */ - if (count($sub_subject)) { - foreach ($sub_subject AS $sub_k => $sub_v) { - $subject = preg_replace("\[$sub_k\]", "$sub_v", $subject); - } - } - if (count($sub_body)) { - foreach ($sub_body AS $sub_k => $sub_v) { - $body = preg_replace("\[$sub_k\]", "$sub_v", $body); - } - } + /* Eventually we should just do this with communication_replace_vars() */ + if (count($sub_subject)) { + foreach ($sub_subject as $sub_k => $sub_v) { + $subject = preg_replace("\[$sub_k\]", "$sub_v", $subject); + } + } + if (count($sub_body)) { + foreach ($sub_body as $sub_k => $sub_v) { + $body = preg_replace("\[$sub_k\]", "$sub_v", $body); + } + } - if (count($sub_body)) { - foreach ($sub_body AS $sub_k => $sub_v) { - $bodyhtml = preg_replace("\[$sub_k\]", "$sub_v", $bodyhtml); - } - } + if (count($sub_body)) { + foreach ($sub_body as $sub_k => $sub_v) { + $bodyhtml = preg_replace("\[$sub_k\]", "$sub_v", $bodyhtml); + } + } - if ($r->from) - $fr = $r->from; - else if ($config['fairmanageremail']) - $fr = $config['fairmanageremail']; - else - $fr = ''; + if ($r->from) + $fr = $r->from; + else if ($config['fairmanageremail']) + $fr = $config['fairmanageremail']; + else + $fr = ''; - // only send the email if we have a from - if ($fr) { - // send using RMail - // FIXME EMAIL - ////email_send_new($to, $fr, $subject, $body, $bodyhtml); - } else - echo error(i18n("CRITICAL ERROR: email '%1' does not have a 'From' and the Fair Manager Email is not configured", array($val), array('email key name'))); - } else { - echo error(i18n("CRITICAL ERROR: email '%1' not found", array($val), array('email key name'))); - } -} + // only send the email if we have a from + if ($fr) { + // send using RMail + // FIXME EMAIL + ////email_send_new($to, $fr, $subject, $body, $bodyhtml); + } else + echo error(i18n("CRITICAL ERROR: email '%1' does not have a 'From' and the Fair Manager Email is not configured", array($val), array('email key name'))); + } else { + echo error(i18n("CRITICAL ERROR: email '%1' not found", array($val), array('email key name'))); + } + } -/*require_once("Rmail/Rmail.php"); + /*require_once("Rmail/Rmail.php"); require_once("Rmail/RFC822.php"); // this sends out an all-ready-to-go email, it does no substitution or changes or database lookups or anything @@ -1008,384 +1027,382 @@ function email_send_new($to, $from, $subject, $body, $bodyhtml = '') */ -/* + /* * returns an array of arrays * [ 0 ] = array ( to, firstname, lastname, email ) * [ 1 ] = array ( to, firstname, lastname, email ) * ...etc */ -function getEmailRecipientsForRegistration($reg_id) -{ - global $config, $pdo; - // okay first grab the registration record, to see if we should email the kids, the teacher, and/or the parents - $q = $pdo->prepare("SELECT * FROM registrations WHERE id='$reg_id' AND year='{$config['FAIRYEAR']}'"); - $q->execute(); - $registration = $q->fetch(); + function getEmailRecipientsForRegistration($reg_id) + { + global $config, $pdo; + // okay first grab the registration record, to see if we should email the kids, the teacher, and/or the parents + $q = $pdo->prepare("SELECT * FROM registrations WHERE id='$reg_id' AND year='{$config['FAIRYEAR']}'"); + $q->execute(); + $registration = $q->fetch(); - if ($registration->emailcontact && isEmailAddress($registration->emailcontact)) { - $ret[] = array( - 'to' => $registration->emailcontact, - 'firstname' => '', - 'lastname' => '', - 'email' => $registration->emailcontact, - ); - } + if ($registration->emailcontact && isEmailAddress($registration->emailcontact)) { + $ret[] = array( + 'to' => $registration->emailcontact, + 'firstname' => '', + 'lastname' => '', + 'email' => $registration->emailcontact, + ); + } - $sq = $pdo->prepare("SELECT * FROM students WHERE registrations_id='$reg_id' AND year='{$config['FAIRYEAR']}'"); - $sq->execute(); - $ret = array(); - while ($sr = $sq->fetch()) { - if ($sr->email && isEmailAddress($sr->email)) { - $to = $sr->email; + $sq = $pdo->prepare("SELECT * FROM students WHERE registrations_id='$reg_id' AND year='{$config['FAIRYEAR']}'"); + $sq->execute(); + $ret = array(); + while ($sr = $sq->fetch()) { + if ($sr->email && isEmailAddress($sr->email)) { + $to = $sr->email; - $ret[] = array( - 'to' => $to, - 'firstname' => $sr->firstname, - 'lastname' => $sr->lastname, - 'email' => $sr->email, - ); - } - } - return $ret; -} + $ret[] = array( + 'to' => $to, + 'firstname' => $sr->firstname, + 'lastname' => $sr->lastname, + 'email' => $sr->email, + ); + } + } + return $ret; + } -function output_page_text($textname) -{ - global $config; - global $pdo; + function output_page_text($textname) + { + global $config; + global $pdo; - $q = $pdo->prepare("SELECT * FROM pagetext WHERE textname='$textname' AND year='" . $config['FAIRYEAR'] . "' AND lang='" . $_SESSION['lang'] . "'"); - $q->execute(); - if ($q->rowCount()) - $r = $q->fetch(); - else { - // not defined, lets grab the default text - $q = $pdo->prepare("SELECT * FROM pagetext WHERE textname='$textname' AND year='-1' AND lang='" . $config['default_language'] . "'"); - $q->execute(); - $r = $q->fetch(); - } + $q = $pdo->prepare("SELECT * FROM pagetext WHERE textname='$textname' AND year='" . $config['FAIRYEAR'] . "' AND lang='" . $_SESSION['lang'] . "'"); + $q->execute(); + if ($q->rowCount()) + $r = $q->fetch(); + else { + // not defined, lets grab the default text + $q = $pdo->prepare("SELECT * FROM pagetext WHERE textname='$textname' AND year='-1' AND lang='" . $config['default_language'] . "'"); + $q->execute(); + $r = $q->fetch(); + } - // if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br - if (get_value_property_or_default($r, 'text') !== null and strlen($r->text) == strlen(strip_tags($r->text))) - echo nl2br($r->text); - else - echo get_value_property_or_default($r, 'text'); -} + // if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br + if (get_value_property_or_default($r, 'text') !== null and strlen($r->text) == strlen(strip_tags($r->text))) + echo nl2br($r->text); + else + echo get_value_property_or_default($r, 'text'); + } -function output_page_cms($filename) -{ - global $config; - global $pdo; + function output_page_cms($filename) + { + global $config; + global $pdo; - $q = $pdo->prepare("SELECT * FROM cms WHERE filename='" . $filename . "' AND lang='" . $_SESSION['lang'] . "' ORDER BY dt DESC LIMIT 1"); - $q->execute(); - if ($q->rowCount()) { - $r = $q->fetch(); - send_header($r['title'], null, null, true); + $q = $pdo->prepare("SELECT * FROM cms WHERE filename='" . $filename . "' AND lang='" . $_SESSION['lang'] . "' ORDER BY dt DESC LIMIT 1"); + $q->execute(); + if ($q->rowCount()) { + $r = $q->fetch(); + send_header($r['title'], null, null, true); - if (file_exists('data/logo-200.gif') && $r['showlogo'] == 1) - echo ''; + if (file_exists('data/logo-200.gif') && $r['showlogo'] == 1) + echo ''; - // if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br - if ($r['text'] !== null and strlen($r['text']) == strlen(strip_tags($r['text']))) - echo nl2br($r['text']); - else - echo $r['text']; - } else { - send_header('Error: File not found'); - echo error(i18n('The file you have requested (%1), does not exist on the server.', array($filename))); - return; - // not defined, lets grab the default text - } + // if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br + if ($r['text'] !== null and strlen($r['text']) == strlen(strip_tags($r['text']))) + echo nl2br($r['text']); + else + echo $r['text']; + } else { + send_header('Error: File not found'); + echo error(i18n('The file you have requested (%1), does not exist on the server.', array($filename))); + return; + // not defined, lets grab the default text + } - send_footer(); -} + send_footer(); + } -function generatePassword($pwlen = 8) -{ - // these are good characters that are not easily confused with other characters :) - $available = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789'; - $len = strlen($available) - 1; + function generatePassword($pwlen = 8) + { + // these are good characters that are not easily confused with other characters :) + $available = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789'; + $len = strlen($available) - 1; - $key = ''; - for ($x = 0; $x < $pwlen; $x++) - $key .= $available[rand(0, $len)]; - return $key; -} + $key = ''; + for ($x = 0; $x < $pwlen; $x++) + $key .= $available[rand(0, $len)]; + return $key; + } -// config specific warning -function config_warnings() {} + // config specific warning + function config_warnings() {} -// admin specific warnings -function admin_warnings() {} + // admin specific warnings + function admin_warnings() {} -// warnings to show to both config and/or admin people -function committee_warnings() -{ - global $config, $pdo; - // it is vital that each year the system be rolled over before we start it again - // we should do this, say, 4 months after the FAIRDATE, so its soon enough that they should see - // the message as soon as they login to start preparing for hte new year, but not too late to do it - // properly :) + // warnings to show to both config and/or admin people + function committee_warnings() + { + global $config, $pdo; + // it is vital that each year the system be rolled over before we start it again + // we should do this, say, 4 months after the FAIRDATE, so its soon enough that they should see + // the message as soon as they login to start preparing for hte new year, but not too late to do it + // properly :) - $q = $pdo->prepare("SELECT DATE_ADD('" . $config['dates']['fairdate'] . "', INTERVAL 4 MONTH) < NOW() AS rollovercheck"); - $q->execute(); + $q = $pdo->prepare("SELECT DATE_ADD('" . $config['dates']['fairdate'] . "', INTERVAL 4 MONTH) < NOW() AS rollovercheck"); + $q->execute(); - $r = $q->fetch(PDO::FETCH_OBJ); + $r = $q->fetch(PDO::FETCH_OBJ); - // FIXME Clear out Important Dates as part of rollover - if ($r->rollovercheck) { - echo error(i18n("It has been more than 4 months since your fair. In order to prepare the system for the next year's fair, you should go to the SFIAB Configuration page, and click on 'Rollover Fair Year'. Do not start updating the system with new information until the year has been properly rolled over.")); - } + // FIXME Clear out Important Dates as part of rollover + if ($r->rollovercheck) { + echo error(i18n("It has been more than 4 months since your fair. In order to prepare the system for the next year's fair, you should go to the SFIAB Configuration page, and click on 'Rollover Fair Year'. Do not start updating the system with new information until the year has been properly rolled over.")); + } - $warn = false; + $warn = false; - $q = $pdo->prepare('SELECT * FROM award_prizes WHERE `external_identifier` IS NOT NULL + $q = $pdo->prepare('SELECT * FROM award_prizes WHERE `external_identifier` IS NOT NULL AND external_identifier=prize'); - $q->execute(); - if ($q->rowCount() > 0) { - /* + $q->execute(); + if ($q->rowCount() > 0) { + /* * The bug was that the external_identifier was set to the prize name.. so only display the warning * if we find that case for a non-sfiab external fair */ - while (($p = $q->fetch(PDO::FETCH_ASSOC))) { - $qq = $pdo->prepare("SELECT * FROM award_awards $r->rollovercheck + while (($p = $q->fetch(PDO::FETCH_ASSOC))) { + $qq = $pdo->prepare("SELECT * FROM award_awards $r->rollovercheck LEFT JOIN fairs ON fairs.id=award_awards.award_source_fairs_id WHERE award_awards.id='{$p['award_awards_id']}' AND year='{$config['FAIRYEAR']}' AND award_awards.award_source_fairs_id IS NOT NULL AND fairs.type='ysc' "); - $qq->execute(); - if ($qq->rowCount() > 0) { - $warn; + $qq->execute(); + if ($qq->rowCount() > 0) { + $warn; - break; - } - } - } - if ($warn) { - // let everyone know about the need to re-download awards before being able to upload - echo notice(i18n("March 30, 2010 - There was a minor issue with uploading award results that has now been corrected, however, you will need to re-download your awards from all external sources, before you will be able to upload the award winners back to those external sources. Re-downloading the awards will not affect the awards in any visible way, it will just allow the winners to be uploaded properly. Click on Fair Administration -> Awards Management -> Download awards from external sources -> and click 'check' for each award source")); - } -} + break; + } + } + } + if ($warn) { + // let everyone know about the need to re-download awards before being able to upload + echo notice(i18n("March 30, 2010 - There was a minor issue with uploading award results that has now been corrected, however, you will need to re-download your awards from all external sources, before you will be able to upload the award winners back to those external sources. Re-downloading the awards will not affect the awards in any visible way, it will just allow the winners to be uploaded properly. Click on Fair Administration -> Awards Management -> Download awards from external sources -> and click 'check' for each award source")); + } + } -$CWSFDivisions = array( - 1 => 'Discovery', - 2 => 'Energy', - 3 => 'Environment', - 4 => 'Health', - 5 => 'Information', - 6 => 'Innovation', - 7 => 'Resources' -); + $CWSFDivisions = array( + 1 => 'Discovery', + 2 => 'Energy', + 3 => 'Environment', + 4 => 'Health', + 5 => 'Information', + 6 => 'Innovation', + 7 => 'Resources' + ); -function theme_icon($icon, $width = 0) -{ - global $theme_icons, $config; + function theme_icon($icon, $width = 0) + { + global $theme_icons, $config; - $w = ($width == 0) ? '' : "width=\"$width\""; - if ($theme_icons['icons'][$icon]) - return "\""'; + $w = ($width == 0) ? '' : "width=\"$width\""; + if ($theme_icons['icons'][$icon]) + return "\""'; - return ''; -} + return ''; + } -// $d can be a unix timestamp integer, OR a text string, eg 2008-01-22 -function format_date($d) -{ - global $config; - if (is_numeric($d)) - return date($config['dateformat'], $d); - else - return date($config['dateformat'], strtotime($d)); -} + // $d can be a unix timestamp integer, OR a text string, eg 2008-01-22 + function format_date($d) + { + global $config; + if (is_numeric($d)) + return date($config['dateformat'], $d); + else + return date($config['dateformat'], strtotime($d)); + } -// $t can be a unix timestamp integer, or a text string, eg 10:23:48 -function format_time($t) -{ - global $config; - if (is_numeric($t)) - return date($config['timeformat'], $t); - else - return date($config['timeformat'], strtotime($t)); -} + // $t can be a unix timestamp integer, or a text string, eg 10:23:48 + function format_time($t) + { + global $config; + if (is_numeric($t)) + return date($config['timeformat'], $t); + else + return date($config['timeformat'], strtotime($t)); + } -// $dt can be a unix timestamp integer, or a text string, eg 2008-01-22 10:23:48 -function format_datetime($dt) -{ - if (is_numeric($dt)) { - return format_date($dt) . ' ' . i18n('at') . ' ' . format_time($dt); - } else { - list($d, $t) = explode(' ', $dt); - return format_date($d) . ' ' . i18n('at') . ' ' . format_time($t); - } -} + // $dt can be a unix timestamp integer, or a text string, eg 2008-01-22 10:23:48 + function format_datetime($dt) + { + if (is_numeric($dt)) { + return format_date($dt) . ' ' . i18n('at') . ' ' . format_time($dt); + } else { + list($d, $t) = explode(' ', $dt); + return format_date($d) . ' ' . i18n('at') . ' ' . format_time($t); + } + } -function format_money($n, $decimals = true) -{ - global $neg; - if ($n < 0) { - $neg = true; - $n = $n * -1; - } - // get the part before the decimal - $before = floor(get_value_or_default($n, 0)); - $out = ''; + function format_money($n, $decimals = true) + { + global $neg; + if ($n < 0) { + $neg = true; + $n = $n * -1; + } + // get the part before the decimal + $before = floor(get_value_or_default($n, 0)); + $out = ''; - // space it out in blocks of three - for ($x = strlen($before); $x > 3; $x -= 3) { - $out = substr($before, $x - 3, 3) . ' ' . $out; - } - if ($x > 0) - $out = substr($before, 0, $x) . ' ' . $out; + // space it out in blocks of three + for ($x = strlen($before); $x > 3; $x -= 3) { + $out = substr($before, $x - 3, 3) . ' ' . $out; + } + if ($x > 0) + $out = substr($before, 0, $x) . ' ' . $out; - // trim any leading/trailing space that was added - $out = trim($out); + // trim any leading/trailing space that was added + $out = trim($out); - if ($neg) - $negdisp = '-'; - else - $negdisp = ''; + if ($neg) + $negdisp = '-'; + else + $negdisp = ''; - if ($decimals) { - // get everything after the decimal place, and %02f it. - $after = substr(strstr(sprintf('%.02f', $n), '.'), 1); + if ($decimals) { + // get everything after the decimal place, and %02f it. + $after = substr(strstr(sprintf('%.02f', $n), '.'), 1); - // finally display it with the right language localization - if ($_SESSION['lang'] == 'fr') - return sprintf('%s%s,%s $', $negdisp, $out, $after); - else - return sprintf('%s$%s.%s', $negdisp, $out, $after); - } else { - if ($_SESSION['lang'] == 'fr') - return sprintf('%s%s $', $negdisp, $out); - else - return sprintf('%s$%s', $negdisp, $out); - } -} + // finally display it with the right language localization + if ($_SESSION['lang'] == 'fr') + return sprintf('%s%s,%s $', $negdisp, $out, $after); + else + return sprintf('%s$%s.%s', $negdisp, $out, $after); + } else { + if ($_SESSION['lang'] == 'fr') + return sprintf('%s%s $', $negdisp, $out); + else + return sprintf('%s$%s', $negdisp, $out); + } + } -function message_push($m) -{ - if (!is_array($_SESSION['messages'])) - $_SESSION['messages'] = array(); - $_SESSION['messages'][] = $m; -} + function message_push($m) + { + if (!is_array($_SESSION['messages'])) + $_SESSION['messages'] = array(); + $_SESSION['messages'][] = $m; + } -function notice_($str, $i18n_array = array(), $timeout = -1, $type = 'notice') -{ - if ($timeout == -1) - $timeout = 5000; - echo ""; -} + } -function happy_($str, $i18n_array = array(), $timeout = -1) -{ - notice_($str, $i18n_array, $timeout, 'happy'); -} + function happy_($str, $i18n_array = array(), $timeout = -1) + { + notice_($str, $i18n_array, $timeout, 'happy'); + } -function error_($str, $i18n_array = array(), $timeout = -1) -{ - notice_($str, $i18n_array, $timeout, 'error'); -} + function error_($str, $i18n_array = array(), $timeout = -1) + { + notice_($str, $i18n_array, $timeout, 'error'); + } -function debug_($str) -{ - if (get_value_from_array($_SESSION, 'debug') != true) - return; - $s = str_replace("\n", '', nl2br(htmlspecialchars($str))) . '
'; - echo ""; -} + } -// this function returns a HTML colour code ranging between red and green, with yellow in the middle based on the percent passed into it -function colour_to_percent($percent) -{ - // 0 is red - // 50 is yellow - // 100 is green + // this function returns a HTML colour code ranging between red and green, with yellow in the middle based on the percent passed into it + function colour_to_percent($percent) + { + // 0 is red + // 50 is yellow + // 100 is green - if ($percent <= 50) - $red = 255; - else - $red = (100 - $percent) * 2 / 100 * 255; - ; + if ($percent <= 50) + $red = 255; + else + $red = (100 - $percent) * 2 / 100 * 255;; - if ($percent > 50) - $green = 255; - else - $green = ($percent) * 2 / 100 * 255; - ; + if ($percent > 50) + $green = 255; + else + $green = ($percent) * 2 / 100 * 255;; - // echo "red=$red"; - // echo "green=$green"; - $str = '#' . sprintf('%02s', dechex($red)) . sprintf('%02s', dechex($green)) . '00'; - return $str; -} + // echo "red=$red"; + // echo "green=$green"; + $str = '#' . sprintf('%02s', dechex($red)) . sprintf('%02s', dechex($green)) . '00'; + return $str; + } -function format_duration($seconds, $granularity = 2) -{ - $units = array( - '1 year|:count years' => 31536000, - '1 week|:count weeks' => 604800, - '1 day|:count days' => 86400, - '1 hour|:count hours' => 3600, - '1 min|:count min' => 60, - '1 sec|:count sec' => 1 - ); - $output = ''; - // $output.=time()." - ".$timestamp." = ".$seconds; - foreach ($units as $key => $value) { - $key = explode('|', $key); - if ($seconds >= $value) { - $count = floor($seconds / $value); - $output .= ($output ? ' ' : ''); - $output .= ($count == 1) ? $key[0] : str_replace(':count', $count, $key[1]); - $seconds %= $value; - $granularity--; - } - if ($granularity == 0) { - break; - } - } - return $output ? $output : '0 sec'; -} + function format_duration($seconds, $granularity = 2) + { + $units = array( + '1 year|:count years' => 31536000, + '1 week|:count weeks' => 604800, + '1 day|:count days' => 86400, + '1 hour|:count hours' => 3600, + '1 min|:count min' => 60, + '1 sec|:count sec' => 1 + ); + $output = ''; + // $output.=time()." - ".$timestamp." = ".$seconds; + foreach ($units as $key => $value) { + $key = explode('|', $key); + if ($seconds >= $value) { + $count = floor($seconds / $value); + $output .= ($output ? ' ' : ''); + $output .= ($count == 1) ? $key[0] : str_replace(':count', $count, $key[1]); + $seconds %= $value; + $granularity--; + } + if ($granularity == 0) { + break; + } + } + return $output ? $output : '0 sec'; + } -function getTextFromHtml($html) -{ - // first, replace an

with


- $text = str_replace('

', '


', $html); - // next, replace a with
- $text = str_replace('', '
', $html); - // now replace any
with newlines - $text = preg_replace('', chr(13) . chr(10), $text); - // and strip the rest of the tags - $text = strip_tags($text); + function getTextFromHtml($html) + { + // first, replace an

with


+ $text = str_replace('

', '


', $html); + // next, replace a with
+ $text = str_replace('', '
', $html); + // now replace any
with newlines + $text = preg_replace('', chr(13) . chr(10), $text); + // and strip the rest of the tags + $text = strip_tags($text); - // a few common html entities - // replace & with & first, so multiply-encoded entities will decode (like "&#160;") - $text = str_replace('&', '&', $text); - $text = str_replace(' ', ' ', $text); - $text = str_replace(' ', ' ', $text); - $text = str_replace('<', '<', $text); - $text = str_replace('>', '>', $text); + // a few common html entities + // replace & with & first, so multiply-encoded entities will decode (like "&#160;") + $text = str_replace('&', '&', $text); + $text = str_replace(' ', ' ', $text); + $text = str_replace(' ', ' ', $text); + $text = str_replace('<', '<', $text); + $text = str_replace('>', '>', $text); - // text version should always wrap at 75 chars, some mail severs wont accept - // mail with very long lines - $text = wordwrap($text, 75, "\n", true); + // text version should always wrap at 75 chars, some mail severs wont accept + // mail with very long lines + $text = wordwrap($text, 75, "\n", true); - return $text; -} + return $text; + } -function getUserForSponsor($sponsor_id) -{ - global $pdo; - // loop through each contact and draw a form with their data in it. - $q = $pdo->prepare("SELECT *,MAX(year) FROM users LEFT JOIN users_sponsor ON users_sponsor.users_id=users.id + function getUserForSponsor($sponsor_id) + { + global $pdo; + // loop through each contact and draw a form with their data in it. + $q = $pdo->prepare("SELECT *,MAX(year) FROM users LEFT JOIN users_sponsor ON users_sponsor.users_id=users.id WHERE sponsors_id='" . $sponsor_id . "' AND types LIKE '%sponsor%' @@ -1394,139 +1411,144 @@ function getUserForSponsor($sponsor_id) ORDER BY users_sponsor.primary DESC,lastname,firstname LIMIT 1 "); - $q->execute(); - $r = $q->fetch(); - return user_load_by_uid($r->uid); -} + $q->execute(); + $r = $q->fetch(); + return user_load_by_uid($r->uid); + } -function projectdivisions_load($year = false) -{ - global $config, $pdo; - if ($year == false) - $year = $config['FAIRYEAR']; - $divs = array(); - $q = $pdo->prepare("SELECT * FROM projectdivisions WHERE year='$year'"); - $q->execute(); - while ($d = $q->fetch(PDO::FETCH_ASSOC)) - $divs[$d['id']] = $d; - return $divs; -} + function projectdivisions_load($year = false) + { + global $config, $pdo; + if ($year == false) + $year = $config['FAIRYEAR']; + $divs = array(); + $q = $pdo->prepare("SELECT * FROM projectdivisions WHERE year='$year'"); + $q->execute(); + while ($d = $q->fetch(PDO::FETCH_ASSOC)) + $divs[$d['id']] = $d; + return $divs; + } -function projectcategories_load($year = false) -{ - global $config, $pdo; - if ($year == false) - $year = $config['FAIRYEAR']; - $cats = array(); - $q = $pdo->prepare("SELECT * FROM projectcategories WHERE year='$year'"); - $q->execute(); - while ($c = $q->fetch(PDO::FETCH_ASSOC)) - $cats[$c['id']] = $c; - return $cats; -} + function projectcategories_load($year = false) + { + global $config, $pdo; + if ($year == false) + $year = $config['FAIRYEAR']; + $cats = array(); + $q = $pdo->prepare("SELECT * FROM projectcategories WHERE year='$year'"); + $q->execute(); + while ($c = $q->fetch(PDO::FETCH_ASSOC)) + $cats[$c['id']] = $c; + return $cats; + } -// Converts the numeric value "$val" to an English text representation of it (e.g. "two thousand four"). -// If the "$monetize" flag is set to true, then it's formatted to be useable on printed cheques (e.g. "***** Two Thousand Four 00/100 *****". -function wordify($val, $monetize = false) -{ - $digits = array('zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine'); - if ($monetize) { - $pennies = intval(($val - intval($val)) * 100); - $returnval = 'and ' . sprintf('%02d', $pennies) . '/100'; - } else if ($val != intval($val)) { - $dec = $val - intval($val); - $returnval = 'point'; - while ($dec) { - $dec *= 10; - $returnval .= ' ' . smallIntToText(intval($dec)); - $dec -= intval($dec); - } - } - $val = intval($val); - $powerofthousand = array( - '', 'Thousand', 'Million', 'Billion', 'trillion', 'quadrillion' - ); - $n = 0; - if (!$val) { - $returnval = 'Zero ' . $returnval; - } else { - while ($val > 0) { - $sectionVal = $val % 1000; - if ($sectionVal != 0) { - $sectionText = smallIntToText($sectionVal); - if ($powerofthousand[$n] != '') { - $returnval = $sectionText . ' ' . $powerofthousand[$n] . ' ' . $returnval; - } else { - $returnval = $sectionText . ' ' . $returnval; - } - } - $val = intval($val / 1000); - $n++; - } - } - if ($monetize) - $returnval = '***' . $returnval; - return $returnval; -} + // Converts the numeric value "$val" to an English text representation of it (e.g. "two thousand four"). + // If the "$monetize" flag is set to true, then it's formatted to be useable on printed cheques (e.g. "***** Two Thousand Four 00/100 *****". + function wordify($val, $monetize = false) + { + $digits = array('zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine'); + if ($monetize) { + $pennies = intval(($val - intval($val)) * 100); + $returnval = 'and ' . sprintf('%02d', $pennies) . '/100'; + } else if ($val != intval($val)) { + $dec = $val - intval($val); + $returnval = 'point'; + while ($dec) { + $dec *= 10; + $returnval .= ' ' . smallIntToText(intval($dec)); + $dec -= intval($dec); + } + } + $val = intval($val); + $powerofthousand = array( + '', + 'Thousand', + 'Million', + 'Billion', + 'trillion', + 'quadrillion' + ); + $n = 0; + if (!$val) { + $returnval = 'Zero ' . $returnval; + } else { + while ($val > 0) { + $sectionVal = $val % 1000; + if ($sectionVal != 0) { + $sectionText = smallIntToText($sectionVal); + if ($powerofthousand[$n] != '') { + $returnval = $sectionText . ' ' . $powerofthousand[$n] . ' ' . $returnval; + } else { + $returnval = $sectionText . ' ' . $returnval; + } + } + $val = intval($val / 1000); + $n++; + } + } + if ($monetize) + $returnval = '***' . $returnval; + return $returnval; + } -// Converts a number between zero and one thousand to Canadian English text -function smallIntToText($number) -{ - $number %= 1000; - $rvals = array( - 0 => 'Zero', - 1 => 'One', - 2 => 'Two', - 3 => 'Three', - 4 => 'Four', - 5 => 'Five', - 6 => 'Six', - 7 => 'Seven', - 8 => 'Eight', - 9 => 'Nine', - 10 => 'Ten', - 11 => 'Eleven', - 12 => 'Twelve', - 13 => 'Thirteen', - 14 => 'Fourteen', - 15 => 'Fifteen', - 16 => 'Sixteen', - 17 => 'Seventeen', - 18 => 'Eighteen', - 19 => 'Nineteen', - 20 => 'Twenty', - 30 => 'Thirty', - 40 => 'Forty', - 50 => 'Fifty', - 60 => 'Sixty', - 70 => 'Seventy', - 80 => 'Eighty', - 90 => 'Ninety', - ); - if (array_key_exists($number, $rvals)) - return $rvals[$number]; - $returnval = ''; - if ($number >= 100) { - $hundred = intval($number / 100); - $returnval = $rvals[$hundred] . ' Hundred'; - $number -= 100 * $hundred; - } - if (array_key_exists($number, $rvals)) { - if ($number > 0) - $returnval .= ' ' . $rvals[$number]; - return $returnval; - } - if ($number >= 10) { - $ten = intval($number / 10); - if ($returnval != '') - $returnval .= ' '; - $returnval .= $rvals[10 * $ten]; - $number -= 10 * $ten; - } - if ($number > 0) { - $returnval .= ' ' . $rvals[$number]; - } - return $returnval; -} + // Converts a number between zero and one thousand to Canadian English text + function smallIntToText($number) + { + $number %= 1000; + $rvals = array( + 0 => 'Zero', + 1 => 'One', + 2 => 'Two', + 3 => 'Three', + 4 => 'Four', + 5 => 'Five', + 6 => 'Six', + 7 => 'Seven', + 8 => 'Eight', + 9 => 'Nine', + 10 => 'Ten', + 11 => 'Eleven', + 12 => 'Twelve', + 13 => 'Thirteen', + 14 => 'Fourteen', + 15 => 'Fifteen', + 16 => 'Sixteen', + 17 => 'Seventeen', + 18 => 'Eighteen', + 19 => 'Nineteen', + 20 => 'Twenty', + 30 => 'Thirty', + 40 => 'Forty', + 50 => 'Fifty', + 60 => 'Sixty', + 70 => 'Seventy', + 80 => 'Eighty', + 90 => 'Ninety', + ); + if (array_key_exists($number, $rvals)) + return $rvals[$number]; + $returnval = ''; + if ($number >= 100) { + $hundred = intval($number / 100); + $returnval = $rvals[$hundred] . ' Hundred'; + $number -= 100 * $hundred; + } + if (array_key_exists($number, $rvals)) { + if ($number > 0) + $returnval .= ' ' . $rvals[$number]; + return $returnval; + } + if ($number >= 10) { + $ten = intval($number / 10); + if ($returnval != '') + $returnval .= ' '; + $returnval .= $rvals[10 * $ten]; + $number -= 10 * $ten; + } + if ($number > 0) { + $returnval .= ' ' . $rvals[$number]; + } + return $returnval; + } -?> +?> \ No newline at end of file diff --git a/theme/default/images/ui-bg_flat_55_999999_40x100.png b/theme/classic/images/ui-bg_flat_55_999999_40x100.png similarity index 100% rename from theme/default/images/ui-bg_flat_55_999999_40x100.png rename to theme/classic/images/ui-bg_flat_55_999999_40x100.png diff --git a/theme/default/images/ui-bg_flat_75_aaaaaa_40x100.png b/theme/classic/images/ui-bg_flat_75_aaaaaa_40x100.png similarity index 100% rename from theme/default/images/ui-bg_flat_75_aaaaaa_40x100.png rename to theme/classic/images/ui-bg_flat_75_aaaaaa_40x100.png diff --git a/theme/default/images/ui-bg_glass_45_0078ae_1x400.png b/theme/classic/images/ui-bg_glass_45_0078ae_1x400.png similarity index 100% rename from theme/default/images/ui-bg_glass_45_0078ae_1x400.png rename to theme/classic/images/ui-bg_glass_45_0078ae_1x400.png diff --git a/theme/default/images/ui-bg_glass_55_f8da4e_1x400.png b/theme/classic/images/ui-bg_glass_55_f8da4e_1x400.png similarity index 100% rename from theme/default/images/ui-bg_glass_55_f8da4e_1x400.png rename to theme/classic/images/ui-bg_glass_55_f8da4e_1x400.png diff --git a/theme/default/images/ui-bg_glass_75_79c9ec_1x400.png b/theme/classic/images/ui-bg_glass_75_79c9ec_1x400.png similarity index 100% rename from theme/default/images/ui-bg_glass_75_79c9ec_1x400.png rename to theme/classic/images/ui-bg_glass_75_79c9ec_1x400.png diff --git a/theme/default/images/ui-bg_gloss-wave_45_e14f1c_500x100.png b/theme/classic/images/ui-bg_gloss-wave_45_e14f1c_500x100.png similarity index 100% rename from theme/default/images/ui-bg_gloss-wave_45_e14f1c_500x100.png rename to theme/classic/images/ui-bg_gloss-wave_45_e14f1c_500x100.png diff --git a/theme/default/images/ui-bg_gloss-wave_50_6eac2c_500x100.png b/theme/classic/images/ui-bg_gloss-wave_50_6eac2c_500x100.png similarity index 100% rename from theme/default/images/ui-bg_gloss-wave_50_6eac2c_500x100.png rename to theme/classic/images/ui-bg_gloss-wave_50_6eac2c_500x100.png diff --git a/theme/default/images/ui-bg_gloss-wave_75_2191c0_500x100.png b/theme/classic/images/ui-bg_gloss-wave_75_2191c0_500x100.png similarity index 100% rename from theme/default/images/ui-bg_gloss-wave_75_2191c0_500x100.png rename to theme/classic/images/ui-bg_gloss-wave_75_2191c0_500x100.png diff --git a/theme/default/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/theme/classic/images/ui-bg_inset-hard_100_fcfdfd_1x100.png similarity index 100% rename from theme/default/images/ui-bg_inset-hard_100_fcfdfd_1x100.png rename to theme/classic/images/ui-bg_inset-hard_100_fcfdfd_1x100.png diff --git a/theme/default/images/ui-icons_0078ae_256x240.png b/theme/classic/images/ui-icons_0078ae_256x240.png similarity index 100% rename from theme/default/images/ui-icons_0078ae_256x240.png rename to theme/classic/images/ui-icons_0078ae_256x240.png diff --git a/theme/default/images/ui-icons_056b93_256x240.png b/theme/classic/images/ui-icons_056b93_256x240.png similarity index 100% rename from theme/default/images/ui-icons_056b93_256x240.png rename to theme/classic/images/ui-icons_056b93_256x240.png diff --git a/theme/default/images/ui-icons_d8e7f3_256x240.png b/theme/classic/images/ui-icons_d8e7f3_256x240.png similarity index 100% rename from theme/default/images/ui-icons_d8e7f3_256x240.png rename to theme/classic/images/ui-icons_d8e7f3_256x240.png diff --git a/theme/default/images/ui-icons_e0fdff_256x240.png b/theme/classic/images/ui-icons_e0fdff_256x240.png similarity index 100% rename from theme/default/images/ui-icons_e0fdff_256x240.png rename to theme/classic/images/ui-icons_e0fdff_256x240.png diff --git a/theme/default/images/ui-icons_f5e175_256x240.png b/theme/classic/images/ui-icons_f5e175_256x240.png similarity index 100% rename from theme/default/images/ui-icons_f5e175_256x240.png rename to theme/classic/images/ui-icons_f5e175_256x240.png diff --git a/theme/default/images/ui-icons_f7a50d_256x240.png b/theme/classic/images/ui-icons_f7a50d_256x240.png similarity index 100% rename from theme/default/images/ui-icons_f7a50d_256x240.png rename to theme/classic/images/ui-icons_f7a50d_256x240.png diff --git a/theme/default/images/ui-icons_fcd113_256x240.png b/theme/classic/images/ui-icons_fcd113_256x240.png similarity index 100% rename from theme/default/images/ui-icons_fcd113_256x240.png rename to theme/classic/images/ui-icons_fcd113_256x240.png diff --git a/theme/default/jquery-ui-1.7.2.custom.css b/theme/classic/jquery-ui-1.7.2.custom.css similarity index 100% rename from theme/default/jquery-ui-1.7.2.custom.css rename to theme/classic/jquery-ui-1.7.2.custom.css diff --git a/theme/default/sfiab.css b/theme/classic/sfiab.css similarity index 100% rename from theme/default/sfiab.css rename to theme/classic/sfiab.css diff --git a/theme/default/theme.php b/theme/classic/theme.php similarity index 92% rename from theme/default/theme.php rename to theme/classic/theme.php index 7c16962a..4f4d51b0 100644 --- a/theme/default/theme.php +++ b/theme/classic/theme.php @@ -20,8 +20,8 @@ Boston, MA 02111-1307, USA. */ - $theme['name']="Default"; - $theme['description']="The default theme"; + $theme['name']="Classic"; + $theme['description']="The classic theme"; $theme['author']="James Grant "; ?> diff --git a/theme/icons_default/icons.php b/theme/icons_default/icons.php index 5ed44d8e..3f859ed1 100644 --- a/theme/icons_default/icons.php +++ b/theme/icons_default/icons.php @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ - $theme_icons['name']="Default Icons"; + $theme_icons['name']="Classic Theme Icons"; $theme_icons['description']="KDE4 icons"; $theme_icons['author']="James Grant ";