Changeset 645

Timestamp:

12/06/10 21:23:24 (18 months ago)

Author:

r2

Message:

trunk + fuze

Location:

trunk

Files:

• admin/components/autoawards/backend.php (modified) (3 diffs)
• admin/components/banners/backend.php (modified) (12 diffs)
• admin/components/board/backend.php (modified) (4 diffs)
• admin/components/catalog/backend.php (modified) (3 diffs)
• admin/components/faq/backend.php (modified) (3 diffs)
• admin/components/forum/backend.php (modified) (2 diffs)
• admin/components/photos/backend.php (modified) (2 diffs)
• admin/components/price/backend.php (modified) (2 diffs)
• admin/editor/index.php (modified) (4 diffs)
• components/blogs/model.php (modified) (1 diff)
• components/clubs/frontend.php (modified) (1 diff)
• components/content/model.php (modified) (3 diffs)
• components/photos/frontend.php (modified) (11 diffs)
• components/photos/model.php (modified) (3 diffs)
• components/search/frontend.php (modified) (1 diff)
• components/users/frontend.php (modified) (14 diffs)
• components/users/messages.php (modified) (3 diffs)
• components/users/model.php (modified) (5 diffs)
• core/classes/user.class.php (modified) (4 diffs)
• core/js/common.js (modified) (1 diff)
• languages/ru/components/clubs.php (modified) (1 diff)
• languages/ru/components/users.php (modified) (2 diffs)
• migrate/step1.php (modified) (1 diff)
• modules/mod_comments/module.php (modified) (2 diffs)
• templates/_default_/components/com_photos_view_photo.tpl (modified) (2 diffs)
• templates/_default_/components/com_users_photo_submit.tpl (modified) (1 diff)
• templates/_default_/components/com_users_photos_view.tpl (modified) (2 diffs)

trunk/admin/components/autoawards/backend.php

@@ -36 +36 @@
                 $toolmenu[12]['icon'] = 'show.gif';
                 $toolmenu[12]['title'] = 'Âêëþ÷èòü âûáðàííûå';
-                $toolmenu[12]['link'] = "javascript:checkSel('?view=components&do=config&id=".$_REQUEST['id']."&opt=show&multiple=1');";
+                $toolmenu[12]['link'] = "javascript:checkSel('?view=components&do=config&id=".$_REQUEST['id']."&opt=show_award&multiple=1');";
 
                 $toolmenu[13]['icon'] = 'hide.gif';
                 $toolmenu[13]['title'] = 'Îòêëþ÷èòü âûáðàííûå';
-                $toolmenu[13]['link'] = "javascript:checkSel('?view=components&do=config&id=".$_REQUEST['id']."&opt=hide&multiple=1');";
+                $toolmenu[13]['link'] = "javascript:checkSel('?view=components&do=config&id=".$_REQUEST['id']."&opt=hide_award&multiple=1');";
 
         }
@@ -74 +74 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbShow('cms_user_autoawards', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbShowList('cms_user_autoawards', $_REQUEST['item']);                           
+                        header('location:'.$_SERVER['HTTP_REFERER']);                   
                 }                       
-                echo '1'; exit;
         }
 
@@ -83 +84 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbHide('cms_user_autoawards', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbHideList('cms_user_autoawards', $_REQUEST['item']);                           
+                        header('location:'.$_SERVER['HTTP_REFERER']);                   
                 }                       
-                echo '1'; exit;
         }
 

trunk/admin/components/banners/backend.php

@@ -10 +10 @@
 /*********************************************************************************************/
 
-function error($msg){
-//
-}
-
 function bannerCTRbyID($id){
         $b = dbGetFields('cms_banners', 'id='.$id, 'clicks, hits');
@@ -32 +28 @@
         echo '<h3>Áàííåðû</h3>';
         if (isset($_REQUEST['opt'])) { $opt = $_REQUEST['opt']; } else { $opt = 'list'; }
+        $msg = '';
         
         $toolmenu = array();
 
-        if($opt=='list'){
+        if($opt=='list' || $opt=='show_banner' || $opt=='hide_banner'){
 
                 $toolmenu[0]['icon'] = 'new.gif';
@@ -47 +44 @@
                 $toolmenu[12]['icon'] = 'show.gif';
                 $toolmenu[12]['title'] = 'Ïóáëèêîâàòü âûáðàííûå';
-                $toolmenu[12]['link'] = "javascript:checkSel('?view=components&do=config&id=".$_REQUEST['id']."&opt=show&multiple=1');";
+                $toolmenu[12]['link'] = "javascript:checkSel('?view=components&do=config&id=".$_REQUEST['id']."&opt=show_banner&multiple=1');";
 
                 $toolmenu[13]['icon'] = 'hide.gif';
                 $toolmenu[13]['title'] = 'Ñêðûòü âûáðàííûå';
-                $toolmenu[13]['link'] = "javascript:checkSel('?view=components&do=config&id=".$_REQUEST['id']."&opt=hide&multiple=1');";
-
-        }
-        
-        if ($opt=='list' || $opt=='config'){
+                $toolmenu[13]['link'] = "javascript:checkSel('?view=components&do=config&id=".$_REQUEST['id']."&opt=hide_banner&multiple=1');";
+
+        }
+        
+        if ($opt=='list' || $opt=='config' || $opt=='show_banner' || $opt=='hide_banner'){
 
                 $toolmenu[15]['icon'] = 'cancel.gif';
@@ -77 +74 @@
         if($opt=='saveconfig'){ 
                 $cfg = array();
-                $cfg['link']        = $_REQUEST['link'];
-                $cfg['saveorig']    = $_REQUEST['saveorig'];
-                $cfg['maxcols']     = $_REQUEST['maxcols'];
                         
                 $inCore->saveComponentConfig('banners', $cfg);
@@ -90 +84 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbShow('cms_banners', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbShowList('cms_banners', $_REQUEST['item']);                           
+                        $opt = 'list';                          
                 }                       
-                echo '1'; exit;
         }
 
@@ -99 +94 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbHide('cms_banners', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbHideList('cms_banners', $_REQUEST['item']);                           
+                        $opt = 'list';                          
                 }                       
-                echo '1'; exit;
         }
 
         if ($opt == 'submit'){  
 
-                        if (!empty($_REQUEST['title'])) { $title = $_REQUEST['title']; } else { error("Óêàæèòå íàçâàíèå áàííåðà!"); }
+                        if (!empty($_REQUEST['title'])) { $title = $_REQUEST['title']; } else { $msg .= 'Óêàæèòå íàçâàíèå áàííåðà!<br>'; }
                         $link = $_REQUEST['link'];
                         
@@ -130 +126 @@
                                                         VALUES ('$position', '$typeimg', '$filename', 0, 0, '$maxhits', $maxuser, 1, NOW(), '$title', '$link', $published)";    
                                         dbQuery($sql);
-                        } else { $msg = 'Îøèáêà çàãðóçêè áàííåðà!'; }
-                        header('location:?view=components&do=config&opt=list&id='.$_REQUEST['id']);             
+                        } else { $msg .= 'Îøèáêà çàãðóçêè áàííåðà èëè ôàéë íå çàãðóæåí!<br>'; }
+                        if ($msg) {$opt = 'add';} else {
+                        header('location:?view=components&do=config&opt=list&id='.$_REQUEST['id']);     }
         }         
         
@@ -138 +135 @@
                         $id = $_REQUEST['item_id'];
                         
-                        if (!empty($_REQUEST['title'])) { $title = $_REQUEST['title']; } else { error("Óêàæèòå íàçâàíèå áàííåðà!"); }
+                        if (!empty($_REQUEST['title'])) { $title = $_REQUEST['title']; } else { $msg .= 'Óêàæèòå íàçâàíèå áàííåðà!<br>'; }
                         $link = $_REQUEST['link'];
                         
@@ -159 +156 @@
                         $sql = "UPDATE cms_banners SET fileurl = '$filename' WHERE id = $id";
                         dbQuery($sql) ;
-                } else { $msg = 'Îøèáêà çàãðóçêè áàííåðà!'; }
+                } else { $msg .= 'Îøèáêà çàãðóçêè áàííåðà!'; }
             }
                                         
@@ -174 +171 @@
                         dbQuery($sql);          
                 }
+                if ($msg) {$opt = 'edit';} else {
                 if (!isset($_SESSION['editlist']) || @sizeof($_SESSION['editlist'])==0){
                         header('location:?view=components&do=config&id='.$_REQUEST['id'].'&opt=list');
@@ -179 +177 @@
                         header('location:?view=components&do=config&id='.$_REQUEST['id'].'&opt=edit');
                 }
+        }
         }
 
@@ -246 +245 @@
                 if ($opt=='add'){
                          echo '<h3>Äîáàâèòü áàííåð</h3>';
+                         cpAddPathway('Äîáàâèòü áàííåð', '?view=components&do=config&id='.$_REQUEST['id'].'&opt=add');
+                         if (@$msg) { echo '<p class="error">'.$msg.'</p>'; }
                 } else {
                                         if(isset($_REQUEST['multiple'])){                                

trunk/admin/components/board/backend.php

@@ -45 +45 @@
         }
 
-        if ($opt=='list_items' || $opt=='list_cats' || $opt=='config'){
+        if ($opt=='list_items' || $opt=='list_cats' || $opt=='config' || $opt == 'show_item' || $opt == 'hide_item'){
 
                 $toolmenu[0]['icon'] = 'newstuff.gif';
@@ -64 +64 @@
 
         }
-        if($opt=='list_items'){
+        if($opt=='list_items' || $opt == 'show_item' || $opt == 'hide_item'){
 
                 $toolmenu[11]['icon'] = 'edit.gif';
@@ -106 +106 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbShow('cms_board_items', (int)$_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbShowList('cms_board_items', $_REQUEST['item']);                               
+                        $opt = 'list_items';                    
                 }                       
-                echo '1'; exit;
         }
 
@@ -115 +116 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbHide('cms_board_items', (int)$_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbHideList('cms_board_items', $_REQUEST['item']);                               
+                        $opt = 'list_items';                    
                 }                       
-                echo '1'; exit;
         }
 

trunk/admin/components/catalog/backend.php

@@ -243 +243 @@
                 dbQuery('UPDATE cms_uc_items SET on_moderate = 0 WHERE id='.$_REQUEST['item_id']);
             }
+                        echo '1'; exit;
                 } else {
                         dbShowList('cms_uc_items', $_REQUEST['item']);
@@ -248 +249 @@
                 dbQuery('UPDATE cms_uc_items SET on_moderate = 0 WHERE id='.$id);
             }
+                        header('location:'.$_SERVER['HTTP_REFERER']);
                 }                       
-                echo '1'; exit;
         }
 
@@ -258 +259 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbHide('cms_uc_items', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbHideList('cms_uc_items', $_REQUEST['item']);                          
+                        header('location:'.$_SERVER['HTTP_REFERER']);                   
                 }                       
-                echo '1'; exit;
         }
 

trunk/admin/components/faq/backend.php

@@ -32 +32 @@
                 $toolmenu[3]['link'] = '?view=components&do=config&id='.(int)$_REQUEST['id'].'&opt=list_cats';
                 
-                if($opt == 'list_items'){
+                if($opt == 'list_items' || $opt == 'show_item' || $opt == 'hide_item'){
                         $toolmenu[11]['icon'] = 'edit.gif';
                         $toolmenu[11]['title'] = 'Ðåäàêòèðîâàòü âûáðàííûå';
@@ -138 +138 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbShow('cms_faq_quests', (int)$_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbShowList('cms_faq_quests', $_REQUEST['item']);                                
+                        $opt = 'list_items';                            
                 }                       
-                echo '1'; exit;
         }
 
@@ -147 +148 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbHide('cms_faq_quests', (int)$_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbHideList('cms_faq_quests', $_REQUEST['item']);                                
+                        $opt = 'list_items';                            
                 }                       
-                echo '1'; exit;
         }
 

trunk/admin/components/forum/backend.php

@@ -127 +127 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbShow('cms_forums', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbShowList('cms_forums', $_REQUEST['item']);                            
+                        header('location:'.$_SERVER['HTTP_REFERER']);
                 }                       
-                echo '1'; exit;
         }
 
@@ -136 +137 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbHide('cms_forums', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbHideList('cms_forums', $_REQUEST['item']);                            
+                        header('location:'.$_SERVER['HTTP_REFERER']);
                 }                       
-                echo '1'; exit;
         }
 

trunk/admin/components/photos/backend.php

@@ -135 +135 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbShow('cms_photo_files', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbShowList('cms_photo_files', $_REQUEST['item']);                               
+                        header('location:'.$_SERVER['HTTP_REFERER']);                           
                 }                       
-                echo '1'; exit;
         }
 
@@ -147 +148 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['item_id'])){ dbHide('cms_photo_files', $_REQUEST['item_id']);  }
+                        echo '1'; exit;
                 } else {
                         dbHideList('cms_photo_files', $_REQUEST['item']);                               
+                        header('location:'.$_SERVER['HTTP_REFERER']);                   
                 }                       
-                echo '1'; exit;
         }
 

trunk/admin/components/price/backend.php

@@ -72 +72 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['id'])){ dbShow('cms_price_items', $id);  }
+                        echo '1'; exit;
                 } else {
                         dbShowList('cms_price_items', $_REQUEST['item']);                               
+                        header('location:'.$_SERVER['HTTP_REFERER']);                                   
                 }                       
-                echo '1'; exit;
         }
 
@@ -81 +82 @@
                 if (!isset($_REQUEST['item'])){
                         if (isset($_REQUEST['id'])){ dbHide('cms_price_items', $id);  }
+                        echo '1'; exit;
                 } else {
                         dbHideList('cms_price_items', $_REQUEST['item']);                               
+                        header('location:'.$_SERVER['HTTP_REFERER']);                                   
                 }                       
-                echo '1'; exit;
         }
 

trunk/admin/editor/index.php

@@ -86 +86 @@
         
         echo '<div class="desc">';
-                echo '<a href="?do=editcat&id='.$id.'" class="toollink">Ðåäàêòèðîâàòü ðàçäåë</a>';
                 if (!$root){
-                        echo ' | <a href="index.php" class="toollink">Íàçàä</a>';                       
+                        echo '<a href="index.php" class="toollink">Íàçàä</a>';                  
                 }
         echo '</div>';
@@ -124 +123 @@
                                         }
 
-                                        echo '<td style="'.$style.'" width="16" valign="top"><img src="../images/actions/delete.gif" /></td>';                  
-                                        echo '<td style="'.$style.'" width="60" align="center" valign="top"><a href="?do=deletecat&id='.$subcat['id'].'">Óäàëèòü</a></td>';                     
-                                                        
                                 echo '</tr>';
                         }
@@ -186 +182 @@
 }
 /*********************************************************************************************/
-if ($do=='newcat' || $do=='editcat'){
+if ($do=='newcat'){
 
         //MENU
@@ -291 +287 @@
 }
 /*********************************************************************************************/
-if ($do == 'updatecat'){
-        if(isset($_REQUEST['id'])) {
-
-        $category['id']                         = (int)$_REQUEST['id'];
-        $category['title']                      = $inCore->request('title', 'str');
-        $category['parent_id']          = $inCore->request('parent', 'int');
-        $category['description']        = $inCore->request('description', 'html');
-        $category['description']        = $inDB->escape_string($category['description']);
-        $category['description']    = $inCore->badTagClear($category['description']);
-        $category['published']          = (int)$_REQUEST['published'];
-        $category['showdate']           = (int)$_REQUEST['showdate'];
-        $category['showcomm']           = (int)$_REQUEST['showcomm'];
-        $category['orderby']            = $inCore->request('orderby', 'str');
-        $category['orderto']            = $inCore->request('orderto', 'str');
-        $category['modgrp_id']          = 0;
-        $category['maxcols']            = 1;
-        $category['showtags']           = 1;
-        $category['showrss']            = 1;
-        $category['showdesc']           = 1;
-        $category['is_public']          = 0;
-
-        $inCore->loadModel('content');
-        $model = new cms_model_content();
-
-        $seolink    = $model->getCategorySeoLink($category);
-
-                $sql = "UPDATE cms_category 
-                                SET title='{$category['title']}',
-                                        description='{$category['description']}',
-                                        published={$category['published']},
-                                        showdate={$category['showdate']},
-                                        showcomm={$category['showcomm']},
-                                        orderby='{$category['orderby']}',
-                                        orderto='{$category['orderto']}',
-                    seolink='$seolink'
-                                WHERE id = {$category['id']}
-                                LIMIT 1";
-                dbQuery($sql) ;
-                
-                header('location:index.php?do=view&id='.$id);           
-        }
-}
-/*********************************************************************************************/ 
 if ($do == 'submitcat'){
 

trunk/components/blogs/model.php

@@ -563 +563 @@
                 if ($post['owner']=='club'){
                     $post['blog_title'] = $post['club_title'];
-                    if ($post['club_type']=='private') { $post['content'] = ''; }
+                    if ($post['club_type']=='private') { $post['content_html'] = ''; }
                 }
                 $list[] = $post;

trunk/components/clubs/frontend.php

@@ -52 +52 @@
     //Îïðåäåëÿåì àäðåñ äëÿ ðåäèðåêòà íàçàä
     $back   = $inCore->getBackURL();
+        
+        $pagetitle = $inCore->menuTitle();
         
         //INPUT PARAMETERS

trunk/components/content/model.php

@@ -236 +236 @@
     public function getArticlesList($only_published=true) {
 
-        $this->reorder();
+//        $this->reorder();
 
         $articles = array();
@@ -285 +285 @@
     public function getArticlesCount($only_published=true) {
 
-        $this->reorder();
-
         $articles = array();
 
@@ -295 +293 @@
         }
 
-        $sql = "SELECT con.*,
-                       con.pubdate as fpubdate,
-                       u.nickname as author,
-                       u.login as user_login
+        $sql = "SELECT 1
 
                 FROM cms_content con
-
-                                LEFT JOIN cms_users u ON u.id = con.user_id
 
                 WHERE con.is_arhive = 0

trunk/components/photos/frontend.php

@@ -264 +264 @@
 
         $sql = "SELECT f.id, f.album_id, f.title, f.description, f.pubdate, f.file, f.published, f.hits, f.comments, f.user_id,
-                        a.id cat_id, a.NSLeft as NSLeft, a.NSRight as NSRight, a.NSDiffer as NSDiffer, a.user_id as album_user_id, a.title cat_title, a.nav album_nav, a.public public, a.showtype a_type, a.showtags a_tags, a.bbcode a_bbcode,
-                        u.nickname, u.login,
+                        a.id cat_id, a.NSLeft as NSLeft, a.NSRight as NSRight, a.NSDiffer as NSDiffer, a.user_id as album_user_id, a.title cat_title, a.nav album_nav, a.public public, a.showtype a_type, a.showtags a_tags, a.bbcode a_bbcode, u.nickname, u.login, p.gender,
                         IFNULL(r.total_rating, 0) as rating
                         FROM cms_photo_files f
                         LEFT JOIN cms_photo_albums a ON a.id = f.album_id
                         LEFT JOIN cms_ratings_total r ON r.item_id = f.id AND r.target = 'photo'
-                        LEFT JOIN cms_users u ON u.id = f.user_id
+                        INNER JOIN cms_users u ON u.id = f.user_id
+                        INNER JOIN cms_user_profiles p ON p.user_id = u.id
                         WHERE f.id = '$id'";
                         
@@ -303 +303 @@
                 $inPage->setTitle($photo['title']);
                 // Îáíîâëÿåì êîëè÷åñòâî ïðîñìîòðîâ ôîòîãðàôèè
-                $inDB->query("UPDATE cms_photo_files SET hits = hits + 1 WHERE id = $id");
+        $inDB->query("UPDATE cms_photo_files SET hits = hits + 1 WHERE id = '$id'");
                                                                 
                 //íàâèãàöèÿ
@@ -322 +322 @@
                         $photo['pubdate'] = $inCore->dateformat($photo['pubdate']);
                                         if ($photo['public']){
-                                                $photo['genderlink'] = cmsUser::getGenderLink($photo['user_id'], $photo['nickname'], 0, '', $photo['login']);
+                        $photo['genderlink'] = cmsUser::getGenderLink($photo['user_id'], $photo['nickname'], 0, $photo['gender'], $photo['login']);
                                         }
                 
@@ -472 +472 @@
                                                                         $published = 1; 
                                                                 }
+                                                                $photo['is_hidden'] = $club['clubtype'] == 'private' ? true : false;
                                                         }
 
@@ -516 +517 @@
 
         $photo = $model->getPhoto($id);
+        if (!$photo) { cmsCore::error404(); }
 
         $inPage->addPathway($_LANG['PHOTO_ADDED']);
@@ -535 +537 @@
                 
         $photo = $model->getPhoto($photoid);
+        if (!$photo) { cmsCore::error404(); }
         
         $album = $model->getAlbum($photo['album_id']);
@@ -605 +608 @@
                                                         if(isset($_REQUEST['id'])){                                                             
                                                                 $photo = $model->getPhoto($photoid);
+                                                                if (!$photo) { cmsCore::error404(); }
 
                                                                 $photo_max_size = ($max_mb * 1024 * 1024);
@@ -627 +631 @@
 
         $photo = $model->getPhoto($id);
+        if (!$photo) { cmsCore::error404(); }
         
         $album = $model->getAlbum($photo['album_id']);
@@ -638 +643 @@
         }
 
-        $is_author = ($inUser->id == $photo['user_id']);
-
-        if ($is_admin || $is_author){
+        if (!$is_admin) { cmsCore::error404(); }
                         
                 if (!isset($_POST['gomove'])){ //SHOW MOVE FORM
@@ -668 +671 @@
                 } else { //DO MOVE
                         
-                                if (@$_POST['album_id']){                               
+                        if ($_POST['album_id']){                                
                                         $fid = $inCore->request('album_id', 'int');
-                                        if ($is_admin){         
-                                                $inDB->query("UPDATE cms_photo_files SET album_id = $fid WHERE id = '$id'") ;
-                                        }                                                                       
+                                $inDB->query("UPDATE cms_photo_files SET album_id = '$fid' WHERE id = '$id'") ;
                                 }
                                 header('location:/photos/'.$fid);
                 }
                         
-                } else { cmsUser::goToLogin(); }
-        
 }
 /////////////////////////////// PHOTO DELETE /////////////////////////////////////////////////////////////////////////////////////////
@@ -686 +685 @@
 
         $photo = $model->getPhoto($photo_id);
+        if (!$photo) { cmsCore::error404(); }
 
         $album = $model->getAlbum($photo['album_id']);

trunk/components/photos/model.php

@@ -144 +144 @@
                 
                 if ($photo['published']) {
+                        $description = $photo['is_hidden'] ? '' : '<a href="/photos/photo'.$photo_id.'.html" class="act_photo"><img border="0" src="/images/photos/small/'.$photo['filename'].'" /></a>';
+
                         cmsActions::log('add_photo', array(
                                   'object' => $photo['title'],
@@ -150 +152 @@
                                   'target' => $album_title,
                                   'target_url' => '/photos/'.$photo['album_id'],
-                                  'description' => '<a href="/photos/photo'.$photo_id.'.html" class="act_photo">
-                                                                                <img border="0" src="/images/photos/small/'.$photo['filename'].'" />
-                                                                          </a>'
+                                  'description' => $description
                         ));
                 }
@@ -362 +362 @@
                 $photo = $this->inDB->get_fields('cms_photo_files', "id = '$id'", '*');
 
-                if (!$photo) { cmsCore::error404(); }
-
                 return $photo;
 

trunk/components/search/frontend.php

@@ -207 +207 @@
                         echo '<div style="margin-top:4px;margin-left:40px">
                                 <a style="color:gray" href="'.$item['placelink'].'">'.$item['place'].'</a>
-                                &mdash <span style="color:green">http://'.$_SERVER['HTTP_HOST'].$item['link'].'</span>
+                                &mdash; <span style="color:green">http://'.$_SERVER['HTTP_HOST'].$item['link'].'</span>
                               </div>';
                     echo '</div>';

trunk/components/users/frontend.php

@@ -585 +585 @@
                 $smarty->assign('comments', $comments);
         $smarty->assign('avatar', usrImage($id));
-                $smarty->assign('pagebar', cmsPage::getPagebar($records_total, $page, $perpage, '/users/%user_id%/comments%page%.html', array('user_id'=>$id)));
+                $smarty->assign('pagebar', cmsPage::getPagebar($records_total, $page, $perpage, 'javascript:centerLink(\'/users/'.$id.'/comments%page%.html\')'));
                 $smarty->display('com_users_comments.tpl');     
+                if ($inCore->inRequest('of_ajax')) { echo ob_get_clean(); exit; }
 
         } else { echo '<p>'.$_LANG['NO_USER_COMMENT'].'</p>';   }
@@ -644 +645 @@
                 $smarty->assign('posts', $posts);
         $smarty->assign('avatar', usrImage($id));
-                $smarty->assign('pagebar', cmsPage::getPagebar($records_total, $page, $perpage, '/users/%user_id%/forumposts%page%.html', array('user_id'=>$id)));
+                $smarty->assign('pagebar', cmsPage::getPagebar($records_total, $page, $perpage, 'javascript:centerLink(\'/users/'.$id.'/forumposts%page%.html\')'));
                 $smarty->display('com_users_forumposts.tpl');
+                if ($inCore->inRequest('of_ajax')) { echo ob_get_clean(); exit; }
 
         } else { echo '<p>'.$_LANG['NOT_USER_POSTS_IN_FORUM'].'</p>';   }
@@ -1396 +1398 @@
         cmsUser::sessionPut('photos_list', array($photo['id']));
 
-    $inCore->redirect('/users/'.$usr['login'].'/photos/submit');
+    $inCore->redirect('/users/'.$usr['login'].'/photos/submit-edit');
 
 }
@@ -1529 +1531 @@
         $we_friends = ($inUser->id && !$my_profile) ? (int)usrIsFriends($usr['id'], $inUser->id) : 0;
 
+        if ($album['allow_who'] == 'all' || $my_profile || ($album['allow_who'] == 'friends' && $we_friends) || ($album['allow_who'] == 'registered' && $inUser->id)) {
     $photos = $model->getAlbumPhotos($usr['id'], $album_type, $album_id, $we_friends);
+        }
 
     //Äåëèì íà ñòðàíèöû
@@ -1619 +1623 @@
                         $records_total = $inDB->rows_count('cms_board_items', 'user_id = '.$id.' AND published = 1');
                 }
-                $perpage = 15; // îáúÿâëåíèé íà ñòðàíèöå
+                $perpage = 10; // îáúÿâëåíèé íà ñòðàíèöå
                 $page = $inCore->request('page', 'int', 1);
                 $sql .= "LIMIT ".($page-1)*$perpage.", $perpage";
@@ -1654 +1658 @@
                 $smarty->assign('myprofile', ($inUser->id == $id));
         $smarty->assign('is_con', $is_con);
-                $smarty->assign('pagebar', cmsPage::getPagebar($records_total, $page, $perpage, '/users/%user_id%/board%page%.html', array('user_id'=>$id)));
+                $smarty->assign('pagebar', cmsPage::getPagebar($records_total, $page, $perpage, 'javascript:centerLink(\'/users/'.$id.'/board%page%.html\')'));
                 $smarty->display('com_users_boards.tpl');                                       
+                if ($inCore->inRequest('of_ajax')) { echo ob_get_clean(); exit; }
 
 }
@@ -1683 +1688 @@
         $smarty->assign('myprofile', ($id == $inUser->id));
         $smarty->assign('total', $total);
-        $smarty->assign('pagebar', cmsPage::getPagebar($total, $page, $perpage, '/users/%user_id%/friendlist%page%.html', array('user_id'=>$id)));
+        $smarty->assign('pagebar', cmsPage::getPagebar($total, $page, $perpage, 'javascript:centerLink(\'/users/'.$id.'/friendlist%page%.html\')'));
                 
     $smarty->display('com_users_friends.tpl');
+        if ($inCore->inRequest('of_ajax')) { echo ob_get_clean(); exit; }
 
 }
@@ -1703 +1709 @@
         if (!$usr) { cmsCore::error404(); }
 
-                        $sql = "SELECT p.*, a.title as album
-                    FROM cms_user_photos p, cms_user_albums a
-                    WHERE p.id = '$photoid' AND p.user_id = '$id' AND p.album_id = a.id
+        $sql = "SELECT p.*, a.title as album, pr.gender
+            FROM cms_user_photos p
+                        INNER JOIN cms_user_albums a ON a.id = p.album_id
+                        INNER JOIN cms_user_profiles pr ON pr.user_id = p.user_id
+            WHERE p.id = '$photoid' AND p.user_id = '$id'
                     LIMIT 1";
                         $result = $inDB->query($sql) ;
@@ -1713 +1721 @@
                                 $photo = $inDB->fetch_assoc($result);
                                 
-                                $inDB->query("UPDATE cms_user_photos SET hits = hits + 1 WHERE id = ".$photo['id']) ;
-        
         $inPage->setTitle($photo['title']);
         $inPage->addPathway($usr['nickname'], cmsUser::getProfileURL($usr['login']));
@@ -1721 +1727 @@
                                 $inPage->addPathway($photo['title'], $_SERVER['REQUEST_URI']);
 
-                                if (usrAllowed($photo['allow_who'], $id) || $inCore->userIsAdmin($inUser->id)){
                                         $photo['pubdate'] = $inCore->dateFormat($photo['pubdate'], true, false, false);
-                                        $photo['genderlink'] = cmsUser::getGenderLink($usr['id'], $usr['nickname'], 0, '', $usr['login']);
+        $photo['genderlink'] = cmsUser::getGenderLink($usr['id'], $usr['nickname'], 0, $photo['gender'], $usr['login']);
                                         $photo['filesize'] = round(filesize($_SERVER['DOCUMENT_ROOT'].'/images/users/photos/medium/'.$photo['imageurl'])/1024, 2);
                                         //ññûëêè íà ïðåäûäóùóþ è ñëåäóþùóþ ôîòîãðàôèè
                                         $previd = $inDB->get_fields('cms_user_photos', "id>'{$photo['id']}' AND user_id = '{$usr['id']}' AND album_id='{$photo['album_id']}'", 'id, title, pubdate', 'id ASC');
                                         $nextid = $inDB->get_fields('cms_user_photos', "id<'{$photo['id']}' AND user_id = '{$usr['id']}' AND album_id='{$photo['album_id']}'", 'id, title, pubdate', 'id DESC');
-
-                                        $is_photo = true;       
-                                } else { $is_photo = false; }
+        // Ïðîâåðÿåì ïðàâà äîñòóïà
+        $is_allow = usrAllowed($photo['allow_who'], $id) || $inCore->userIsAdmin($inUser->id) ? true : false;
+        // Åñëè âèäèì ôîòî, îáíîâëÿåì ïðîñìîòðû
+        if ($is_allow) { $inDB->query("UPDATE cms_user_photos SET hits = hits + 1 WHERE id = ".$photo['id']) ; }
                                         
                                 $smarty = $inCore->initSmarty('components', 'com_users_photos_view.tpl');
@@ -1740 +1746 @@
                                 $smarty->assign('myprofile', $myprofile);
                                 $smarty->assign('is_admin', $inCore->userIsAdmin($user_id));
-                                $smarty->assign('is_photo', $is_photo);
-                                if($is_photo){
+        $smarty->assign('is_allow', $is_allow);
+        if($is_allow){
                                         $inCore->loadLib('tags');       
                                         $smarty->assign('tagbar', cmsTagBar('userphoto', $photo['id']));
@@ -1748 +1754 @@
                                         
                                         //show user comments
-                                if($inCore->isComponentInstalled('comments') && $is_photo){
+        if($inCore->isComponentInstalled('comments') && $is_allow){
                                                 $inCore->includeComments();
                                                 comments('userphoto', $photo['id']);
@@ -2742 +2748 @@
                                                                 }
                     //send email notification, if user want it
-                    $user['email_newmsg']   = $inDB->get_field('cms_user_profiles', "user_id='{$user_id}'", 'email_newmsg');
-                    if ($user['email_newmsg'] && $user_id != $author_id){
+                    $usr['email_newmsg']   = $inDB->get_field('cms_user_profiles', "user_id='{$user_id}'", 'email_newmsg');
+                    if ($usr['email_newmsg'] && $user_id != $author_id){
                             $inConf = cmsConfig::getInstance();
                             //fetch target user
@@ -2749 +2755 @@
                             $postdate       = date('d/m/Y H:i:s');
                                                                                 $from_nick      = $inDB->get_field('cms_users', "id='{$author_id}'", 'nickname');
-                                                                                $profilelink    = cmsUser::getProfileURL($usr['login']);
+                                                        $profilelink    = HOST . cmsUser::getProfileURL($usr['login']);
 
                             $letter_path    = PATH.'/includes/letters/newwallpost.txt';

trunk/components/users/messages.php

@@ -24 +24 @@
                         $msg_count = $inDB->rows_count('cms_user_msg', 'to_id = '.$id.'');
                         // Ïàãèíàöèÿ
-                        $pagebar = ($msg_count > $perpage) ? cmsPage::getPagebar($msg_count, $page, $perpage, '/users/%user_id%/messages%page%.html', array('user_id'=>$id)) : '';
+                   $pagebar = ($msg_count > $perpage) ? cmsPage::getPagebar($msg_count, $page, $perpage, 'javascript:centerLink(\'/users/'.$id.'/messages%page%.html\')') : '';
 
                 $sql = "SELECT m.*, m.senddate as fpubdate, m.from_id as sender_id, u.nickname as author, u.login as author_login, u.is_deleted, p.imageurl
                 FROM cms_user_msg m
-                LEFT JOIN cms_users u ON m.from_id = u.id
-                LEFT JOIN cms_user_profiles p ON m.from_id = p.user_id
-                WHERE m.to_id = $id
-                ORDER BY senddate DESC
+                                                                        LEFT JOIN cms_users u ON u.id = m.from_id
+                                                                        LEFT JOIN cms_user_profiles p ON p.user_id = u.id
+                                                                        WHERE m.to_id = '$id'
+                                                                        ORDER BY m.id DESC
                 LIMIT ".(($page-1)*$perpage).", $perpage";
 
@@ -40 +40 @@
                         $msg_count = $inDB->rows_count('cms_user_msg m, cms_users u', 'm.from_id = '.$id.' AND m.to_id = u.id');
                         // Ïàãèíàöèÿ
-                        $pagebar = ($msg_count > $perpage) ? cmsPage::getPagebar($msg_count, $page, $perpage, '/users/%user_id%/messages-sent%page%.html', array('user_id'=>$id)) : '';
+                    $pagebar = ($msg_count > $perpage) ? cmsPage::getPagebar($msg_count, $page, $perpage, 'javascript:centerLink(\'/users/'.$id.'/messages-sent%page%.html\')') : '';
 
             $sql = "SELECT m.*, u.nickname as author, u.login as author_login, m.senddate as fpubdate, m.to_id as sender_id, u.is_deleted, p.imageurl
-                    FROM cms_user_msg m, cms_users u, cms_user_profiles p
-                    WHERE m.from_id = $id AND m.to_id = u.id AND m.to_id = p.user_id
-                    ORDER BY senddate DESC
+                                                                FROM cms_user_msg m
+                                                                INNER JOIN cms_users u ON u.id = m.to_id
+                                                                INNER JOIN cms_user_profiles p ON p.user_id = u.id
+                                                                WHERE m.from_id = '$id'
+                                                                ORDER BY m.id DESC
                     LIMIT ".(($page-1)*$perpage).", $perpage";
 
                         break;
 
-        case 'history': $with_name = dbGetField('cms_users', "id = $with_id", 'nickname');
+        case 'history': $with_name = $inDB->get_field('cms_users', "id = $with_id", 'nickname');
                         $inPage->addPathway($_LANG['MESSEN_WITH'].' '.$with_name, $_SERVER['REQUEST_URI']);
                         //Êîëè÷åñòâî çàïèñåé
-                        $msg_count = $inDB->rows_count('cms_user_msg m, cms_users u', '((m.from_id = '.$id.' AND m.to_id = '.$with_id.') OR (m.from_id = '.$with_id.' AND m.to_id = '.$id.')) AND m.from_id = u.id');
+                        $msg_count = $inDB->rows_count('cms_user_msg m, cms_users u', "m.from_id IN ($id, $with_id) AND m.to_id IN ($id, $with_id) AND m.from_id = u.id");
                         // Ïàãèíàöèÿ
-                        $pagebar = ($msg_count > $perpage) ? cmsPage::getPagebar($msg_count, $page, $perpage, '/users/%user_id%/messages-history%to_id%-%page%.html', array('user_id'=>$id, 'to_id'=>$with_id)) : '';
+                        $pagebar = ($msg_count > $perpage) ? cmsPage::getPagebar($msg_count, $page, $perpage, 'javascript:centerLink(\'/users/'.$id.'/messages-history'.$with_id.'-%page%.html\')') : '';
 
             $sql = "SELECT m.*, u.nickname as author, u.login as author_login, m.senddate as fpubdate, m.from_id as sender_id, u.is_deleted, p.imageurl
-                    FROM cms_user_msg m, cms_users u, cms_user_profiles p
-                    WHERE ((m.from_id = $id AND m.to_id = $with_id) OR (m.from_id = $with_id AND m.to_id = $id)) AND m.from_id = u.id AND m.from_id = p.user_id
-                    ORDER BY senddate DESC
+                                                                FROM cms_user_msg m
+                                                                INNER JOIN cms_users u ON u.id = m.from_id
+                                                                INNER JOIN cms_user_profiles p ON p.user_id = u.id
+                                                                WHERE m.from_id IN ($id, $with_id) AND m.to_id IN ($id, $with_id)
+                                                                ORDER BY m.id DESC
                     LIMIT ".(($page-1)*$perpage).", $perpage";
 
@@ -140 +144 @@
     
     $smarty->display('com_users_messages.tpl');
+        if ($inCore->inRequest('of_ajax')) { echo ob_get_clean(); exit; }
 
 ?>

trunk/components/users/model.php

@@ -67 +67 @@
                 IFNULL(COUNT(i.id), 0) as invites_count
                 FROM cms_users u
-                                LEFT JOIN cms_user_profiles p ON p.user_id = u.id
-                                LEFT JOIN cms_user_groups g ON g.id = u.group_id
+                                INNER JOIN cms_user_profiles p ON p.user_id = u.id
+                                INNER JOIN cms_user_groups g ON g.id = u.group_id
                                 LEFT JOIN cms_online o ON o.user_id = u.id
                                 LEFT JOIN cms_banlist b ON b.user_id = u.id
@@ -183 +183 @@
 
                 if ($is_delete) {
+
+                        $avatar = $this->inDB->get_field('cms_user_profiles', "user_id = '$user_id'", 'imageurl');
+            if ($avatar && $avatar != 'nopic.jpg'){
+                 @unlink(PATH.'/images/users/avatars/'.$avatar);
+                 @unlink(PATH.'/images/users/avatars/small/'.$avatar);
+            }
+
                         $this->inDB->query("DELETE FROM cms_users WHERE id = '$user_id' LIMIT 1");
                         $this->inDB->query("DELETE FROM cms_user_profiles WHERE user_id = '$user_id' LIMIT 1");
+                        $this->inDB->query("DELETE FROM cms_user_wall WHERE user_id = '$user_id' AND usertype = 'user'");
+                        
                 } else {
                 $this->inDB->query("UPDATE cms_users SET is_deleted = 1 WHERE id = '$user_id'");
@@ -190 +199 @@
         $this->inDB->query("DELETE FROM cms_user_friends WHERE to_id = '$user_id' OR from_id = '$user_id'");
                 $this->inDB->query("DELETE FROM cms_user_clubs WHERE user_id = '$user_id'");
+                $this->inDB->query("DELETE FROM cms_user_awards WHERE user_id = '$user_id'");
+
                 cmsActions::removeUserLog($user_id);
         
@@ -480 +491 @@
 
         if ($type == 'private'){
-            $album = $this->inDB->get_fields('cms_user_albums', "id='{$id}'", 'id, user_id, title');
+            $album = $this->inDB->get_fields('cms_user_albums', "id='{$id}'", 'id, user_id, title, allow_who');
         }
 
@@ -574 +585 @@
                                 a.allow_who='all'
                                 OR
-                                (a.allow_who='registered' AND ({$user_id}>0))
+                                (a.allow_who='registered' AND ({$inUser->id}>0))
                                 OR
                                 (a.allow_who='friends' AND ({$is_friends}=1))

trunk/core/classes/user.class.php

@@ -830 +830 @@
         $perpage    = 10;
 
-        if ($usertype=='user'){
-            $myprofile = ($inUser->id == $user_id || $inUser->is_admin);
-        } else {
-            $inCore->loadLib('clubs');
-            $myprofile = ($clubUserIsRole || $clubUserIsAdmin || $inUser->is_admin);
+                switch ($usertype){
+                        case 'user': $myprofile = ($inUser->id == $user_id || $inUser->is_admin);  break;
+                        case 'club': $inCore->loadLib('clubs');
+                                 $myprofile = ($clubUserIsRole || $clubUserIsAdmin || $inUser->is_admin); break;
+                        default: $myprofile = $inUser->is_admin;
         }
 
@@ -849 +849 @@
             $sql = "SELECT w.*, g.gender, g.imageurl, u.nickname as author, u.login as author_login, u.is_deleted, w.pubdate
                     FROM cms_user_wall w
-                                        LEFT JOIN cms_users u ON u.id = w.author_id
-                                        LEFT JOIN cms_user_profiles g ON g.user_id = w.author_id
+                                        INNER JOIN cms_users u ON u.id = w.author_id
+                                        INNER JOIN cms_user_profiles g ON g.user_id = u.id
                     WHERE w.user_id = $user_id AND w.usertype = '$usertype'
                     ORDER BY w.pubdate DESC
@@ -856 +856 @@
 
             $result     = $inDB->query($sql);
-            $total_page = $inDB->num_rows($result);
-
+
+                        if (!function_exists('usrImageNOdb')){
             $inCore->includeFile('components/users/includes/usercore.php');
+                        }
 
             while($record = $inDB->fetch_assoc($result)){
@@ -887 +888 @@
         $smarty->assign('page', $page);
         $smarty->assign('total', $total);
-        $smarty->assign('total_page', $total_page);
         $smarty->assign('pagebar', $pagebar);
 

trunk/core/js/common.js

@@ -2 +2 @@
     $("img#"+img_id).attr("src", "/includes/codegen/cms_codegen.php?"+Math.random());
 }
+function centerLink(href){
+
+        $.post(href, {'of_ajax': 1}, function(data){
+                $('div.component').html(data);
+        });
+
+}

trunk/languages/ru/components/clubs.php

@@ -102 +102 @@
 $_LANG['LOADING']                       ='Çàãðóçêà';
 $_LANG['CLUB_WALL']                     ='Ñòåíà êëóáà';
+$_LANG['NOT_POSTS_ON_WALL_TEXT']        ='Íà ñòåíå íåò çàïèñåé. Âàøà áóäåò ïåðâîé!';
 $_LANG['WRITE_ON_WALL']                 ='Íàïèñàòü íà ñòåíå';
 $_LANG['CLUB_NOT_FOUND_TEXT']           ='Êëóá íå íàéäåí. Âîçìîæíî îí íå àêòèâåí èëè óäàëåí.';

trunk/languages/ru/components/users.php

@@ -140 +140 @@
 
 $_LANG['PHOTO_NOT_FOUND']           ='Ôîòîãðàôèÿ íå íàéäåíà';
-$_LANG['PHOTO_NOT_FOUND_TEXT']      ='Âîçìîæíî îíà áûëà óäàëåíà èëè ïîëüçîâàòåëü îãðàíè÷èë åå ïðîñìîòð.';
+$_LANG['PHOTO_NOT_FOUND_TEXT']      ='Ïîëüçîâàòåëü îãðàíè÷èë ïðîñìîòð ýòîé ôîòîãðàôèè.';
 
 $_LANG['ADD_TO_FRIEND']             ='Äîáàâèòü â äðóçüÿ';
@@ -282 +282 @@
 $_LANG['USERS_PHOTOS_PUBLIC_ALBUMS']='Ôîòîãðàôèè ïîëüçîâàòåëÿ â îáùèõ àëüáîìàõ';
 $_LANG['ALL_PHOTOS']                ='Âñå ôîòîãðàôèè';
-$_LANG['NOT_PHOTOS']                ='Íåò äîñòóïíûõ ôîòîãðàôèé.';
+$_LANG['NOT_PHOTOS']                ='Íåò äîñòóïíûõ ôîòîãðàôèé, âîçìîæíî ó âàñ íåò ïðàâ äëÿ ïðîñìîòðà ýòîãî àëüáîìà.';
 $_LANG['ADD']                       ='Äîáàâèòü';
 $_LANG['ALL_COMMENTS']              ='Âñå êîììåíòàðèè';

trunk/migrate/step1.php

@@ -4 +4 @@
         $inDB->query("ALTER TABLE `cms_modules` ADD `is_strict_bind` TINYINT NOT NULL DEFAULT '0'");
     }
+
+    $inDB->query("ALTER TABLE `cms_user_photos` CHANGE `pubdate` `pubdate` DATETIME NOT NULL");
 
     if (!$inDB->isFieldExists('cms_modules', 'version')){

trunk/modules/mod_comments/module.php

@@ -25 +25 @@
         if (!$targeting){ echo '<p>'.$_LANG['COMMENTS_NOT_SHOWTYPE'].'</p>'; return true; }
 
-        $sql            = '';
-        $target_where   = '';
-        $t              = 1;
+        $t_list = array();
 
-        foreach($cfg['targets'] as $key=>$value){
-            if ($t === 1) { $target_where .= " AND ("; }
-            $target_where .= 'c.target="'.$value.'"';
-            if ($t <= sizeof($cfg['targets'])-1) { $target_where .= " OR "; } else { $target_where .= ")"; }
-            $t++;
+                foreach($cfg['targets'] as $type){
+                        $t_list[] = "'$type'";
         }
+
+                $t_list = rtrim(implode(',', $t_list), ',');
+
+                $target_where = "AND c.target IN ({$t_list})";
 
         $guest_sql = $cfg['showguest'] ? "OR c.guestname<>''" : "";
@@ -50 +49 @@
                        IFNULL(u.login, '') as author_login,
                        IFNULL(v.total_rating, 0) as rating
-                                FROM cms_users u, cms_comments c
+                                FROM cms_comments c
+                                INNER JOIN cms_users u ON u.id = c.user_id {$guest_sql}
                 LEFT JOIN cms_ratings_total v ON v.item_id=c.id AND v.target='comment'
-                                WHERE (c.user_id=u.id {$guest_sql}) AND c.published=1 {$target_where}
+                                WHERE c.published=1 {$target_where}
                 GROUP BY c.id
-                ORDER BY c.pubdate DESC
+                ORDER BY c.id DESC
                 LIMIT 70";
 

trunk/templates/_default_/components/com_photos_view_photo.tpl

@@ -70 +70 @@
                         {if $is_author || $is_admin}
                             <a href="/photos/editphoto{$photo.id}.html" title="{$LANG.EDIT}"><img src="/templates/_default_/images/icons/edit.png" border="0"/></a>&nbsp;
-                        {if is_admin}
+                        {if $is_admin}
                             <a href="/photos/movephoto{$photo.id}.html" title="{$LANG.MOVE}"><img src="/templates/_default_/images/icons/move.png" border="0"/></a>&nbsp;
                         {/if}
@@ -106 +106 @@
 
 {/strip}
-
-{*
-
-                <table width="100%" cellpadding="5" cellspacing="0">
-                        <tr>
-                <td colspan="3" align="center">
-
-                </td>
-            </tr>       
-                        <tr>
-                <td colspan="3" align="center">
-                                        <div>&larr; {$LANG.BACK_TO} <a href="/photos/{$photo.cat_id}">{$LANG.TO_ALBUM}</a>
-                                                {if $photo.NSDiffer==''} | <a href="/photos">{$LANG.TO_LIST_ALBUMS}</a>{/if}
-                        </div>
-                                </td>
-            </tr>
-                        <tr>
-                                <td style="text-align:center"></td>
-                        </tr>
-                        {if $photo.a_bbcode}
-                        <tr>
-                <td style="text-align:center">          
-                                        <label for="bbcode">{$LANG.CODE_INPUT_TO_FORUMS}: </label>
-                    
-                                </td>
-            </tr>
-                        {/if}
-
-                </table>
-                                           
-        {/if}
-*}

trunk/templates/_default_/components/com_users_photo_submit.tpl

@@ -85 +85 @@
                                 <td>
                                     <select name="allow[{$photo.id}]">
-                                        <option value="all">{$LANG.TO_ALL}</option>
-                                        <option value="registered">{$LANG.TO_REGISTERED}</option>
-                                        <option value="friends">{$LANG.TO_MY_FRIEND}</option>
+                                        <option value="all" {if $photo.allow_who=='all'}selected="selected"{/if}>{$LANG.TO_ALL}</option>
+                                        <option value="registered" {if $photo.allow_who=='registered'}selected="selected"{/if}>{$LANG.TO_REGISTERED}</option>
+                                        <option value="friends" {if $photo.allow_who=='friends'}selected="selected"{/if}>{$LANG.TO_MY_FRIEND}</option>
                                     </select>
                                 </td>

trunk/templates/_default_/components/com_users_photos_view.tpl

@@ -3 +3 @@
 {* ================================================================================ *}
 {strip}
-    {if $is_photo}
+    {if $is_allow}
 
         {if $myprofile || $is_admin}
@@ -55 +55 @@
 
     {else}
-        <div class="con_heading">{$LANG.PHOTO_NOT_FOUND}</div>
-        <p>{$LANG.PHOTO_NOT_FOUND_TEXT}</p>
+        <div class="con_heading">{$photo.title}</div>
+
+        <div class="bar">
+            {$photo.genderlink} &mdash; {$photo.pubdate} &mdash; <strong>{$LANG.HITS}:</strong> {$photo.hits}
+        </div>
+
+        <table cellpadding="0" cellspacing="0" border="0" width="100%" height="300">
+            <tr>
+                
+                <td width="30%">
+                    {if $previd}
+                        <a class="usr_photo_prev_link" href="/users/{$usr.id}/photo{$previd.id}.html" title="{$previd.title}"></a>
+                    {else}
+                        &nbsp;
+                    {/if}
+                </td>
+                
+                <td width="40%">
+                    <div class="usr_photo_view">
+                        {if $nextid}<a href="/users/{$usr.id}/photo{$nextid.id}.html">{/if}
+                            <span>{$LANG.PHOTO_NOT_FOUND_TEXT}</span>
+                        {if $nextid}</a>{/if}
+                    </div>
+                </td>
+                
+                <td width="30%">
+                    {if $nextid}
+                        <a class="usr_photo_next_link" href="/users/{$usr.id}/photo{$nextid.id}.html" title="{$nextid.title}"></a>
+                    {else}
+                        &nbsp;
+                    {/if}
+                </td>
+                
+            </tr>
+        </table>
+
     {/if}
 {/strip}