' . $this->pagetitle . ' :: ' . $this->base

diff --git a/inc/class.page.php b/inc/class.page.php --- a/inc/class.page.php +++ b/inc/class.page.php @@ -53,8 +53,6 @@ if (file_exists($config_inc)) { } - - //************************************************** // class.page.php Author: Ethan Zonca // @@ -66,32 +64,25 @@ class page { /* Site-wide configuration options */ - private $base_title = 'SlatePermutate :: Find the schedule that works for you!'; + private $base_title = 'SlatePermutate - Find the schedule that works for you!'; private $doctype = 'html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"'; private $htmlargs = 'xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"'; - private $bodyargs = ''; - - public $lastJobTable = ''; private $pageGenTime = 0; - /* Whether or not to output valid XHTML */ private $xhtml = FALSE; /* Scripts and styles */ private $headCode = array(); - /* - * Google analytics ga.js tracking code. Expanded in __construct(). - */ - private $trackingcode = ''; - + private $trackingcode = ''; // Tracking code private $pagetitle = ''; // Title of page private $scripts = array(); // Scripts to include on page /* the current school. See get_school(). */ private $school; + /** * \param $ntitle * Must be a valid HTML string (i.e., escaped with htmlentities()). @@ -100,11 +91,14 @@ class page */ public function __construct($ntitle, $nscripts = array(), $immediate = TRUE) { + /* Begin tracking generation time */ + $this->pageGenTime = round(microtime(),4); + global $ga_trackers; require_once('school.inc'); - // Scripts and styles available to include + /* Scripts and styles available for inclusion */ $this->headCode['jQuery'] = ''; $this->headCode['jQueryUI'] = ''; $this->headCode['jValidate'] = ''; @@ -115,6 +109,7 @@ class page $this->headCode['gliderHeadcode'] = ''; $this->headCode['uiTabsKeyboard'] = ''; $this->headCode['displayTables'] = ''; + $this->pagetitle = $ntitle; $this->scripts = $nscripts; @@ -197,42 +192,38 @@ class page public function headcode_add($key, $code, $enable = FALSE) { $this->headCode[$key] = $code; - if ($enable) + if ($enable) { $this->scripts[] = $key; + } } /** * \brief - * Output the HTML header for a page, including the and + * Output the HTML header for a page, including , , and opening structure */ public function head() { - $this->pageGenTime = round(microtime(), 3); - if ($this->xhtml) + if ($this->xhtml) { echo '' . PHP_EOL; + } echo 'doctype . '>'. PHP_EOL . 'htmlargs . '>'. PHP_EOL . ' '. PHP_EOL . - ' ' . $this->pagetitle . ' :: ' . $this->base_title . ''. PHP_EOL . + ' ' . $this->pagetitle . ' - ' . $this->base_title . ''. PHP_EOL . ' '. PHP_EOL . ' '. PHP_EOL . - ' '. PHP_EOL; + ' '. PHP_EOL; // Write out all passed scripts foreach ($this->scripts as $i) echo ' ' . $this->headCode["$i"] . "\n"; echo ' ' . PHP_EOL . - ' bodyargs.'>'. PHP_EOL . - '

'. PHP_EOL; - echo $this->top(); // Write out top - } - - /** Write out the top of the page, including opening div tags, header title and images, etc */ - private function top(){ - echo '

'. PHP_EOL . + ' '. PHP_EOL . + '

'. PHP_EOL . + '

'. PHP_EOL . '

'. PHP_EOL . @@ -244,10 +235,12 @@ class page '

'. PHP_EOL; } - /** Write out the foot of the page and closing divs */ + /** + * \brief + * Write out the foot of the page and closing divs + */ public function foot(){ echo '

'. PHP_EOL; - $this->pageGenTime = round(microtime(), 3); echo '

'. PHP_EOL . '

'. PHP_EOL . ' Submit Feedback'. PHP_EOL . @@ -259,56 +252,52 @@ class page '

'. PHP_EOL; echo $this->trackingcode; echo ' '. PHP_EOL . - ''; + '' . PHP_EOL; + $this->pageGenTime = round(microtime() - $this->pageGenTime,4); + echo ''; } - /** Takes a number in seconds, and outputs HH:MM:SS */ - public function secondsToCompound($seconds) { - $ret = ""; - $hours = intval(intval($seconds) / 3600); - $ret .= "$hours:"; - $minutes = bcmod((intval($seconds) / 60),60); - $ret .= "$minutes:"; - $seconds = bcmod(intval($seconds),60); - $ret .= "$seconds"; - return $ret; - } - - /** Shows a box with recently processed schedules */ - public function showSavedScheds($session) - { + /** + * \brief + * Shows a box with recently processed schedules + */ + public function showSavedScheds($session) { global $clean_urls; - echo '

'; - if (isset($session['saved']) && count($session['saved']) > 0) - { - $process_php_s = 'process.php?s='; - if ($clean_urls) - $process_php_s = ''; + if (isset($session['saved']) && count($session['saved']) > 0) { + echo '

' . PHP_EOL; - echo '

Saved Schedules:

'; + $process_php_s = 'process.php?s='; + if ($clean_urls) { + $process_php_s = ''; + } + echo '

Saved Schedules:

'; + + $hidden = ''; + $count = 0; + $output = ''; - $hidden = ''; - foreach($session['saved'] as $key => $name) - { - if($key == 5) { - echo '

More...

'; - $hidden = 'hidden'; - } - else { - echo '

'; - echo '#' . $key . ":\n " - . htmlentities($name) - . ' edit' - . ' delete' - . "

\n" - . '

'; - } + foreach($session['saved'] as $key => $name) { + if($count == 4) { + $output .= '

More...

'; + $hidden = 'hidden'; + } + else { + $output = '

' . PHP_EOL + . ' #' . $key . ":" + . htmlentities($name) + . ' edit' + . ' delete' + . '

' . PHP_EOL + . '

' . PHP_EOL . $output; } - echo '

Less...

'; + $count++; + } + echo $output; + echo '

Less...

' . PHP_EOL; + echo '

' . PHP_EOL; } - echo '

'; } /** @@ -331,9 +320,9 @@ class page */ public function showSchoolInstructions() { - echo "

\n"; - echo school_instructions_html($this->school); - echo "

\n"; + echo '

' . PHP_EOL + . school_instructions_html($this->school) . PHP_EOL + . '

' . PHP_EOL; } /** @@ -380,7 +369,7 @@ class page * A message consisting of valid XHTML to display to the user in * the 404 page. */ - public static function show_404($message = 'I couldn\'t find what you were looking for :-/.') + public static function show_404($message = 'The page you were looking for cannot be found!.') { $page_404 = page::page_create('404: Content Not Found'); $page_404->head(); @@ -490,13 +479,17 @@ class page */ public function script_wrap($js, $type = 'text/javascript') { - return ''; + return ''; } + /** + * \brief + * Add a trailing slash to a path if one does not already exist + */ private function add_trailing_slash($path){ if($path[strlen($path)-1] != '/') { return $path . "/"; @@ -519,11 +512,15 @@ class page { global $clean_urls, $short_url_base; - if ($clean_urls && isset($short_url_base)) + if ($clean_urls && isset($short_url_base)) { return $this->add_trailing_slash($short_url_base) . $id; - elseif ($clean_urls) + } + elseif ($clean_urls) { return 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $id; - else + } + else { return 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/process.php?s=' . $id; + } } + }