From: Maxious <maxious@lambdacomplex.org>
Date: Mon, 13 Aug 2012 00:25:30 +0000
Subject: Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/disclosr
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=disclosr.git&a=commitdiff&h=d05f78e6ef1bf34fe04a5994e0a46eeb15bcb0fc
---
Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/disclosr


Former-commit-id: e869d59c5493e9e3cd511cf520f64b1690218a28
---


--- a/about.php
+++ b/about.php
@@ -7,10 +7,9 @@
     <h4 class="subheader">Lorem ipsum.</h4>
 </div>
 <h2> What is this? </h2>
-Disclosr is a project to monitor Australian Federal Government agencies 
+Disclo.gs is a project to monitor Australian Federal Government agencies 
 compliance with their <a href="http://www.oaic.gov.au/publications/other_operational/foi_policy_frequently_asked_questions.html#_Toc291837571">"proactive disclosure requirements"</a>.
-OGRE (Open Government Realization Evaluation) is a ranking of compliance with these requirements.
-Prometheus is the agent which polls agency websites to assess compliance.
+
 
 <h2> Open everything </h2>
 All documents released CC-BY 3 AU

--- a/getAgency.php
+++ b/getAgency.php
@@ -137,7 +137,7 @@
         }
     }
 
-    $mode = "edit";
+    $mode = "view";
     $rowArray = object_to_array($obj);
 ksort($rowArray);
     if ($mode == "edit") {

--- /dev/null
+++ b/google676a414ad086cefb.html
@@ -1,1 +1,2 @@
+google-site-verification: google676a414ad086cefb.html
 

--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -51,6 +51,9 @@
 function phrase_to_tag ($phrase) {
     return str_replace(" ","_",str_replace("'","",str_replace(",","",strtolower($phrase))));
 }
+function local_url() {
+    return "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/";
+}
 function GetDomain($url)
 {
 $nowww = ereg_replace('www\.','',$url);

--- a/include/couchdb.inc.php
+++ b/include/couchdb.inc.php
@@ -161,7 +161,7 @@
 } else
 if (php_uname('n') == "KYUUBEY") {
 
-    $serverAddr = 'http://127.0.0.1:5984/';
+    $serverAddr = 'http://192.168.1.148:5984/';
 } else {
     $serverAddr = 'http://127.0.0.1:5984/';
 }

--- /dev/null
+++ b/index.php
@@ -1,1 +1,9 @@
+<?php
+/* Redirect to a different page in the current directory that was requested */
+$host  = $_SERVER['HTTP_HOST'];
+$uri   = rtrim(dirname($_SERVER['PHP_SELF']), '/\\');
+$extra = 'getAgency.php';
+header("Location: http://$host$uri/$extra");
+exit;
+?>
 

--- a/robots.txt
+++ b/robots.txt
@@ -3,3 +3,4 @@
 
 User-agent: *
 Disallow: /admin/
+Sitemap: http://orgs.disclosurelo.gs/sitemap.xml.php

--- /dev/null
+++ b/sitemap.xml.php
@@ -1,1 +1,25 @@
+<?php
 
+include ('include/common.inc.php');
+$last_updated = date('Y-m-d', @filemtime('cbrfeed.zip'));
+header("Content-Type: text/xml");
+echo "<?xml version='1.0' encoding='UTF-8'?>";
+echo '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . "\n";
+echo " <url><loc>" . local_url() . "index.php</loc><priority>1.0</priority></url>\n";
+foreach (scandir("./") as $file) {
+    if (strpos($file, ".php") !== false && $file != "index.php" && $file != "sitemap.xml.php")
+        echo " <url><loc>" . local_url() . "$file</loc><priority>0.3</priority></url>\n";
+}
+
+$db = $server->get_db('disclosr-agencies');
+try {
+    $rows = $db->get_view("app", "byCanonicalName")->rows;
+    foreach ($rows as $row) {
+        echo '<url><loc>' . local_url() . 'getAgency.php?id=' . $row->value->_id . "</loc><priority>0.6</priority></url>\n";
+    }
+} catch (SetteeRestClientException $e) {
+    setteErrorHandler($e);
+}
+echo '</urlset>';
+?>
+