diff --git a/bl-kernel/abstract/content.class.php b/bl-kernel/abstract/content.class.php index 710605f5..dcb72fa0 100644 --- a/bl-kernel/abstract/content.class.php +++ b/bl-kernel/abstract/content.class.php @@ -17,6 +17,7 @@ class Content { return($this->vars!==false); } + // Returns the value from the $field, FALSE if the field doesn't exist. public function getField($field) { if(isset($this->vars[$field])) { @@ -38,7 +39,7 @@ class Content { private function build($path) { - if( !Sanitize::pathFile($path, 'index.txt') ) { + if( !Sanitize::pathFile($path.'index.txt') ) { return false; } diff --git a/bl-kernel/abstract/dbjson.class.php b/bl-kernel/abstract/dbjson.class.php index ef881474..04dffaa9 100644 --- a/bl-kernel/abstract/dbjson.class.php +++ b/bl-kernel/abstract/dbjson.class.php @@ -45,6 +45,7 @@ class dbJSON public function restoreDB() { $this->db = $this->dbBackup; + return true; } diff --git a/bl-kernel/abstract/plugin.class.php b/bl-kernel/abstract/plugin.class.php index 42a76d4e..c459d252 100644 --- a/bl-kernel/abstract/plugin.class.php +++ b/bl-kernel/abstract/plugin.class.php @@ -103,13 +103,27 @@ class Plugin { return ''; } - public function setDb($array) + public function setDb($args) { $tmp = array(); - // All fields will be sanitize before save. - foreach($array as $key=>$value) { - $tmp[$key] = Sanitize::html($value); + foreach($this->dbFields as $key=>$value) + { + if(isset($args[$key])) + { + // Sanitize value + $tmpValue = Sanitize::html( $args[$key] ); + + // Set type + settype($tmpValue, gettype($value)); + + // Set value + $tmp[$key] = $tmpValue; + } + else + { + $tmp[$key] = false; + } } $this->db = $tmp; diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css index af0da748..b9cfd13c 100644 --- a/bl-kernel/admin/themes/default/css/default.css +++ b/bl-kernel/admin/themes/default/css/default.css @@ -179,17 +179,53 @@ button.delete-button:hover { text-transform: uppercase; } -#jstagList { - margin-top: 5px; +#bludit-tags { + margin-top: 15px; } -#jstagList span { - background: #f1f1f1; - border-radius: 3px; - color: #2672ec; +#bludit-tags .uk-button { + padding: 0 12px !important; + margin-left: 10px; +} + +#jstagList { + margin-top: 15px; +} + +#jstagList span.unselect, +#jstagList span.select { + margin-top: 5px; margin-right: 5px; - padding: 3px 10px; + padding: 1px 15px; cursor: pointer; + display: inline-block; + border-radius: 3px; + background: #f1f1f1; + vertical-align: middle; +} + +#jstagList span.unselect:before { + font-family: FontAwesome; + content: "\f067"; + padding-right: 5px; +} + +#jstagList span.unselect { + color: #AAA; +} + +#jstagList span.unselect:hover { + color: #888; +} + +#jstagList span.select:before { + font-family: FontAwesome; + content: "\f00c"; + padding-right: 5px; +} + +#jstagList span.select { + color: #2672ec; } /* ----------- BLUDIT IMAGES V8 ----------- */ @@ -229,6 +265,36 @@ button.delete-button:hover { font-size: 0; } +/* Bludit Menu v8 */ + +#bludit-menuV8 { + display: none; + z-index: 1020; + position: absolute; + overflow: hidden; + border: 1px solid #CCC; + background: #FFF; + color: #333; + border-radius: 2px; + list-style-type: none; + padding: 5px; + margin: 0; +} + +#bludit-menuV8 li { + padding: 8px 12px; + cursor: pointer; +} + +#bludit-menuV8 li:hover { + background-color: #2672ec; + color: #fff; +} + +#bludit-menuV8 li i { + margin-right: 10px; +} + /* ----------- BLUDIT QUICK IMAGES ----------- */ #bludit-quick-images { diff --git a/bl-kernel/admin/themes/default/init.php b/bl-kernel/admin/themes/default/init.php index 5b271e07..c674843b 100644 --- a/bl-kernel/admin/themes/default/init.php +++ b/bl-kernel/admin/themes/default/init.php @@ -21,20 +21,21 @@ class HTML { { $html = ''; -$script = ''; -'; echo $html.$script; } @@ -67,108 +68,32 @@ $(document).ready(function() { echo $html; } - public static function tagsAutocomplete($args) + public static function tags($args) { - // Tag array for Javascript - $tagArray = 'var tagArray = [];'; - if(!empty($args['value'])) { - $tagArray = 'var tagArray = ["'.implode('","', $args['value']).'"]'; + // Javascript code + include(PATH_JS.'bludit-tags.js'); + + $html = '
'; + + $html .= ''; + + $html .= ''; + + $html .= '
'; + $html .= ''; + $html .= ''; + + $html .= '
'; + + foreach($args['allTags'] as $tag) { + $html .= ''.$tag.''; } - $args['value'] = ''; - // Text input - self::formInputText($args); - - echo '
'; - -$script = ''; - - echo $script; + $html .= '
'; + $html .= '
'; + $html .= '
'; + echo $html; } public static function formInputPassword($args) @@ -242,67 +167,46 @@ $(document).ready(function() { echo $html; } - public static function formButtonSubmit($args) - { - $html = ''; - } - public static function bluditQuickImages() { + // Javascript code + include(PATH_JS.'bludit-quick-images.js'); + global $L; -$html = ''; -$html .= ' -
-
-'; + $html = ''; + $html .= ' +
+
+ '; -$thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true); -array_splice($thumbnailList, THUMBNAILS_AMOUNT); -foreach($thumbnailList as $file) { - $filename = basename($file); - $html .= 'Thumbnail'; -} + $thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true); + array_splice($thumbnailList, THUMBNAILS_AMOUNT); + foreach($thumbnailList as $file) { + $filename = basename($file); + $html .= 'Thumbnail'; + } -$html .= ' -
-'; + $html .= ' +
+ '; -if(empty($thumbnailList)) { - $html .= '
'.$L->g('There are no images').'
'; -} + $html .= '
'.$L->g('There are no images').'
'; -$html .= ' -'.$L->g('More images').' + $html .= ' + '.$L->g('More images').' -
-'; +
+ '; -$script = ' - -'; - - echo $html.$script; + echo $html; } public static function bluditCoverImage($coverImage="") { + // Javascript code + include(PATH_JS.'bludit-cover-image.js'); + global $L; $style = ''; @@ -310,225 +214,106 @@ function addQuickImages(filename) $style = 'background-image: url('.HTML_PATH_UPLOADS_THUMBNAILS.$coverImage.')'; } -$html = ''; -$html .= ' -
-
+ $html = ''; + $html .= ' +
+
- + -
-
'.$L->g('Cover image').'
-
'.$L->g('Drag and drop or click here').'
-
+
+
'.$L->g('Cover image').'
+
'.$L->g('Drag and drop or click here').'
+
-
-
-
+
+
+
-
-
0%
-
+
+
0%
+
-
-
-'; +
+
+ '; -$script = ' - -'; - echo $html.$script; + echo $html; } public static function bluditImagesV8() { + // Javascript code + include(PATH_JS.'bludit-images-v8.js'); + global $L; -$html = ''; -$html .= ' -
-
+ $html = ''; + $html .= ' +
+
-
+
-
-
'.$L->g('Upload image').'
-
'.$L->g('Drag and drop or click here').'
-
+
+
'.$L->g('Upload image').'
+
'.$L->g('Drag and drop or click here').'
+
-
-
0%
-
+
+
0%
+
-
+
-
-'; +
+ '; -$thumbnailList = Filesystem::listFiles(PATH_UPLOADS_THUMBNAILS,'*','*',true); -foreach($thumbnailList as $file) { - $filename = basename($file); - $html .= 'Thumbnail'; -} - -$html .= ' -
-'; - -if(empty($thumbnailList)) { - $html .= '
'.$L->g('There are no images').'
'; -} - -$html .= ' - - -
-
-'; - -$script = ' - -'; - echo $html.$script; + echo $html; } + + public static function profileUploader($username) { global $L; diff --git a/bl-kernel/admin/themes/default/js/jstz.min.js b/bl-kernel/admin/themes/default/js/jstz.min.js new file mode 100644 index 00000000..a6be0f66 --- /dev/null +++ b/bl-kernel/admin/themes/default/js/jstz.min.js @@ -0,0 +1,2 @@ +/* jstz.min.js Version: 1.0.6 Build date: 2015-11-04 */ +!function(e){var a=function(){"use strict";var e="s",s={DAY:864e5,HOUR:36e5,MINUTE:6e4,SECOND:1e3,BASELINE_YEAR:2014,MAX_SCORE:864e6,AMBIGUITIES:{"America/Denver":["America/Mazatlan"],"Europe/London":["Africa/Casablanca"],"America/Chicago":["America/Mexico_City"],"America/Asuncion":["America/Campo_Grande","America/Santiago"],"America/Montevideo":["America/Sao_Paulo","America/Santiago"],"Asia/Beirut":["Asia/Amman","Asia/Jerusalem","Europe/Helsinki","Asia/Damascus","Africa/Cairo","Asia/Gaza","Europe/Minsk"],"Pacific/Auckland":["Pacific/Fiji"],"America/Los_Angeles":["America/Santa_Isabel"],"America/New_York":["America/Havana"],"America/Halifax":["America/Goose_Bay"],"America/Godthab":["America/Miquelon"],"Asia/Dubai":["Asia/Yerevan"],"Asia/Jakarta":["Asia/Krasnoyarsk"],"Asia/Shanghai":["Asia/Irkutsk","Australia/Perth"],"Australia/Sydney":["Australia/Lord_Howe"],"Asia/Tokyo":["Asia/Yakutsk"],"Asia/Dhaka":["Asia/Omsk"],"Asia/Baku":["Asia/Yerevan"],"Australia/Brisbane":["Asia/Vladivostok"],"Pacific/Noumea":["Asia/Vladivostok"],"Pacific/Majuro":["Asia/Kamchatka","Pacific/Fiji"],"Pacific/Tongatapu":["Pacific/Apia"],"Asia/Baghdad":["Europe/Minsk","Europe/Moscow"],"Asia/Karachi":["Asia/Yekaterinburg"],"Africa/Johannesburg":["Asia/Gaza","Africa/Cairo"]}},i=function(e){var a=-e.getTimezoneOffset();return null!==a?a:0},r=function(){var a=i(new Date(s.BASELINE_YEAR,0,2)),r=i(new Date(s.BASELINE_YEAR,5,2)),n=a-r;return 0>n?a+",1":n>0?r+",1,"+e:a+",0"},n=function(){var e,a;if("undefined"!=typeof Intl&&"undefined"!=typeof Intl.DateTimeFormat&&(e=Intl.DateTimeFormat(),"undefined"!=typeof e&&"undefined"!=typeof e.resolvedOptions))return a=e.resolvedOptions().timeZone,a&&(a.indexOf("/")>-1||"UTC"===a)?a:void 0},o=function(e){for(var a=new Date(e,0,1,0,0,1,0).getTime(),s=new Date(e,12,31,23,59,59).getTime(),i=a,r=new Date(i).getTimezoneOffset(),n=null,o=null;s-864e5>i;){var t=new Date(i),A=t.getTimezoneOffset();A!==r&&(r>A&&(n=t),A>r&&(o=t),r=A),i+=864e5}return n&&o?{s:u(n).getTime(),e:u(o).getTime()}:!1},u=function l(e,a,i){"undefined"==typeof a&&(a=s.DAY,i=s.HOUR);for(var r=new Date(e.getTime()-a).getTime(),n=e.getTime()+a,o=new Date(r).getTimezoneOffset(),u=r,t=null;n-i>u;){var A=new Date(u),c=A.getTimezoneOffset();if(c!==o){t=A;break}u+=i}return a===s.DAY?l(t,s.HOUR,s.MINUTE):a===s.HOUR?l(t,s.MINUTE,s.SECOND):t},t=function(e,a,s,i){if("N/A"!==s)return s;if("Asia/Beirut"===a){if("Africa/Cairo"===i.name&&13983768e5===e[6].s&&14116788e5===e[6].e)return 0;if("Asia/Jerusalem"===i.name&&13959648e5===e[6].s&&14118588e5===e[6].e)return 0}else if("America/Santiago"===a){if("America/Asuncion"===i.name&&14124816e5===e[6].s&&1397358e6===e[6].e)return 0;if("America/Campo_Grande"===i.name&&14136912e5===e[6].s&&13925196e5===e[6].e)return 0}else if("America/Montevideo"===a){if("America/Sao_Paulo"===i.name&&14136876e5===e[6].s&&1392516e6===e[6].e)return 0}else if("Pacific/Auckland"===a&&"Pacific/Fiji"===i.name&&14142456e5===e[6].s&&13961016e5===e[6].e)return 0;return s},A=function(e,i){for(var r=function(a){for(var r=0,n=0;n=a.rules[n].s&&e[n].e<=a.rules[n].e)){r="N/A";break}if(r=0,r+=Math.abs(e[n].s-a.rules[n].s),r+=Math.abs(a.rules[n].e-e[n].e),r>s.MAX_SCORE){r="N/A";break}}return r=t(e,i,r,a)},n={},o=a.olson.dst_rules.zones,u=o.length,A=s.AMBIGUITIES[i],c=0;u>c;c++){var m=o[c],l=r(o[c]);"N/A"!==l&&(n[m.name]=l)}for(var f in n)if(n.hasOwnProperty(f))for(var d=0;d'; 'name'=>'content', 'value'=>$_Page->contentRaw(false), 'class'=>'uk-width-1-1 uk-form-large', - 'placeholder'=>$L->g('Content') + 'placeholder'=>'' )); @@ -77,13 +77,11 @@ echo '