|
From: Florin C B. <ory...@us...> - 2012-10-22 07:16:32
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory vz-cvs-4.sog:/tmp/cvs-serv32733
Modified Files:
album_pic.php album_rdf.php album_rss.php
Log Message:
lang encoding and permissions fix for smartor album
Index: album_rss.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_rss.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** album_rss.php 9 Sep 2008 05:05:18 -0000 1.5
--- album_rss.php 22 Oct 2012 07:16:29 -0000 1.6
***************
*** 99,111 ****
$index_url = PORTAL_URL . $index;
$thumb_url = PORTAL_URL . $thumbs;
$rss_time = date('D, j M Y G:i:s T',$time_start);
!
$board_config['sitename'] = str_replace("&","&",$board_config['sitename']);
$board_config['site_desc'] = str_replace("&","&",$board_config['site_desc']);
! $rss = "<?xml version=\"1.0\" encoding=\"ISO-8859-2\" ?>
<rss version=\"2.0\">
<channel>
! <title>" . $board_config['sitename'] . " Album (XXX needs registering)</title>
<link>" . $index_url . "</link>
<description>" . $board_config['site_desc'] . "</description>
--- 99,112 ----
$index_url = PORTAL_URL . $index;
$thumb_url = PORTAL_URL . $thumbs;
+ $s_user_lang = ($mx_user->lang['default_lang']) ? $mx_user->encode_lang($mx_user->lang['default_lang']) : $board_config['default_lang'];
$rss_time = date('D, j M Y G:i:s T',$time_start);
! //dir=\"". $lang['DIRECTION'] ."\"
$board_config['sitename'] = str_replace("&","&",$board_config['sitename']);
$board_config['site_desc'] = str_replace("&","&",$board_config['site_desc']);
! $rss = "<?xml version=\"1.0\" encoding=\"". $lang['ENCODING'] ."\"?>
<rss version=\"2.0\">
<channel>
! <title>" . $board_config['sitename'] . " Album (" . $board_config['sitename'] . ")</title>
<link>" . $index_url . "</link>
<description>" . $board_config['site_desc'] . "</description>
***************
*** 223,226 ****
--- 224,228 ----
$description = htmlentities($description);
$description .= $lang['Pic_Desc'].": ".nl2br($topics[$i]['pic_desc']);
+ $description = str_replace("&", "&", $description);
$pic_time = date('D, j M Y G:i:s T',$topics[$i]['pic_time']);
Index: album_pic.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_pic.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** album_pic.php 3 Mar 2011 14:28:40 -0000 1.8
--- album_pic.php 22 Oct 2012 07:16:29 -0000 1.9
***************
*** 168,172 ****
$album_user_access = album_permissions($album_user_id, $cat_id, ALBUM_AUTH_VIEW, $thispic);
! $auth_data = album_user_access($cat_id, $thiscat, 1, 0, 1, 1, 1, 1);
if (($auth_data['view'] == 0) && ($album_user_access['view'] == false))
--- 168,173 ----
$album_user_access = album_permissions($album_user_id, $cat_id, ALBUM_AUTH_VIEW, $thispic);
! $auth_data = album_user_access($cat_id, $thiscat, 1, 0, 1, 0, 0, 0);
! //album_user_access($cat_id, $thiscat, $view_check, $upload_check, $rate_check, $comment_check, $edit_check, $delete_check);
if (($auth_data['view'] == 0) && ($album_user_access['view'] == false))
***************
*** 182,186 ****
if ( ($thispic['cat_approval'] == ADMIN) || (($thispic['cat_approval'] == MOD) && !$album_user_access['moderator']) )
{
! if ($thispic['pic_approval'] !== 1)
{
mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
--- 183,187 ----
if ( ($thispic['cat_approval'] == ADMIN) || (($thispic['cat_approval'] == MOD) && !$album_user_access['moderator']) )
{
! if ($thispic['pic_approval'] != 1)
{
mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
Index: album_rdf.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_rdf.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_rdf.php 30 Aug 2008 04:37:11 -0000 1.4
--- album_rdf.php 22 Oct 2012 07:16:29 -0000 1.5
***************
*** 87,104 ****
$board_config['sitename'] = str_replace("&","&",$board_config['sitename']);
$board_config['site_desc'] = str_replace("&","&",$board_config['site_desc']);
!
! $rdf = "<?xml version=\"1.0\" encoding=\"ISO-8859-2\" ?>
<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns=\"http://my.netscape.com/rdf/simple/0.9/\">
-
<channel>
! <title>" . $board_config['sitename'] . " Album (XXX needs registering)</title>
! <link>" . $index_url . "</link>
! <description>" . $board_config['site_desc'] . "</description>
! <image>
! <title>" . $board_config['sitename'] . " Forum</title>
! <link>" . $index_site . "</link>
! <description>" . $board_config['site_desc'] . "</description>
! <url>" . $images['logo_url'] . "</url>
! </image>
</channel>
";
--- 87,102 ----
$board_config['sitename'] = str_replace("&","&",$board_config['sitename']);
$board_config['site_desc'] = str_replace("&","&",$board_config['site_desc']);
!
! $rdf = "<?xml version=\"1.0\" encoding=\"". $lang['ENCODING'] ."\"?>
<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns=\"http://my.netscape.com/rdf/simple/0.9/\">
<channel>
! <title>". $board_config['sitename'] ." Album (XXX needs registering)</title>
! <description>". $board_config['site_desc'] ."</description>
! <image>" . $images['logo_url'] ."</image>
! <title>". $board_config['sitename'] ." Forum</title>
! <link>" . $index_site ."</link>
! <url>". $index_url ."</url>
! <language>en-us</language>
! <generator>FAP</generator>
</channel>
";
***************
*** 184,195 ****
{
$title = $topics[$i]['pic_title'];
! $title = str_replace("&","&",$title);
$url = $index_url . "?" . "pic_id=" . $topics[$i]['pic_id'] . $picrow[$i]['pic_id'];
$thumb = $thumb_url . "?" . "pic_id=" . $topics[$i]['pic_id'] . $picrow[$i]['pic_id'];
! $description = '<a href="' . $url . '"><img src="' . $thumb . '" border="1" vspace="2" hspace="2" align="left" ></a>';
! $description = htmlentities($description);
! $description .= $lang['Pic_Desc'].": ".nl2br($topics[$i]['pic_desc']);
!
$rdf .= "
<item>
--- 182,193 ----
{
$title = $topics[$i]['pic_title'];
! $title = str_replace("&", "&", $title);
$url = $index_url . "?" . "pic_id=" . $topics[$i]['pic_id'] . $picrow[$i]['pic_id'];
$thumb = $thumb_url . "?" . "pic_id=" . $topics[$i]['pic_id'] . $picrow[$i]['pic_id'];
! $description = '<a href="' . $url . '"><img src="' . $thumb . '" border="1" vspace="2" hspace="2" align="left"></a>';
! $description = htmlentities($description);
! $description .= $lang['Pic_Desc'].": ".nl2br($topics[$i]['pic_desc']);
! $description = str_replace("&", "&", $description);
$rdf .= "
<item>
|