remove amon, fix openid
--- a/admin/data/CN806771.2cb256c016c609172a97a04741a278f8.xls
+++ b/admin/data/CN806771.2cb256c016c609172a97a04741a278f8.xls
@@ -1010,7 +1010,7 @@
="Future Fund Management Agency" ="CN987101" ="CN987101-A2" 25-Oct-12 09:58 AM 19-Dec-12 10:44 AM ="published" 10-Oct-12 31-Mar-13 67000.00 " Contractor fee " ="FFMA0513" ="Temporary personnel services" ="Limited tender" ="" ="No" ="" ="No" ="" ="No" ="" "Contract extension" ="Ranstad Pty Ltd" ="" ="Sydney" ="2000" ="AUSTRALIA" ="No" ="28080275378" ="" ="" ="3000"
="Future Fund Management Agency" ="" ="CN1104112" 19-Dec-12 10:47 AM ="published" 26-Nov-12 01-Mar-13 15000.00 " Contractor fees " ="FFMA0527" ="Temporary personnel services" ="Limited tender" ="" ="No" ="" ="No" ="" ="No" ="" "" ="Randstad" ="" ="Sydney" ="2000" ="AUSTRALIA" ="No" ="28080275378" ="" ="" ="3000"
="Australian Securities and Investments Commission" ="" ="CN1104152" 19-Dec-12 09:50 AM ="published" 12-Apr-12 30-Jun-13 178970.00 " Vetting " ="2854" ="Security surveillance and detection" ="Limited tender" ="" ="No" ="" ="No" ="" ="No" ="" "" ="Premier Protection Agency" ="PO Box 3401" ="Liverpool" ="2170" ="AUSTRALIA" ="No" ="37078491826" ="" ="" ="2000"
-="Department of Defence" ="" ="CN1104192" 19-Dec-12 10:01 AM ="published" 22-Jul-09 30-Sep-09 26180.00 " MRH 90 PROJECT NET ACTIONS SCRIPT PROGRAMMER " ="4500714409" ="Computer services" ="Limited tender" ="" ="No" ="" ="No" ="" ="No" ="" "" ="DESIGN AND BUILD THIS" ="14 LARKEN AVE" ="BAULKHAM HILLS" ="2153" ="AUSTRALIA" ="No" ="93223025707" ="ARMY Headquarters" ="Army Group" ="2000"
+="Department of Defence" ="" ="CN1104192" 19-Dec-12 10:01 AM ="published" 22-Jul-09 30-Sep-09 26180.00 " MRH 90 PROJECT NET ACTIONS SCRIPT PROGRAMMER " ="4500714409" ="Computer services" ="Limited tender" ="" ="No" ="" ="No" ="" ="No" ="" "" ="DESIGN AND BUILD THIS" ="" ="BAULKHAM HILLS" ="2153" ="AUSTRALIA" ="No" ="93223025707" ="ARMY Headquarters" ="Army Group" ="2000"
="Department of Industry, Innovation, Science, Research and Tertiary Education" ="CN1065821" ="CN1065821-A1" 03-Dec-12 02:22 PM 19-Dec-12 10:06 AM ="published" 07-Aug-12 30-Jun-13 13491.50 " HTML Conversion of 2011-12 Annual Report " ="CONTRACTS-004828-0" ="Internet services" ="Limited tender" ="" ="No" ="" ="No" ="" ="No" ="" "Increase contract value" ="SWELL DESIGN GROUP" ="" ="MANUKA" ="2603" ="AUSTRALIA" ="No" ="95060811725" ="" ="" ="2601"
="Defence Materiel Organisation" ="" ="CN1104232" 19-Dec-12 10:06 AM ="published" 19-Dec-12 21-May-13 87747.00 " purchase of test sets and shipping crates " ="NC1YY9" ="Aerospace systems and components and equipment" ="Limited tender" ="" ="No" ="" ="No" ="" ="No" ="" "" ="astrite pty ltd" ="5 jarrah court" ="hoppers crossing" ="3029" ="AUSTRALIA" ="No" ="18756753773" ="" ="" ="3027"
="Future Fund Management Agency" ="" ="CN1104262" 19-Dec-12 10:46 AM ="published" 30-Nov-12 30-Nov-12 31680.00 " Personnel Recruitment " ="FFMA0526" ="Personnel recruitment" ="Limited tender" ="" ="No" ="" ="No" ="" ="No" ="" "" ="Mahlad Recruitment Pty Lts" ="" ="Melbourne" ="3000" ="AUSTRALIA" ="No" ="46633561134" ="" ="" ="3000"
@@ -1847,4 +1847,5 @@
="Office of the Director of Public Prosecutions" ="" ="CN1112292" 21-Dec-12 06:59 PM ="published" 01-Jan-13 31-Oct-13 120000.00 " Estimated value for process servers " ="" ="Legal services" ="Open tender" ="" ="SON1112262" ="No" ="" ="No" ="" ="No" ="" "" ="Probe Group Pty Ltd" ="" ="Melbourne" ="3000" ="AUSTRALIA" ="No" ="90770747494" ="" ="" ="2601"
="Office of the Director of Public Prosecutions" ="" ="CN1112302" 21-Dec-12 07:02 PM ="published" 01-Jan-13 31-Oct-13 210000.00 " Estimated Value for process servers " ="" ="Legal services" ="Open tender" ="" ="SON1112262" ="No" ="" ="No" ="" ="No" ="" "" ="Statewide Mercantile Services Pty Ltd" ="" ="West Melbourne" ="3000" ="AUSTRALIA" ="No" ="77075475544" ="" ="" ="2601"
="Office of the Director of Public Prosecutions" ="" ="CN1112312" 21-Dec-12 07:04 PM ="published" 01-Jan-13 31-Oct-13 205000.00 " Estimated value for process servers " ="" ="Legal services" ="Open tender" ="" ="SON1112262" ="No" ="" ="No" ="" ="No" ="" "" ="Wise McGrath" ="" ="Sydney" ="2000" ="AUSTRALIA" ="No" ="14096930568" ="" ="" ="2601"
-="Australian Law Reform Commission" ="" ="CN1014921" 17-Dec-12 02:20 PM ="published" 01-Nov-12 02-Nov-15 12000.00 " Office supplies and stationary " ="ALRC 02" ="Stationery" ="Open tender" ="FIN11/FMG010" ="SON473022" ="No" ="" ="No" ="" ="No" ="" "" ="OfficeMax Australia Limited" ="20 Worth St" ="Chullora" ="2190" ="AUSTRALIA" ="No" ="26064777224" ="Australian Law Reform Commission" ="Attorney-General's Department" ="2001"
+="Australian Law Reform Commission" ="" ="CN1014921" 17-Dec-12 02:20 PM ="published" 01-Nov-12 02-Nov-15 12000.00 " Office supplies and stationary " ="ALRC 02" ="Stationery" ="Open tender" ="FIN11/FMG010" ="SON473022" ="No" ="" ="No" ="" ="No" ="" "" ="OfficeMax Australia Limited" ="20 Worth St" ="Chullora" ="2190" ="AUSTRALIA" ="No" ="26064777224" ="Australian Law Reform Commission" ="Attorney-General's Department" ="2001"
+
--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -14,14 +14,6 @@
if (strstr($_SERVER['PHP_SELF'], "labs/") || strstr($_SERVER['PHP_SELF'], "admin/") || strstr($_SERVER['PHP_SELF'], "heuristics/")) {
$basePath = "../";
}
-if ($_SERVER['HTTP_HOST'] != "localhost") {
-require $basePath."lib/amon-php/amon.php";
-Amon::config(array('address'=> 'http://127.0.0.1:2464',
- 'protocol' => 'http',
- 'secret_key' => "JBcSUdFOi5lK0vCjLjbHDpQamcBnRA4iV7QLaTADeDQ"));
-Amon::setup_exception_handler();
-}
-
require ROOT . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'openid.php';
$openid = new LightOpenID($_SERVER['HTTP_HOST']);
// you have to open the session to be able to modify or remove it
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -81,7 +81,7 @@
$this->trustRoot = (strpos($host, '://') ? $host : 'https://' . $host);
}
- if(($host_end = strpos($this->trustRoot, '/', 8)) !== false) {
+ if(($host_end = @strpos($this->trustRoot, '/', 8)) !== false) {
$this->trustRoot = substr($this->trustRoot, 0, $host_end);
}