--- a/.gitmodules +++ b/.gitmodules @@ -7,4 +7,7 @@ [submodule "lib/springy"] path = lib/springy url = https://github.com/dhotson/springy.git +[submodule "lib/php-diff"] + path = lib/php-diff + url = https://github.com/chrisboulton/php-diff.git
--- a/admin/import.php +++ b/admin/import.php @@ -1,6 +1,6 @@ <?php -require_once 'include/common.inc.php'; +require_once '../include/common.inc.php'; try { $server->create_db('disclosr-agencies'); } catch (SetteeRestClientException $e) {
--- /dev/null +++ b/admin/refreshDesignDoc.php @@ -1,1 +1,7 @@ +<?php +require_once '../include/common.inc.php'; +$db = $server->get_db('disclosr-agencies'); +createAgencyDesignDoc(); +?> +
--- /dev/null +++ b/admin/resolveConflicts.php @@ -1,1 +1,43 @@ +<?php +include_once('../include/common.inc.php'); +include_header(); +// Include the diff class +echo '<STYLE TYPE="text/css"> +<!-- + @import url(../lib/php-diff/example/styles.css); +--> +</STYLE> + '; +require_once dirname(__FILE__) . '/../lib/php-diff/lib/Diff.php'; +// Generate a side by side diff +require_once dirname(__FILE__) . '/../lib/php-diff/lib/Diff/Renderer/Html/SideBySide.php'; +$renderer = new Diff_Renderer_Html_SideBySide; + + + +$db = $server->get_db('disclosr-agencies'); +$docs = Array(); +try { + $rows = $db->get_view("app", "getConflicts")->rows; + //print_r($rows); + foreach ($rows as $row) { + echo '<h2>' . $row->id . '</h2>'; + echo "Comparing " . $row->value[0] . " and " . $row->value[1]; + $docA = explode(",", json_encode($db->get($row->id . "?rev=" . $row->value[0]))); + $docB = explode(",", json_encode($db->get($row->id . "?rev=" . $row->value[1]))); + // Options for generating the diff + $options = array( + //'ignoreWhitespace' => true, + //'ignoreCase' => true, + ); + + // Initialize the diff class + $diff = new Diff($docA, $docB, $options); + echo $diff->Render($renderer); + } +} catch (SetteeRestClientException $e) { + setteErrorHandler($e); +} +include_footer(); +?>
--- a/admin/verify.php +++ b/admin/verify.php @@ -1,6 +1,6 @@ <?php -include_once('include/common.inc.php'); +include_once('../include/common.inc.php'); include_header(); $db = $server->get_db('disclosr-agencies');
--- a/alaveteli/exportAgencies.csv.php +++ b/alaveteli/exportAgencies.csv.php @@ -34,13 +34,13 @@ $row["#id"] = $agency->value->_id; $row["name"] = $agency->value->name; if (isset($agency->value->foi_email)) { - $row["request_email"] = $agency->value->foi_email; + $row["request_email"] = $agency->value->foiEmail; } else { $row["request_email"] = "foi@".GetDomain($agency->value->website); // } - if (isset($agency->value->short_name)) { - $row["short_name"] = $agency->value->short_name; + if (isset($agency->value->shortName)) { + $row["short_name"] = $agency->value->shortName; } else { $out = Array(); preg_match_all('/[A-Z]/', $agency->value->name, $out);
--- a/alaveteli/exportCategories.rb.php +++ b/alaveteli/exportCategories.rb.php @@ -13,7 +13,7 @@ $rows = $db->get_view("app", "byDeptStateName", null, true)->rows; //print_r($rows); foreach ($rows as $row) { - echo ' [ "'.phrase_to_tag(dept_to_portfolio($row->key)).'","'. dept_to_portfolio($row->key).'","'.dept_to_portfolio($row->key).'" ],'.PHP_EOL; + echo ' [ "'.phrase_to_tag(dept_to_portfolio($row->key)).'","'. dept_to_portfolio($row->key).'","part of the '.dept_to_portfolio($row->key).' portfolio" ],'.PHP_EOL; } } catch (SetteeRestClientException $e) { setteErrorHandler($e);
--- a/getAgency.php +++ b/getAgency.php @@ -31,8 +31,9 @@ } else { if (strpos($key, "_") === 0) { echo"<input type='hidden' id='$key' name='$key' value='$value'/>"; + } else if ($key == "parentOrg") { - echo "<label for='$key'>$key</label><select id='$key' name='$key'>"; + echo "<label for='$key'>$key</label><select id='$key' name='$key'><option value=''> Select... </option>"; $rows = $db->get_view("app", "byDeptStateName")->rows; //print_r($rows); foreach ($rows as $row) { @@ -40,7 +41,7 @@ } echo" </select>"; } else if (strpos($key, "has") === 0) { - echo "<label for='$key'><input type='checkbox' id='$key' name='$key' ".(($value=='true')?"checked='$value'":"")."> $key</label>"; + echo "<label for='$key'><input type='checkbox' id='$key' name='$key' ".(($value=='on' || $value=='true')?"checked='$value'":"")."> $key</label>"; } else { echo "<label>$key</label><input class='input-text' type='text' id='$key' name='$key' value='$value'/>"; if ((strpos($key,"URL") > 0 || $key == 'website')&& $value != "") { @@ -89,13 +90,21 @@ //print_r($row); if (sizeof($_POST) > 0) { //print_r($_POST); + foreach ($_POST as $postkey => $postvalue) { + if ($postvalue == "") { + unset($_POST[$postkey]); + } + if (is_array($postvalue) && count($postvalue) == 1 && $postvalue[0] == "") { + unset($_POST[$postkey]); + } + } if (isset($_POST['_id']) && $db->get_rev($_POST['_id']) == $_POST['_rev']) { echo "Edited version was latest version, continue saving"; $newdoc = $_POST; $newdoc['metadata']['lastModified'] = time(); $row = $db->save($newdoc); } else { - echo "ALERT doc revised by someone else while editing."; + echo "ALERT doc revised by someone else while editing. Document not saved."; } }
--- a/graph.php +++ b/graph.php @@ -1,21 +1,51 @@ <?php include_once('include/common.inc.php'); //include_header(); -?> -<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> -<script src="lib/springy/springy.js"></script> -<script src="lib/springy/springyui.js"></script> -<script> - var graph = new Graph(); - var nodes = []; -<?php +$format = "html"; +if (isset($_REQUEST['format'])) { + $format = $_REQUEST['format']; +} + +function add_node($id, $label) { + global $format; + if ($format == "html") { + echo "nodes[\"$id\"] = graph.newNode({label: \"$label\"});" . PHP_EOL; + } + if ($format == "dot" && $label != "") { + echo "$id [label=\"$label\"];". PHP_EOL; + } +} + +function add_edge($from, $to, $color) { + global $format; + if ($format == "html") { + echo "graph.newEdge(nodes[\"$from\"], nodes['$to'], {color: '$color'});" . PHP_EOL; + } + if ($format == "dot") { + echo "$from -> $to ".($color != ""? "[color=$color]":"").";". PHP_EOL; + } +} + +if ($format == "html") { + ?> + <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> + <script src="lib/springy/springy.js"></script> + <script src="lib/springy/springyui.js"></script> + <script> + var graph = new Graph(); + var nodes = []; + <?php +} +if ($format == "dot") { + echo 'digraph g {'. PHP_EOL; +} $db = $server->get_db('disclosr-agencies'); -echo "nodes[\"fedg\"] = graph.newNode({label: \"Federal Government - Commonwealth of Australia\"});" . PHP_EOL; + add_node("fedg","Federal Government - Commonwealth of Australia"); try { $rows = $db->get_view("app", "byCanonicalName", null, true)->rows; - //print_r($rows); +//print_r($rows); foreach ($rows as $row) { - echo "nodes[\"{$row->value->_id}\"] = graph.newNode({label: \"{$row->key}\"});" . PHP_EOL; + add_node($row->id, $row->key); } } catch (SetteeRestClientException $e) { setteErrorHandler($e); @@ -23,9 +53,9 @@ try { $rows = $db->get_view("app", "byDeptStateName", null, true)->rows; - //print_r($rows); +//print_r($rows); foreach ($rows as $row) { - echo "graph.newEdge(nodes[\"fedg\"], nodes['{$row->value}'], {color: '#00A0B0'});" . PHP_EOL; + add_edge("fedg", $row->value, 'yellow'); } } catch (SetteeRestClientException $e) { setteErrorHandler($e); @@ -33,25 +63,30 @@ try { $rows = $db->get_view("app", "parentOrgs", null, true)->rows; - // print_r($rows); +// print_r($rows); foreach ($rows as $row) { - echo "graph.newEdge(nodes[\"{$row->key}\"], nodes['{$row->value}'], {color: '#FFA0B0'});" . PHP_EOL; + add_edge($row->key, $row->value, 'blue'); } } catch (SetteeRestClientException $e) { setteErrorHandler($e); } -?> - window.onload = function() { - $(document).ready(function() { - var springy = $('#springydemo').springy({ - graph: graph +if ($format == "html") { + ?> + window.onload = function() { + $(document).ready(function() { + var springy = $('#springydemo').springy({ + graph: graph + }); }); - }); - }; -</script> + }; + </script> -<canvas id="springydemo" width="1260" height="680" /> -<?php + <canvas id="springydemo" width="1260" height="680" /> + <?php +} +if ($format == "dot") { + echo "}"; +} //include_footer(); ?>
--- a/include/common.inc.php +++ b/include/common.inc.php @@ -4,11 +4,9 @@ $basePath = ""; if (strstr($_SERVER['PHP_SELF'], "alaveteli/") - || strstr($_SERVER['PHP_SELF'], "myway/") + || strstr($_SERVER['PHP_SELF'], "admin/") || strstr($_SERVER['PHP_SELF'], "lib/") - || strstr($_SERVER['PHP_SELF'], "geo/") - || strstr($_SERVER['PHP_SELF'], "include/") - || strstr($_SERVER['PHP_SELF'], "servicealerts/")) + || strstr($_SERVER['PHP_SELF'], "include/")) $basePath = "../"; include_once ('couchdb.inc.php'); @@ -49,7 +47,7 @@ return trim(str_replace("Department of", "", str_replace("Department of the", "Department of", $deptName))); } function phrase_to_tag ($phrase) { - return str_replace(" ","_",str_replace(",","",strtolower($phrase))); + return str_replace(" ","_",str_replace("'","",str_replace(",","",strtolower($phrase)))); } function GetDomain($url) {
--- a/include/template.inc.php +++ b/include/template.inc.php @@ -1,6 +1,7 @@ <?php function include_header() { + global $basePath; ?> <!DOCTYPE html> @@ -18,11 +19,11 @@ <title>Disclosr</title> <!-- Included CSS Files --> - <link rel="stylesheet" href="stylesheets/foundation.css"> - <link rel="stylesheet" href="stylesheets/app.css"> + <link rel="stylesheet" href="<?php echo $basePath ?>stylesheets/foundation.css"> + <link rel="stylesheet" href="<?php echo $basePath ?>stylesheets/app.css"> <!--[if lt IE 9]> - <link rel="stylesheet" href="stylesheets/ie.css"> + <link rel="stylesheet" href="<?php echo $basePath ?>stylesheets/ie.css"> <![endif]--> @@ -43,7 +44,7 @@ <div class="eight columns hide-on-phones"> <strong class="right"> <a href="getAgency.php">Agencies</a> - <a href="about.php">About/FAQ</a> + <a href="about.php">About/FAQ</a> </strong> </div> </div> @@ -54,7 +55,10 @@ <div class="container"> <?php } - function include_footer() { ?> + function include_footer() { + global $basePath; + ?> + </div> <!-- container --> @@ -62,14 +66,13 @@ <!-- Included JS Files --> - <script src="javascripts/foundation.js"></script> - <script src="javascripts/app.js"></script> + <script src="<?php echo $basePath; ?>javascripts/foundation.js"></script> + <script src="<?php echo $basePath; ?>javascripts/app.js"></script> <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script> </body> </html> -<?php } - +<?php } ?>
--- /dev/null +++ b/lib/php-diff
--- a/schemas/agency.json.php +++ b/schemas/agency.json.php @@ -4,38 +4,44 @@ "description" => "Representation of government agency and online transparency measures", "type" => "object", "properties" => Array( - "name" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "short_name" => Array("type" => "string", "required" => false, "x-title"=> "Agency Short Name", "description" => "Agency Name shortened, usually to an acronym"), - "otherNames" => Array("type" => "array", "required" => true, "x-title" => "Agency Past/Other Names", "description" => "Agency Names", + "name" => Array("type" => "string", "required" => true, "x-title" => "Name", "description" => "Name, most recent and broadest"), + "shortName" => Array("type" => "string", "required" => false, "x-title" => "Short Name", "description" => "Name shortened, usually to an acronym"), + "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"), + "otherNames" => Array("type" => "array", "required" => true, "x-title" => "Past/Other Names", "description" => "Other names for organisation", "items" => Array("type" => "string")), "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies", "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous", "items" => Array("type" => "string")), - "orgType"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "parentOrg"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "website"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "abn" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "contractListURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "grantsReportingURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "annualReportURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "consultanciesURL" => Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "legalExpenditureURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "recordsListURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "FOIDocumentsURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "infoPublicationSchemeURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "appointmentsURL"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "hasRSS"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "hasMailingList"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "hasTwitter"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "hasFacebook"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - "hasYouTube"=> Array("type" => "string", "required" => true, "x-title"=> "Agency Name", "description" => "Agency Name, most recent and broadest"), - + "orgType" => Array("type" => "string", "required" => true, "x-title" => "Organisation Type", "description" => "Org type based on legal formation via FMA/CAC legislation etc."), + "parentOrg" => Array("type" => "string", "required" => true, "x-title" => "Parent Organisation", "description" => "Parent organisation, usually a department of state"), + "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "description" => "Website URL"), + "abn" => Array("type" => "string", "required" => true, "x-title" => "Australian Business Number", "description" => "ABN from business register"), + "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), + "grantsReportingURL" => Array("type" => "string", "required" => true, "x-title" => "Grants Awarded", + "description" => "Departmental and agency grants mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm and Commonwealth grants guidelines http://www.finance.gov.au/publications/fmg-series/23-commonwealth-grant-guidelines.html"), + "annualReportURL" => Array("type" => "string", "required" => true, "x-title" => "Annual Report(s)", "description" => ""), + "consultanciesURL" => Array("type" => "string", "required" => true, "x-title" => "Consultants Hired", "description" => ""), + "legalExpenditureURL" => Array("type" => "string", "required" => true, "x-title" => "Legal Services Expenditure", "description" => "Legal Services Expenditure mandated by Legal Services Directions 2005"), + "recordsListURL" => Array("type" => "string", "required" => true, "x-title" => "Files/Records Held", "description" => "Indexed lists of departmental and agency files, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), + "FOIDocumentsURL" => Array("type" => "string", "required" => true, "x-title" => "FOI Documents Released", "description" => ""), + "infoPublicationSchemeURL" => Array("type" => "string", "required" => true, "x-title" => "Information Publication Scheme", "description" => ""), + "appointmentsURL" => Array("type" => "string", "required" => true, "x-title" => "Agency Appointments/Boards", "description" => "Departmental and agency appointments and vacancies , mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm"), + "advertisingURL" => Array("type" => "string", "required" => true, "x-title" => "Approved Advertising Campaigns", "description" => " Agency advertising and public information projects, mandated by the Senate @ http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm "), + "hasRSS" => Array("type" => "string", "required" => true, "x-title" => "Has RSS", "description" => ""), + "hasMailingList" => Array("type" => "string", "required" => true, "x-title" => "Has Mailing List", "description" => ""), + "hasTwitter" => Array("type" => "string", "required" => true, "x-title" => "Has Twitter", "description" => ""), + "hasFacebook" => Array("type" => "string", "required" => true, "x-title" => "Has Facebook", "description" => ""), + "hasYouTube" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""), + + "hasFlickr" => Array("type" => "string", "required" => true, "x-title" => "Has YouTube", "description" => ""), + "hasCCBY" => Array("type" => "string", "required" => true, "x-title" => "Has CC-BY", "description" => "Has any page licenced Creative Commons - Attribution"), + ), - /*"org":{"type":"object", - "properties":{ - "organizationName":{"type":"string"}, - "organizationUnit":{"type":"string"}}, - } - }*/ + /* "org":{"type":"object", + "properties":{ + "organizationName":{"type":"string"}, + "organizationUnit":{"type":"string"}}, + } + } */ ); ?>