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

modified : issues fixed

Browse source
This commit is contained in:
Fahad Abbas 2017-03-17 18:56:00 +05:00
parent 0fcd042521
commit da35ec745d
7 changed files with 72 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
upload/admin_area/styles/cb_2014/layout/category.html
View file

@ -29,16 +29,17 @@
<tr>
<div class="col-md-4">
<label>Make Default Category</label>
<select class="form-control" name="default_categ">
<option class="form-control" name="default" id="default_0">Yes</option>
<option class="form-control" name="default" id="default_1" selected="selected">No</option>
<select class="form-control" name="default">
<option class="form-control" id="default_0" value="yes">Yes</option>
<option class="form-control" id="default_1" value="no" selected="selected">No</option>
</select>
</div>
</div>
<div class="row marginTopLarge">
<div class="col-md-12">
<textarea class="form-control" name="desc" id="desc" cols="33" rows="5" >{'desc'|post_form_val}</textarea>
<label>Description</label>
<textarea class="form-control" name="desc" id="description" cols="33" rows="5" >{'desc'|post_form_val}</textarea>
</div>
</div>
@ -78,14 +79,15 @@
<div class="col-md-4">
<label>Make Default Category</label>
<select class="form-control" name="default_categ">
<option class="form-control" name="default" id="default_0" {if $cat_details.isdefault=='yes'} checked="checked"{/if} >Yes</option>
<option class="form-control" name="default" id="default_1" {if $cat_details.isdefault=='no'} checked="checked"{/if}>No</option>
<option class="form-control" id="default_0" value="yes" {if $cat_details.isdefault=='yes'} checked="checked"{/if} >Yes</option>
<option class="form-control" id="default_1" value="no" {if $cat_details.isdefault=='no'} checked="checked"{/if}>No</option>
</select>
</div>
</div>
<div class="row marginTopLarge">
<div class="col-md-12">
<textarea class="form-control" name="desc" id="desc" cols="33" rows="5">{$cat_details.category_desc}</textarea>
<label>Description</label>
<textarea class="form-control" name="desc" id="description" cols="33" rows="5">{$cat_details.category_desc}</textarea>
</div>
</div>
<br>

98
upload/admin_area/styles/cb_2014/layout/main.html
View file

@ -261,12 +261,12 @@
Channels & Photos
</a>
</li>
<li class="">
<a data-toggle="tab" href="#groups">
Groups
</a>
</li>
<!-- <li class="">
<a data-toggle="tab" href="#groups">
Groups
</a>
</li> -->
<li class="">
<a data-toggle="tab" href="#general">
@ -473,51 +473,51 @@
</div>
</div>
</div>
<div id="groups" class="tab-pane">
<h2>Groups</h2>
<div class="row">
<div class="col-md-4">
<label for="groupsSelection">Enable group selection</label>
<select class="form-control" name="groupsSection" id="groupsSection">
<option value="yes" {if $row.groupsSection!='no'} selected="selected"{/if}>Yes</option>
<option value="no" {if $row.groupsSection=='no'} selected="selected"{/if}>No</option>
</select>
</div>
<div class="col-md-4">
<label for="grp_thumb_height">Group Thumb Height</label>
<input name="grp_thumb_height" type="text" id="grp_thumb_height" class="form-control" value="{$row.grp_thumb_height}" size="15" maxlength="5" />
</div>
<div class="col-md-4">
<label for="grp_thumb_width">Group Thumb Width</label>
<input name="grp_thumb_width" type="text" id="grp_thumb_width" class="form-control" value="{$row.grp_thumb_width}" size="15" maxlength="5" />
</div>
</div>
<!-- <div id="groups" class="tab-pane">
<h2>Groups</h2>
<div class="row">
<div class="col-md-4">
<label for="grp_max_title">Group max title</label>
<input class="form-control" name="grp_max_title" type="text" id="grp_max_title" value="{$row.grp_max_title}" size="15" maxlength="5" />
</div>
<div class="col-md-4">
<label for="grp_max_desc">Group max description</label>
<input class="form-control" name="grp_max_desc" type="text" id="grp_max_desc" value="{$row.grp_max_desc}" size="15" maxlength="5" />
</div>
<div class="col-md-4">
<label for="max_topic_lenght">Max group topic length</label>
<input class="form-control" name="max_topic_length" type="text" id="max_topic_length" value="{$row.max_topic_length}" size="15" maxlength="5" />
</div>
<div class="col-md-4">
<label for="groupsSelection">Enable group selection</label>
<select class="form-control" name="groupsSection" id="groupsSection">
<option value="yes" {if $row.groupsSection!='no'} selected="selected"{/if}>Yes</option>
<option value="no" {if $row.groupsSection=='no'} selected="selected"{/if}>No</option>
</select>
</div>
<div class="col-md-4">
<label for="grp_thumb_height">Group Thumb Height</label>
<input name="grp_thumb_height" type="text" id="grp_thumb_height" class="form-control" value="{$row.grp_thumb_height}" size="15" maxlength="5" />
</div>
<div class="col-md-4">
<label for="grp_thumb_width">Group Thumb Width</label>
<input name="grp_thumb_width" type="text" id="grp_thumb_width" class="form-control" value="{$row.grp_thumb_width}" size="15" maxlength="5" />
</div>
</div>
<div class="form-group1">
<label for="grp_categories">Max categories for each group</label>
<input class="form-control" name="grp_categories" type="text" id="grp_categories" value="{$row.grp_categories}" size="15" maxlength="5" />
</div>
</div>
<div class="row">
<div class="col-md-4">
<label for="grp_max_title">Group max title</label>
<input class="form-control" name="grp_max_title" type="text" id="grp_max_title" value="{$row.grp_max_title}" size="15" maxlength="5" />
</div>
<div class="col-md-4">
<label for="grp_max_desc">Group max description</label>
<input class="form-control" name="grp_max_desc" type="text" id="grp_max_desc" value="{$row.grp_max_desc}" size="15" maxlength="5" />
</div>
<div class="col-md-4">
<label for="max_topic_lenght">Max group topic length</label>
<input class="form-control" name="max_topic_length" type="text" id="max_topic_length" value="{$row.max_topic_length}" size="15" maxlength="5" />
</div>
</div>
<div class="form-group1">
<label for="grp_categories">Max categories for each group</label>
<input class="form-control" name="grp_categories" type="text" id="grp_categories" value="{$row.grp_categories}" size="15" maxlength="5" />
</div>
</div> -->
<div id="general" class="tab-pane">
<h2>General</h2>
<div class="row">

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

@ -600,9 +600,7 @@ abstract class CBCategory
} elseif ($pcat == $cid){
e(lang("You can not make category parent of itself"));
} else {
$db->update(tbl($this->cat_tbl),array("isdefault"),"no"," category_id!='$cid' ");
$db->update(tbl($this->cat_tbl),$flds,$values," category_id='$cid' ");
if($default=='yes')
$this->make_default_category($cid);
e(lang("cat_update_msg"),'m');

3
upload/plugins/cb_server_thumb/cb_server_thumb.php
View file

@ -18,10 +18,11 @@ define("DEFAULT_HEIGHT",120);
define("CB_SERVER_THUMB_DIR_NAME",basename(__DIR__));
define("CB_SERVER_THUMB_URL",PLUG_URL.'/'.CB_SERVER_THUMB_DIR_NAME);
define("CB_SERVER_THUMB_DIR",PLUG_DIR.'/'.CB_SERVER_THUMB_DIR_NAME);
define ('FILE_CACHE_DIRECTORY', dirname(dirname(dirname(__FILE__))).'/cache');
$__resize_thumbs = true;
if(!is_writable(CB_SERVER_THUMB_DIR.'/cache'))
if(!is_writable(FILE_CACHE_DIRECTORY))
{
$__resize_thumbs =false;

2
upload/plugins/cb_server_thumb/timthumb.php
View file

@ -42,7 +42,7 @@ if(! defined('FILE_CACHE_TIME_BETWEEN_CLEANS')) define ('FILE_CACHE_TIME_BETWEEN
if(! defined('FILE_CACHE_MAX_FILE_AGE') ) define ('FILE_CACHE_MAX_FILE_AGE', 86400); // How old does a file have to be to be deleted from the cache
if(! defined('FILE_CACHE_SUFFIX') ) define ('FILE_CACHE_SUFFIX', '.timthumb.txt'); // What to put at the end of all files in the cache directory so we can identify them
if(! defined('FILE_CACHE_PREFIX') ) define ('FILE_CACHE_PREFIX', 'timthumb'); // What to put at the beg of all files in the cache directory so we can identify them
if(! defined('FILE_CACHE_DIRECTORY') ) define ('FILE_CACHE_DIRECTORY', './cache'); // Directory where images are cached. Left blank it will use the system temporary directory (which is better for security)
if(! defined('FILE_CACHE_DIRECTORY') ) define ('FILE_CACHE_DIRECTORY', dirname(dirname(dirname(__FILE__))).'/cache'); // Directory where images are cached. Left blank it will use the system temporary directory (which is better for security)
if(! defined('MAX_FILE_SIZE') ) define ('MAX_FILE_SIZE', 10485760); // 10 Megs is 10485760. This is the max internal or external file size that we'll process.
if(! defined('CURL_TIMEOUT') ) define ('CURL_TIMEOUT', 20); // Timeout duration for Curl. This only applies if you have Curl installed and aren't using PHP's default URL fetching mechanism.
if(! defined('WAIT_BETWEEN_FETCH_ERRORS') ) define ('WAIT_BETWEEN_FETCH_ERRORS', 3600); // Time to wait between errors fetching remote file

10
upload/styles/cb_28/layout/blocks/pm/messages.html
View file

@ -75,6 +75,16 @@
<a href="{$userquery->profile_link($pr_msg)}">{$pr_msg.username}</a>
</strong> - {$pr_msg.date_added|date_format:"%A, %B %e, %Y %I:%M %p"}
</div>
<div class="pm_line">
{lang code='To'} :
<strong>
{$to_id = $pr_msg.message_to}
{$trimed_to = str_replace('#','', $to_id)}
<a href="{$userquery->profile_link($trimed_to)}">
{ucfirst(get_username($trimed_to))}
</a>
</strong>
</div>
<div class="pm_line">
{lang code='Subject'} : <strong>{$pr_msg.message_subject}</strong>
</div>

2
upload/styles/cb_28/layout/edit_account.html
View file

@ -154,7 +154,7 @@
<form method="post" enctype="multipart/form-data">
<h2>{lang code='user_user_avatar'}</h2>
<div class="show-image">
<img src="{$userquery->getUserThumb($user)}" class="edit-img-thumbnail img-responsive" />
<img src="{$userquery->getUserThumb($user)}?{uniqid()}" class="edit-img-thumbnail img-responsive" />
</div>
<div class="form-group">