[Peepagg-cvs] PA SVN Commit r63 - in trunk: classes docs lib lib/rdfapi/syntax publicroot templates/html

[<sv...@2n...>]

Author: crschmidt
Date: 2004-04-06 22:32:28 -0700 (Tue, 06 Apr 2004)
New Revision: 63

Modified:
   trunk/classes/paGroup.php
   trunk/classes/paProfile.php
   trunk/docs/INSTALL
   trunk/lib/cache.php
   trunk/lib/config.php-dist
   trunk/lib/rdf.php
   trunk/lib/rdfapi/syntax/RdfSerializer.php
   trunk/publicroot/addselftogroup.php
   trunk/publicroot/create.php
   trunk/publicroot/edit.php
   trunk/publicroot/forgotpw.php
   trunk/publicroot/register.php
   trunk/publicroot/relationship.php
   trunk/publicroot/upload-image.php
   trunk/publicroot/userverification.php
   trunk/publicroot/view.php
   trunk/templates/html/privacy.tpl
Log:
Changing pretty much ever instance of http://peopleaggregator.com into an
instance of $pa_server_url . Also modifying peopleaggregator.com emails t=
o
be editable in configuration.

Following new config variables:
$pa_email_contact. Previously co...@pe...
$pa_email_bugs.    Previously bug...@pe...

Also adding documentation to mention that the .htaccess file has PAcom sp=
ecifc
information that should be modified by other sites.



Modified: trunk/classes/paGroup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/classes/paGroup.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/classes/paGroup.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -64,7 +64,7 @@
          $statement =3D new Statement($groupnode, $RDF_type, $FOAF_Group=
);
          $this->_groupModel->add($statement);
          $this->_groupName =3D null;
-         $this->_groupURL =3D "http://peopleaggregator.com/profile?id=3D=
g".$this->_groupID;
+         $this->_groupURL =3D "$pa_server_url/profile?id=3Dg".$this->_gr=
oupID;
          return;
       }
=20
@@ -85,7 +85,7 @@
                $this->_groupModel =3D $db_store->getModel("g".$id);
                $this->_groupJoinability =3D $row[2];
                $this->_groupVisibility =3D $row[3];
-               $this->_groupURL =3D "http://peopleaggregator.com/profile=
?id=3Dg".$id;
+               $this->_groupURL =3D "$pa_server_url/profile?id=3Dg".$id;
             } else {
                $this =3D null;
             }
@@ -243,7 +243,7 @@
 	// some more deeply unsustainable proof-of-concept code, for the moment=
. -Liz (FIXME!!)
 	$uid =3D $this->getGroupID();
 	$uid =3D mysql_escape_string(preg_replace("/^.*[^0-9]([0-9]+)\$/","\$1"=
,$uid));
-	$safe_url =3D mysql_escape_string("http://peopleaggregator.com/profile?=
id=3Dg" . $uid);
+	$safe_url =3D mysql_escape_string("$pa_server_url/profile?id=3Dg" . $ui=
d);
 	$usql =3D "select concat(firstname,' ',lastname) as name, u.id from use=
rs u, temp_profile_membership p
 		where u.id =3D p.profile_id and p.group_url =3D '$safe_url' ";
 	$uresult =3D $database->GetAll($usql);

Modified: trunk/classes/paProfile.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/classes/paProfile.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/classes/paProfile.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -319,7 +319,7 @@
          if($target_consumed["info"]["mbox"]) {
             $target_email =3D $target_consumed["info"]["mbox"];
          } else {
-            if(ereg("peopleaggregator.com/profile",$url)) {
+            if(ereg("$pa_server_url/profile",$url)) {
                $exp =3D explode("=3D", $url);
                $profileID =3D $exp[1];
                $targetProfile =3D new paProfile($profileID);  //FIXME: I=
s this right?
@@ -367,7 +367,7 @@
          $message->assign("rel",$type);
          $message->assign("pa_server_url",$pa_server_url);
          $message->assign("code",$code);
-         mail($target_email, "PeopleAggregator relationship request", $m=
essage->fetch("relationship_request.tpl"), "From: contact@peopleaggregato=
r.com");
+         mail($target_email, "PeopleAggregator relationship request", $m=
essage->fetch("relationship_request.tpl"), "From: $pa_email_contact");
       }
    }
=20

Modified: trunk/docs/INSTALL
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/docs/INSTALL	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/docs/INSTALL	2004-04-07 05:32:28 UTC (rev 63)
@@ -18,6 +18,9 @@
 This also allows the .htaccess to turn on allow_furl_open. This is neede=
d in=20
 order to fetch images in some case - for example, in the getimagesize fu=
nction.
=20
+You should modify the .htaccess file to reflect the location of your ins=
tall in
+the RewriteRules in that file.
+
 This section is most likely incomplete.
=20
 PeopleAggregator Installation:

Modified: trunk/lib/cache.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lib/cache.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/lib/cache.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -27,7 +27,7 @@
       $current_time =3D time();
       $cache_time =3D $row[2];
       //FIXME: This catches ONLY local RDF.  Anything else still gets ca=
ched.
-      $is_local =3D ereg("peopleaggregator.com/profile",$url);
+      $is_local =3D ereg("$pa_server_url/profile",$url);
       if(($current_time>=3D(strtotime($cache_time)+300)) || ($is_local))=
 {
 //         echo "retrieving due to age/locality";
          $data =3D retrieve($url);

Modified: trunk/lib/config.php-dist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lib/config.php-dist	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/lib/config.php-dist	2004-04-07 05:32:28 UTC (rev 63)
@@ -20,6 +20,8 @@
 $pa_file_location =3D "/home/pa";
 $pa_tmp_location =3D "/tmp/pa";
=20
+$pa_email_contact =3D "contact@localhost";
+$pa_email_bugs    =3D "bugreports@localhost";
 $pa_debug_mode =3D false;
=20
 // Technorati Integration.  See http://www.technorati.com/developers/ fo=
r details.

Modified: trunk/lib/rdf.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lib/rdf.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/lib/rdf.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -130,7 +130,7 @@
    $parser =3D new RdfParser();
=20
    //This little ereg saves us the task of having to go "http" fetch a p=
rofile if we know it's local.
-   if(ereg("peopleaggregator.com/profile",$url)) {
+   if(ereg("$pa_server_url/profile",$url)) {
       //Find the profile ID.
       $exp =3D explode("=3D", $url);
       $profile_id =3D $exp[1];

Modified: trunk/lib/rdfapi/syntax/RdfSerializer.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lib/rdfapi/syntax/RdfSerializer.php	2004-04-06 20:35:28 UTC (re=
v 62)
+++ trunk/lib/rdfapi/syntax/RdfSerializer.php	2004-04-07 05:32:28 UTC (re=
v 63)
@@ -217,7 +217,7 @@
             if (!HIDE_ADVERTISE) {
 //                $this->m_out.=3D"<!-- Generated by RdfSerializer.php f=
rom RDF RAP.".LINEFEED."# http://www.wiwiss.fu-berlin.de/suhl/bizer/rdfap=
i/index.html !-->".LINEFEED.LINEFEED ;
                 $this->m_out.=3D"<!-- Generated by PeopleAggregator usin=
g RdfSerializer.php from RDF RAP v0.7 -->".LINEFEED;
-                $this->m_out.=3D"<!-- PeopleAggregator information: http=
://peopleaggregator.com/ -->".LINEFEED;
+                $this->m_out.=3D"<!-- PeopleAggregator information: $pa_=
server_url/ -->".LINEFEED;
                 $this->m_out.=3D"<!-- RDF RAP information: http://www.wi=
wiss.fu-berlin.de/suhl/bizer/rdfapi/ -->".LINEFEED.LINEFEED;
             }
=20

Modified: trunk/publicroot/addselftogroup.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/addselftogroup.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/publicroot/addselftogroup.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -7,7 +7,7 @@
=20
 $currentProfile =3D new paProfile($paUserInfo->getCurrentProfileID());
=20
-$currentProfile->addMembership("http://peopleaggregator.com/profile?id=3D=
" . $gid);
+$currentProfile->addMembership("$pa_server_url/profile?id=3D" . $gid);
=20
 $template->assign('gid',$gid);
 $template->display('group_added.tpl');

Modified: trunk/publicroot/create.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/create.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/publicroot/create.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -17,7 +17,7 @@
    case "plain":
       $newProfile =3D new paProfile();
       $newProfile->setOwnerID($paUserInfo->getUserID());
-      $newProfile->setProfileURL("http://peopleaggregator.com/profile?id=
=3D".$newProfile->getProfileID());
+      $newProfile->setProfileURL("$pa_server_url/profile?id=3D".$newProf=
ile->getProfileID());
       $paUserInfo->setCurrentProfileID($newProfile->getProfileID());
       $_SESSION["current_profile_id"] =3D $newProfile->getProfileID();
       $template->assign('profile_id',$newProfile->getProfileID());
@@ -42,7 +42,7 @@
                $subject =3D $statement2->getObject();
                $currentProfile =3D new paProfile();
                $currentProfile->setOwnerID($paUserInfo->getUserID());
-               $currentProfile->setProfileURL("http://peopleaggregator.c=
om/profile?id=3D".$currentProfile->getProfileID());
+               $currentProfile->setProfileURL("$pa_server_url/profile?id=
=3D".$currentProfile->getProfileID());
                $iterator =3D new StatementIterator($currentProfile->db_p=
rofile);
                   while($iterator->hasNext()) {
                      $statement =3D $iterator->next();
@@ -99,7 +99,7 @@
       if($remote_model) {
          $currentProfile =3D new paProfile();
          $currentProfile->setOwnerID($paUserInfo->getUserID());
-         $currentProfile->setProfileURL("http://peopleaggregator.com/pro=
file?id=3D".$currentProfile->getProfileID());
+         $currentProfile->setProfileURL("$pa_server_url/profile?id=3D".$=
currentProfile->getProfileID());
=20
          $iterator =3D new StatementIterator($currentProfile->db_profile=
);
          while($iterator->hasNext()) {

Modified: trunk/publicroot/edit.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/edit.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/publicroot/edit.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -81,7 +81,7 @@
             $sql =3D "INSERT INTO imagecache (data, type) VALUES ('$data=
','$type')";
             $database->Execute($sql);
             $id =3D $database->Insert_ID();
-            $pictureurl =3D "http://peopleaggregator.com/image?id=3D".$i=
d;
+            $pictureurl =3D "$pa_server_url/image?id=3D".$id;
             pa_update_model_from_string($consumed_model["description"]["=
pictureurl"], $pictureurl, $db_model, $currentProfile->getProfileOwner(),=
 $FOAF_depiction, "resource");
          }
       }

Modified: trunk/publicroot/forgotpw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/forgotpw.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/publicroot/forgotpw.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -20,7 +20,7 @@
    $message->assign("pa_server_url",$pa_server_url);
    $message->assign("code",$code);
=20
-   mail($email,"PeopleAggregator Password Reset Request",$message->fetch=
('forgot_password.tpl'), "From: co...@pe...");
+   mail($email,"PeopleAggregator Password Reset Request",$message->fetch=
('forgot_password.tpl'), "From: $pa_email_contact");
    print_msg("E-mail has been sent","An e-mail has been sent to that add=
ress with instructions on how to recover your password.");
 } elseif($_REQUEST["verify_code"]) {
    if(($_REQUEST["password1"]) && ($_REQUEST["password2"])) {

Modified: trunk/publicroot/register.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/register.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/publicroot/register.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -48,7 +48,7 @@
                   $sql =3D "INSERT INTO temp_user_verifications (code, u=
serid, timestamp) VALUES ('$code','$id',NOW())";
                   $database->Execute($sql);
                   mail($email,"PeopleAggregator User Verification","Hell=
o!  To finish verifying your PeopleAggregator account, ".
-                       "go to $pa_server_url/userverification?action=3Df=
inish&code=3D$code", "From: co...@pe...");
+                       "go to $pa_server_url/userverification?action=3Df=
inish&code=3D$code", "From: $pa_email_contact");
                }
=20
                redirect("create");

Modified: trunk/publicroot/relationship.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/relationship.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/publicroot/relationship.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -34,7 +34,7 @@
          $currentProfile =3D new paProfile($paUserInfo->getCurrentProfil=
eID());
=20
          if(!$currentProfile)
-            error_page("No profile available!","Sorry, but it appears yo=
u have not set up a profile.  Try http://peopleaggregator.com/create");
+            error_page("No profile available!","Sorry, but it appears yo=
u have not set up a profile.  Try $pa_server_url/create");
=20
          $def_name =3D qName($currentProfile->getModel());
=20
@@ -105,7 +105,7 @@
             $message->template_dir =3D $pa_file_location."/templates/mai=
l";
             $message->assign("rel_type",$row[2]);
             $message->assign("from_person",$row[5]);
-            mail($mbox,"PeopleAggregator Relationship Denied",$message->=
fetch("relationship_denied.tpl"), "From: co...@pe...");
+            mail($mbox,"PeopleAggregator Relationship Denied",$message->=
fetch("relationship_denied.tpl"), "From: $pa_email_contact");
             //FIXME: Decode $row[5] and get a proper name if possible at=
 some point.
          } else {
             error_page("Invalid code.","Sorry, but that verification cod=
e no longer works.  This could be because it has expired, invalid, or the=
 person extending the relationship request had recinded it.");
@@ -140,7 +140,7 @@
             }
=20
             $mbox =3D $row[4];
-            mail($mbox,"PeopleAggregator Relationship Acknowledged","$na=
me ($url) has confirmed your relationship request.", "From: contact@peopl=
eaggregator.com");
+            mail($mbox,"PeopleAggregator Relationship Acknowledged","$na=
me ($url) has confirmed your relationship request.", "From: $pa_email_con=
tact");
=20
             $othername =3D qName($db_model);
             $template->assign("rel",$rel);=20

Modified: trunk/publicroot/upload-image.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/upload-image.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/publicroot/upload-image.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -6,7 +6,7 @@
 if($_REQUEST["submit"]) {
    if ($_FILES['imagefile']) {
       copy ($_FILES['imagefile']['tmp_name'],"userfiles/".$_FILES['image=
file']['name'])
-         or error_page("Unable to copy","For some reason, PA was unable =
to copy this file into place.  Try again, and if the problem persists, pl=
ease e-mail bug...@pe...");
+         or error_page("Unable to copy","For some reason, PA was unable =
to copy this file into place.  Try again, and if the problem persists, pl=
ease e-mail $pa_email_bugs");
=20
       //FIXME: Warning: This does not obfuscate the damn name
       //Then we add this image to the person's FOAF

Modified: trunk/publicroot/userverification.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/userverification.php	2004-04-06 20:35:28 UTC (rev 62=
)
+++ trunk/publicroot/userverification.php	2004-04-07 05:32:28 UTC (rev 63=
)
@@ -22,7 +22,7 @@
          $sql =3D "INSERT INTO temp_user_verifications (code, userid, ti=
mestamp) VALUES ('$code','".$paUserInfo->getUserID()."',NOW())";
          $database->Execute($sql);
          mail($email,"PeopleAggregator User Verification","Hello!  To fi=
nish verifying your PeopleAggregator account, ".
-              "go to $pa_server_url/userverification?action=3Dfinish&cod=
e=3D$code", "From: co...@pe...");=20
+              "go to $pa_server_url/userverification?action=3Dfinish&cod=
e=3D$code", "From: $pa_email_contact");=20
          pa_add_sysnote("An e-mail has been sent to your registered addr=
ess with the verification code.");
          redirect("private");
       break;

Modified: trunk/publicroot/view.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/publicroot/view.php	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/publicroot/view.php	2004-04-07 05:32:28 UTC (rev 63)
@@ -9,7 +9,7 @@
 }=20
=20
 if(isset($_REQUEST["id"])) {
-   $url =3D "http://peopleaggregator.com/profile?id=3D".mysql_escape_str=
ing($_REQUEST["id"]);
+   $url =3D "$pa_server_url/profile?id=3D".mysql_escape_string($_REQUEST=
["id"]);
 } else {
    $url =3D mysql_escape_string($_REQUEST["url"]);
 }
@@ -20,7 +20,7 @@
=20
    //Figure out if this profile is owned by the viewer.
    foreach($paUserInfo->getAllProfileIDs() as $user_profile) {
-      $profile_url =3D "http://peopleaggregator.com/profile?id=3D".$user=
_profile[0];
+      $profile_url =3D "$pa_sever_url/profile?id=3D".$user_profile[0];
       if($profile_url =3D=3D $url) {
          $lookingatself =3D true;
          $template->assign('lookingatself',$lookingatself);

Modified: trunk/templates/html/privacy.tpl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/templates/html/privacy.tpl	2004-04-06 20:35:28 UTC (rev 62)
+++ trunk/templates/html/privacy.tpl	2004-04-07 05:32:28 UTC (rev 63)
@@ -5,7 +5,7 @@
          <h1>PeopleAggregator Privacy Policy</h1>
          <p class=3D"p1">Since I don't have any money to pay lawyers to =
make some indecipherable privacy policy, I'm going to just say what I pla=
n to do.  If you have questions,  comments, or feel this policy has been =
broken, e-mail es...@pe....</p>
          <p class=3D"p1">Your registration info will be kept confidentia=
l.  The e-mail address you use to register will not be sold to third part=
ies, only used by PeopleAggregator to contact you if there is no other wa=
y.  Period.  I hate spam as much as everyone else.</p>
-         <p class=3D"p1">This is site is "social software", that is, it'=
s something designed to help people connect to other people.  So in order=
 for it to work there will always be some amount of information made publ=
ic to allow people to find one another.  This is anything in your "Profil=
e" (the FOAF data).  Over time, features will be introduced to allow you =
to limit your personal information to specific groups, but right now anyt=
hing in your FOAF (the data you get from http://peopleaggregator.com/prof=
ile?id=3D#) is public.</p>
+         <p class=3D"p1">This is site is "social software", that is, it'=
s something designed to help people connect to other people.  So in order=
 for it to work there will always be some amount of information made publ=
ic to allow people to find one another.  This is anything in your "Profil=
e" (the FOAF data).  Over time, features will be introduced to allow you =
to limit your personal information to specific groups, but right now anyt=
hing in your FOAF (the data you get from {$pa_server_url}/profile?id=3D#)=
 is public.</p>
          <p class=3D"p1">Finally, I have put in place safeguards to try =
to prevent strip-mining of your FOAF profile data by people known to have=
 no scruples, but these measures may not work.</p>
          <p class=3D"p1">Oh, and should this privacy policy ever change,=
 every user of PeopleAggregator will be notified and will not have the ne=
w rules applied to their account until they agree to them.</p>
       </div>