vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed : Language phrases

Browse source 
Fixed : Photo thumb load problem
Replace : Orphans with user album
Fixed : Editors pick
Fixed : please in cb_install
This commit is contained in:
Arslan Hassan 2011-04-25 09:37:47 +00:00
parent 4ab03616fb
commit c1cc31102a
8 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
upload/cb_install/functions.php
View file

@ -229,7 +229,7 @@
{
$permsArray[] = array('path'=>$file,'msg'=>'writeable');
}else
$permsArray[] = array('path'=>$file,'err'=>'plessae chmod this file/directory to 777');
$permsArray[] = array('path'=>$file,'err'=>'please chmod this file/directory to 777');
}
return $permsArray;
}

2
upload/includes/classes/pages.class.php
View file

@ -61,7 +61,7 @@ class pages{
$base = basename(dirname($_SERVER['SCRIPT_NAME']));
$sus_dirs = array('admin_area','includes','plugins','files');
$sus_dirs = array('admin_area','includes','plugins','files','actions');
$remove_arr = array();

2
upload/includes/classes/photos.class.php
View file

@ -138,7 +138,7 @@ class CBPhotos
$accountLinks = array(
lang('manage_photos') => "manage_photos.php",
lang('manage_favorite_photos') => "manage_photos.php?mode=favorite",
lang('manage_orphan_photos') => "manage_photos.php?mode=orphan",
lang('manage_my_album') => "manage_photos.php?mode=my_album",
);
if(isSectionEnabled('photos'))
$userquery->user_account[lang('Photos')] = $accountLinks;

6
upload/includes/common.php
View file

@ -160,7 +160,9 @@ if(!@$in_bg_cron)
require_once 'languages.php';
$lang_obj->init();
$LANG = $lang_obj->lang_phrases('file');
$calcdate = new CalcDate();
$signup = new signup();
@ -398,8 +400,6 @@ if(phpversion() < '5.2.0')
$userquery->init();
$cbvideo->init();
$cbpm->init();
$lang_obj->init();
$LANG = $lang_obj->lang_phrases('file');
$thisurl = curPageURL();
//Setting Up Group Class
$cbgroup->gp_thumb_width = config('grp_thumb_width');

18
upload/manage_photos.php
View file

@ -97,6 +97,8 @@ switch($mode)
if($_POST['remove_fav_photos'])
{
$total = count($_POST['check_photo']);
for($i=0;$i<$total;$i++)
{
@ -126,9 +128,23 @@ switch($mode)
}
break;
case "orphan":
case "my_album":
{
assign('albumPrivacyUrl',queryString('','album_privacy'));
assign('mode','orphan');
if(isset($_GET['album_privacy']))
{
if(in_array(get('album_privacy'),array('private','public','friends')))
{
$db->update(tbl("users"),array("album_privacy"),array(mysql_clean(get("album_privacy")))," userid='".userid()."'" );
e(lang("album_privacy_updated"),'m');
$udetails ['album_privacy'] = get('album_privacy');
assign('user',$udetails);
}
}
if(isset($_GET['delete_orphan_photo']))
{
$id = mysql_clean($_GET['delete_orphan_photo']);

3
upload/plugins/editors_pick/editors_picks.php
View file

@ -122,7 +122,8 @@ if(!function_exists('editors_pick'))
function get_ep_videos()
{
global $db;
$results = $db->select(tbl('editors_picks').','.tbl('video'),"*"," ".tbl('editors_picks').".videoid = ".tbl('video').".videoid AND ".tbl('video.active')." = 'yes' AND ".tbl('video.broadcast')." = 'public' AND ".tbl('video.status')." = 'Successful' ORDER BY ".tbl('editors_picks').".sort ASC");
$results = $db->select(tbl('editors_picks,video,users'),tbl('editors_picks.*,video.*,users.userid,users.username')," ".tbl('editors_picks').".videoid = ".tbl('video').".videoid AND ".tbl('video.active')." = 'yes' AND ".tbl('video.broadcast')." = 'public' AND ".tbl('video.status')." = 'Successful' AND ".tbl("video.userid")." = ".tbl("users.userid")." ORDER BY ".tbl('editors_picks').".sort ASC");
return $results;
}

2
upload/plugins/embed_video_mod/embed_video_mod.php
View file

@ -31,7 +31,7 @@ if(!function_exists('validate_embed_code'))
if(empty($time))
return true;
$time = explode(':',$time);
if(count($time)>0)
if(count($time)>0 && !is_array($time))
{
$sec = 0;
$total = count($time);

16
upload/styles/cbv2new/layout/manage_photos.html
View file

@ -79,8 +79,20 @@
{/if}
{if $mode == 'orphan'}
<h2 style="margin-bottom:5px;">{lang code="manage_orphan_photos"}</h2>
<div style="font:normal 10px Tahoma; color:#666; margin-bottom:15px;">What are Orphan Photos? All the photos uploaded are dependent on their collections/albums. When you remove some photo from collection/album, this will not delete photo permenently. It will move photo here. You can also use this to make your photos private. Direct link is available for you to share with your friends.</div>
<h2 style="margin-bottom:5px;">{lang code="manage_my_album"}</h2>
<div align="right">
Make my album <label>
<input type="radio" name="my_album_privacy" value="public" {if $user.album_privacy =='public'} checked="checked" {/if}
onclick="window.location = '{$albumPrivacyUrl}album_privacy=public'"
/> Public</label>
<label><input type="radio" name="my_album_privacy" value="private" {if $user.album_privacy =='private'} checked="checked" {/if}
onclick="window.location = '{$albumPrivacyUrl}album_privacy=private'"/> Private</label>
<label><input type="radio" name="my_album_privacy" value="friends" {if $user.album_privacy =='friends'} checked="checked" {/if}
onclick="window.location = '{$albumPrivacyUrl}album_privacy=friends'"/>For friends</label>
</div>
<div style="font:normal 10px Tahoma; color:#666; margin-bottom:15px;"> All the photos uploaded are dependent on their collections/albums. When you remove some photo from collection/album, this will not delete photo permenently. It will move photo here. You can also use this to make your photos private. Direct link is available for you to share with your friends.</div>
<div align="right" style="float:right; display:inline">
<form id="form1" name="form1" method="get" action="">
<input name="query" type="text" class="search_field" id="query" value="{$smarty.get.query|form_val}" />