Skip to content

Commit

Permalink
Merge branch 'v1.9-php7-dev'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	include/inc_lib/revision/revision.php
  • Loading branch information
@slackero
slackero committed Jan 10, 2020
2 parents a18e7f9 + 54a4e13 commit 2d59253
Show file tree
Hide file tree
Showing 673 changed files with 2,046 additions and 1,955 deletions.
2 changes: 1 addition & 1 deletion dbdown.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion download.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion feeds.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion filebrowser.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion fileinfo.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion image_resized.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion image_zoom.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion img/blank.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion img/cmsimage.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion img/mapimage.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion img/random_image.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
3 changes: 1 addition & 2 deletions include/config/dist.conf.inc.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down Expand Up @@ -104,7 +104,6 @@
$phpwcms['i18n_parse'] = 1; // enable|disable browser based language parser - all @@Text@@ will be parsed and checked for translation/var based replacement
$phpwcms['i18n_complex'] = 0; // enable|disable the way browser language setting should be used, false = the easier way (always 2 chars "en"), true - "en-gb"...
$phpwcms['FCK_FileBrowser'] = 1; // enable|disable phpwcms Filebrowser in FCKeditor instead of built-in FCK file bowser support
$phpwcms['JW_FLV_License'] = ''; // insert your JW FLV Media Player License Code here - License warning will no longer displayed
$phpwcms['feuser_regkey'] = 'FEUSER';
$phpwcms['login.php'] = 'login.php';
$phpwcms['js_lib'] = array(); // extends default lib settings array('jquery'=>'jQuery 1.3','mootools-1.4'=>'MooTools 1.4','mootools-1.1'=>'MooTools 1.1);
Expand Down
2 changes: 1 addition & 1 deletion include/config/dist.iptc.inc.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/config/feeds.ini.php
View file
Expand Up @@ -3,7 +3,7 @@
; phpwcms content management system
;
; @author Oliver Georgi <og@phpwcms.org>
; @copyright Copyright (c) 2002-2019, Oliver Georgi
; @copyright Copyright (c) 2002-2020, Oliver Georgi
; @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
; @link http://www.phpwcms.org
Expand Down
2 changes: 1 addition & 1 deletion include/config/sitemap.custom.ini
View file
@@ -1,7 +1,7 @@
; phpwcms content management system
;
; @author Oliver Georgi <og@phpwcms.org>
; @copyright Copyright (c) 2002-2019, Oliver Georgi
; @copyright Copyright (c) 2002-2020, Oliver Georgi
; @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
; @link http://www.phpwcms.org

Expand Down
2 changes: 1 addition & 1 deletion include/config/sitemap.custom.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_addchat.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_articlecontent.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_cache.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_download.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_export.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_file.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_filecat.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_formmailer.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_frontendcss.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_frontendsetup.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_ftptakeover.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_guestbook.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_message.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_phpinfo.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_schedule.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_sendnewsletter.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_startuptext.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_structure.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_upload.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_user.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/act_usergroup.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_act/ajax_connector.php
View file
Expand Up @@ -3,7 +3,7 @@
* phpwcms content management system
*
* @author Oliver Georgi <og@phpwcms.org>
* @copyright Copyright (c) 2002-2019, Oliver Georgi
* @copyright Copyright (c) 2002-2020, Oliver Georgi
* @license http://opensource.org/licenses/GPL-2.0 GNU GPL-2
* @link http://www.phpwcms.org
*
Expand Down
2 changes: 1 addition & 1 deletion include/inc_css/login.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions include/inc_css/login.processed.css
View file
Expand Up @@ -66,8 +66,7 @@ hr {
padding: 10px 13px;
margin-bottom: 12px;
border: 1px solid #c1d2e2;
-webkit-border-radius: 4px;
border-radius: 4px;
border-radius: 4px;
}

.alert-success {
Expand Down
2 changes: 1 addition & 1 deletion include/inc_css/phpwcms.min.css
View file

Large diffs are not rendered by default.

0 comments on commit 2d59253

Please sign in to comment.