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

Added : Facebook Support

Browse source 
Added : Photos Menu
This commit is contained in:
Arslan Hassan 2011-01-03 12:46:44 +00:00
parent c7d1419c56
commit 3e49aab092
9 changed files with 138 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
upload/.htaccess
View file

@ -76,6 +76,8 @@ RewriteRule ^create_group create_group.php [L]
#Collection Section #Collection Section
RewriteRule ^collections/(.*)/(.*)/(.*)/(.*)/(.*) collections.php?cat=$1&sort=$3&time=$4&page=$5&seo_cat_name=$2 [L] RewriteRule ^collections/(.*)/(.*)/(.*)/(.*)/(.*) collections.php?cat=$1&sort=$3&time=$4&page=$5&seo_cat_name=$2 [L]
RewriteRule ^collections collections.php [L] RewriteRule ^collections collections.php [L]
RewriteRule ^photos/(.*)/(.*)/(.*)/(.*)/(.*) photos.php?cat=$1&sort=$3&time=$4&page=$5&seo_cat_name=$2 [L]
RewriteRule ^photos photos.php [L]
RewriteRule ^collection/(.*)/(.*)/(.*) view_collection.php?cid=$1&type=$2&%{QUERY_STRING} [L] RewriteRule ^collection/(.*)/(.*)/(.*) view_collection.php?cid=$1&type=$2&%{QUERY_STRING} [L]
#Photo Section #Photo Section

1
upload/includes/classes/ClipBucket.class.php
View file

@ -428,6 +428,7 @@ class ClipBucket
if(!userid()) if(!userid())
$this->head_menu[] = array('name'=>lang("signup"),'link'=>cblink(array('name'=>'signup')),"this"=>"signup"); $this->head_menu[] = array('name'=>lang("signup"),'link'=>cblink(array('name'=>'signup')),"this"=>"signup");
$this->head_menu[] = array('name'=>lang("photos"),'link'=>cblink(array('name'=>'photos')),"this"=>"photos");
$this->head_menu[] = array('name'=>lang("upload"),'link'=>cblink(array('name'=>'upload')),"this"=>"upload"); $this->head_menu[] = array('name'=>lang("upload"),'link'=>cblink(array('name'=>'upload')),"this"=>"upload");
if($params['assign']) if($params['assign'])
assign($params['assign'],$this->head_menu); assign($params['assign'],$this->head_menu);

4
upload/includes/classes/collections.class.php
View file

@ -225,7 +225,9 @@ class Collections extends CBCategory
function get_collection($id,$cond=NULL) function get_collection($id,$cond=NULL)
{ {
global $db; global $db;
$result = $db->select(tbl($this->section_tbl).",".tbl("users"),"".tbl($this->section_tbl).".*,".tbl('users').".userid,".tbl('users').".username"," ".tbl($this->section_tbl).".collection_id = $id AND ".tbl($this->section_tbl).".userid = ".tbl('users').".userid $cond"); $result = $db->select(tbl($this->section_tbl).",".tbl("users"),
"".tbl($this->section_tbl).".*,".tbl('users').".userid,".tbl('users').".username",
" ".tbl($this->section_tbl).".collection_id = $id AND ".tbl($this->section_tbl).".userid = ".tbl('users').".userid $cond");
//echo $db->db_query; //echo $db->db_query;
if($result) if($result)
return $result[0]; return $result[0];

8
upload/includes/functions.php
View file

@ -3373,7 +3373,10 @@
$_GET['time'] = 'all_time'; $_GET['time'] = 'all_time';
if(!isset($_GET['page'])) if(!isset($_GET['page']))
$_GET['page'] = 1; $_GET['page'] = 1;
if(THIS_PAGE=='photos')
$type = 'photos';
if(SEO=='yes') if(SEO=='yes')
return BASEURL.'/'.$type.'/'.$data['category_id'].'/'.SEO($data['category_name']).'/'.$_GET['sort'].'/'.$_GET['time'].'/'; return BASEURL.'/'.$type.'/'.$data['category_id'].'/'.SEO($data['category_name']).'/'.$_GET['sort'].'/'.$_GET['time'].'/';
else else
@ -3474,6 +3477,9 @@
$time = $sort; $time = $sort;
else else
$time = $_GET['time']; $time = $_GET['time'];
if(THIS_PAGE=='photos')
$type = 'photos';
if(SEO=='yes') if(SEO=='yes')
return BASEURL.'/'.$type.'/'.$_GET['cat'].'/'.$_GET['seo_cat_name'].'/'.$sorting.'/'.$time.'/'.$_GET['page']; return BASEURL.'/'.$type.'/'.$_GET['cat'].'/'.$_GET['seo_cat_name'].'/'.$sorting.'/'.$time.'/'.$_GET['page'];

2
upload/includes/langs/en.lang
View file

File diff suppressed because one or more lines are too long

3
upload/player/pak_player/pak_player.php
View file

@ -222,6 +222,9 @@ if(!function_exists("pak_player"))
$embedCode .= '<param name="allowFullScreen" value="true"></param>'; $embedCode .= '<param name="allowFullScreen" value="true"></param>';
$embedCode .= '<param name="allowscriptaccess" value="always"></param>'; $embedCode .= '<param name="allowscriptaccess" value="always"></param>';
$embedCode .= '<embed src="'.$final_code.'"'; $embedCode .= '<embed src="'.$final_code.'"';
assign('embedFinalCode',$final_code);
$embedCode .= 'type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="'.EMBED_VDO_WIDTH.'" height="'.EMBED_VDO_HEIGHT.'"></embed>'; $embedCode .= 'type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="'.EMBED_VDO_WIDTH.'" height="'.EMBED_VDO_HEIGHT.'"></embed>';
return $embedCode .= '</object>'; return $embedCode .= '</object>';
} }

96
upload/plugins/embed_video_mod/form.html Normal file
View file

@ -0,0 +1,96 @@
{assign var='video_fields' value=$Upload->load_video_fields($input)}
<div class="upload_info" id="upload_form{$objId}" style="margin-top:10px;border:none">
<form name="uploadForm{$objId}" class="upload_form" id="uploadForm{$objId}" method="post" action="" onSubmit="return false" enctype="multipart/form-data">
{* Adding Embed Form *}
<fieldset>
<span class="form_head">Embed video details</span>
<div class="field">
<label for="embed_code" class="label">Embed Code</label>
<textarea name="embed_code" cols="30" id="embed_code" rows="3" class="upload_input textarea">{"embed_code"|post|form_val}</textarea>
<div class="hint">supports embed, object and iframes</div>
</div>
<div class="field">
<label for="duration" class="label">Video duration</label>
<input type="text" name="duration" id="duration" size="15" class="upload_input" value="{"duration"|post|form_val}"/>
<div class="hint">duration format is hours:minutes:seconds</div>
</div>
<div class="field">
<label for="thumb_file" class="label">Thumb file</label>
<input name="thumb_file" type="file" class="upload_input filefield" id="thumb_file" />
</div>
</fieldset>
{foreach from=$video_fields item=field_group}
<fieldset>
{* Hide fields if group is not required *}
{if $field_group.group_id!='required_fields'}
<span class="form_head"
onclick="$('#more_fields_{$field_group.group_id}').slideToggle()"
style="cursor:pointer">{$field_group.group_name}</span>
<div id="more_fields_{$field_group.group_id}" style="display:none">
{else}
<span class="form_head">{$field_group.group_name}</span>
{/if}
<div {if $field_group.group_id=='required_fields'} style="width:400px; float:left"{/if}>
{foreach from=$field_group.fields item=field}
{if $field.name!='category[]'}
<div class="field">
<label for="{$field.id}" class="label">{$field.title}</label>
{if $field.hint_1}<div class="hint">{$field.hint_1}</div><br>{/if}
{ANCHOR place=$field.anchor_before}
{$formObj->createField($field)}
{if $field.hint_2}<br>
<div class="hint">{$field.hint_2}</div>{/if}
</div>
{else}
{assign var='category_array' value=$field}
{/if}
{/foreach}
</div>
{* Loading Category in a seperate dive so they can fit properly*}
{if $category_array}
<div style="float:left; width:200px; margin-left:10px;">
<div class="field">
<label for="{$field.id}" class="label">{$category_array.title}</label>
{if $category_array.hint_1}<div class="hint">{$category_array.hint_1}</div><br>{/if}
{ANCHOR place=$category_array.anchor_before}
<div style="overflow:auto; height:150px">
{$formObj->createField($category_array)}
</div>
{if $category_array.hint_2}<br>
<div class="hint">{$category_array.hint_2}</div>{/if}
</div>
</div>
{assign var='category_array' value=''}
{/if}
{if $field_group.group_id=='required_fields'}<div class="clearfix"></div>{/if}
{* Closing Div for hidden fields *}
{if $field_group.group_id!='required_fields'}
</div>
{/if}
</fieldset>
{/foreach}
<input name="submit_upload" type="hidden" value="just_do_it">
<div align="right" style="margin-top:10px">
<input type="button" name="embed_upload" id="embed_upload" value="Upload" onClick="check_embed_code('{$objId}')" class="cbSubmitUpload"/></div>
</form>
</div>

23
upload/styles/cbv2new/layout/global_header.html
View file

@ -166,6 +166,29 @@ function bookmarkSite(title, url) {
} }
</script> </script>
{/literal} {/literal}
{if $smarty.const.THIS_PAGE=='watch_video'}
<meta property="og:image" content="{getThumb vdetails=$video}">
<meta property="og:title" content="{$video.title}" />
<meta property="og:description" content="{$video.description}" />
<meta property="og:type" content="video" />
<meta property="og:url" content="{videoLink vdetails=$video}" />
<meta property="og:site_name" content="{cbtitle}" />
<meta name="embed_video_url" content="http://embed.break.com/1976758">
<meta name="embed_video_thumb_url" content="{getThumb vdetails=$video}">
<meta name="embed_video_title" id="vid_title" content="{$video.title}">
<meta name="embed_video_description" id="vid_desc" content="{$video.description}">
<meta name="embed_video_width" content="{$smarty.const.EMBED_VDO_WIDTH}">
<meta name="embed_video_height" content="{$smarty.const.EMBED_VDO_HEIGHT}">
<meta name="medium" content="video">
<meta name="video_height" content="{$smarty.const.EMBED_VDO_HEIGHT}">
<meta name="video_width" content="{$smarty.const.EMBED_VDO_WIDTH}">
<meta name="video_type" content="application/x-shockwave-flash">
<link rel="video_src" href="{$embedFinalCode}">
<link rel="videothumbnail" href="{getThumb vdetails=$video}" type="image/jpeg">
<link rel="canonical" href="{videoLink vdetails=$video}">
<link rel="image_src" href="{getThumb vdetails=$video}">
{/if}
</head> </head>
<!-- Global Header Ends Here --> <!-- Global Header Ends Here -->

4
upload/styles/cbv2new/theme/main.css
View file

@ -96,9 +96,9 @@ span.remember { font-size:10px; }
.top_tabs { margin:0px; padding:0px; clear:both;overflow:hidden } .top_tabs { margin:0px; padding:0px; clear:both;overflow:hidden }
.top_tabs ul { margin:0px; padding:0px; list-style:none; float:left; position:relative; left:50%; } .top_tabs ul { margin:0px; padding:0px; list-style:none; float:left; position:relative; left:50%; }
.top_tabs ul li { margin:0px; padding:0px; float:left; list-style:none; position:relative; right:50%; top:1px; } .top_tabs ul li { margin:0px; padding:0px; float:left; list-style:none; position:relative; right:50%; top:1px; }
.top_tabs ul li a { width:139px; display:block; height:33px; line-height:33px; background:#62b3ff; text-align:center; text-decoration:none; color:#FFF; margin-right:9px; font-size:14px; border-radius:5px 5px 0px 0px;-khtml-border-radius:5px 5px 0px 0px; -moz-border-radius:5px 5px 0px 0px; -webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px; background:url(../images/nav_grads.png); background-position:-0px -162px; background-repeat:repeat-x} .top_tabs ul li a { width:120px; display:block; height:25px; line-height:25px; background:#62b3ff; text-align:center; text-decoration:none; color:#FFF; margin-right:2px; font-size:13px; border-radius:5px 5px 0px 0px;-khtml-border-radius:5px 5px 0px 0px; -moz-border-radius:5px 5px 0px 0px; -webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px; background:url(../images/nav_grads.png); background-position:-0px -169px; background-repeat:repeat-x}
.top_tabs ul li a:hover { background:#0099cc; } .top_tabs ul li a:hover { background:#0099cc; }
.top_tabs ul li.selected a { background:url(../images/nav_grads.png) top repeat-x; border:1px solid #006699; border-bottom:0px none; } .top_tabs ul li.selected a { background:url(../images/nav_grads.png) -0px -7px; repeat-x; border:1px solid #006699; border-bottom:0px none; font-weight:bold}
/* NAVIGATION */ /* NAVIGATION */
#navi_con { background:#14669c; padding:5px; margin:0px; border-top:1px solid #006699; } #navi_con { background:#14669c; padding:5px; margin:0px; border-top:1px solid #006699; }