Changeset 218

Timestamp:

07/02/10 10:31:36 (19 months ago)

Author:

fuze

Message:

Ticket #104

Location:

branches/fuze

Files:

• core/classes/user.class.php (modified) (6 diffs)
• templates/_default_/components/com_users_profile.tpl (modified) (1 diff)

branches/fuze/core/classes/user.class.php

@@ -404 +404 @@
         }
 
-        $sql = "SELECT DISTINCT c.id, c.content, c.target as target, c.target_id as target_id, c.user_id, c.target_link, u.id as user_id, u.nickname as nickname, u.login as login,
-                       IF(DATE_FORMAT(c.pubdate, '%d-%m-%Y')=DATE_FORMAT(NOW(), '%d-%m-%Y'), DATE_FORMAT(c.pubdate, '<strong>Cåãîäíÿ</strong> â %H:%i'),
-                       IF(DATEDIFF(NOW(), c.pubdate)=1, DATE_FORMAT(c.pubdate, 'Â÷åðà â %H:%i'),DATE_FORMAT(c.pubdate, '%d, %M') ))  as pubdate
+        $sql = "SELECT DISTINCT c.id, c.content, c.target as target, c.target_id as target_id, c.user_id, c.target_link, u.id as user_id, u.nickname as nickname, u.login as login, c.pubdate as pubdate
                 FROM cms_comments c, cms_users u
                 WHERE c.user_id = u.id AND ({$friends_sql})
@@ -421 +419 @@
 
         while ($comment = $inDB->fetch_assoc($result)){
-            $comment['pubdate'] = $inCore->getRusDate($comment['pubdate']);
+            $comment['pubdate'] = $inCore->dateFormat($comment['pubdate']);
             if (sizeof($comment['content'])>50){
                 $comment['content'] = substr($comment['content'], 0, 50) . '...';
@@ -466 +464 @@
                                 u.nickname as nickname,
                                 u.login as login,
-                       IF(DATE_FORMAT(p.pubdate, '%d-%m-%Y')=DATE_FORMAT(NOW(), '%d-%m-%Y'), DATE_FORMAT(p.pubdate, '<strong>Cåãîäíÿ</strong> â %H:%i'),
-                       IF(DATEDIFF(NOW(), p.pubdate)=1, DATE_FORMAT(p.pubdate, 'Â÷åðà â %H:%i'),DATE_FORMAT(p.pubdate, '%d, %M') ))  as pubdate
+                                        p.pubdate as pubdate
                 FROM cms_blog_posts p, cms_users u, cms_blogs b
                 WHERE p.blog_id = b.id AND p.user_id = u.id AND ({$friends_sql})
@@ -485 +482 @@
 
         while ($post = $inDB->fetch_assoc($result)){
-            $post['pubdate']    = $inCore->getRusDate($post['pubdate']);
+            $post['pubdate']    = $inCore->dateFormat($post['pubdate']);
             $post['url']        = $model->getPostURL(0, $post['bloglink'], $post['seolink']);
             $posts[]            = $post;
@@ -518 +515 @@
             if ($id < sizeof($friends)-1){ $friends_sql .= ' OR '; }
         }
-
-        $sql = "SELECT DISTINCT p.id, p.title, p.user_id, u.id as user_id, u.nickname as nickname, u.login as login, 
-                       IF(DATE_FORMAT(p.pubdate, '%d-%m-%Y')=DATE_FORMAT(NOW(), '%d-%m-%Y'), DATE_FORMAT(p.pubdate, '<strong>Cåãîäíÿ</strong> â %H:%i'),
-                       IF(DATEDIFF(NOW(), p.pubdate)=1, DATE_FORMAT(p.pubdate, 'Â÷åðà â %H:%i'),DATE_FORMAT(p.pubdate, '%d, %M') ))  as pubdate
+                // Ïîëó÷àåì ôîòî èç îáùåé ãàëåðåè
+        $sql = "SELECT p.id, p.title, u.nickname as nickname, u.login as login, p.pubdate as pubdate
                 FROM cms_photo_files p, cms_users u
                 WHERE p.user_id = u.id AND ({$friends_sql})
@@ -530 +525 @@
         
         $result = $inDB->query($sql);
-
-        $photos = array();
-
-        if (!$inDB->num_rows($result)){ return false; }
+                //Ïîëó÷àåì ëè÷íûå ôîòîãðàôèè
+                $private_sql = "SELECT p.id, p.title, p.user_id, u.nickname as nickname, u.login as login, p.pubdate as pubdate
+                                                FROM cms_user_photos p, cms_users u
+                                                WHERE p.user_id = u.id AND ({$friends_sql})
+                                                ORDER BY p.pubdate DESC
+                                                ";
+                if ($limit) { $private_sql .= 'LIMIT '.$limit; }
+                $private_res = $inDB->query($private_sql);
+                
+                $photos = array();
+
+        if (!$inDB->num_rows($result) && !$inDB->num_rows($private_res)){ return false; }
+                
+                if ($inDB->num_rows($private_res)) {
+                        while($photo = $inDB->fetch_assoc($private_res)){
+                                $photo['pubdate'] = $inCore->dateFormat($photo['pubdate']);
+                                $photos[]       = $photo;
+                        }
+                }
 
         while ($photo = $inDB->fetch_assoc($result)){
-            $photo['pubdate'] = $inCore->getRusDate($photo['pubdate']);
+            $photo['pubdate'] = $inCore->dateFormat($photo['pubdate']);
             $photos[] = $photo;
         }
-
+                //Âûáèðàåì ïîñëåäíèå $limit ôîòî èç îáùåãî ìàññèâà
+                $total      = sizeof($photos);
+        
+                if ($total){
+                        $page_photos    = array();
+                        for($p=0; $p<$limit; $p++){
+                                if ($photos[$p]){
+                                        $page_photos[] = $photos[$p];
+                                }
+                        }
+                        $photos = $page_photos; unset($page_photos);
+                }
         return $photos;
         

branches/fuze/templates/_default_/components/com_users_profile.tpl

@@ -310 +310 @@
                                                 <td>
                                                     <a href="{profile_url login=$photo.login}" class="nickname">{$photo.nickname}</a> &rarr;
+                                                {if $photo.user_id}
+                                                        <a href="/users/{$photo.user_id}/photo{$photo.id}.html">{$photo.title}</a>
+                                                {else}
                                                     <a href="/photos/photo{$photo.id}.html">{$photo.title}</a>
+                                                {/if}    
                                                 </td>                                                
                                             </tr>