Merge UFC_Email and UFC_EmailList into a single class (UFC_Email).

[platal.git] / classes / profile.php

diff --git a/classes/profile.php b/classes/profile.php
index 8087474..f8d2781 100644 (file)
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -130,9 +130,9 @@ class Profile
     {
         return str_replace(array('%s', '%f', '%l', '%F', '%S', '%p'),
                            array($this->isFemale() ? '•' : '',
-                                 $this->first_name, $this->last_name,
-                                 $this->full_name, $this->short_name,
-                                 $this->promo), $format);
+                                 $this->firstName(), $this->lastName(),
+                                 $this->fullName(), $this->shortName(),
+                                 $this->promo()), $format);
     }
 
     public function fullName($with_promo = false)
@@ -213,6 +213,10 @@ class Profile
         return property_exists($this, $name) || isset($this->data[$name]);
     }
 
+    /** Sets the level of visibility of the profile
+     * Sets $this->visibility to a list of valid visibilities.
+     * @param one of the self::VISIBILITY_* values
+     */
     public function setVisibilityLevel($visibility)
     {
         if ($visibility != self::VISIBILITY_PRIVATE
@@ -226,21 +230,27 @@ class Profile
         }
     }
 
+    /** Determine whether an item with visibility $visibility can be displayed
+     * with the current level of visibility of the profile
+     * @param $visibility The level of visibility to be checked
+     */
+    public function isVisible($visibility)
+    {
+        return in_array($visibility, $this->visibility);
+    }
 
     /* Photo
      */
     public function getPhoto($fallback = true)
     {
-        /* TODO: migrate photo table to profile_photo, change uid to pid
-         */
         $cond = '';
         if ($this->visibility) {
             $cond = ' AND pub IN ' . XDB::formatArray($this->visibility);
         }
-        $res = XDB::query('SELECT  *
+        $res = XDB::query("SELECT  *
                              FROM  profile_photos
-                            WHERE  attachmime IN (\'jpeg\', \'png\')
-                                   ' . $cond . ' AND  pid = {?}',
+                            WHERE  attachmime IN ('jpeg', 'png')
+                                   " . $cond . ' AND  pid = {?}',
                           $this->id());
         if ($res->numRows() > 0) {
             $photo = $res->fetchOneAssoc();
@@ -608,7 +618,7 @@ class Profile
     public static function rebuildSearchTokens($pid)
     {
         XDB::execute('DELETE FROM  search_name
-                            WHERE  uid = {?}',
+                            WHERE  pid = {?}',
                      $pid);
         $keys = XDB::iterator("SELECT  CONCAT(n.particle, n.name) AS name, e.score,
                                        FIND_IN_SET('public', e.flags) AS public
@@ -627,9 +637,9 @@ class Profile
             while ($toks) {
                 $token = strtolower(replace_accent(array_pop($toks) . $token));
                 $score = ($toks ? 0 : 10 + $first) * ($key['score'] / 10);
-                XDB::execute('REPLACE INTO  search_name (token, uid, soundex, score, flags)
+                XDB::execute('REPLACE INTO  search_name (token, pid, soundex, score, flags)
                                     VALUES  ({?}, {?}, {?}, {?}, {?})',
-                             $token, $uid, soundex_fr($token), $score, $key['public']);
+                             $token, $pid, soundex_fr($token), $score, $key['public']);
                 $first = 0;
             }
         }