diff options
| -rw-r--r-- | includes/wot.inc.php | 2 | ||||
| -rw-r--r-- | locale/escape_special_chars.php | 9 | ||||
| -rw-r--r-- | pages/account/41.php | 2 | ||||
| -rw-r--r-- | pages/wot/11.php | 52 | ||||
| -rw-r--r-- | pages/wot/14.php | 51 | ||||
| -rw-r--r-- | scripts/db_migrations/version2.sh | 96 | ||||
| -rw-r--r-- | www/policy/DisputeResolutionPolicy.php | 407 | ||||
| -rw-r--r-- | www/policy/OrganisationAssurancePolicy.php | 141 | ||||
| -rw-r--r-- | www/wot.php | 2 |
9 files changed, 472 insertions, 290 deletions
diff --git a/includes/wot.inc.php b/includes/wot.inc.php index edc442a..6b3bcc8 100644 --- a/includes/wot.inc.php +++ b/includes/wot.inc.php @@ -364,6 +364,8 @@ break; case 'Unknown': // to be revoked in the future? limit to max 50 pts? case 'Trusted Third Parties': // to be revoked in the future? limit to max 35 pts? + case 'TTP-Assisted': // TTP assurances, limit to 35 + case 'TOPUP': // TOPUP to be delevoped in the future, limit to 30 case '': // to be revoked in the future? limit to max 50 pts? case 'Face to Face Meeting': // normal assurances, limit to 35/50 pts in the future? break; diff --git a/locale/escape_special_chars.php b/locale/escape_special_chars.php index 32de390..0f494f1 100644 --- a/locale/escape_special_chars.php +++ b/locale/escape_special_chars.php @@ -41,6 +41,9 @@ function is_msgid($line) { return substr_compare($line, MSGID, 0, MSGID_LEN) === 0; } + +////////////// Main ////////////// + // Skip the metadata (first msgid/msgstr pair) while (!feof(STDIN)) { $line = fgets(STDIN); @@ -65,7 +68,13 @@ while (!feof(STDIN)) { } if ($msgstr) { + // Escape everything that has a special HTML entity such as + // > or ä except quote characters $line = htmlentities($line, ENT_NOQUOTES, "UTF-8"); + + // Escape everything else -> all characters that don't have a special + // HTML entity but are outside the ASCII range + $line = mb_convert_encoding($line, "HTML-ENTITIES", "UTF-8"); } echo $line; } diff --git a/pages/account/41.php b/pages/account/41.php index d2cfc8c..4ea9b10 100644 --- a/pages/account/41.php +++ b/pages/account/41.php @@ -25,7 +25,7 @@ require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php'); <td colspan="2" class="title"><?=_("My Language Settings")?></td> </tr> <tr> - <td class="DataTD"><?=_("My prefered language")?>:</td> + <td class="DataTD"><?=_("My preferred language")?>:</td> <td class="DataTD"><select name="lang"> <? foreach(L10n::$translations as $key => $val) diff --git a/pages/wot/11.php b/pages/wot/11.php deleted file mode 100644 index e25a862..0000000 --- a/pages/wot/11.php +++ /dev/null @@ -1,52 +0,0 @@ -<? /* - LibreSSL - CAcert web application - Copyright (C) 2004-2008 CAcert Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ ?> -<? if($_SESSION['profile']['admin'] == 1) { ?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="2" class="title"><?=_("Organisational Assurance")?></td> - </tr> - <tr> - <td class="DataTD"><b><?=_("Organisation Title")?>:</b></td> - <td class="DataTD"> </td> - </tr> - <tr> - <td class="DataTD"><b><?=_("Contact Email")?>:</b></td> - <td class="DataTD"> </td> - </tr> - <tr> - <td class="DataTD"><b><?=_("Town/Suburb")?>:</b></td> - <td class="DataTD"> </td> - </tr> - <tr> - <td class="DataTD"><b><?=_("State/Province")?>:</b></td> - <td class="DataTD"> </td> - </tr> - <tr> - <td class="DataTD"><b><?=_("Country")?>:</b></td> - <td class="DataTD"> </td> - </tr> - <tr> - <td class="DataTD"><b><?=_("Comments")?>:</b></td> - <td class="DataTD"> </td> - </tr> -</table> -<? } else { ?> -<p><?=_("This page is a work in Progress. Please see this")?> -<a href="http://wiki.cacert.org/wiki/OrganisationEntities"><?=_("article on the Wiki")?></a> -<?=_("for more information about Organizational Support.")?></a></p> -<? } ?> diff --git a/pages/wot/14.php b/pages/wot/14.php deleted file mode 100644 index a827ee4..0000000 --- a/pages/wot/14.php +++ /dev/null @@ -1,51 +0,0 @@ -<? /* - LibreSSL - CAcert web application - Copyright (C) 2004-2008 CAcert Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ ?> - -<p>This is a demo page, which isn't fully functional yet.</p> - -<p><?=sprintf(_("If you have a %sSignaturecard%s (also called 'Buergerkarte'), you can digitally sign your assurance request here, and get 50 CAcert points:"),"<a href='http://www.buergerkarte.at/'>","</a>")?><br /></p> - -<p><?=sprintf(_("To get assured with your Signaturecard, you need the ". - "Software from %s. To activate your E-Card, please go to %s."), - "<a href='http://www.buergerkarte.at/bku/'>http://www.buergerkarte.at/bku/</a>", - "<a href='https://www.sozialversicherung.at/signon2-Registrierung/'>https://www.sozialversicherung.at/signon2-Registrierung/</a>" - )?></p> - - -<pre><?=sanitizeHTML($_REQUEST['XMLResponse'])?></pre> - -<h1>1. Step: Assurance form</h1> - -<form name="form" method="post" action="http://localhost:3495/http-security-layer-request"/> - <input type="submit" name="Weiter" value="Start Assurance"> - <input type="hidden" name="XMLRequest" value="<CreateXMLSignatureRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/20020831#' xmlns:dsig='http://www.w3.org/2000/09/xmldsig#' xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/20020225#'><KeyboxIdentifier>CertifiedKeypair</KeyboxIdentifier><DataObjectInfo Structure='enveloping'><sl10:DataObject><sl10:XMLContent>Mit dieser Signatur beantragen Sie die Assurance ihres CAcert Accounts '<?=$_SESSION['profile']['email']?>' mit ihrer Buergerkarte.</sl10:XMLContent></sl10:DataObject><sl10:TransformsInfo><sl10:FinalDataMetaInfo><sl10:MimeType>text/plain</sl10:MimeType></sl10:FinalDataMetaInfo></sl10:TransformsInfo></DataObjectInfo></CreateXMLSignatureRequest>"/> - <input type="hidden" name="actualtest_" value="4"/> - <input type="hidden" name="DataURL" value="https://www.cacert.org/tverify/seclayer.php?id=14&user=<?=$_SESSION['profile']['email']?>"/> - <input type="hidden" name="TestResult_" value="<strong>TestResult</strong>"/> -</form> - -<h1>2. Step: Person binding (Birthday)</h1> - -<form name="form" method="post" action="http://localhost:3495/http-security-layer-request"/> - <input type="submit" name="Weiter" value="Read birthday from Card"> - <input type="hidden" name="XMLRequest" value="<InfoboxReadRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/20020225#"><InfoboxIdentifier>IdentityLink</InfoboxIdentifier><BinaryFileParameters ContentIsXMLEntity="true"/></InfoboxReadRequest>"/> - <input type="hidden" name="actualtest_" value="4"/> - <input type="hidden" name="DataURL" value="https://www.cacert.org/tverify/seclayer.php?id=14&user=<?=$_SESSION['profile']['email']?>"/> - <input type="hidden" name="TestResult_" value="<strong>TestResult</strong>"/> -</form> - diff --git a/scripts/db_migrations/version2.sh b/scripts/db_migrations/version2.sh new file mode 100644 index 0000000..7d940ff --- /dev/null +++ b/scripts/db_migrations/version2.sh @@ -0,0 +1,96 @@ +#!/bin/sh +# LibreSSL - CAcert web application +# Copyright (C) 2004-2011 CAcert Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + +# script to do database migrations + +# This particular version migrates from the preversioned state to version 1 +# If you want to reuse it for further migrations you probably should pay special +# attention because you have to adjust it a bit + +set -e # script fails if any command fails + +STDIN=0 +STDOUT=1 +STDERR=2 + +if [ "$1" = "--help" ]; then + cat >&$STDERR <<- USAGE + Usage: $0 [MYSQL_OPTIONS] + You have to specify all options needed by "mysql" as if you had started + the MySQL command line client directly (including the name of the + database to operate on). The MySQL user used has to have enough + privileges to do all necessary operations (among others CREATE, ALTER, + DROP, UPDATE, INSERT, DELETE). + You might need to enter the mysql password multiple times if you + specify the -p option. + USAGE + exit 1 +fi + +mysql_opt=" --batch --skip-column-names $@" + +schema_version=$( mysql $mysql_opt <<- 'SQL' + + SELECT MAX(`version`) FROM `schema_version`; +SQL +) +if [ $schema_version != 1 ]; then + cat >&$STDERR <<- ERROR + Error: database schema is not in the right version to do the migration! + Expected version: 1 (i.e. the version before there was versioning) + ERROR + exit 2 +fi + +mysql $mysql_opt <<- 'SQL' + + -- Organisation Assurance bug #1118 + ALTER TABLE `orgemailcerts` ADD `ou` varchar(50) NOT NULL + DEFAULT ''; + + + -- Bugs #855, #863, #864, #888, #1118 + ALTER TABLE `notary` + -- add "TTP-Assisted" as method for point transfers (for TTP) + MODIFY `method` + enum( + 'Face to Face Meeting', + 'Trusted Third Parties', + 'Thawte Points Transfer', + 'Administrative Increase', + 'CT Magazine - Germany', + 'Temporary Increase', + 'Unknown', + 'TOPUP', + 'TTP-Assisted' + ) NOT NULL DEFAULT 'Face to Face Meeting'; + + + + + -- Update schema version number + INSERT INTO `schema_version` + (`version`, `when`) VALUES + ('2' , NOW() ); +SQL + + +echo "Database successfully migrated to version 2" +exit 0 + diff --git a/www/policy/DisputeResolutionPolicy.php b/www/policy/DisputeResolutionPolicy.php index a97789b..40fca3a 100644 --- a/www/policy/DisputeResolutionPolicy.php +++ b/www/policy/DisputeResolutionPolicy.php @@ -1,60 +1,95 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> - -<html> +<?='<?xml version="1.0" encoding="utf-8"?>'?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>Dispute Resulution Policy</title> + <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8" /> + <title>Dispute Resulution Policy</title> +<style type="text/css"> +<!-- +.first-does-not-work { + color : red; +} +.comment { + color : steelblue; +} +.q { + color : green; + font-weight: bold; + text-align: center; + font-style:italic; +} +.change { + color : blue; + font-weight: bold; +} +.change2 { + color : steelblue; +} +.strike { + color : blue; + text-decoration:line-through; +} +.draftadd { + color : darkblue; + font-weight: bold; + font-style: italic; +} +.draftdrop { + color : darkblue; + text-decoration:line-through; + font-style: italic; +} +--> +</style> + </head> <body> -<table width="100%"> -<tr> -<td> DRP </td> -<td> </td> -<td width="20%"> Teus Hagen </td> -</tr> -<tr> -<td> POLICY <a href="http://wiki.cacert.org/wiki/TopMinutes-20070917">m20070919.3</a> </td> -<td> </td> -<td> - $Date: 2008-01-18 22:56:31 $ - <!-- - to get this to work, we have to do this: - svn propset svn:keywords "Date" PolicyOnPolicy.html - except it does not work through the website. - --> -</td> -</tr> +<div class="comment"> +<table width="100%"> <tr> -<td> COD7 </td> -<td> </td> -<td> <!-- contributors --> </td> -</tr> - +<td> + Name: DRP <a style="color: steelblue" href="//svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD7</a><br /> + Status: POLICY <a style="color: steelblue" href="//wiki.cacert.org/wiki/TopMinutes-20070917">m20070919.3</a><br /> + <span class="draftadd">DRAFT p20110108 p20121213</span> <br /> + Editor: <a style="color: steelblue" href="//wiki.cacert.org/TeusHagen">Teus Hagen +</a><br /> + Licence: <a style="color: steelblue" href="//wiki.cacert.org/Policy#Licence" title="this document is Copyright © CAcert Inc., licensed openly under CC-by-sa with all disputes resolved under DRP. More at wiki.cacert.org/Policy" > CC-by-sa+DRP </a><br /></td> +<td valign="top" align="right"> + <a href="//www.cacert.org/policy/PolicyOnPolicy.php"><img src="/images/cacert-policy.png" alt="TTP-Assist Status - POLICY" height="31" width="88" style="border-style: none;" /></a><br /> + <a href="//www.cacert.org/policy/PolicyOnPolicy.php"><img src="/images/cacert-draft.png" alt="TTP-Assist Status - DRAFT" height="31" width="88" style="border-style: none;" /></a> -<tr> <!-- title only --> -<td> </td> -<td > <b>Dispute Resolution Policy</b> </td> -<td> </td> +</td> </tr> - </table> +</div> -<h2> <a name="0"> 0. </a> Introduction</h2> +<h1> Dispute Resolution Policy </h1> + +<h2 id="s0"> 0. Introduction</h2> <p> -This is the Dispute Resolution Policy for CAcert. +This is the Dispute Resolution Policy +<span class="draftdrop">for CAcert</span> +<span class="draftadd">for the CAcert Community, consisting of CAcert Inc and Members who agree to the CAcert Community Agreement (CCA)</span>. Disputes arising out of -operations by CAcert and interactions between -users may be addressed through this policy. +operations by CAcert +<span class="draftadd">Inc</span> +and interactions between +<span class="draftadd"> +Members +</span> +may be addressed through this policy. This document also presents the rules for resolution of disputes. </p> -<h3> <a name="0.1"> 0.1 </a> Nature of Disputes </h3> +<h3 id="s0.1"> 0.1 Nature of Disputes </h3> <p> Disputes include: @@ -64,9 +99,12 @@ Disputes include: Requests for non-routine support actions. CAcert support team has no authority to act outside the normal support facilities made - available to Users; + available to + <span class="draftadd"> + Members; + </span> </li><li> - Classical disputes where a User or another + Classical disputes where a <span class="draftadd">Member</span> or another assert claims and demand remedies; </li><li> Requests by external organisations, including @@ -75,15 +113,15 @@ Disputes include: Events initiated for training purposes. </li></ul> -<h2> <a name="1"> 1. </a> Filing</h2> +<h2 id="s1"> 1. Filing</h2> -<h3> <a name="1.1"> 1.1 </a> Filing Party</h3> +<h3 id="s1.1"> 1.1 Filing Party</h3> <p> Anyone may file a dispute. In filing, they become <i>Claimants</i>. </p> -<h3> <a name="1.2">1.2 </a> Channel for Filing</h3> +<h3 id="s1.2"> 1.2 Channel for Filing</h3> <p> Disputes are filed by being sent to the normal @@ -96,7 +134,7 @@ Such fees as are imposed on filing will be specified on the dispute resolution page of the website. </p> -<h3> <a name="1.3">1.3 </a> Case Manager</h3> +<h3 id="s1.3"> 1.3 Case Manager</h3> <p> The Case Manager (CM) takes control of the filing. </p> @@ -120,10 +158,10 @@ The Case Manager (CM) takes control of the filing. <p> The personnel within the CAcert support team are Case Managers, by default, or as directed -by the Dispute Resolution Officer. +by the Dispute Resolution Officer <span class="change2">(DRO)</span>. </p> -<h3> <a name="1.4">1.4 </a> Contents</h3> +<h3 id="s1.4"> 1.4 Contents</h3> <p> The filing must specify: </p> @@ -135,13 +173,13 @@ The filing must specify: being the <i>Respondent(s)</i>. This will be CAcert in the case of requests for support actions. - It may be a User (possibly unidentified) in the - case where one User has given rise to a complaint against another. + It may be a <span class="draftadd">Member</span> (possibly unidentified) in the + case where one <span class="draftadd">Member</span> has given rise to a complaint against another. </li><li> The <i>Complaint</i>. For example, a trademark has been infringed, privacy has been breached, - or a user has defrauded using a certificate. + or a <span class="draftadd">Member</span> has defrauded using a certificate. </li><li> The action(s) requested by the filing party (technically, called the <i>relief</i>). @@ -157,11 +195,12 @@ may refile with the additional information, attaching the original messages. </p> -<h3> <a name="1.5">1.5 </a> The Arbitrator</h3> +<h3 id="s1.5"> 1.5 The Arbitrator</h3> <p> The Case Manager selects the Arbitrator according -to the mechanism managed by the Dispute Resolution Officer +to the mechanism managed by the +<span class="change2">DRO</span> <!-- Dispute Resolution Officer --> and approved from time to time. This mechanism is to maintain a list of Arbitrators available for dispute resolution. @@ -174,24 +213,31 @@ closed with status "declined." </p> <p> -Arbitrators are experienced Assurers of CAcert. +Arbitrators are experienced Assurers <span class="draftdrop">of CAcert</span>. They should be independent and impartial, including -of CAcert itself where it becomes a party. +of CAcert <span class="draftadd">Inc.</span> itself where it becomes a party. </p> -<h2> <a name="2"> 2. </a> The Arbitration</h2> +<h2 id="s2"> 2. The Arbitration</h2> -<h3> <a name="2.1">2.1 </a> Authority</h3> +<h3 id="s2.1"> 2.1 Authority</h3> <p> -The Board of CAcert and the Users vest in Arbitrators +The Board of CAcert <span class="draftadd">Inc.</span> and the +<span class="draftadd"> +Members of the Community +</span> + vest in Arbitrators full authority to hear disputes and deliver rulings -which are binding on CAcert and the Users. +which are binding on CAcert <span class="draftadd">Inc.</span> and the +<span class="draftadd"> +Members. +</span> </p> -<h3> <a name="2.2">2.2 </a> Preliminaries</h3> +<h3 id="s2.2"> 2.2 Preliminaries</h3> <p> The Arbitrator conducts some preliminaries: @@ -208,29 +254,54 @@ The Arbitrator conducts some preliminaries: agree, are under such jurisdiction, and it is deemed more appropriate. However, this is strictly limited to those parties, - and especially, CAcert and other parties - remains under the governing law. + and especially, CAcert <span class="draftadd">Inc.</span> and other parties + remain under the governing law. </li><li> The Arbitrator reviews the Respondents and Claimants with a view to dismissal or joining of additional parties. - E.g., support personel may be joined if emergency action was + E.g., support personnel may be joined if emergency action was taken. </li><li> - Any parties that are not Users and are not bound - by the CPS are given the opportunity to enter into - CAcert and be bound by the CPS and these rules of arbitration. - If these Non-Related Persons (NRPs) remain outside, + Any parties that are not + <span class="draftadd"> + Members + </span> + and are not bound by the + <span class="draftdrop">CPS</span> <span class="draftadd">CCA</span> + are given the opportunity to enter into + CAcert and be bound by the + <span class="draftdrop">CPS</span> <span class="draftadd">CCA</span> + and these rules of arbitration. + If + <!-- <span class="draftdrop">these Non-Related Persons (NRPs)</span> <span class="change">they</span> --> + these Non-Related Persons (NRPs) + remain outside, their rights and remedies under CAcert's policies - and forum are strictly limited to that specified in the - Non-Related Persons -- Disclaimer and Licence. - NRPs may proceed with Arbitration subject to preliminary orders + and forum are strictly limited to + <span class="strike">that</span> <span class="change2">those</span> + specified in the + <span class="draftdrop">Non-Related Persons -- Disclaimer and Licence</span> <span class="draftadd">Root Distribution License</span>. + NRPs + may proceed with Arbitration subject to preliminary orders of the Arbitrator. </li><li> - Participating Users may not resign until the completion of the case. + Participating + <span class="draftadd"> + Members + </span> + may not resign + <span class="change2"> + from the Community + </span> + until the completion of the case. </li><li> The Arbitrator confirms that all parties accept the forum of dispute resolution. - This is especially important where a User might be + This is especially important where a + <span class="draftadd"> + Member + </span> + might be in a country with no Arbitration Act in law, or where there is reason to believe that a party might go to an external court. @@ -240,12 +311,12 @@ The Arbitrator conducts some preliminaries: represented, but are not encouraged to do so, bearing in mind the volunteer nature of the organisation and the size of the dispute. - If they do so they must declare such, including any - changes. + If they do so<span class="change2">,</span> + they must declare such, including any changes. </li><li> The Arbitrator may appoint experienced Assurers to assist and represent parties, especially for NRPs. - The Case Manager must not to provide such assistance. + The Case Manager must not provide such assistance. </li><li> The Arbitrator is bound to maintain the balance of legal fairness. @@ -255,16 +326,18 @@ The Arbitrator conducts some preliminaries: to emergency actions already taken. </li><li> The Arbitrator may request any written pleadings, - counterclaim, and/or statements of defence. + counterclaims, and/or statements of defence. </li></ul> -<h3> <a name="2.3">2.3 </a> Jurisdiction </h3> +<h3 id="s2.3"> 2.3 Jurisdiction </h3> <p> -Jurisidiction - the right or power to hear and rule on +Jurisdiction - the right or power to hear and rule on disputes - is initially established by clauses in the -User agreements for all CAcert Users. +<span class="draftadd"> +CAcert Community Agreement. +</span> The agreement must establish: </p> @@ -292,7 +365,7 @@ to be considered carefully: </p> <ul><li> - Where NRPs, being not members of CAcert and not + Where NRPs, being not Members of CAcert and not bound by agreement, are parties to the dispute. E.g., intellectual property disputes may involve NRPs and their trademarks; @@ -301,7 +374,11 @@ to be considered carefully: proceedings, e.g., fraud; </li><li> - Contracts between Users that were formed without + Contracts between + <span class="draftadd"> + Members + </span> + that were formed without a clause to seek arbitration in the forum; </li><li> Areas where laws fall outside the Arbitration Act, @@ -321,7 +398,7 @@ another forum, the Arbitrator should seek the agreement of the NRP to file the ruling as part of the new case. </p> -<h3> <a name="2.4">2.4 </a> Basis in Law </h3> +<h3 id="s2.4"> 2.4 Basis in Law </h3> <p> Each country generally has an Arbitration Act @@ -329,7 +406,12 @@ that elevates Arbitration as a strong dispute resolution forum. The Act generally defers to Arbitration if the parties have so agreed. -That is, as Users of CAcert, you agree to resolve +That is, as + <span class="draftadd"> + Members + </span> +<span class="draftdrop">users of CAcert</span>, +you agree to resolve all disputes before CAcert's forum. This is sometimes called <i>private law</i> or <i>alternative dispute resolution</i>. @@ -338,13 +420,16 @@ or <i>alternative dispute resolution</i>. <p> As a matter of public policy, courts will generally refer any case back to Arbitration. -Users should understand that they will have + <span class="draftadd"> + Members + </span> +should understand that they will have strictly limited rights to ask the courts to seek to have a case heard or to override a Ruling. </p> -<h3> <a name="2.5">2.5 </a> External Courts </h3> +<h3 id="s2.5"> 2.5 External Courts </h3> <p> When an external court claims and asserts its jurisdiction, @@ -362,17 +447,20 @@ seek to have a case heard or to override a Ruling. court, and rules. The Arbitrator may rule to reject the order, for jurisdiction or other reasons. - By way of example, if all Parties are registered Users, + By way of example, if all Parties are + <span class="draftadd"> + Members, + </span> then jurisdiction more normally falls within the forum. If the Arbitrator rules to reject, - he should do so only after consulting with CAcert counsel. + he should do so only after consulting with CAcert <span class="draftadd">Inc.</span> counsel. The Arbitrator's jurisidiction is ordinarily that of dealing with the order, and not that which the external court has claimed to. </p> -<h3> <a name="2.6">2.6 </a> Process</h3> +<h3 id="s2.6"> 2.6 Process</h3> <p> The Arbitrator follows the procedure: @@ -382,8 +470,11 @@ The Arbitrator follows the procedure: <ol><li> Establish the facts. The Arbitrator collects the evidence from the parties. - The Arbitrator may order CAcert or Users under - jurisdiction to provide support or information. + The Arbitrator may order CAcert <span class="draftadd">Inc.</span> or + <span class="draftadd"> + Members + </span> + under jurisdiction to provide support or information. The Arbitrator may use email, phone or face-to-face meetings as proceedings. </li><li> @@ -392,15 +483,23 @@ The Arbitrator follows the procedure: The Arbitrator may request that the parties submit their views. The Arbitrator also works to the mission of CAcert, - the benefit of all Users, and the community as a whole. - The Arbitrator may any assistance. + the benefit of all + <span class="draftadd"> + Members + </span> + , and the community as a whole. + The Arbitrator may + <span class="draftadd"> + seek + </span> + any assistance. </li><li> Makes a considered Ruling. </li></ol> -<h2> <a name="3"> 3. </a> The Ruling</h2> +<h2 id="s3"> 3. The Ruling</h2> -<h3> <a name="3.1">3.1 </a> The Contents </h3> +<h3 id="s3.1"> 3.1 The Contents </h3> <p> The Arbitrator records: @@ -420,11 +519,11 @@ The Arbitrator records: </li></ol> -<h3> <a name="3.2">3.2 </a> Process </h3> +<h3 id="s3.2"> 3.2 Process </h3> <p> Once the Ruling is delivered, the case is closed. The Case Manager is responsible for recording the -Ruling, publishing it, and advising users. +Ruling, publishing it, and advising <span class="draftadd">Members</span>. </p> <p> @@ -440,53 +539,94 @@ Arbitrator declare the Ruling private <i>under seal</i>. Such a declaration must be reviewed in its entirety by the Board, and the Board must confirm or deny that declaration. -If it confirms, the existance of any Rulings under seal -must be published to the Users in a timely manner +If it confirms, the existence of any Rulings under seal +must be published to the + <span class="draftadd"> + Members + </span> +in a timely manner (within days). </p> -<h3> <a name="3.3">3.3 </a> Binding and Final </h3> - -<p> -The Ruling is binding and final on CAcert and all Users. -Ordinarily, all Users agree to be bound by this dispute -resolution policy. Users must declare in the Preliminaries +<h3 id="s3.3"> 3.3 Binding and Final </h3> + +<p> +The Ruling is +<!-- (DRAFT p20110108) --> +<span class="draftadd">ordinarily final and binding </span> +<span class="draftdrop">binding and final</span> +on CAcert <span class="draftadd">Inc.</span> and all + <span class="draftadd"> + Members + </span> +. +Ordinarily, all + <span class="draftadd"> + Members + </span> + agree to be bound by this dispute +resolution policy. + <span class="draftadd"> + Members + </span> +must declare in the Preliminaries any default in agreement or binding. </p> <p> -If a person who is not a User is a party to the dispute, +If a person who is not a + <span class="draftadd"> + Member + </span> +is a party to the dispute, then the Ruling is not binding and final on that person, but the Ruling must be presented in filing any dispute in another forum such as the person's local courts. </p> -<h3> <a name="3.4">3.4 </a> Re-opening the Case or Appeal </h3> +<h3 id="s3.4"> 3.4 <span class="draftadd">Review for Appeal (DRAFT p20110108)</span> <span class="draftdrop">Re-opening the Case or Appeal</span> </h3> <p> -In the case of clear injustices, egregious behaviour or -unconscionable Rulings, parties may seek to re-open the -case by filing a dispute. The new Arbitrator -reviews the new dispute, +In the <span class="draftadd">event</span> <span class="draftdrop">case</span> of clear injustices, egregious behaviour or +unconscionable Rulings, +<span class="draftadd"> +a review may be requested by filing a dispute (DRAFT p20110108). +</span> +<span class="draftdrop"> +parties may seek to re-open the +case by filing a dispute. +</span> +The new Arbitrator reviews the new dispute, re-examines and reviews the entire case, then rules on whether the case may be re-opened or not. </p> <p> +<span class="draftadd"> +If the Review Arbitrator rules the case be re-opened, +then the Review Arbitrator refers the case to an Appeal Panel of 3. +The Appeal Panel is led by a Senior Arbitrator, +and is formed according to procedures established +by the DRO from time to time. +The Appeal Panel hears the case and delivers a final and binding Ruling. + (DRAFT p20110108) +</span> +<span class="draftdrop"> If the new Arbitrator rules the case be re-opened, then it is referred to the Board of CAcert Inc. The Board hears the case and delivers a final and binding Ruling. +</span> </p> -<h3> <a name="3.5">3.5 </a> Liability </h3> +<h3 id="s3.5"> 3.5 Liability </h3> <p> All liability of the Arbitrator for any act in connection with deciding a dispute is excluded by all parties, provided such act does not constitute an intentional breach of duty. -All liability of the Arbitrators, CAcert, its officers and its +All liability of the Arbitrators, CAcert <span class="draftadd">Inc.</span>, its officers and its employees (including Case Manager) for any other act or omission in connection with arbitration proceedings is excluded, provided such acts do not @@ -495,15 +635,18 @@ constitute an intentional or grossly negligent breach of duty. <p> The above provisions may only be overridden by -appeal process (by means of a new dispute causing -referral to the Board). +appeal process + (by means of a new dispute causing referral to the Board). + </p> -<h3> <a name="3.6">3.6 </a> Remedies </h3> +<h3 id="s3.6"> 3.6 Remedies </h3> <p> The Arbitrator generally instructs using internal remedies, -that is ones that are within the general domain of CAcert, +that is ones that are within the general domain of +<span class="draftdrop">CAcert</span> +<span class="draftadd">the Community</span>, but there are some external remedies at his disposal. He may rule and instruct any of the parties on these issues. </p> @@ -515,7 +658,7 @@ He may rule and instruct any of the parties on these issues. </li><li> writing documentation </li><li> - serve in role - support, dispute arbitration + serve in <span class="change2">a</span> role - support, dispute arbitration </li></ul> or others as decided. @@ -531,7 +674,10 @@ He may rule and instruct any of the parties on these issues. </li><li> Monetary fine up to the liability cap established for - each party as described in the Registered User Agreement. + each party as described in the + <span class="draftadd"> + CAcert Community Agreement. + </span> </li><li> Exclusion from community. @@ -548,20 +694,25 @@ He may rule and instruct any of the parties on these issues. The Arbitrator is not limited within the general domain of CAcert, and may instruct novel remedies as seen fit. Novel remedies outside the domain may be routinely -confirmed by the Board by way of appeals process, +confirmed by the Board by way of appeal process, in order to establish precedent. + </p> -<h2> <a name="4"> 4. </a> Appendix</h2> +<h2 id="s4"> 4. Appendix</h2> -<h3> <a name="4.1">4.1 </a> The Advantages of this Forum </h3> +<h3 id="s4.1"> 4.1 The Advantages of this Forum </h3> <p> -The advantage of this process for Users is: +The advantage of this process for + <span class="draftadd"> + Members + </span> + is: </p> <ul><li> - CAcert and Users operate across many jurisdictions. + CAcert and <span class="draftadd">Members</span> operate across many jurisdictions. Arbitration allows us to select a single set of rules across all jurisdictions. </li><li> @@ -572,7 +723,7 @@ The advantage of this process for Users is: authority to act. Good governance is thus maintained. </li><li> - This forum allows CAcert Users to look after themselves + This forum allows CAcert <span class="draftadd">Members</span> to look after themselves in a community, without exposing each other to potentially disastrous results in strange courts from foreign lands. </li><li> @@ -588,18 +739,21 @@ The advantage of this process for Users is: other external agencies. </li></ul> -<h3> <a name="4.2">4.2 </a> The Disadvantages of this Forum </h3> +<h3 id="s4.2"> 4.2 The Disadvantages of this Forum </h3> <p> Some disadvantages exist. </p> <ul><li> - Users may have their rights trampled over. + <span class="draftadd">Members</span> may have their rights trampled over. In such a case, the community should strive to - re-open the case and refer it to the board. + re-open the case + and refer it to the board. + + </li><li> - Users may feel overwhelmed by the formality + <span class="draftadd">Members</span> may feel overwhelmed by the formality of the process. It is kept formal so as to establish good and proper authority to act; otherwise, support and other @@ -613,7 +767,7 @@ Some disadvantages exist. they should also depart the community. </li></ul> -<h3> <a name="4.3">4.3 </a> Process and Flow </h3> +<h3 id="s4.3"> 4.3 Process and Flow </h3> <p> To the extent reasonable, the Arbitrator conducts @@ -635,5 +789,6 @@ Note also that many elements of legal proceedings are deliberately left out of the rules. </p> + </body> </html> diff --git a/www/policy/OrganisationAssurancePolicy.php b/www/policy/OrganisationAssurancePolicy.php index 7d8699c..e462693 100644 --- a/www/policy/OrganisationAssurancePolicy.php +++ b/www/policy/OrganisationAssurancePolicy.php @@ -1,54 +1,51 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head><title>Organisation Assurance Policy</title></head> +<?='<?xml version="1.0" encoding="utf-8"?>'?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title> Organisation Assurance Policy </title> +<style type="text/css"> +<!-- +.comment { + color : steelblue; +} +--> +</style> + +</head> <body> +<div class="comment"> <table width="100%"> <tr> -<td> OAP </td> -<td> </td> -<td width="20%"> Jens </td> -</tr> - -<tr> -<td> POLICY <a href="http://wiki.cacert.org/wiki/TopMinutes-20070917">m20070918.x</a> </td> -<td> </td> <td> - $Date: 2008-01-18 22:56:31 $ - <!-- - to get this to work, we have to do this: - svn propset svn:keywords "Date" file.html - except it does not work through the website. - --> -</td> -</tr> + Name: OAP <a style="color: steelblue" href="//svn.cacert.org/CAcert/Policies/ControlledDocumentList.html">COD11</a><br /> -<tr> -<td> COD11 </td> -<td> </td> -<td> </td> -</tr> + Status: POLICY/DRAFT <a style="color: steelblue" href="//wiki.cacert.org/wiki/TopMinutes-20070917">m20070918.x </a><br /> + <span class="draftadd">DRAFT p20080401.1 </span> <br /> + Editor: Jens Paul <br /> + Licence: <a style="color: steelblue" href="//wiki.cacert.org/Policy#Licence" title="this document is Copyright © CAcert Inc., licensed openly under CC-by-sa with all disputes resolved under DRP. More at wiki.cacert.org/Policy" > CC-by-sa+DRP </a><br /></td> +<td valign="top" align="right"> + <a href="//www.cacert.org/policy/PolicyOnPolicy.html"><img src="/images/cacert-policy.png" alt="OAP Status - POLICY" height="31" width="88" style="border-style: none;" /></a><br /> + <a href="//www.cacert.org/policy/PolicyOnPolicy.html"><img src="/images/cacert-draft.png" alt="OAP Status - DRAFT" height="31" width="88" style="border-style: none;" /></a> -<tr> -<td> </td> -<td > <b>Organisation Assurance Policy</b> </td> -<td> </td> +</td> </tr> - </table> +</div> +<h1> Organisation Assurance Policy </h1> -<h2> <a name="0"> 0. </a> Preliminaries </h2> +<h2 id="s0">0. Preliminaries </h2> <p> This policy describes how Organisation Assurers ("OAs") conduct Assurances on Organisations. It fits within the overall web-of-trust -or Assurance process of Cacert. +or Assurance process of CAcert. </p> <p> @@ -56,7 +53,7 @@ This policy is not a Controlled document, for purposes of Configuration Control Specification ("CCS"). </p> -<h2> <a name="1"> 1. </a> Purpose </h2> +<h2 id="s1"> 1. Purpose </h2> <p> Organisations with assured status can issue certificates @@ -76,27 +73,31 @@ and as described in the CPS. to this policy. </li><li> The organisation is within the jurisdiction - and can be taken to Arbitration. + and can be taken to CAcert Arbitration. </li></ul> -<h2> <a name="2"> 2. </a> Roles and Structure </h2> +<h2 id="s2"> 2. Roles and Structure </h2> -<h3> <a name="2.1"> 2.1 </a> Assurance Officer </h3> +<h3 id="s2.1"> 2.1 Assurance Officer </h3> <p> The Assurance Officer ("AO") -manages this policy and reports to the board. +manages this policy and reports to the CAcert Inc. Committee ("Board"). </p> <p> The AO manages all OAs and is responsible for process, -the CAcert Organisation Assurance Programme form ("COAP"), +the CAcert Organisation Assurance Programme ("COAP") form, OA training and testing, manuals, quality control. In these responsibilities, other Officers will assist. </p> +<p> +The OA is appointed by the Board. +Where the OA is failing the Board decides. +</p> -<h3> <a name="2.2"> 2.2 </a> Organisation Assurers </h3> +<h3 id="s2.2"> 2.2 Organisation Assurers </h3> <p> </p> @@ -141,11 +142,30 @@ In these responsibilities, other Officers will assist. as supervised, trained and tested. </li> </ol> + </li> + <li>The OA can decide when a CAcert + (individual) Assurer + has done several OA Application Advises to appoint this + person to OA Assurer. + </li> + </ol> +<h3 id="s2.3"> 2.3 Organisation Assurance Advisor ("OAA") </h3> + <p>In countries/states/provinces where no OA Assurers are + operating for an OA Application (COAP) the OA + can be advised by an experienced local CAcert + (individual) Assurer to take the decision + to accept the OA Application (COAP) of the organisation. + </p> + <p> + The local Assurer must have at least 150 Points, + should know the language, and know + the organisation trade office registry culture and quality. + </p> -<h3> <a name="2.3"> 2.3 </a> Organisation Administrator </h3> +<h3 id="s2.4"> 2.4 Organisation Administrator </h3> <p> The Administrator within each Organisation ("O-Admin") @@ -175,9 +195,9 @@ and the issuing of certificates. </ol> -<h2> <a name="3"> 3. </a> Policies </h2> +<h2 id="s3"> 3. Policies </h2> -<h3> <a name="3.1"> 3.1 </a> Policy </h3> +<h3 id="s3.1"> 3.1 Policy </h3> <p> There is one policy being this present document, @@ -191,7 +211,7 @@ and several subsidiary policies. <li> Organisations are assured under an appropriate subsidiary policy. </li> </ol> -<h3> <a name="3.2"> 3.2 </a> Subsidiary Policies </h3> +<h3 id="s3.2"> 3.2 Subsidiary Policies </h3> <p> The nature of the Subsidiary Policies ("SubPols"): @@ -210,7 +230,7 @@ The nature of the Subsidiary Policies ("SubPols"): </li><li> For OAs, SubPol specifies the <i>tests of local knowledge</i> - including the local organisational forms. + including the local organisation assurance COAP forms. </li><li> For assurances, SubPol specifies the <i>local documentation forms</i> @@ -221,7 +241,7 @@ The nature of the Subsidiary Policies ("SubPols"): policy approval process. </li></ol> -<h3> <a name=""> </a> 3.3 Freedom to Assemble </h3> +<h3 id="s3.3"> 3.3 Freedom to Assemble </h3> <p> Subsidiary Policies are open, accessible and free to enter. @@ -254,9 +274,9 @@ Subsidiary Policies are open, accessible and free to enter. </li></ol> -<h2> <a name="4"> 4. </a> Process </h2> +<h2 id="s4"> 4. Process </h2> -<h3> <a name="4.1"> 4.1 </a> Standard of Organisation Assurance </h3> +<h3 id="s4.1"> 4.1 Standard of Organisation Assurance </h3> <p> The essential standard of Organisation Assurance is: </p> @@ -276,7 +296,7 @@ The essential standard of Organisation Assurance is: requestor can sign on behalf of the organisation. </li><li> the organisation has agreed to the terms of the - Registered User Agreement, + CAcert Community Agreement and is therefore subject to Arbitration. </li></ol> @@ -285,7 +305,7 @@ The essential standard of Organisation Assurance is: are stated in the SubPol. </p> -<h3> <a name="4.2"> 4.2 </a> COAP </h3> +<h3 id="s4.2"> 4.2 COAP </h3> <p> The COAP form documents the checks and the resultant assurance results to meet the standard. @@ -302,12 +322,13 @@ Additional information to be provided on form: <li>additional contact information (as required by SubPol).</li> </ol> </li><li> - administrator account names (1 or more) + administrator account name(s) (1 or more) </li><li> domain name(s) </li><li> - Agreement with registered user agreement. - Statement and initials box for organsation + Agreement with + CAcert Community Agreement. + Statement and initials box for organisation and also for OA. </li><li> Date of completion of Assurance. @@ -322,17 +343,17 @@ and indication provided that the English is the ruling language (due to Arbitration requirements). </p> -<h3> <a name="4.3"> 4.3 </a> Jurisdiction </h3> +<h3 id="s4.3"> 4.3 Jurisdiction </h3> <p> Organisation Assurances are carried out by -CAcert Inc under its Arbitration jurisdiction. +CAcert Inc. under its Arbitration jurisdiction. Actions carried out by OAs are under this regime. </p> <ol type="a"><li> The organisation has agreed to the terms of the - Registered User Agreement, + CAcert Community Agreement. </li><li> The organisation, the Organisation Assurers, CAcert and other related parties are bound into CAcert's jurisdiction @@ -340,12 +361,13 @@ Actions carried out by OAs are under this regime. </li><li> The OA is responsible for ensuring that the organisation reads, understands, intends and - agrees to the registered user agreement. + agrees to the + CAcert Community Agreement. This OA responsibility should be recorded on COAP (statement and initials box). </li></ol> -<h2> <a name="5"> 5. </a> Exceptions </h2> +<h2 id="s5"> 5. Exceptions </h2> <ol type="a"><li> @@ -375,5 +397,6 @@ Actions carried out by OAs are under this regime. E.g., registration as DBA or holding of registered trade mark. This means that the anglo law tradition of unregistered DBAs is not accepted without further proof. -</li></ol> - + </li></ol> +</body> +</html> diff --git a/www/wot.php b/www/wot.php index 3401f57..9e41891 100644 --- a/www/wot.php +++ b/www/wot.php @@ -301,7 +301,7 @@ $iecho= "c"; } else if($_SESSION['profile']['board'] == 1) { $query .= ",\n`method`='".mysql_escape_string(stripslashes($_POST['method']))."'"; } else if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) { - $query .= ",\n`method`='Trusted Third Parties'"; + $query .= ",\n`method`='TTP-Assisted'"; } mysql_query($query); fix_assurer_flag($_SESSION['_config']['notarise']['id']); |