Take a picture

.gitattributes

@@ -1,6 +1,9 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
+.gitattributes export-ignore
+.gitignore export-ignore
+
 # Custom for Visual Studio
 *.cs     diff=csharp
 

.gitignore

@@ -3,11 +3,13 @@
 \#*
 *.bak
 .idea/
+
 htdocs/mainfile.php
 htdocs/xoops_data/caches/smarty_cache/*
 htdocs/xoops_data/caches/smarty_compile/*
 htdocs/xoops_data/caches/xoops_cache/*
 htdocs/xoops_data/caches/xoops_cache/*/
 htdocs/xoops_data/configs/*
 htdocs/xoops_data/data/secure.php
+htdocs/xoops_data/data/license.php
 htdocs/xoops_data/data/*key*

docs/README.txt

@@ -1,8 +1,9 @@
-XOOPS 2.5.8
+XOOPS 2.5.9
 
-The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.8. This version includes fixes and enhancements, security updates, PHP 7 compatibility and introduces XMF, the XOOPS Module Framework library.
+The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.9. This version includes
+fixes and enhancements, security updates, PHP 7.1 compatibility.
 
-Download XOOPS 2.5.8 from GitHub: https://github.com/XOOPS/XoopsCore25/releases
+Download XOOPS 2.5.9 from GitHub: https://github.com/XOOPS/XoopsCore25/releases
 
 
 How to contribute
@@ -13,4 +14,4 @@ Documentation: https://www.gitbook.com/book/xoops/xoops-documentation-process/de
 Support Forums: http://xoops.org/modules/newbb/
 
 XOOPS Development Team
-2016
+2017

docs/changelog.250.txt

@@ -1,5 +1,89 @@
 XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
 
+===================================
+2.5.9                  NOT RELEASED
+===================================
+- fix issue with establishing database character set under mysqli
+- Add PHP4 same name constructor shim in XoopsMailer (geekwright)
+- Some cleanup in xBootstrap to reduce setup for users, especially with publisher
+- fix with pre-install reporting (zyspec)
+- Streamline setup for publisher with xBootstrap (geekwright)
+- various "Assign by reference" issues in PHP 7 (geekwright/mamba/ggoffy)
+- Icons for Edit, Delete, Download (bleekk)
+- use HTML5 br tags consitently (mamba)
+- Publisher templates cleanup in xBootstrap (geekwright)
+- Change set charset behavior for mysqli
+- bug in mysqldatabase.php in XOOPS_DB_CHARSET for PHP < 5.5 (mamba)
+- Update makedata.php (luciorota)
+- Backport Smarty securityToken plugin (geekwright)
+- Add a table property to handlers  (geekwright)
+- Fix occasional issues using xoops_loadLanguage('locale') (geekwright)
+- Docblock fix for getHandler functions (geekwright)
+- Correct help/module_index in system (geekwright)
+- fixed missing language constants (mamba)
+- Fix Bug #141 for avatar, userrank, smilies(mage)
+- improved upload class (mage)
+- fix Report error on database connection (geekwright)
+- fix Correct protector connection  (geekwright)
+- Update help.tpl (cesagonchu)
+- Module Changelog in UTF-8 (mamba)
+- update system_siteclosed for xbootstrap (liomj)
+- make clean exit after delivering file in browse.php (geekwright)
+- fix XoopsObjectTree issues  (geekwright)
+- various CSS and template tweaks  (geekwright)
+- xos_kernel_Xoops2 reference issues (geekwright)
+- Implement Footer Blocks in xbootstrap theme (liamj/geekwright)
+- Bug in ProfileProfileHandler::get() (geekwright)
+- XoopsFormDateTime - time only option(geekwright)
+- Move to HTML5 syntax (geekwright)
+- changing icons in User Admin for consistency (mamba)
+- fixes for Publisher templates in xBootstrap (mamba)
+- Highlight Update System Module in upgrade(geekwright)
+- add recaptch2 support (mage)
+- fix login over IPv6 during upgrade (mage)
+- fix display of HTML5 banners in admin (mage)
+- profile module, hide ICQ, AIM, YIM and MSNM fields by default
+- profile module, us dhtml editor for signatures
+- use public suffix list when determining cookie domain
+- add polyfill for mb string, most functions always available if without extension
+- new admin theme - Transition (bitcero)
+- add XoopsObjectTree::makeSelectElement(), return tree as XoopsFormSelect (geekwright, mage)
+- Bootstrap form support with XoopsFormRenderer (geekwright, mage)
+- new templates to allow more consistent theme overrides (geekwright, mage)
+  (system_comments_controls.tpl system_search.tpl system_popup_header.tpl, system_popup_footer.tpl)
+- Multi-file uploads for Image Manager, Avatars (mage)
+- PHP 7.1 compatibility fixes (mamba, geekwright)
+- set XOOPS_COOKIE_DOMAIN during install and set in mainfile.php
+- recommend Intl extension
+- add 'rendered' key to XoopsForm::assign(), allows template to choose rendered or by element
+- add lexikon templates for xBootstrap (bleekk)
+- removed extras/modules/system/admin/filemanager/
+- installer updated
+- upgrader updated
+- theme changes: removed sucio and zetagenesis, added xswatch
+- error in search links (mage)
+- multiple issues in profile module (mage, trabis, geekwright)
+- issue with xBootstrap slider (mage)
+- XoopsFormSelectUsers issues
+- fix theme selection in install (mage)
+- Update \ModuleAdmin::renderAbout() PayPal donations (zyspec)
+- xbootstrap updates (mamba)
+
+Updated libraries and assets:
+ - jQuery 3.2.1 (mamba)
+ - jQuery UI 1.12.1 (mamba)
+ - jGrowl to 1.4.5 (mamba)
+ - Tabs jQuery Tools to 1.2.7 (mamba)
+ - jQuery Lightbox to 1.2.3 (mamba)
+ - jQuery Form to 3.5.1 (mamba)
+ - jQuery Tablesorter to 2.26.6 (mamba)
+ - phpThumb to 1.7.14-201607141354 (mamba)
+ - Bootstrap 3.3.7 in xBootstrap theme (geekwright, mamba)
+ - HTML Purifier to 4.8.0 (mamba)
+ - PHPMailer to 5.2.21
+ - XMF to 1.2.5
+ - Font Awesome 4.7.0 now included
+
 ===================================
 2.5.8 Final            2016-05-27
 ===================================

docs/lang_diff.txt

@@ -4,7 +4,110 @@ LANGUAGE DIFFERENCES
 Below are language differences from a version to next version.
 
 ===============================
-NOT RELEASED: Version 2.5.8
+2017/04/08: Version 2.5.9 RC1
+===============================
+ADDED/DELETED DEFINES
+
+htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php
+- added define('_AM_MODULEADMIN_ABOUT_AMOUNT', 'Amount');
+- added define('_AM_MODULEADMIN_ABOUT_AMOUNT_TTL', 'Please enter USD amount e.g. $25.00');
+- added define('_AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY', 'USD');
+- added define('_AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED', '25.00');
+- added define('_AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN', '\\$?[0-9]+(,[0-9]{3})*(\\.[0-9]{0,2})?$');
+- added define('_AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT', 'Donate using PayPal or a major credit card online!');
+
+htdocs/install/language/english/install.php
+*NOTE* The installer was significantly changed, so this file should be reviewed closely
+- added define("CURL_HTTP", "Client URL Library (cURL)");
+- added define('XOOPS_COOKIE_DOMAIN_LABEL', 'Cookie Domain for the Website');
+- added define('XOOPS_COOKIE_DOMAIN_HELP', 'Domain to set cookies. May be blank, the full host from the URL (www.example.com), or the registered domain without subdomains (example.com) to share across subdomains (www.example.com and blog.example.com.)');
+- added define('INTL_SUPPORT', 'Internationalization functions');
+- added define('XOOPS_SOURCE_CODE', "XOOPS on GitHub");
+- added define('XOOPS_INSTALLING', 'Installing');
+- added define('XOOPS_ERROR_ENCOUNTERED', 'Error');
+- added define('XOOPS_ERROR_SEE_BELOW', 'See below for messages.');
+- added define('MODULES_AVAILABLE', 'Available Modules');
+- added define('INSTALL_THIS_MODULE', 'Add %s');
+
+htdocs/install/language/english/finish.php
+- change to refer new users to xoops.org for information on modules and themes
+
+htdocs/language/english/global.php
+- added define('_UPLOAD', 'Upload');
+- added define('_SELECTFILES', 'Select files');
+- added define('_DROPFILESHERE', 'Drop files here');
+- added define('_RETRY', 'Retry');
+- added define('_OK', 'Ok');
+- added define('_FORMATPROGRESS', '{percent}% of {total_size}');
+- added define('_FAILUPLOAD', 'Upload failed!');
+- added define('_WAITINGFORRESPONSE', 'Processing...');
+- added define('_PAUSED', 'Paused');
+- added define('_PROCESSINGDROPPEDFILES', 'Processing dropped files...');
+- added define('_TYPEERROR', '{file} has an invalid extension. Valid extension(s): {extensions}!');
+- added define('_SIZEERROR', '{file} is too large, maximum file size is {sizeLimit}!');
+- added define('_MINSIZEERROR', '{file} is too small, minimum file size is {minSizeLimit}!');
+- added define('_EMPTYERROR', '{file} is empty, please select files again without it!');
+- added define('_NOFILESERROR', 'No files to upload!');
+- added define('_TOOMANYITEMSERROR', 'Too many items ({netItems}) would be uploaded.  Item limit is {itemLimit}!');
+- added define('_MAXHEIGHTIMAGEERROR', 'Image is too tall!');
+- added define('_MAXWIDTHIMAGEERROR', 'Image is too wide!');
+- added define('_MINHEIGHTIMAGEERROR', 'Image is not tall enough!');
+- added define('_MINWIDTHIMAGEERROR', 'Image is not wide enough!');
+- added define('_RETRYFAILTOOMANYITEMS', 'Retry failed - you have reached your file limit!');
+- added define('_ONLEAVE', 'The files are being uploaded, if you leave now the upload will be canceled!');
+- added define('_UNSUPPORTEDBROWSERIOS8SAFARI', 'Unrecoverable error - this browser does not permit file uploading of any kind due to serious bugs in iOS8 Safari.  Please use iOS8 Chrome until Apple fixes these issues!');
+
+htdocs/language/english/uploader.php
+- added define('_ER_UP_INISIZE', 'The uploaded file exceeds the upload_max_filesize directive in php.ini');
+- added define('_ER_UP_FORMSIZE', 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form');
+- added define('_ER_UP_PARTIAL', 'The uploaded file was only partially uploaded');
+- added define('_ER_UP_NOFILE', 'No file was uploaded');
+- added define('_ER_UP_NOTMPDIR', 'Missing a temporary folder');
+- added define('_ER_UP_CANTWRITE', 'Failed to write file to disk');
+- added define('_ER_UP_EXTENSION', 'File upload stopped by extension. View phpinfo()');
+- added define('_ER_UP_UNKNOWN', 'Unknown upload error');
+
+htdocs/language/english/user.php
+- deleted define('_US_USECOOKIE', 'Store my user name in a cookie for 1 year');
+
+htdocs/modules/profile/language/english/admin.php
+- added define('_PROFILE_AM_CANNOTDEACTIVATEWEBMASTERS', 'You cannot deactivate Webmaster account');
+
+htdocs/modules/system/language/english/admin/comments.php
+- added define('_MP_DELETECOUNT', 'The number of members in the group is too big ( > 4,000) ');
+
+htdocs/modules/system/language/english/admin/userrank.php
+- added define('_AM_SYSTEM_USERRANK_ERROR', 'Errors');
+
+upgrade/language/english/upgrade.php
+- added define('_LANGUAGE', 'Language');
+- added define('_SUPPORT', 'Support');
+- added define('_XOOPS_SOURCE_CODE', 'XOOPS on GitHub');
+- added define('_PATCH_COUNT', 'Patches Sets');
+- added define('_USERNAME_PLACEHOLDER', 'Your Username');
+- added define('_PASSWORD_PLACEHOLDER', 'Your Password');
+- added define('_CONTINUE', 'Continue');
+- added define('XOOPS_ERROR_ENCOUNTERED', 'Error');
+- added define('XOOPS_ERROR_SEE_BELOW', 'See below for messages.');
+
+htdocs/themes/xbootstrap/language/english/main.php
+- added define("THEME_USER_WELCOME", "Welcome");
+
+NEW FILES:
+- htdocs/modules/system/themes/transition/language/english/admin.php
+- htdocs/modules/system/themes/transition/language/english/localsupport.php
+
+- upgrade/language/english/
+*NOTE* The upgrade code was significantly changed, so these files should be reviewed closely
+- moved all per patch language files from patch directories to upgrade/language/*
+  i.e. upgrade/upd-2.0.18-to-2.3.0/language/english.php became
+  upgrade/language/english/upd-2.0.18-to-2.3.0.php
+
+- upgrade/language/english/support.php (same as  htdocs/install/language/english/support.php)
+- upgrade/language/english/welcome.php
+
+===============================
+2016/05/27: Version 2.5.8
 ===============================
 ADDED/DELETED DEFINES
 
@@ -18,7 +121,7 @@ define('_AM_SYSTEM_USERS_ACTIVATE', 'Activate User');
 /modules/system/language/english/blocks.php
 define('_MB_SYSTEM_BLOCK_HEIGHT',"Block Height (lines)");
 
-install/language/enggitglish/install.php
+install/language/english/install.php
 define('CHMOD_CHGRP_REPEAT', 'Retry');
 define('CHMOD_CHGRP_IGNORE', 'Use Anyway');
 define('CHMOD_CHGRP_ERROR', 'Installer may not be able to write the configuration file %1$s.<p>PHP is writing files under user %2$s and group %3$s.<p>The dire
@@ -44,6 +147,9 @@ NEW FILES:
 /language/english/stopwords.php
 /language/english/xmf.php
 
+UPDATED XoopsMailerLocal class example:
+htdocs/language/english/xoopsmailerlocal.php
+
 ===============================
 2014/06/14: Version 2.5.7 Final
 ===============================

extras/login.php

@@ -72,7 +72,7 @@
             echo '<div style="text-align:center;"><input value="' . _CLOSE . '" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
         }
     } else {
-        xoops_error(_US_INCORRECTLOGIN . '<br /><a href="login.php">' . _BACK . '</a>');
+        xoops_error(_US_INCORRECTLOGIN . '<br><a href="login.php">' . _BACK . '</a>');
     }
 }