Merge branch 'develop' of github.com:glFusion/glfusion into develop

glFusion · Feb 22, 2017 · d1a806a · d1a806a
2 parents b7387de + ec4cecc
commit d1a806a
Show file tree

Hide file tree

Showing 265 changed files with 15,022 additions and 12,316 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,40 @@
-## v1.6.5 (unreleased)
+## v1.6.6 (unreleased)
+  - Display story summary at the top of the email story form
+  - Added configuration option to set display order for 3rd party authentication modules
+  - Fixed issue where help text did not display in configuration screen for items that were arrays
+  - Ensure links in emailed stories are absolute
+  - Allow Bad Behavior 2 functionality to be disabled in fusionrescue
+  - Polls Enhancements
+    - Ability to view vote data per poll
+    - Description field added to each poll
+    - Admin interface improvements
+    - Allow configuration setting so no anonymous voter id data is removed
+  - Forum - Sort mood dropdown in alphabetical order
+  - Forum - Rounded corners on topic list headers
+  - Forum - Moderators were not displayed when configured to display
+  - Wrap mail story / contact user forms in a panel
+  - Static Pages - Fixed error where hits were not shown if show last updated date was disabled
+  - Removed invalid BOM marker from install english utf8 language file
+  - Improved consistency on status / warning / error messages
+  - Forum - Do not prepend the "RE:" on reply subjects
+  - Cleaned up interface for rebuilding / resizing images and thumbnails in Media Gallery
+  - Demo Mode updates
+  - Cancel button did not cancel on forms with empty required fields
+  - Forum - Formatting improvements to Latest Post block
+  - Additional environment checks (required PHP extensions) added to Environment Check
+  - Additional environment validations (required PHP extensions) performed during install / upgrade
+  - Forum - Fix on smiley replacement to properly escape text
+  - Additional checks in Media Gallery view templates to ensure prompts are not shown without data
+  - Updated German Translations - Matrox66
+  - Fixed invalid button classes - modified type="cancel" to type="submit" - Matrox66
+
+## v1.6.5 (January 22, 2017)
+  - Updated German Translations from Matrox66
+  - Media Gallery - removed references to depreciated online print option
+  - Media Gallery - styled the postcard screens using uikit styles
+  - Media Gallery - removed hard coded language string from summary index page
+  - Media Gallery - allow summary index page template to control whether owner name is used when no copyright name is available
+  - Media Gallery - do not display language prompts when no corresponding data is available (i.e.; View or Media ID)
   - Forum - If a post is edited (and silent edit is not checked), display a Last Edited msg in the post.
   - Forum - Do not display Silent Edit checkbox for new posts or replies
   - Tweaked sort order for style sheets - Order is: UIKIT Styles, Theme Styles, Plugin Styles, custom.css

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.6.5
+1.6.6
diff --git a/private/language/afrikaans.php b/private/language/afrikaans.php
@@ -183,70 +183,11 @@
     505 => 'Your database version is: %s<br />The glFusion script version is: %s<br />Please check the integrity of your site!',
     'ctl' => 'Clear Template Cache',
     'logview' => 'Logview',
-    'correct_perms' => 'Please correct the issues identified below. Once they have been corrected, use the <b>Recheck</b> button to validate the environment.',
-    'current' => 'Current',
-    'current_php_settings' => 'Current PHP Settings',
-    'directory_permissions' => 'Directory Permissions',
-    'enabled' => 'Enabled',
-    'env_check' => 'Environment Check',
-    'file_permissions' => 'File Permissions',
-    'file_uploads' => 'Many features of glFusion require the ability to upload files, this should be enabled.',
-    'filesystem_check' => 'Directory / File Permissions',
-    'gd_lib' => 'GD Libraries',
-    'gd_not_found' => 'Unable to locate the GD library functions.  Please ensure that the GD libraries were compiled into PHP or select an alternate graphics library.',
-    'gd_ok' => 'GD Libraries v2 are installed.',
-    'gd_v1' => 'GD Libraries v1 is installed - This version does not fully support JPG image processing so there may be some quality issues.',
-    'graphics' => 'Graphics Library',
-    'hosting_env' => 'Hosting Environment Check',
-    'imagemagick' => 'ImageMagick Programs',
-    'im_not_found' => 'Unable to locate the <strong>convert</strong> executable for ImageMagick.',
-    'im_ok' => 'The <strong>convert</strong> executable appears to be valid.',
-    'memory_limit' => 'It is recommended that you have at least 48M of memory enabled on your site.',
-    'not_writable' => 'NOT WRITABLE',
-    'notes' => 'Notes',
-    'not_found' => 'Not Found',
-    'netpbm' => 'NetPBM Library',
-    'np_ok' => 'The NetPBM library is installed',
-    'np_not_found' => 'The NetPBM executables were not found.',
-    'off' => 'Off',
-    'ok' => 'OK',
-    'on' => 'On',
-    'open_basedir' => 'If <strong>open_basedir</strong> restrictions are enabled on your site, it may cause permission problems during the install. The File System Check below should point out any issues.',
-    'php_req_version' => 'glFusion requires PHP version 4.3.0 or newer.',
-    'php_settings' => 'PHP Settings',
-    'php_version' => 'PHP Version',
-    'php_warning' => 'If any of the items below are marked in <span class="no">red</span>, you may encounter problems with your glFusion site.  Check with your hosting provider for information on changing any of these PHP settings.',
-    'post_max_size' => 'glFusion allows you to upload plugins, images, and files. You should allow at least 8M for the maximum post size.',
-    'extensions' => 'Required PHP Extensions',
-    'mbstring_library' => 'Multibyte Extensions',
-    'mbstring_ok' => 'Mutlibyte extensions are properly configured.',
-    'mbstring_not_found' => 'Multibyte extension not found - some features will be disabled such as the image browser in the WYSIWYG editor.',
-    'openssl_library' => 'OpenSSL Extension',
-    'openssl_ok' => 'OpenSSL found',
-    'openssl_not_found' => 'OpenSSL extension not found - these are required if you are using remote login features such as Facebook or Twitter logins.',
-    'recheck' => 'Recheck Environment',
-    'recommended' => 'Recommended',
-    'register_globals' => 'If PHP\'s <strong>register_globals</strong> is enabled, it can create security issues.',
-    'safe_mode' => 'If PHP\'s <strong>safe_mode</strong> is enabled, some functions of glFusion may not work correctly. Specifically the Media Gallery plugin.',
-    'setting' => 'Setting',
-    'unable_mkdir' => 'Unable to create directory',
-    'upload_max_filesize' => 'glFusion allows you to upload plugins, images, and files. You should allow at least 8M for the upload size.',
-    'not_checked' => 'Skipped',
-    'bypass_note' => 'Since either Safe Mode or open_basedir restrictions were detected, the check for graphic libraries were skipped.',
-    'jhead' => 'jhead Program',
-    'jhead_not_found' => 'Unable to locate the jhead executable.',
-    'jhead_ok' => 'The jhead executable is installed.',
-    'jpegtran' => 'jpegtran Program',
-    'jpegtran_not_found' => 'Unable to locate the jpegtran executable.',
-    'jpegtran_ok' => 'The jpegtran executable is installed.',
-    'show_phpinfo' => 'Show Full PHP Info',
-    'hide_phpinfo' => 'Hide Full PHP Info',
     'autotag_perms' => 'Autotag Permissions',
     'subscribe' => 'Subscribe',
     'unsubscribe' => 'Unsubscribe',
     'view_online' => 'Click here %s to view online',
     'no_new_items' => 'No New Items',
-    'max_execution_time' => 'glFusion recommends the PHP default value of 30 seconds as a minimum, but plugin uploads and other operations may take longer than this depending upon your hosting environment.  If safe_mode (above) is Off, you may be able to increase this by modifying the value of <b>max_execution_time</b> in your php.ini file.',
     'allowed_html' => 'Allowed HTML:',
     'posted_in' => 'Posted in',
     'continue_reading' => 'Continue Reading',
@@ -256,13 +197,8 @@
     'blocks_right_title' => 'Right Side',
     'blocks_footer_title' => 'Footer',
     'source' => 'Source',
-    'phpendoflife' => 'Your PHP version has reached end of life and is no longer supported, including security updates. Please consider upgrading to a <a href="http://php.net/supported-versions.php" target="_blank">supported version of PHP</a>.',
-    'db_header' => 'Database Info',
-    'db_driver' => 'Database Driver',
-    'db_version' => 'Database Version',
-    'db_engine' => 'Database Engine',
-    'db_charset' => 'Database Character Set',
-    'db_collation' => 'Database Collation'
+    'env_check' => 'Environment Check',
+    'ok' => 'OK'
 );
 
 ###############################################################################
@@ -1579,7 +1515,7 @@
     88 => '',
     89 => '',
     90 => '',
-    91 => '',
+    91 => 'Error removing the plugin file structure - the web server may not have sufficient permissions. See error.log for details.',
     92 => "Please <a href=\"{$_CONF['site_admin_url']}/sectest.php\">check the security of your site</a> before using it!",
     93 => 'Database back up was successful.',
     94 => 'Backup Failed: Filesize less than 1kb',
@@ -2455,6 +2391,88 @@
     'perm_editor' => 'Permission Editor'
 );
 
+###############################################################################
+# envcheck.php
+
+$LANG_ENVCHK = array(
+    'bypass_note' => 'Since either Safe Mode or open_basedir restrictions were detected, the check for graphic libraries were skipped.',
+    'correct_perms' => 'Please correct the issues identified below. Once they have been corrected, use the <b>Recheck</b> button to validate the environment.',
+    'ctype_extension' => 'Ctype Extension',
+    'current' => 'Current',
+    'current_php_settings' => 'Current PHP Settings',
+    'database_version' => 'Database Version',
+    'date_extension' => 'Date Extension',
+    'db_charset' => 'Database Character Set',
+    'db_collation' => 'Database Collation',
+    'db_driver' => 'Database Driver',
+    'db_engine' => 'Database Engine',
+    'db_header' => 'Database Info',
+    'db_version' => 'Database Version',
+    'directory_permissions' => 'Directory Permissions',
+    'enabled' => 'Enabled',
+    'extensions' => 'Required PHP Extensions',
+    'file_permissions' => 'File Permissions',
+    'file_uploads' => 'Many features of glFusion require the ability to upload files, this should be enabled.',
+    'filesystem_check' => 'Directory / File Permissions',
+    'filter_extension' => 'Filter Extension',
+    'gd_lib' => 'GD Libraries',
+    'gd_not_found' => 'Unable to locate the GD library functions.  Please ensure that the GD libraries were compiled into PHP or select an alternate graphics library.',
+    'gd_ok' => 'GD Libraries v2 are installed.',
+    'gd_v1' => 'GD Libraries v1 is installed - This version does not fully support JPG image processing so there may be some quality issues.',
+    'gettext_extension' => 'Gettext Extension',
+    'graphics' => 'Graphics Library',
+    'hide_phpinfo' => 'Hide Full PHP Info',
+    'hosting_env' => 'Hosting Environment Check',
+    'im_not_found' => 'Unable to locate the <strong>convert</strong> executable for ImageMagick.',
+    'im_ok' => 'The <strong>convert</strong> executable appears to be valid.',
+    'imagemagick' => 'ImageMagick Programs',
+    'is_optional' => ' is optional',
+    'is_required' => ' is required',
+    'jhead' => 'jhead Program',
+    'jhead_not_found' => 'Unable to locate the jhead executable.',
+    'jhead_ok' => 'The jhead executable is installed.',
+    'jpegtran' => 'jpegtran Program',
+    'jpegtran_not_found' => 'Unable to locate the jpegtran executable.',
+    'jpegtran_ok' => 'The jpegtran executable is installed.',
+    'json_extension' => 'Json Extension',
+    'max_execution_time' => 'glFusion recommends the PHP default value of 30 seconds as a minimum, but plugin uploads and other operations may take longer than this depending upon your hosting environment.  If safe_mode (above) is Off, you may be able to increase this by modifying the value of <b>max_execution_time</b> in your php.ini file.',
+    'mbstring_extension' => 'Multibyte (mbstring) Extension',
+    'memory_limit' => 'It is recommended that you have at least 64M of memory enabled on your site.',
+    'mysqli_extension' => 'MySQLi Extension',
+    'netpbm' => 'NetPBM Library',
+    'not_checked' => 'Skipped',
+    'not_found' => 'Not Found',
+    'not_writable' => 'NOT WRITABLE',
+    'notes' => 'Notes',
+    'np_not_found' => 'The NetPBM executables were not found.',
+    'np_ok' => 'The NetPBM library is installed',
+    'off' => 'Off',
+    'ok' => 'OK',
+    'on' => 'On',
+    'open_basedir' => 'If <strong>open_basedir</strong> restrictions are enabled on your site, it may cause permission problems during the install. The File System Check below should point out any issues.',
+    'openssl_extension' => 'OpenSSL Extension',
+    'php_req_version' => 'glFusion requires PHP version 5.3.3 or newer.',
+    'php_settings' => 'PHP Settings',
+    'php_version' => 'PHP Version',
+    'php_warning' => 'If any of the items below are marked in <span class="no">red</span>, you may encounter problems with your glFusion site.  Check with your hosting provider for information on changing any of these PHP settings.',
+    'phpendoflife' => 'Your PHP version has reached end of life and is no longer supported, including security updates. Please consider upgrading to a <a href="http://php.net/supported-versions.php" target="_blank">supported version of PHP</a>.',
+    'post_max_size' => 'glFusion allows you to upload plugins, images, and files. You should allow at least 8M for the maximum post size.',
+    'recheck' => 'Recheck Environment',
+    'recommended' => 'Recommended',
+    'register_globals' => 'If PHP\'s <strong>register_globals</strong> is enabled, it can create security issues.',
+    'safe_mode' => 'If PHP\'s <strong>safe_mode</strong> is enabled, some functions of glFusion may not work correctly. Specifically the Media Gallery plugin.',
+    'session_extension' => 'Session Extension',
+    'setting' => 'Setting',
+    'show_phpinfo' => 'Show Full PHP Info',
+    'status' => 'Status',
+    'unable_mkdir' => 'Unable to create directory',
+    'unknown' => 'unknown',
+    'unlimited' => 'unlimited',
+    'upload_max_filesize' => 'glFusion allows you to upload plugins, images, and files. You should allow at least 8M for the upload size.',
+    'xml_extension' => 'XML Extension',
+    'zlib_extension' => 'zlib Extension'
+);
+
 ###############################################################################
 # versioncheck.php
 
@@ -2811,7 +2829,8 @@
     'open_ext_url_new_window' => 'External Links in New Window',
     'enable_404_logging' => 'Log 404 - Not Found Errors',
     'debug_oauth' => 'Oauth Debug Logging',
-    'debug_html_filter' => 'HTML Filter Debug Logging'
+    'debug_html_filter' => 'HTML Filter Debug Logging',
+    'standard_auth_first' => 'Display Standard Auth First in Dropdown'
 );
 
 $LANG_configsubgroups['Core'] = array(