[Peepagg-cvs] PA SVN Commit r66 - in trunk: classes docs lib publicroot schema templates/html

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

Author: esigler
Date: 2004-04-08 09:19:55 -0700 (Thu, 08 Apr 2004)
New Revision: 66

Added:
   trunk/publicroot/htaccess-dist
   trunk/publicroot/preferences.php
   trunk/templates/html/preferences.tpl
Modified:
   trunk/classes/paUserInfo.php
   trunk/docs/INSTALL
   trunk/lib/cache.php
   trunk/lib/rdf.php
   trunk/publicroot/
   trunk/publicroot/private.php
   trunk/publicroot/thumbnail.php
   trunk/publicroot/view.php
   trunk/schema/database.sql
   trunk/templates/html/private.tpl
Log:
Removed .htaccess from being a version-controlled resource.=20
Added htaccess-dist (like config.php/config.php-dist).
(Makes it so potential installers _have to_ poke at certain things,
and also gets our bot ban list out of the public eye.)

Created preferences pages (for certain kinds of info display).
Not done yet, but use /preferences to see the current work.

Thumbnailer (aka not just scaling the images, but actually shrinking them=
 + caching them)

Database tables added in this revision:

CREATE TABLE user_preferences (
   id int(10) NOT NULL AUTO_INCREMENT,
   user_id int(10) NOT NULL,
   pref_name varchar(255) NOT NULL,
   pref_value text,=20
   PRIMARY KEY (id),
   UNIQUE ID (id)
);

CREATE TABLE thumbcache (
   id int(10) NOT NULL AUTO_INCREMENT,
   url varchar(255),
   data text,
   type varchar(255), =20
   timestamp timestamp,
   PRIMARY KEY (id),
   UNIQUE ID (id)
);

Note also, that thumbnail.php currently does a system call
to "convert", which is a part of ImageMagick.  Future revs
will probably do something different for image manip.

Install docs updated to reflect changes.



Modified: trunk/classes/paUserInfo.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/paUserInfo.php	2004-04-08 06:08:25 UTC (rev 65)
+++ trunk/classes/paUserInfo.php	2004-04-08 16:19:55 UTC (rev 66)
@@ -272,6 +272,43 @@
    function __wakeup() {
       $this->refresh();
    }
+
+   function setPref($pref_name, $pref_value) {
+      global $database;
+      $safe_name =3D $database->qstr($pref_name);
+      $safe_value =3D $database->qstr($pref_value);
+      if($this->getPref($pref_name)) {
+         if($pref_value) {
+            $sql =3D "UPDATE user_preferences SET pref_value=3D$safe_val=
ue WHERE user_id=3D'$this->userID' AND pref_name=3D$safe_name";
+         } else {
+            $sql =3D "DELETE FROM user_preferences WHERE user_id=3D'$thi=
s->userID' AND pref_name=3D$safe_name";
+         }
+      } else {
+         if($pref_value) {
+            $sql =3D "INSERT INTO user_preferences (user_id, pref_name, =
pref_value) VALUES ('$this->userID', $safe_name, $safe_value)";
+         }
+      }
+
+      if($sql)
+         $database->Execute($sql);
+   }
+        =20
+   function getPref($pref_name) {
+      global $database;
+      $safe_pref =3D $database->qstr($pref_name);
+      $sql =3D "SELECT pref_value FROM user_preferences WHERE user_id=3D=
'$this->userID' AND pref_name=3D$safe_pref";
+      $results =3D $database->Execute($sql);
+      if($results) {
+         if($results->RecordCount()) {
+            $row =3D $results->FetchRow();
+            return $row["pref_value"];
+         } else {
+            return null;
+         }
+      } else {
+         return null;
+      }
+   }
 }
=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-08 06:08:25 UTC (rev 65)
+++ trunk/docs/INSTALL	2004-04-08 16:19:55 UTC (rev 66)
@@ -25,10 +25,15 @@
=20
 This section is most likely incomplete.
=20
+Also, currently, PeopleAggregator uses ImageMagick to shrink images and
+thumbnail them.  Make sure "convert" is in a web-server accessable path.
+This will change in future releases.
+
 PeopleAggregator Installation:
=20
 1) Load schema/database.sql into the MySQL database of your choice
 2) Move lib/config.php-dist to lib/config.php and change everything to t=
he information you wish=20
+3) Move publicroot/htaccess-dist to publicroot/.htaccess and change ever=
ything as appropriate
 3) Make a temp file directory (/tmp/pa usually) and make it webserver wr=
itable
 4) Point a webserver at publicroot
 5) You're up and running!

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-08 06:08:25 UTC (rev 65)
+++ trunk/lib/cache.php	2004-04-08 16:19:55 UTC (rev 66)
@@ -11,7 +11,7 @@
 function fetch_url($url) {
    //OK, we look up the URL in the db, and if it's there, and less than =
X hours old, we get it!
=20
-   global $database;
+   global $database, $pa_server_url;
=20
    //FIXME: We need to make sure that there's a proper http: in front of=
 this URL
    if(!pa_is_url_valid($url))

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-08 06:08:25 UTC (rev 65)
+++ trunk/lib/rdf.php	2004-04-08 16:19:55 UTC (rev 66)
@@ -127,6 +127,7 @@
 }
=20
 function makemodel($url) {
+   global $pa_server_url;
    $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.
@@ -147,6 +148,10 @@
          set_error_handler("parser_error_handler");
          $model =3D $parser->generateModel($rdf_data);
          restore_error_handler();
+
+         if($model)
+            $model->index();
+
          return $model;
       } else {
          return false;


Property changes on: trunk/publicroot
___________________________________________________________________
Name: svn:ignore
   + .htaccess


Copied: trunk/publicroot/htaccess-dist (from rev 65, trunk/publicroot/.ht=
access)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/.htaccess	2004-04-08 06:08:25 UTC (rev 65)
+++ trunk/publicroot/htaccess-dist	2004-04-08 16:19:55 UTC (rev 66)
@@ -0,0 +1,16 @@
+php_flag allow_url_fopen 1
+php_flag magic_quotes_gpc 0=20
+
+RewriteEngine on
+RewriteCond %{HTTP_HOST} ^www\.peopleaggregator\.com$ [NC]
+RewriteRule ^(.*)$ http://peopleaggregator.com/$1 [R=3D301,L]
+
+RewriteCond %{SERVER_PORT} !^80$
+RewriteRule ^(.*)$ http://peopleaggregator.com/$1 [R=3D301,L]
+
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ /$1.php=20
+
+ErrorDocument 404 /error.php
+ErrorDocument 403 /error.php


Property changes on: trunk/publicroot/htaccess-dist
___________________________________________________________________
Name: svn:executable
   +=20

Added: trunk/publicroot/preferences.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/preferences.php	2004-04-08 06:08:25 UTC (rev 65)
+++ trunk/publicroot/preferences.php	2004-04-08 16:19:55 UTC (rev 66)
@@ -0,0 +1,27 @@
+<?php
+
+require_once("../lib/main.php");
+must_be_logged_in();
+
+if(isset($_REQUEST["submit"])) {
+   $paUserInfo->setPref("private_showpendinggroups",$_REQUEST["showpendi=
nggroups"]);
+   $paUserInfo->setPref("private_showgroups",$_REQUEST["showgroups"]);
+   $paUserInfo->setPref("private_showpendingrels",$_REQUEST["showpending=
rels"]);
+   $paUserInfo->setPref("private_showrels",$_REQUEST["showrels"]);
+   $paUserInfo->setPref("breadcrumbs",$_REQUEST["breadcrumbs"]);
+   pa_add_sysnote("The changes to your preferences have been saved.");
+   redirect("private");
+}
+
+$crumbs =3D array("1","2","3","4","5","6","7","10","15","20","50");
+
+$template->assign("preferences_showpendinggroups", $paUserInfo->getPref(=
"private_showpendinggroups"));
+$template->assign("preferences_showgroups", $paUserInfo->getPref("privat=
e_showgroups"));
+$template->assign("preferences_showpendingrels", $paUserInfo->getPref("p=
rivate_showpendingrels"));
+$template->assign("preferences_showrels", $paUserInfo->getPref("private_=
showrels"));
+$template->assign("preferences_breadcrumbs", $paUserInfo->getPref("bread=
crumbs"));
+$template->assign("crumbs", $crumbs);
+
+$template->display("preferences.tpl");
+
+?>

Modified: trunk/publicroot/private.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/private.php	2004-04-08 06:08:25 UTC (rev 65)
+++ trunk/publicroot/private.php	2004-04-08 16:19:55 UTC (rev 66)
@@ -36,6 +36,12 @@
       if(isset($consumed["friends"]))
          $template->assign('profile_friends',$consumed["friends"]);
=20
+      $template->assign("preferences_showpendinggroups", $paUserInfo->ge=
tPref("private_showpendinggroups"));
+      $template->assign("preferences_showgroups", $paUserInfo->getPref("=
private_showgroups"));
+      $template->assign("preferences_showpendingrels", $paUserInfo->getP=
ref("private_showpendingrels"));
+      $template->assign("preferences_showrels", $paUserInfo->getPref("pr=
ivate_showrels"));
+      $template->assign("preferences_breadcrumbs", $paUserInfo->getPref(=
"breadcrumbs"));
+
       $template->display('private.tpl');
    } else {
       error_page("Unable to retrieve profile!","Sorry, but I was unable =
to retrieve your user profile.  Something's not right.");

Modified: trunk/publicroot/thumbnail.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/thumbnail.php	2004-04-08 06:08:25 UTC (rev 65)
+++ trunk/publicroot/thumbnail.php	2004-04-08 16:19:55 UTC (rev 66)
@@ -1,81 +1,61 @@
 <?php
=20
 require_once("../lib/main.php");
+require_once("../lib/image_size.func.php");
=20
-if(file_exists($pa_file_location."/thumbs/".md5($_REQUEST["url"])."-thum=
b")) {
-   @clearstatcache();
-   $requested_time =3D strtotime($_SERVER['HTTP_IF_modified_SINCE']);
-   $file_time =3D filemtime($pa_file_location."/thumbs/".md5($_REQUEST["=
url"])."-thumb");
-   header("Last-modified: " . gmdate("D, d M Y H:i:s",$file_time) . " GM=
T");
+if($_REQUEST["url"]) {
+   $url =3D $database->qstr($_REQUEST["url"]);
+   $sha1url =3D sha1($url);
=20
-   if( $file_time=3D=3D$requested_time ) {
-      header("{$_SERVER['SERVER_PROTOCOL']} 304 not modified");
-      exit();
-   } else {=20
-   $image_path =3D $pa_file_location."/thumbs/pa-base-file-".md5($_REQUE=
ST["url"]);
-   $ch =3D curl_init(ereg_replace("%20","",$_REQUEST["url"]));
-   $fp =3D fopen($image_path,"w");
+   $sql =3D "SELECT * FROM thumbcache WHERE url=3D'$sha1url'";
+   $result =3D $database->Execute($sql);
=20
-   curl_setopt($ch,CURLOPT_FILE,$fp);
-   curl_setopt($ch,CURLOPT_HEADER,0);
-   curl_exec($ch);
-   curl_close($ch);
-   fclose($fp);
+   if($result->RecordCount()) {
+      $row =3D $result->FetchRow();
+      $data =3D $row["data"];
+      $image =3D base64_decode($data);
+      header("Content-type: ".$row["type"]);
+      echo $image;
+   } else {
+      //Fetch image.
+      $image_path =3D $pa_tmp_location."/tnail-$sha1url";
+      $ch =3D curl_init($_REQUEST["url"]);
+      $file =3D fopen($image_path,"w");
=20
-   $current_file =3D $image_path;
-   $max_width =3D "64";
+      curl_setopt($ch,CURLOPT_FILE,$file);
+      curl_setopt($ch,CURLOPT_HEADER,0);
+      curl_exec($ch);
+      curl_close($ch);
+      fclose($file);
=20
-   $current_size =3D getimagesize($current_file);
-   $current_img_width =3D $current_size[0];
-   $current_img_height =3D $current_size[1];
+      //Shrink image.
+      $image_size =3D image_size($image_path, 64, 64);
=20
-   $new_file =3D $pa_file_location."/thumbs/".md5($_REQUEST["url"])."-th=
umb";
+      $new_image_path =3D $pa_tmp_location."/tnail-tmp-$sha1url";
+      $new_img_width =3D $image_size["width"];
+      $new_img_height =3D $image_size["height"];
=20
-   $too_big_diff_ratio =3D $current_img_width/$max_width;
-   $new_img_width =3D $max_width;
-   $new_img_height =3D round($current_img_height/$too_big_diff_ratio);
+      $make_magick =3D system("convert -geometry $new_img_width x $new_i=
mg_height $image_path $new_image_path", $retval);
=20
-   $make_magick =3D system("convert -geometry $new_img_width x $new_img_=
height $current_file $new_file", $retval);
+      //Grok image.
+      $type =3D image_type_to_mime_type(exif_imagetype($new_image_path))=
;
=20
-   $handle =3D fopen ($new_file, "r");
-   $contents =3D fread ($handle, filesize ($new_file));
-   fclose ($handle);
-   header("Content-type: image/jpeg");
-   echo $contents;
-   unlink($current_file);
-   }
-} else {
-   $image_path =3D $pa_file_location."/thumbs/pa-base-file-".md5($_REQUE=
ST["url"]);
-   $ch =3D curl_init(ereg_replace("%20","",$_REQUEST["url"]));
-   $fp =3D fopen($image_path,"w");
+      $data =3D base64_encode(file_get_contents($new_image_path));
+      if(!$data)
+         exit();  //FIXME: Could probably do something better here.
=20
-   curl_setopt($ch,CURLOPT_FILE,$fp);
-   curl_setopt($ch,CURLOPT_HEADER,0);
-   curl_exec($ch);
-   curl_close($ch);
-   fclose($fp);
+      //Store image.
+      $sql =3D "INSERT INTO thumbcache (url, data, type) VALUES ('$sha1u=
rl','$data','$type')";
+      $database->Execute($sql);
=20
-   $current_file =3D $image_path;
-   $max_width =3D "64";
+      //Get rid of temp files.
+      unset($new_image_path);
+      unset($image_path);
=20
-   $current_size =3D getimagesize($current_file);
-   $current_img_width =3D $current_size[0];
-   $current_img_height =3D $current_size[1];
-
-   $new_file =3D $pa_file_location."/thumbs/".md5($_REQUEST["url"])."-th=
umb";
-
-   $too_big_diff_ratio =3D $current_img_width/$max_width;
-   $new_img_width =3D $max_width;
-   $new_img_height =3D round($current_img_height/$too_big_diff_ratio);
-
-   $make_magick =3D system("convert -geometry $new_img_width x $new_img_=
height $current_file $new_file", $retval);
-
-   $handle =3D fopen ($new_file, "r");
-   $contents =3D fread ($handle, filesize ($new_file));
-   fclose ($handle);
-   header("Content-type: image/jpeg");
-   echo $contents;
-   unlink($current_file);
+      //Show image.
+      header("Content-type: $type");
+      echo base64_decode($data);
+   }
 }
=20
 ?>

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-08 06:08:25 UTC (rev 65)
+++ trunk/publicroot/view.php	2004-04-08 16:19:55 UTC (rev 66)
@@ -20,7 +20,7 @@
=20
    //Figure out if this profile is owned by the viewer.
    foreach($paUserInfo->getAllProfileIDs() as $user_profile) {
-      $profile_url =3D "$pa_sever_url/profile?id=3D".$user_profile[0];
+      $profile_url =3D "$pa_server_url/profile?id=3D".$user_profile[0];
       if($profile_url =3D=3D $url) {
          $lookingatself =3D true;
          $template->assign('lookingatself',$lookingatself);

Modified: trunk/schema/database.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/schema/database.sql	2004-04-08 06:08:25 UTC (rev 65)
+++ trunk/schema/database.sql	2004-04-08 16:19:55 UTC (rev 66)
@@ -1,3 +1,24 @@
+### two tables added by esigler 4/8/04 --- for thumbnail caching and use=
r-level preferences
+
+CREATE TABLE user_preferences (
+   id int(10) NOT NULL AUTO_INCREMENT,
+   user_id int(10) NOT NULL,
+   pref_name varchar(255) NOT NULL,
+   pref_value text,
+   PRIMARY KEY (id),
+   UNIQUE ID (id)
+);
+
+CREATE TABLE thumbcache (
+   id int(10) NOT NULL AUTO_INCREMENT,
+   url varchar(255),
+   data text,
+   type varchar(255),
+   timestamp timestamp,
+   PRIMARY KEY (id),
+   UNIQUE ID (id)
+);
+
 ## three tables added by Liz, first week of April, 2004 -- necessary for=
 the message boards
=20
=20

Added: trunk/templates/html/preferences.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/preferences.tpl	2004-04-08 06:08:25 UTC (rev 65)
+++ trunk/templates/html/preferences.tpl	2004-04-08 16:19:55 UTC (rev 66)
@@ -0,0 +1,22 @@
+{include file=3D"header.tpl" title=3D"PeopleAggregator"}
+{include file=3D"body_top.tpl"}
+   <div id=3D"pageContent">
+      <div id=3D"fullPage">
+         <h1>{localize tag=3D"prefs-title"}:</h1>
+         <form method=3D"post" action=3D"preferences">
+            <h2>{localize tag=3D"prefs-private-title"}:</h2>
+            {localize tag=3D"prefs-private-showpendinggroups"}: <input t=
ype=3D"checkbox" name=3D"showpendinggroups" value=3D"1" {if $preferences_=
showpendinggroups}checked{/if} /><br />
+            {localize tag=3D"prefs-private-showgroups"}: <input type=3D"=
checkbox" name=3D"showgroups" value=3D"1" {if $preferences_showgroups}che=
cked{/if} /><br />
+            {localize tag=3D"prefs-private-showpendingrels"}: <input typ=
e=3D"checkbox" name=3D"showpendingrels" value=3D"1" {if $preferences_show=
pendingrels}checked{/if} /><br />
+            {localize tag=3D"prefs-private-showrels"}: <input type=3D"ch=
eckbox" name=3D"showrels" value=3D"1" {if $preferences_showrels}checked{/=
if} /><br />
+            <hr />
+            <h2>{localize tag=3D"prefs-nav-title"}</h2>
+            {localize tag=3D"prefs-nav-crumbs"}: <select name=3D"breadcr=
umbs">
+            {html_options values=3D$crumbs selected=3D$preferences_bread=
crumbs output=3D$crumbs}
+            </select>
+            <hr />
+            <input type=3D"submit" name=3D"submit" value=3D"{localize ta=
g=3D"prefs-submit"}" />
+         </form>
+      </div>
+   </div>
+{include file=3D"body_bottom.tpl"}


Property changes on: trunk/templates/html/preferences.tpl
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/templates/html/private.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/private.tpl	2004-04-08 06:08:25 UTC (rev 65)
+++ trunk/templates/html/private.tpl	2004-04-08 16:19:55 UTC (rev 66)
@@ -20,13 +20,14 @@
          <a href=3D"create">{localize tag=3D"personal-createnewpersonali=
ty"}</a> -
          <a href=3D"delete?id=3D{$profile_id}">{localize tag=3D"personal=
-deleteprofile"}</a> -=20
          <a href=3D"{$profile_url}">{localize tag=3D"personal-viewrdf"}<=
/a> <br />
-         <strong>Community:</strong>
-         Create a new Community -
+         <strong>Group:</strong>
+         <a href=3D"all_groups">List all groups</a> -
+         <a href=3D"creategroup">Create a group</a>
          </p>
=20
          <!-- FIXME: Show pending memberships here -->
=20
-         {if $prefs.showgroupmemberships and $memberships}=20
+         {if $preferences_showmemberships and $memberships}=20
          <h3>Group memberships:</h3>
          <p class=3D"p1">
          {section name=3Dinc loop=3D$memberships}
@@ -35,7 +36,7 @@
          </p>
          {/if}
=20
-         {if $prefs.showpendingrelationships and $waiting_relationships}
+         {if $preferences_showpendingrels and $waiting_relationships}
          <h3>{localize tag=3D"personal-waitingrels"}:</h3>
          <table align=3D"center">
          {section name=3Dwaiting loop=3D$waiting_relationships}
@@ -62,7 +63,7 @@
          </table>
          {/if}
=20
-         {if $prefs.showrelationships and $profile_friends}
+         {if $preferences_showrels and $profile_friends}
          <h3>{localize tag=3D"personal-rels"}:</h3>
          <table align=3D"center">
          {section name=3Dfriend loop=3D$profile_friends}