Renames uid to pid in watch_profile table.

[platal.git] / classes / profile.php

diff --git a/classes/profile.php b/classes/profile.php
index 3c782b6..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();
@@ -286,8 +289,8 @@ class Profile
                            LEFT JOIN  geoloc_administrativeareas AS ga ON (ga.id = pa.administrativeAreaId)
                            LEFT JOIN  geoloc_administrativeareas AS gas ON (gas.id = pa.subAdministrativeAreaId)
                            LEFT JOIN  geoloc_countries AS gc ON (gc.iso_3166_1_a2 = pa.countryId)
-                           LEFT JOIN  profile_phones AS ppfix ON (ppfix.link_type = \'address\' AND ppfix.uid = pa.pid AND ppfix.link_id = pa.id AND ppfix.tel_type = \'fixed\')
-                           LEFT JOIN  profile_phones AS ppfax ON (ppfax.link_type = \'address\' AND ppfax.uid = pa.pid AND ppfax.link_id = pa.id AND ppfax.tel_type = \'fax\')
+                           LEFT JOIN  profile_phones AS ppfix ON (ppfix.link_type = \'address\' AND ppfix.pid = pa.pid AND ppfix.link_id = pa.id AND ppfix.tel_type = \'fixed\')
+                           LEFT JOIN  profile_phones AS ppfax ON (ppfax.link_type = \'address\' AND ppfax.pid = pa.pid AND ppfax.link_id = pa.id AND ppfax.tel_type = \'fax\')
                                WHERE  ' . $where . '
                             ORDER BY  pa.id
                                       ' . $limit);
@@ -308,7 +311,7 @@ class Profile
      */
     public function getEducations($flags, $limit = null)
     {
-        $where = XDB::format('pe.uid = {?}', $this->id());
+        $where = XDB::format('pe.pid = {?}', $this->id());
         if ($flags & self::EDUCATION_MAIN) {
             $where .= ' AND FIND_IN_SET(\'primary\', pe.flags)';
         } else if ($flags & self::EDUCATION_EXTRA) {
@@ -344,7 +347,7 @@ class Profile
 
     public function getNetworking($flags, $limit = null)
     {
-        $where = XDB::format('pn.uid = {?}', $this->id());
+        $where = XDB::format('pn.pid = {?}', $this->id());
         if ($flags & self::NETWORKING_WEB) {
             $where .= ' AND pn.network_type = 0'; // XXX hardcoded reference to web site index
         }
@@ -378,7 +381,7 @@ class Profile
 
     public function getJobs($flags, $limit = null)
     {
-        $where = XDB::format('pj.uid = {?}', $this->id());
+        $where = XDB::format('pj.pid = {?}', $this->id());
         $cond  = 'TRUE';
         if ($this->visibility) {
             $where .= ' AND pj.pub IN ' . XDB::formatArray($this->visibility);
@@ -414,8 +417,8 @@ class Profile
     public function getBinets()
     {
         return XDB::fetchColumn('SELECT  binet_id
-                                   FROM  binets_ins
-                                  WHERE  user_id = {?}', $this->id());
+                                   FROM  profile_binets
+                                  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) {
@@ -447,7 +469,7 @@ class Profile
                                       ap.uid AS owner_id
                                 FROM  profiles AS p
                           INNER JOIN  profile_display AS pd ON (pd.pid = p.pid)
-                          INNER JOIN  profile_education AS pe ON (pe.uid = p.pid AND FIND_IN_SET(\'primary\', pe.flags))
+                          INNER JOIN  profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET(\'primary\', pe.flags))
                           INNER JOIN  profile_name AS pn_f ON (pn_f.pid = p.pid
                                                                AND pn_f.typeid = ' . self::getNameTypeId('firstname', true) . ')
                           INNER JOIN  profile_name AS pn_l ON (pn_l.pid = p.pid
@@ -458,7 +480,7 @@ class Profile
                                                                 AND pn_ul.typeid = ' . self::getNameTypeId('lastname_ordinary', true) . ')
                            LEFT JOIN  profile_name AS pn_n ON (pn_n.pid = p.pid
                                                                AND pn_n.typeid = ' . self::getNameTypeId('nickname', true) . ')
-                           LEFT JOIN  profile_phones AS pp ON (pp.uid = p.pid AND pp.link_type = \'user\' AND tel_type = \'mobile\')
+                           LEFT JOIN  profile_phones AS pp ON (pp.pid = p.pid AND pp.link_type = \'user\' AND tel_type = \'mobile\')
                            LEFT JOIN  profile_photos AS ph ON (ph.pid = p.pid)
                            LEFT JOIN  account_profiles AS ap ON (ap.pid = p.pid AND FIND_IN_SET(\'owner\', ap.perms))
                                WHERE  p.pid IN ' . XDB::formatArray($pids) . '
@@ -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));