Skip to content

Commit 272acb5

Browse files
dignajardignajar
committed
Bug fixes
1 parent 2386029 commit 272acb5

File tree

13 files changed

+45
-156
lines changed

13 files changed

+45
-156
lines changed

‎admin/ajax/uploader (copy).php

-83
This file was deleted.

‎admin/boot/rules/98-constants.bit

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
// =====================================================================
1414
// SYSTEM INFORMATION
1515
// =====================================================================
16-
define('NIBBLEBLOG_VERSION', '4.0.3');
17-
define('NIBBLEBLOG_NAME', 'Coffee');
18-
define('NIBBLEBLOG_RELEASE_DATE', '14/02/2014');
19-
define('NIBBLEBLOG_BUILD', 2392406951);
16+
define('NIBBLEBLOG_VERSION', '4.0.4');
17+
define('NIBBLEBLOG_NAME', 'Coffee Plus');
18+
define('NIBBLEBLOG_RELEASE_DATE', '01/09/2015');
19+
define('NIBBLEBLOG_BUILD', 2392406952);
2020

2121
// =====================================================================
2222
// DEBUG
@@ -34,4 +34,6 @@ if(DEBUG_MODE)
3434
error_reporting(E_ALL | E_STRICT | E_NOTICE);
3535
}
3636

37+
header('Content-Type: text/html; charset=utf-8');
38+
3739
?>

‎admin/controllers/plugins/config.bit

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ if( ($_SERVER['REQUEST_METHOD'] == 'POST') && isset($_POST['plugin']) )
1616
$destination = PATH_PLUGINS_DB.$plugin->get_dir_name();
1717
$complete = $destination.'/'.$field_name.'.'.$extension;
1818

19+
if( ($extension=='jpg') || ($extension=='gif') || ($extension=='png') )
20+
{
21+
1922
// Upload the new file and move
2023
if(move_uploaded_file($file["tmp_name"], $complete))
2124
{
@@ -31,6 +34,8 @@ if( ($_SERVER['REQUEST_METHOD'] == 'POST') && isset($_POST['plugin']) )
3134
$Resize->saveImage($complete, $quality, true);
3235
}
3336
}
37+
38+
}
3439
}
3540

3641
unset($_POST['plugin']);

‎admin/controllers/settings/regional.bit

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ $timezone_html = Date::get_timezones();
1818

1919
$timestamp_format_html = array(
2020
''=>$_LANG['CUSTOM'],
21-
'%d/%m/%y'=>'31/12/14',
21+
'%d/%m/%y'=>'31/12/15',
2222

23-
'%m/%d/%y'=>'12/31/14',
23+
'%m/%d/%y'=>'12/31/15',
2424

25-
'%d %B, %Y'=>'31 December, 2014',
25+
'%d %B, %Y'=>'31 December, 2015',
2626

27-
'%d %b, %Y'=>'31 Dec, 2014'
27+
'%d %b, %Y'=>'31 Dec, 2015'
2828
);
2929

3030
?>

‎admin/kernel/api/login.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ private function get_key()
257257
$ip = getenv('REMOTE_ADDR');
258258

259259
// Hash
260-
return sha1($agent.$ip);
260+
return sha1($agent);
261261
}
262262

263263
} // END class LOGIN

‎admin/kernel/helpers/video.class.php

+5-26
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,12 @@ private static function video_get_youtube($url, $width = 640, $height = 360)
3333
preg_match('/[\\?\\&]v=([^\\?\\&]+)/', $url, $matches);
3434
$video_id = $matches[1];
3535

36-
// Check if a valid url
37-
if(!Net::check_http_code('http://gdata.youtube.com/feeds/api/videos/'.$video_id,200))
38-
{
39-
return(false);
40-
}
41-
42-
// GET INFO
43-
$xml = simplexml_load_file('http://gdata.youtube.com/feeds/api/videos/'.$video_id);
44-
$media = $xml->children('http://search.yahoo.com/mrss/');
45-
4636
$info = array();
4737
$info['id'] = $video_id;
48-
$info['title'] = (string)$media->group->title;
49-
$info['description'] = (string)$media->group->description;
38+
$info['title'] = '';
39+
$info['description'] = '';
5040

51-
$info['thumb'][0] = (string)$media->group->thumbnail[0]->attributes()->url;
52-
$info['thumb'][1] = (string)$media->group->thumbnail[1]->attributes()->url;
53-
$info['thumb'][2] = (string)$media->group->thumbnail[2]->attributes()->url;
54-
$info['thumb'][3] = (string)$media->group->thumbnail[3]->attributes()->url;
55-
56-
$info['embed'] = '<iframe class="youtube_embed" width="'.$width.'" height="'.$height.'" src="http://www.youtube.com/embed/'.$video_id.'?rel=0" frameborder="0" allowfullscreen></iframe>';
41+
$info['embed'] = '<iframe class="youtube_embed" width="'.$width.'" height="'.$height.'" src="https://www.youtube.com/embed/'.$video_id.'?rel=0" frameborder="0" allowfullscreen></iframe>';
5742

5843
return($info);
5944
}
@@ -63,13 +48,7 @@ private static function video_get_vimeo($url, $width = 640, $height = 360)
6348
preg_match('/vimeo\.com\/([0-9]{1,10})/', $url, $matches);
6449
$video_id = $matches[1];
6550

66-
// Check if a valid url
67-
if(!Net::check_http_code('http://vimeo.com/api/v2/video/'.$video_id.'.php',200))
68-
{
69-
return(false);
70-
}
71-
72-
$hash = unserialize(file_get_contents('http://vimeo.com/api/v2/video/'.$video_id.'.php'));
51+
$hash = unserialize(file_get_contents('https://vimeo.com/api/v2/video/'.$video_id.'.php'));
7352

7453
$info = array();
7554
$info['id'] = $video_id;
@@ -79,7 +58,7 @@ private static function video_get_vimeo($url, $width = 640, $height = 360)
7958
$info['thumb'][0] = $hash[0]['thumbnail_medium'];
8059
$info['thumb'][1] = $hash[0]['thumbnail_small'];
8160

82-
$info['embed'] = '<iframe class="vimeo_embed" width="'.$width.'" height="'.$height.'" src="http://player.vimeo.com/video/'.$video_id.'" frameborder="0" allowFullScreen></iframe>';
61+
$info['embed'] = '<iframe class="vimeo_embed" width="'.$width.'" height="'.$height.'" src="https://player.vimeo.com/video/'.$video_id.'" frameborder="0" allowFullScreen></iframe>';
8362

8463
return($info);
8564
}

‎admin/templates/easy4/css/main.css

+13-13
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ div.separator {
5151
background-color: #428BCA;
5252
color: #FFFFFF;
5353
display: block;
54-
font-size: 1.3em;
54+
font-size: 1.4em;
5555
padding: 16px 0;
5656
position: fixed;
5757
text-align: center;
@@ -85,7 +85,7 @@ div.separator {
8585
float: right;
8686
display: inline-block;
8787
line-height: 26px;
88-
font-size: 1.3em;
88+
font-size: 1.4em;
8989
margin: 0 25px 0 0;
9090
color: #333;
9191
}
@@ -135,7 +135,7 @@ div.top_toolbar a.selected {
135135
}
136136

137137
#footer p {
138-
font-size: 1.3em;
138+
font-size: 1.4em;
139139
margin: 0;
140140
}
141141

@@ -179,7 +179,7 @@ a.default_homepage {
179179
border-top: 1px solid #428BCA;
180180
color: #333333;
181181
display: block;
182-
font-size: 1.3em;
182+
font-size: 1.4em;
183183
margin: 20px 0;
184184
padding: 20px;
185185
text-align: center;
@@ -300,7 +300,7 @@ div.dashboard_box a.last_comments:hover {
300300

301301
div.dashboard_box a.last_comments div.content {
302302
margin-bottom: 5px;
303-
font-size: 1.3em;
303+
font-size: 1.4em;
304304
overflow: hidden;
305305
text-overflow: ellipsis;
306306
white-space: nowrap;
@@ -335,7 +335,7 @@ div.notification div.icon {
335335

336336
div.notification div.type {
337337
margin-bottom: 5px;
338-
font-size: 1.3em;
338+
font-size: 1.4em;
339339
margin-left: 40px;
340340
color: #428BCA;
341341
}
@@ -360,7 +360,7 @@ div.notification div.info {
360360
/*====================================================================*/
361361
div.form_block {
362362
margin-bottom: 22px;
363-
font-size: 1.3em;
363+
font-size: 1.4em;
364364
clear: both;
365365
}
366366

@@ -395,7 +395,7 @@ div.form_block input[type="text"].little {
395395
}
396396

397397
div.form_block input[type="text"].title {
398-
font-size: 1.3em;
398+
font-size: 1.4em;
399399
}
400400

401401
div.form_block select {
@@ -514,7 +514,7 @@ table {
514514
margin: 0;
515515
text-align: center;
516516
width: 100%;
517-
font-size: 1.3em;
517+
font-size: 1.4em;
518518
border: 1px solid #E7E7E7;
519519
}
520520

@@ -554,7 +554,7 @@ table div.options a {
554554
}
555555

556556
div.pager {
557-
font-size: 1.3em;
557+
font-size: 1.4em;
558558
text-align: left;
559559
padding-top: 10px;
560560
}
@@ -581,7 +581,7 @@ div.plugin {
581581
background-color: #FAFAFA;
582582
border: 1px solid #F1F1F1;
583583
border-radius: 2px 2px 2px 2px;
584-
font-size: 1.3em;
584+
font-size: 1.4em;
585585
margin-bottom: 20px;
586586
padding: 12px;
587587
}
@@ -607,7 +607,7 @@ div.plugin a {
607607
/* PLUGINS: FORMS
608608
/*====================================================================*/
609609
form.plugins {
610-
font-size: 1.3em;
610+
font-size: 1.4em;
611611
}
612612

613613
form.plugins input[type="text"],
@@ -721,7 +721,7 @@ div.theme-img img {
721721

722722
div.theme-data {
723723
margin-left: 280px;
724-
font-size: 1.3em;
724+
font-size: 1.4em;
725725
}
726726

727727
div.theme-data h2.name {

‎admin/views/settings/general.bit

-15
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,6 @@ echo Html::form_open( array('id'=>'js_form', 'name'=>'form', 'method'=>'post') )
5959
echo Html::div( array('content'=>$_LANG['ABSOLUTE_ADDRESS_THAT_CONTAINS_THE_BLOGS_FILE_SYSTEM'], 'class'=>'input_tip') );
6060
echo Html::div_close();
6161

62-
echo Html::separator( array('content'=>$_LANG['BLUDIT_SYNC']) );
63-
64-
// NIBBLEBLOG URL FOR SYNC
65-
echo Html::div_open( array('class'=>'form_block') );
66-
echo Html::label( array('content'=>$_LANG['NIBBLEBLOG_URL_SYNC'], 'class'=>'blocked') );
67-
echo Html::input( array('id'=>'js_nb_url_sync', 'name'=>'nb_url_sync', 'type'=>'text', 'value'=>BLOG_URL) );
68-
echo Html::div_close();
69-
70-
// NIBBLEBLOG KEY FOR SYNC
71-
require(FILE_KEYS);
72-
echo Html::div_open( array('class'=>'form_block') );
73-
echo Html::label( array('content'=>$_LANG['NIBBLEBLOG_KEY_SYNC'], 'class'=>'blocked') );
74-
echo Html::input( array('id'=>'js_nb_key_sync', 'name'=>'nb_key_sync', 'type'=>'text', 'value'=>Crypt::get_hash($_KEYS[1])) );
75-
echo Html::div_close();
76-
7762
echo Html::separator( array('content'=>$_LANG['VERSION']) );
7863
echo Html::div_open( array('class'=>'form_block') );
7964
echo '<p><a href="http://nibbleblog.com">Nibbleblog '.NIBBLEBLOG_VERSION.' "'.NIBBLEBLOG_NAME.'"</a> - Developed by Diego Najar</p>';

0 commit comments

Comments
 (0)