From: maxious Date: Fri, 24 Jun 2011 03:49:15 +0000 Subject: MyWay timeliness study data collection X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=e3562233fc481ae6c729caa9a130b29cdd1d1672 --- MyWay timeliness study data collection --- --- a/include/common-db.inc.php +++ b/include/common-db.inc.php @@ -11,6 +11,9 @@ if (!$conn) { die("A database error occurred.\n"); } +if (isDebug()) { + $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); +} function databaseError($errMsg) { die($errMsg); --- a/include/common-geo.inc.php +++ b/include/common-geo.inc.php @@ -3,6 +3,7 @@ $suburbs = explode(",", "Acton,Ainslie,Amaroo,Aranda,Banks,Barton,Belconnen,Bonner,Bonython,Braddon,Bruce,Calwell,Campbell,Chapman,Charnwood,Chifley,Chisholm,City,Conder,Cook,Curtin,Deakin,Dickson,Downer,Duffy,Dunlop,Evatt,Fadden,Farrer,Fisher,Florey,Flynn,Forrest,Franklin,Fraser,Fyshwick,Garran,Gilmore,Giralang,Gordon,Gowrie,Greenway,Griffith,Gungahlin,Hackett,Hall,Harrison,Hawker,Higgins,Holder,Holt,Hughes,Hume,Isaacs,Isabella Plains,Kaleen,Kambah,Kingston,Latham,Lawson,Lyneham,Lyons,Macarthur,Macgregor,Macquarie,Mawson,McKellar,Melba,Mitchell,Monash,Narrabundah,Ngunnawal,Nicholls,Oaks Estate,O'Connor,O'Malley,Oxley,Page,Palmerston,Parkes,Pearce,Phillip,Pialligo,Red Hill,Reid,Richardson,Rivett,Russell,Scullin,Spence,Stirling,Symonston,Tharwa,Theodore,Torrens,Turner,Wanniassa,Waramanga,Watson,Weetangera,Weston,Yarralumla"); function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb", $collapsible = true) { + global $labsPath; $width = 300; $height = 300; $metersperpixel[9] = 305.492 * $width; @@ -47,7 +48,7 @@ } $output = ""; if ($collapsible) $output.= '

Open Map...

'; - $output.= ''; if ($collapsible) $output.= '
'; return $output; --- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -23,8 +23,10 @@ $url.= "&guid=ON"; return str_replace("&", "&", $url); } + function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { +global $labsPath; echo ' @@ -33,16 +35,16 @@ ' . $pageTitle . ' - '; + '; if (isDebugServer()) { - echo ' + echo ' - + - '; + '; } else { echo ' @@ -54,10 +56,10 @@ '; } echo ' - - - - + + + +