diff --git a/CHANGELOG.md b/CHANGELOG.md index dc1cf8f..0ea4ea1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Under development: [FlatPress 1.3 "Andante"](https://github.com/flatpressblog/flatpress/releases/tag/1.3) ## Changed requirements -- FlatPress 1.3 runs under PHP up to **8.1**; minimum required PHP version increases to **7.1**. +- FlatPress 1.3 runs under PHP up to **8.2**; minimum required PHP version increases to **7.1**. - Also, the PHP extension [**intl**](https://www.php.net/manual/book.intl.php) becomes mandatory. ## General @@ -89,6 +89,7 @@ - Fixed disappearing non-Latin characters in page title ([#49](https://github.com/flatpressblog/flatpress/issues/49) and [#91](https://github.com/flatpressblog/flatpress/issues/91)) - Worked around strftime() marked as deprecated as of PHP 8.1 ([#92](https://github.com/flatpressblog/flatpress/issues/92)) - thx @bohwaz - Comments and contact form: Fixed error on sending mails with umlaut subjects ([#207](https://github.com/flatpressblog/flatpress/issues/207), [#209](https://github.com/flatpressblog/flatpress/issues/209)) +- Added missing properties in order to prevent "Dynamic properties are deprecated" error under PHP 8.2 ([#115](https://github.com/flatpressblog/flatpress/issues/115)) ## Security - Possible XSS prevented: Session cookie missed the "secure" and "httponly" flags diff --git a/README.md b/README.md index 36fc0b0..3ff8a0b 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Visit our [wiki](https://wiki.flatpress.org) to learn everything about blogging Ask your questions, show off your FlatPress blog and meet fellow FlatPressers at the [support forum](https://forum.flatpress.org). ## Requirements -FlatPress runs on any web server (e.g. Apache or IIS) with PHP 7.1 to PHP 8.1 (more details [on the wiki](https://wiki.flatpress.org/doc:techfaq#what_is_required_to_run_flatpress)). Since all data is stored in files, no database is needed. +FlatPress runs on any web server (e.g. Apache or IIS) with PHP 7.1 to PHP 8.2 (more details [on the wiki](https://wiki.flatpress.org/doc:techfaq#what_is_required_to_run_flatpress)). Since all data is stored in files, no database is needed. ## Credits There are many people who contributed to FlatPress over the years. [See them here.](./CONTRIBUTORS.md) diff --git a/admin/panels/entry/admin.entry.write.php b/admin/panels/entry/admin.entry.write.php index d75ed49..4bc3861 100755 --- a/admin/panels/entry/admin.entry.write.php +++ b/admin/panels/entry/admin.entry.write.php @@ -40,6 +40,8 @@ class admin_entry_write extends AdminPanelActionValidated { ); var $draft = false; + + var $id = null; function _makePreview($arr, $id = null) { if (!$id) { diff --git a/admin/panels/maintain/admin.maintain.php b/admin/panels/maintain/admin.maintain.php index ba2f529..44dd953 100755 --- a/admin/panels/maintain/admin.maintain.php +++ b/admin/panels/maintain/admin.maintain.php @@ -37,6 +37,7 @@ class tpl_deleter extends fs_filelister { class s_entry_crawler extends fs_filelister { var $_directory = CONTENT_DIR; + var $index; function __construct() { $this->index = entry_init(); diff --git a/admin/panels/plugin/admin.plugin.php b/admin/panels/plugin/admin.plugin.php index e29d4df..f059cf2 100644 --- a/admin/panels/plugin/admin.plugin.php +++ b/admin/panels/plugin/admin.plugin.php @@ -40,6 +40,10 @@ class admin_plugin_default extends AdminPanelAction { ); var $errors = array(); + + var $pluginid; + + var $fp_plugins; function setup() { $this->pluginid = isset($_GET ['plugin']) ? $_GET ['plugin'] : null; diff --git a/admin/panels/static/admin.static.delete.php b/admin/panels/static/admin.static.delete.php index b8861da..dbe0dd5 100755 --- a/admin/panels/static/admin.static.delete.php +++ b/admin/panels/static/admin.static.delete.php @@ -17,6 +17,7 @@ class admin_static_delete extends AdminPanelAction { var $events = array('delete', 'cancel'); + var $page; function setup() { $this->page = @($_REQUEST['page']); diff --git a/fp-includes/core/core.bplustree.class.php b/fp-includes/core/core.bplustree.class.php index c8c2b67..2c2e928 100755 --- a/fp-includes/core/core.bplustree.class.php +++ b/fp-includes/core/core.bplustree.class.php @@ -542,6 +542,8 @@ class BPlusTree_Node { * @var int number of valid keys in $keys */ var $validkeys; + + var $storage; /** * constructor @@ -1558,6 +1560,8 @@ class BPlusTree { * @var bool true if fifo is enabled */ var $fifo_enabled = false; + + var $file = null; /** * constructor @@ -2376,14 +2380,14 @@ class BPlusTree { class BPlusWalker { var $tree; - var $keylower; - var $includelower; - var $keyupper; - var $includeupper; + var $startnode; + var $node; + var $node_index; + var $valid; function __construct(&$tree, &$keylower, $includelower = null, $keyupper = null, $includeupper = null) { $this->tree = & $tree; @@ -2572,8 +2576,10 @@ class caching_BPT extends BPlusTree { class SBPlusTree extends BPlusTree { var $maxstring; - var $stringfile; + var $nodesize; + var $keylen; + var $position; function __construct($infile, $stringfile, $maxstring = 256, $pos = null, $nodesize = null, $keylen = null) { parent::__construct($infile, $pos, $nodesize, $keylen); diff --git a/fp-includes/core/core.entry.php b/fp-includes/core/core.entry.php index 64777cf..0f93225 100755 --- a/fp-includes/core/core.entry.php +++ b/fp-includes/core/core.entry.php @@ -38,6 +38,8 @@ class entry_index { var $_keysize = 12; var $_lock_file = null; + + var $catlist = null; function __construct() { $this->_lock_file = CACHE_DIR . 'bpt.lock'; diff --git a/fp-includes/core/core.fpdb.class.php b/fp-includes/core/core.fpdb.class.php index a5bb7c0..7530d27 100644 --- a/fp-includes/core/core.fpdb.class.php +++ b/fp-includes/core/core.fpdb.class.php @@ -159,6 +159,13 @@ class FPDB_Query { var $secondary_idx = null; var $walker = null; + + var $prevkey = null; + + var $nextkey = null; + + var $comments = null; + function __construct($params, $ID) { global $current_query; diff --git a/fp-interface/themes/leggero/flatmaas-rev/res/admin.css b/fp-interface/themes/leggero/flatmaas-rev/res/admin.css old mode 100755 new mode 100644 diff --git a/fp-interface/themes/leggero/leggero-v2/res/admin.css b/fp-interface/themes/leggero/leggero-v2/res/admin.css index ccac7de..7a107e1 100755 --- a/fp-interface/themes/leggero/leggero-v2/res/admin.css +++ b/fp-interface/themes/leggero/leggero-v2/res/admin.css @@ -9,19 +9,17 @@ Version: 1.0 Module: admin.css */ -@import url("common.css"); -@import url("globals.css"); +@import url('common.css'); +@import url('globals.css'); /* ===== VARIOUS ===== */ -@viewport { width: device-width } - .buttonbar input { box-shadow: none !IMPORTANT; - background: #bdbdbd url("../imgs/buttonsh.png") repeat-x + background: #bdbdbd url('../imgs/buttonsh.png') repeat-x } .buttonbar input:hover { - background: #d3d3d3 url("../imgs/buttonsh2.png") repeat-x + background: #d3d3d3 url('../imgs/buttonsh2.png') repeat-x } diff --git a/fp-interface/themes/leggero/leggero-v2/res/common.css b/fp-interface/themes/leggero/leggero-v2/res/common.css index 229b25a..5c5bffa 100644 --- a/fp-interface/themes/leggero/leggero-v2/res/common.css +++ b/fp-interface/themes/leggero/leggero-v2/res/common.css @@ -21,7 +21,7 @@ html { html::before { /* background-attachment: fix workaround for mobile devices */ content: ' '; display: block; - background-image: url("../imgs/back.jpg"); + background-image: url('../imgs/back.jpg'); background-position: center; -webkit-background-size: cover; -moz-background-size: cover; @@ -398,7 +398,7 @@ h4#addcomment { clear: both } } /* end of .entry */ - #main ul.entry-footer { /* entry footer */ + #main ul.entry-footer { /* entry footer */ clear: both; font-size: 80%; color: black; diff --git a/fp-interface/themes/leggero/leggero-v2/res/style.css b/fp-interface/themes/leggero/leggero-v2/res/style.css index cbc2fb5..992fbd5 100644 --- a/fp-interface/themes/leggero/leggero-v2/res/style.css +++ b/fp-interface/themes/leggero/leggero-v2/res/style.css @@ -10,11 +10,11 @@ Module: style.css */ /* imports common style ruleset */ -@import url("common.css"); -@import url("globals.css"); +@import url('common.css'); +@import url('globals.css'); /* imports column (where widgets usually go) rules */ -@import url("column.css"); +@import url('column.css'); #comments li.comment-admin { padding: 1em diff --git a/fp-interface/themes/leggero/leggero/res/admin.css b/fp-interface/themes/leggero/leggero/res/admin.css index 16fadd9..5d13f9b 100755 --- a/fp-interface/themes/leggero/leggero/res/admin.css +++ b/fp-interface/themes/leggero/leggero/res/admin.css @@ -10,61 +10,62 @@ Author: NoWhereMan & drudo Version: 0.1 Module: admin.css -last change: 2022-02-19 +last change: 2023-11-01 */ -@import url(common.css); -@import url(globals.css); +@import url('common.css'); +@import url('globals.css'); /* ===== VARIOUS ===== */ .buttonbar input { padding: .3em; - background: #bdbdbd url(../imgs/buttonsh.png) repeat-x; + background: #bdbdbd url('../imgs/buttonsh.png') repeat-x } + .buttonbar input:hover { padding: .3em; - background: #d3d3d3 url(../imgs/buttonsh2.png) repeat-x; + background: #d3d3d3 url('../imgs/buttonsh2.png') repeat-x } /* ===== HEADERS TAGS ===== */ h1, h2 { - font-family: 'book antiqua', georgia, garamond, times, 'times new roman', serif; - margin: auto; + font-family: "book antiqua", georgia, garamond, times, "times new roman", serif; + margin: auto } -h2 { - border-bottom: 1px solid #ddd; -} +h2 { border-bottom: 1px solid #ddd; margin: 0.5em 0 } #admin-content h2, #admin-content form h2 { - font-style: normal; - padding: unset; + font-style: normal; + padding: unset } -body { background: #eee; } +body { background: #eee } /* === Redefines some stuff in inline mode === */ -body#inline-body { - background: white; -} +body#inline-body { background: white } -body#inline-body input { +/* ===== Smartphone and Tablet ===== */ +@media (max-width: 1920px) { /* prevents too large font size on mobile devices */ + #body-container { + -webkit-text-size-adjust: none; + -moz-text-size-adjust: none; + text-size-adjust: none + } } /* === Conflict with inner h1 === */ #admin-content h1 { color: black } - /* DIV CONTAINER ALL ADMIN DIV BLOCK */ #cpmain { padding: 10px } - /* ===== SMALL NAVBAR (home and logout links) ===== */ ul#admin-small-nav { font-size: 80%; @@ -75,14 +76,13 @@ ul#admin-small-nav { ul#admin-small-nav li { display: inline; margin: 5px } - /* ===== TAB MENU ===== */ ul#admin-tabmenu { margin: 1em 0 0 0; padding: .5em; background: #000; -moz-border-radius-topleft:3px; - -moz-border-radius-topright:3px; + -moz-border-radius-topright:3px } ul#admin-tabmenu li { @@ -98,7 +98,7 @@ ul#admin-tabmenu li a { font-weight: normal; text-decoration: none; padding: 0.5em; - margin: .1em; + margin: .1em } ul#admin-tabmenu li a.admin-tab-current, @@ -106,32 +106,27 @@ ul#admin-tabmenu li a:hover { color: black; font-weight: normal; background-color: #ddd; - -moz-border-radius: 2px; + -moz-border-radius: 2px } -ul#admin-tabmenu li a.admin-tab-current { - font-weight: bold; -} +ul#admin-tabmenu li a.admin-tab-current { font-weight: bold } + /* ===== submenu ====== */ - #admin-submenu { background: #eee; padding: .5em; border: 1px solid #ccc; } -#admin-submenu li { - display:inline; - font-size: 80%; -} +#admin-submenu li { display:inline; font-size: 80% } #admin-submenu li a { padding: 0 1em ; color: #000; border-left: 1px solid #eee; - border-right: 1px solid #eee; - font-weight: normal; + border-right: 1px solid #eee; + font-weight: normal } #admin-submenu li a:hover, @@ -140,13 +135,10 @@ ul#admin-tabmenu li a.admin-tab-current { background: #555; padding: .1em 1em .3em; -moz-border-radius: 3px; - text-decoration: none; -} - -#admin-submenu li a.active { - font-weight: bold; + text-decoration: none } +#admin-submenu li a.active { font-weight: bold } /* ===== MAIN MENU ITEM ===== */ @@ -166,7 +158,6 @@ ul#admin-tabmenu li a.admin-tab-current { } - /* ===== ADMIN ENTRY ===== */ input#subject { width: 99%; @@ -176,7 +167,7 @@ input#subject { } textarea.code { - font-family: Lucida Console, Monaco, monospace; + font-family: "Lucida Console", Monaco, monospace; font-size: 90% } @@ -187,13 +178,9 @@ textarea.code { padding-left: 1em } -#admin-bbcode-toolbar p { display: inline } - #admin-bbcode-toolbar select { width: 10em } - - -#admin-content table { width: 100%; } +#admin-content table { width: 100% } #admin-content td { font-size: 0.8em; @@ -202,16 +189,14 @@ textarea.code { padding: .9em; */ background: #e6e6e6; - text-align: center; + text-align: center } -#admin-content .enabled td { - background: inherit; -} +#admin-content .enabled td { background: inherit } #admin-content td.main-cell { width: 30%; - text-align: left; + text-align: left } #admin-content th { @@ -222,16 +207,27 @@ textarea.code { padding: 8px } -input.maxsize, select.maxsize { width: 100% } - +input.maxsize, select.maxsize { width: 99% } #admin-bbcode-toolbar { margin: 0; padding: 0; padding-right: 0.7%; + display: table; border: none } +#admin-bbcode-toolbar p { + display: table-cell; + vertical-align: middle; + line-height: 1em +} + +#admin-bbcode-toolbar p img { + vertical-align: middle; + cursor: pointer +} + #admin-bbcode-toolbar legend { display: none } #admin-content ul, @@ -241,19 +237,14 @@ input.maxsize, select.maxsize { width: 100% } border: none; width: 99%; margin: auto; - height: 11em; + height: 11em } - -#plugin-table td { - padding: 1em .6em; -} +#plugin-table td { padding: 1em .6em } .admin-entry-commentlist td , .admin-widgets-blockparser td , -.admin-plugin-default td { - padding: 1em .6em; -} +.admin-plugin-default td { padding: 1em .6em } #admin-drafts { border-top: 1px solid #bbb; @@ -261,139 +252,111 @@ input.maxsize, select.maxsize { width: 100% } padding: .4em; color: #555; background-color: #ddd; - overflow: auto; + overflow: auto } #admin-drafts p { font-weight: bold; float: left; padding: 0; - margin: 0; + margin: 0 } -#admin-content #admin-drafts ul { - margin: 0; padding: 0; -} +#admin-content #admin-drafts ul { margin: 0; padding: 0 } #admin-drafts li { float:left; list-style-position: inside; - margin: 0; padding-left: 1em; + margin: 0; padding-left: 1em } /* ===== PREVIEW SETTINGS ===== */ -#post-preview { - min-width: 39em; -} +#post-preview { min-width: 39em } -#post-preview .entry { padding: 2em; max-height: 20em; overflow: auto } +#post-preview .entry { padding: 2em; max-height: 20em; overflow: auto } #post-preview div.entry h2, -#post-preview div.entry h3 { - border-bottom: none; -} +#post-preview div.entry h3 { border-bottom: none } #post-preview div.entry h2 { font-style: italic; margin: 0; - padding: 1em 0 1em 0; + padding: 1em 0 1em 0 } -#post-preview div.entry h4 { - margin: 2em 0 0 0; -} +#post-preview div.entry h4 { margin: 2em 0 0 0 } + +.entry-footer { text-align: right } -.entry-footer { - text-align: right; -} /* ===== UPLOAD PANEL ===== */ -#admin-uploader-filelist { - margin: 1em auto; -} +#admin-uploader-filelist { margin: 1em auto } -#admin-uploader-thumbs { - list-style-type: none; -} +#admin-uploader-thumbs { list-style-type: none } #admin-uploader-thumbs li.thumb { float:left; width: 110px; height: 110px; padding: 1em 4px; - margin: 1em; + margin: 1em } /* (applies only to the inline version */ -#upload { - margin-top: .5em -} +#upload { margin-top: .5em } /* ===== THEME PANEL ===== */ - #current-theme h5, -#available-themes h5 { - font-size: 1em; -} +#available-themes h5 { font-size: 1em } #current-theme { margin-bottom: 4em; - overflow:hidden; + overflow:hidden } - #current-theme img { float:left; border: 1px solid #ddd; - margin-right: 2em; + margin-right: 2em } -#available-themes { - clear: both; -} +#available-themes { clear: both } +#available-themes img { border: 1px solid #eee } -#available-themes img { - border: 1px solid #eee -} - -#available-themes ul { - list-style-type: none; -} +#available-themes ul { list-style-type: none } #available-themes ul li { float:left; padding: 1em; border: 1px solid #fff; text-align: center; - width: 300px; + width: 300px } #available-themes ul li:hover { background: #eee; - border: 1px solid #ddd; + border: 1px solid #ddd } + /* ===== WIDGET PANEL ====== */ - -#admin-widgetset-list { - width: 30em; -} +#admin-widgetset-list { width: 30em } #admin-widgetset-list ul { list-style-type: none; margin: 0; margin-bottom: 2em; - text-align: left; + text-align: left } li.admin-widgetset { padding: .5em; margin-bottom: 2em; - border: 1px solid #ddd; + border: 1px solid #ddd } #available-widgets { @@ -405,7 +368,7 @@ li.admin-widgetset { width: 30%; z-index: 1000; position: relative; - text-align: left; + text-align: left } #widget-trashcan { /*colors for trashcan/uninstall widgets while dragging*/ @@ -416,7 +379,7 @@ li.admin-widgetset { padding: 2em; text-align: center; border: 2px solid #f00; - margin: 2em; + margin: 2em } .widget-available { /*colors for available widgets while dragging*/ @@ -424,7 +387,7 @@ li.admin-widgetset { color: #fff; background-color: rgba(34, 102, 0, 0.7); border: 2px solid #2f0; - z-index: 2000; + z-index: 2000 } .widget-installed { /*colors for installed widgets while dragging*/ @@ -432,15 +395,14 @@ li.admin-widgetset { color: #fff; background-color: rgba(0, 34, 102, 0.7); border: 2px solid #00f; - z-index: 2000; + z-index: 2000 } #available-widgets ul, .admin-widgetset ul { padding-left: 0; - margin-left: 0; + margin-left: 0 } - li.widget-instance, li.widget-class { cursor: move; @@ -449,16 +411,15 @@ li.widget-class { padding: .5em; height: 30px; background-color: white; - list-style-type: none; + list-style-type: none } - .admin-widgetset h3 { font-style: italic; margin-bottom:1em; padding: .3em; background: #eee; - border: 1px solid #ddd; + border: 1px solid #ddd } #available-widgets h2 { @@ -467,7 +428,7 @@ li.widget-class { margin-bottom:1em; padding: .3em; border: 1px solid #eee; - background: #999; + background: #999 } .widget-instance .textinput { @@ -477,149 +438,132 @@ li.widget-class { font-style: oblique; color: blue; border: #fff 2px solid; - text-align: right; + text-align: right } .widget-instance .textinput:hover { border: #d00 2px solid; - background-color:white; + background-color: white } - .widget-instance .textinput:focus { font-style: normal; border: #f00 2px solid; background-color:white; - text-align: left; + text-align: left } - .widgetname a, .widgetname a:link, -.widgetname a:visited { - color: #ddd; -} +.widgetname a:visited { color: #ddd } .widget-placeholder { padding: .5em; font-style: oblique; text-align: center; - border: 1px dashed #ddd; + border: 1px dashed #ddd } .widget-dragger { text-align: left; z-index: 1000; padding: .5em; - height: 30px !important; + height: 30px !important } /* ===== CONFIG PANEL ===== */ -.option-set .option-list { - margin-bottom: 4em; -} +.option-set .option-list { margin-bottom: 3em } -.option-list ul li { - list-style-type: none; -} +.option-list ul li { list-style-type: none } .option-set dt { - width: 33%; - text-align:right; - margin-top: 1.8em; - line-height: 1.5em; - font-weight: bold; + width: 33%; + text-align:right; + margin-top: 0.5em; + line-height: 1em; + font-weight: bold; } -.option-set dt label { - padding-top: .2em; +.option-set dt label { padding-top: .2em } + +.option-list dd label { + position: relative; + vertical-align: middle; + display: flex } .option-set dd { - margin-left: 35%; - margin-top: -1.7em; - line-height: 1.5em; + margin-left: 35%; + bottom: 1.24em; + line-height: 1.5em; + position: relative } +.option-set dd p { margin: 0 } -.option-set dd p { - margin: 0; +.option-set dd p.text { + display: inline; + vertical-align: middle } - -.option-set dd input{ - margin-bottom: .2em; +.option-list dd code { + position: relative; + font-size: 1em } -.textinput, .bigtextinput, .smalltextinput { - padding: .5em; -} +.option-set dd input{ margin-bottom: .2em } -.textinput:focus, .bigtextinput:focus, .smalltextinput:focus { - font-weight: bold; -} +.textinput, .bigtextinput, .smalltextinput { padding: .1em } + +.textinput:focus, .bigtextinput:focus, .smalltextinput:focus { font-weight: bold } .widetextinput { width: 99%; font-size: 1.3em; - color: #333333; + color: #333333 } .option-set input.textinput , -.option-set select.textinput { - width: 20em; -} +.option-set select.textinput { width: 20em } +.option-set input.bigtextinput { width: 30em } -.option-set input.bigtextinput { - width: 30em; -} +.option-set input.smalltextinput { width: 5em } -.option-set input.smalltextinput { - width: 5em; -} - /* ===== SPECIAL HOVERS ====== */ a.link-disable, a.link-delete, a.link-enable, a.link-general { - padding: .9em; + padding: .9em } -td.main-cell a.link-general {display:block} +td.main-cell a.link-general { display: block } a.link-disable:hover, a.link-delete:hover { background-color: red; - color: white; + color: white } a.link-enable:hover { background-color: green; - color: white; + color: white } a.link-general:hover, .main-cell a:hover { background-color: #aaa; - color: black; + color: black } - /* ===== NOTIFICATIONS ===== */ -.hint { - cursor: help; -} +.hint { cursor: help } .draft { background-color: #333 } /* (already defined in common, here we put just some tuning settings) */ -#admin-content ul.msgs { - margin:0; -} +#admin-content ul.msgs { margin: 0 } -form { - margin: auto; -} +form { margin: auto } diff --git a/fp-interface/themes/leggero/leggero/res/column.css b/fp-interface/themes/leggero/leggero/res/column.css index b3ddd80..ef88f6e 100644 --- a/fp-interface/themes/leggero/leggero/res/column.css +++ b/fp-interface/themes/leggero/leggero/res/column.css @@ -10,27 +10,25 @@ Author: NoWhereMan & drudo Version: 0.2 Module: style.css -last change: 2022-03-17 +last change: 2023-11-01 */ - /* ===== COLUMN ===== */ #column { float: right; - width: 28%; + width: 28%; font-size: 80% !important; font-size: 75%; height:1%; - margin: 1em; - padding: 0.7em; - /* border-left: solid 1px #ccc; */ + margin: 1em; + padding: 0.7em } #column h4 { /* Titles of the sections */ - margin-bottom: .5em; + margin-bottom: .5em } #column p, #column div { margin: 10px 5px } @@ -55,37 +53,41 @@ last change: 2022-03-17 The following definitions take care of the Calendar plugin ======================================================= */ +#widget_calendar table.calendar { + font-size: 85% +} + .calendar { - margin: 0; - padding: 0 0 2em 0; - font-size: 80%; + margin: 0; + padding: 0 0 2em 0; + font-size: 80% } .calendar-month { - margin: 0; - padding: 0.4em 0 0.4em 0; - color: #333; - background-color: transparent; - font-weight: bold; - border-bottom: 0.1em solid #333; + margin: 0; + padding: 0.4em 0 0.4em 0; + color: #333; + background-color: transparent; + font-weight: bold; + border-bottom: 0.1em solid #333 } .calendar th { - padding: 0.4em; - color: #fff; - background-color: #c37576; + padding: 0.4em; + color: #fff; + background-color: #c37576 } .calendar td { - padding: 0.4em; - text-align: center; + padding: 0.4em; + text-align: center } .current-day { - color: #333; - background-color: transparent; - border: 2px solid #c37576; + color: #333; + background-color: transparent; + border: 2px solid #c37576 } /* ======================================================= End of Calendar plugin -======================================================= */ \ No newline at end of file +======================================================= */ diff --git a/fp-interface/themes/leggero/leggero/res/common.css b/fp-interface/themes/leggero/leggero/res/common.css index 53ed2b5..37cb221 100644 --- a/fp-interface/themes/leggero/leggero/res/common.css +++ b/fp-interface/themes/leggero/leggero/res/common.css @@ -10,16 +10,15 @@ Author: NoWhereMan & drudo Version: 0.2 Module: common.css -last change: 2022-03-13 +last change: 2023-11-01 */ - /* ===== GENERAL (redefinition HTML tag) ===== */ html { font-size: 85%; - font-family: 'Lucida Grande', 'Trebuchet MS', arial, Helvetica, sans-serif; + font-family: "Lucida Grande", "Trebuchet MS", arial, Helvetica, sans-serif; margin: 0; padding: 0 } @@ -28,9 +27,9 @@ body { font-size: 100%; padding: 0; /* text-align: center; */ - background: white url(../imgs/backshade.png) repeat-x; + background: white url('../imgs/backshade.png') repeat-x; color: black; - width: 100% + width: 100% } hr { display: none } @@ -41,8 +40,8 @@ img { border: none } /* Responsive Design img */ img { - max-width: 100%; - height: auto; + max-width: 100%; + height: auto } /* @@ -50,23 +49,21 @@ img { */ .center { - display: block; - margin-left: auto; - margin-right: auto + display: block; + margin-left: auto; + margin-right: auto } /* Plugin: QuickGallery */ .img-gallery img { - display: inline; - margin: 0.4em; + display: inline; + margin: 0.4em } /* Plugin: QuickGallery */ -.img-gallery img .center { - display: inline; -} +.img-gallery img .center { display: inline } blockquote { width: 90%; @@ -77,24 +74,21 @@ blockquote { } pre, code { - font-family: Lucida Console, Monaco, monospace; - font-size: 90%; + font-family: "Lucida Console", Monaco, monospace; + font-size: 90% } pre { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; background-color: #efefef; - overflow: auto; width: 90%; margin: 1em 1em 2em 1em; padding: 1em 0.5em; - - /* fix overflow in IE */ min-height: 40px; height: auto !important; - height: 40px; + height: 40px } ul, li, ol { margin: 0; padding: 0 } @@ -128,14 +122,13 @@ input:hover, input:focus, textarea:hover, textarea:focus { textarea { font-size: 100%; - font-family: 'Lucida Grande', 'Trebuchet MS', arial, Helvetica, sans-serif; + font-family: "Lucida Grande", "Trebuchet MS", arial, Helvetica, sans-serif; width: 99%; margin-top: .1em; margin-bottom: 1em } - /* ===== LINKS GENERAL ===== */ a:link, a:visited { color: #aa4142; @@ -149,7 +142,6 @@ a:hover { } - /* ===== HEADERS TAGS ===== */ h1 { /* Title of the blog */ @@ -160,54 +152,44 @@ h1 { h2 { /* Titles of the entry */ - font-family: 'book antiqua', georgia, garamond, times, 'times new roman', serif; + font-family: "book antiqua", georgia, garamond, times, "times new roman", serif; font-style: italic; font-size: 1.5em; color: #333333; margin: 0; - padding: 1em 0 1em 0; + padding: 1em 0 1em 0 } h3 { margin: 0; font-size: 1.3em; - padding: 1em 0 1em 0; + padding: 1em 0 0.2em 0 } -h4 { font-size: 1.2em; } - +h4 { font-size: 1.2em } /* ===== DIV CONTAINER ALL ELEMENTS BLOCK ===== */ #body-container { text-align: left; - /*width: 760px !important; - width: 748px; /* fix for I.E. */ - width: 85%; + width: 85%; margin: 0 auto; - max-width: 68em; - /* padding: 5px; */ - padding: 0.3em; + max-width: 68em; + padding: 0.3em; border: solid 1px #ccc; background-color: white } - /* ===== HEAD ===== */ #head { - clear: both; - font-family: 'book antiqua', georgia, garamond, times, 'times new roman', serif; - /* padding: 95px 10px 5px 5px; - margin: 10px; - background: #c37676 url('../imgs/shade.png') repeat-x; - border: #bbb 1px solid */ - margin: 1em; - padding: 7em 0.6em 0.5em 0.5em; - border-radius: 1em; - border: 0; - background-image: linear-gradient( #aa4142, #c37576); - /* background: #aa4142 */ + clear: both; + font-family: "book antiqua", georgia, garamond, times, "times new roman", serif; + margin: 1em; + padding: 7em 0.6em 0.5em 0.5em; + border-radius: 1em; + border: 0; + background-image: linear-gradient( #aa4142, #c37576) } #head a { color: white; text-decoration: none } @@ -221,36 +203,24 @@ h4 { font-size: 1.2em; } } - /* ===== DIV CONTAINER "MAIN" ===== */ #outer-container { - /* position: relative; - height: 1%; - margin: 0px; - padding: 0px; - border-top: 1px solid white; /* problem with I.E. */ - width: 100%; + width: 100%; background-color: white } - /* ===== MAIN ===== */ #main h4 { margin: 2em 0 0 0} #main { float: left; - /* position: relative; - width: 508px !important; - width: 478px; */ - width: 62%; + width: 62%; font-size: 100%; - margin: 1em; + margin: 1em } -#main p { line-height: 1.5em; margin-top: 1.2em; } - -/* #main img { margin: 0.5em } */ +#main p { line-height: 1.5em; margin-top: 1.2em } #main img.emoticon { margin: 0; padding: 0 } @@ -265,75 +235,70 @@ h4 { font-size: 1.2em; } padding: 0 1.6em 0 1.6em } - #commentform fieldset p { margin: 0 0 .5em 0 } +#commentform fieldset p { margin: 0 0 .5em 0 } - #comments li { - margin: 0 0 1.5em 0; - padding: 5px; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - background: #efefef - } +#comments li { + margin: 0 0 1.5em 0; + padding: 5px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; + background: #efefef +} /* === Class of main block === */ - h6.date { - font-size: 80%; - color: #aaa; - } +h6.date { + font-size: 80%; + color: #aaa +} - .date { /* date under titles of the entry */ - font-size: 80%; - font-style: oblique; - color: gray; - margin: .2em 0 0 0 - } +.date { /* date under titles of the entry */ + font-size: 80%; + font-style: oblique; + color: gray; + margin: .2em 0 0 0 +} /* .entry class */ - .entry { - margin: 0 0 1.5em 0; - padding: 0; - overflow: auto; /* floating images fix IE<7*/ - } +.entry { + margin: 0 0 1.5em 0; + padding: 0; + overflow: auto +} - #main>.entry { - overflow: hidden; /* rest of the world :) */ - } +#main>.entry { /* rest of the world :) */ + overflow: hidden +} /* end of .entry */ - #main ul.entry-footer { /* entry footer */ - clear: both; - font-size: 80%; - color: gray; - margin: 2em 0 .5em 0; - text-align: right; - } +#main ul.entry-footer { /* entry footer */ + clear: both; + font-size: 80%; + color: gray; + margin: 2em 0 .5em 0; + text-align: right +} - .entry-footer li { - display: block; - } +.entry-footer li { display: block } +.admincontrols { /* [edit] and [delete] */ + font-size: 80%; + text-align: right +} - .admincontrols { /* [edit] and [delete] */ - font-size: 80%; - text-align: right; - } +.buttonbar { text-align: center } - .buttonbar { text-align: center } +.buttonbar input { + text-align: center; + margin: .1em .5em; + padding: 0 1em +} - .buttonbar input { - text-align: center; - margin: .1em .5em; - padding: 0 1em - } - - .navigation { /* next entries & previous entries link */ - font-size: 80%; - margin-bottom: 5em - } +.navigation { /* next entries & previous entries link */ + font-size: 80%; + margin-bottom: 5em +} - form#search ul { - list-style-type: none; - } +form#search ul { list-style-type: none } /* ===== FOOTER ===== */ @@ -341,9 +306,9 @@ h4 { font-size: 1.2em; } clear: both; font-size: 80%; color: #555; - background-color: #dcdcdc; + background-color: #dcdcdc; padding: 1em; - margin: 0 1em 1em 1em; - text-align: center; + margin: 0 1em 1em 1em; + text-align: center; border-top: #bbb 1px solid } diff --git a/fp-interface/themes/leggero/leggero/res/globals.css b/fp-interface/themes/leggero/leggero/res/globals.css index ff8f100..aecfdd6 100755 --- a/fp-interface/themes/leggero/leggero/res/globals.css +++ b/fp-interface/themes/leggero/leggero/res/globals.css @@ -11,8 +11,6 @@ Version: 0.1 Module: globals.css */ - - .alignleft { float: left } .alignright { float: right } @@ -21,7 +19,7 @@ Module: globals.css #main ul.msgs, ul.msgs { margin: 0; padding: 1em 2em; - list-style-type: none; + list-style-type: none } .errors { @@ -50,7 +48,7 @@ Module: globals.css border-top: 1px solid; border-bottom: 1px solid; border-color: #f8e674; - background: #fffdd5; + background: #fffdd5 } diff --git a/fp-interface/themes/leggero/leggero/res/style.css b/fp-interface/themes/leggero/leggero/res/style.css index 7b288a2..3c91a96 100644 --- a/fp-interface/themes/leggero/leggero/res/style.css +++ b/fp-interface/themes/leggero/leggero/res/style.css @@ -10,119 +10,127 @@ Author: NoWhereMan & drudo Version: 0.2 Module: style.css -last change: 2022-03-12 +last change: 2023-11-01 */ - - /* imports common style ruleset */ -@import url(common.css); -@import url(globals.css); +@import url('common.css'); +@import url('globals.css'); /* imports column (where widgets usually go) rules */ -@import url(column.css); +@import url('column.css'); /* defines rules specific to the front page */ -body { margin: 80px 0 0 0 } +body { margin: 80px 0 10px 0 } -#comments li.comment-admin { - padding:1em -} +#comments li.comment-admin { padding: 1em } -#comments li.comment-admin strong.comment-name { font-size:140% } +#comments li.comment-admin strong.comment-name { font-size: 140% } -#widget-searchbox form { - /* text-align: center; */ +#widget-searchbox div.buttonbar { + margin: 10px -5px; + text-align: left } /* 800er Bildschirme zum Beispiel iPad Hochformat */ -@media only screen and (max-width: 768px) { +@media (max-width: 768px) { -#main { - width: 100%; - margin: 0; - padding: 1em 0.5em 0 0.5em; -} + #main { + width: 97%; + margin: 0; + padding: 1em 0.5em 0 0.5em + } -#main ul.entry-footer { - margin: 0; - padding: 2em 0 1em 0 ; - width: 98%; - text-align: right; -} + #main ul.entry-footer { + margin: 0; + padding: 2em 0 1em 0 ; + width: 98%; + text-align: right + } -#column { - width: 100%; - font-size: 80%; - margin: 0; - padding: 1em 0.5em 2em 0.5em; - /* border: 1px solid red; */ - overflow: auto; /* shit, bei 84% Bildbreite wird es eng! */ -} + #column { + width: 100%; + font-size: 80%; + margin: 0; + padding: 1em 0.5em 2em 0.5em; + overflow: auto; + text-align: center + } + #widget-searchbox div.buttonbar { + text-align: center + } + + #widget_calendar table.calendar { + margin-left: auto; + margin-right: auto; + text-align: center + } + + blockquote { + border-left: unset !IMPORTANT + } } - + /* Kleinbildschirme */ -@media only screen and (max-width: 480px) { +@media (max-width: 480px) { -body { - margin: 1px 0 0 0; - padding: 0; - width: 100%; -} + body { + margin: 1px 0 0 0; + padding: 0; + width: 100% + } -#body-container { - margin: 0; - padding: 0.5em; - width: 96%; - border: none; -} + #body-container { + margin: 0; + padding: 0.5em; + width: 96%; + border: none + } -#head { - margin: 0; - padding: 0; - width: 100%; -} + #head { + margin: 0; + padding: 0; + width: 100% + } -h1 { - margin: 0; - padding: 0.5em 0 0 0.2em; -} + h1 { + margin: 0; + padding: 0.5em 0 0 0.2em + } -.subtitle { - margin: 0; - padding: 0.5em 0.5em 1em 0.5em; -} + .subtitle { + margin: 0; + padding: 0.5em 0.5em 1em 0.5em + } -#main { - margin: 0; - padding: 1em 0.4em 0 0; - width: 100%; -} + #main { + margin: 0; + padding: 1em 0.4em 0 0; + width: 100% + } -.entry { - margin: 0; - padding: 0 0.5em 1em 0.5em -} + .entry { + margin: 0; + padding: 0 0.5em 1em 0.5em + } -#main ul.entry-footer { - margin: 0; - padding: 2em 0 1em 0; - width: 98%; - text-align: right; -} + #main ul.entry-footer { + margin: 0; + padding: 2em 0 1em 0; + width: 98%; + text-align: right + } -#main pre { - margin: 0; - padding: 0 0 0 1.5em; -} + #main pre { + margin: 0; + padding: 0 0 0 1.5em + } -#column { - margin: 0; - padding: 0; - width: 100%; -} - - -} \ No newline at end of file + #column { + margin: 0; + padding: 0; + width: 100% + } +} diff --git a/fp-plugins/bbcode/inc/stringparser.class.php b/fp-plugins/bbcode/inc/stringparser.class.php index 1f1fd98..2230b03 100755 --- a/fp-plugins/bbcode/inc/stringparser.class.php +++ b/fp-plugins/bbcode/inc/stringparser.class.php @@ -208,6 +208,8 @@ class StringParser { * @var bool */ var $_recentlyReparsed = false; + + var $_output; /** * Constructor diff --git a/fp-plugins/bbcode/inc/stringparser_bbcode.class.php b/fp-plugins/bbcode/inc/stringparser_bbcode.class.php index d5262e7..3fac19e 100755 --- a/fp-plugins/bbcode/inc/stringparser_bbcode.class.php +++ b/fp-plugins/bbcode/inc/stringparser_bbcode.class.php @@ -150,6 +150,11 @@ class StringParser_BBCode extends StringParser { * @var bool */ var $_validateAgain = false; + + var $_savedName; + var $_quoting; + var $_savedCloseCount; + var $_savedValue; /** * Add a code @@ -1634,6 +1639,8 @@ class StringParser_BBCode_Node_Element extends StringParser_Node { * @var bool */ var $_paragraphHandled = false; + + var $_codeInfo = null; // //////////////////////////////////////////////// diff --git a/fp-plugins/blockparser/plugin.blockparser.php b/fp-plugins/blockparser/plugin.blockparser.php index 1af2626..3faab16 100644 --- a/fp-plugins/blockparser/plugin.blockparser.php +++ b/fp-plugins/blockparser/plugin.blockparser.php @@ -77,9 +77,11 @@ if (class_exists('AdminPanelAction')) { 'disable' ); + var $bp_enabled; + function doenable($id) { $success = -1; - $enabled = & $this->bp_enabled; + $enabled = &$this->bp_enabled; if (static_exists($id)) { if (!$enabled) { $enabled = array(); @@ -98,7 +100,7 @@ if (class_exists('AdminPanelAction')) { function dodisable($id) { $success = -2; - $enabled = & $this->bp_enabled; + $enabled = &$this->bp_enabled; if ($enabled && is_numeric($v = array_search($id, $enabled))) { unset($enabled [$v]); @sort($enabled); diff --git a/fp-plugins/commentcenter/inc/admin.php b/fp-plugins/commentcenter/inc/admin.php index b633be9..41f2673 100644 --- a/fp-plugins/commentcenter/inc/admin.php +++ b/fp-plugins/commentcenter/inc/admin.php @@ -43,6 +43,8 @@ class admin_entry_commentcenter extends AdminPanelAction { 'commdelok_2', 'ccancel_2' ); + + var $plugin; /** * This function is used as a callback when the panel is loaded.