Renames uid to pid in watch_profile table.

[platal.git] / classes / profile.php

diff --git a/classes/profile.php b/classes/profile.php
index a1ddca2..f46eb15 100644 (file)
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -113,6 +113,11 @@ class Profile
         return $this->promo;
     }
 
+    public function yearpromo()
+    {
+        return intval(substr($this->promo, 1, 4));
+    }
+
     /** Print a name with the given formatting:
      * %s = • for women
      * %f = firstname
@@ -226,16 +231,14 @@ class Profile
      */
     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();
@@ -415,7 +418,7 @@ class Profile
     {
         return XDB::fetchColumn('SELECT  binet_id
                                    FROM  profile_binets
-                                  WHERE  user_id = {?}', $this->id());
+                                  WHERE  pid = {?}', $this->id());
     }
 
 
@@ -424,6 +427,25 @@ class Profile
         return User::getSilent($this);
     }
 
+    public function compareNames($firstname, $lastname)
+    {
+        $_lastname  = mb_strtoupper($this->lastName());
+        $_firstname = mb_strtoupper($this->firstName());
+        $lastname   = mb_strtoupper($lastname);
+        $firstname  = mb_strtoupper($firstname);
+
+        $isOk  = (mb_strtoupper($_firstname) == mb_strtoupper($firstname));
+        $tokens = preg_split("/[ \-']/", $lastname, -1, PREG_SPLIT_NO_EMPTY);
+        $maxlen = 0;
+
+        foreach ($tokens as $str) {
+            $isOk &= (strpos($_lastname, $str) !== false);
+            $maxlen = max($maxlen, strlen($str));
+        }
+
+        return ($isOk && ($maxlen > 2 || $maxlen == strlen($_lastname)));
+    }
+
     private static function fetchProfileData(array $pids, $respect_order = true)
     {
         if (count($pids) == 0) {
@@ -642,6 +664,10 @@ class Profile
 
     public static function getXorgId($schoolId)
     {
+        if (!preg_match('/^[0-9]{6}$/', $schoolId)) {
+            return null;
+        }
+
         $year = intval(substr($schoolId, 0, 3));
         $rank = intval(substr($schoolId, 3, 3));