Merge branch '2.8' into 2.9

CHANGELOG

@@ -21,8 +21,12 @@ Version 2.9.0-dev 2014-01-
 - updated bundled TinyMCE to version 4.0.12 (Thorsten)
 - dropped support for ext/mysql (Thorsten)
 
-Version 2.8.5 - 2013-12-
+Version 2.8.6 - 2014-
+- updated Hungarian translation
+
+Version 2.8.5 - 2013-12-31
 - fixed SSO logins with mod_auth_kerb (Stephane Lapie)
+- improved HTTPS handling (Thorsten)
 - updated Dutch translation
 - updated European Portuguese translation
 - fixed some minor bugs (Thorsten)
@@ -1142,4 +1146,4 @@ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
 License for the specific language governing rights and limitations
 under the License.
 
-(c) 2001-2013 phpMyFAQ Team
+(c) 2001-2014 phpMyFAQ Team

Gruntfile.js

@@ -7,7 +7,7 @@ module.exports = function(grunt) {
         meta: {
             version: '2.9'
         },
-        banner: '/*! phpMyFAQ v2.9 - http://www.phpmyfaq.de - Copyright (c) 2001 - 2013 Thorsten Rinne and phpMyFAQ Team */\n',
+        banner: '/*! phpMyFAQ v2.9 - http://www.phpmyfaq.de - Copyright (c) 2001 - 2014 Thorsten Rinne and phpMyFAQ Team */\n',
         // Task configuration.
         bower: {
             install: {

README.md

@@ -131,4 +131,4 @@ Licenced under the terms of the SIL Open Font License and MIT License
 
 
 
-Copyright (c) 2001-2013 Thorsten Rinne and the phpMyFAQ Team
+Copyright (c) 2001-2014 Thorsten Rinne and the phpMyFAQ Team

documentation/documentation.html

@@ -446,7 +446,7 @@ <h3>[ phpMyFAQ 2.8.x Documentation ]</h3>
 
 <p><strong>1.3. <a id="1.3"></a>Copyright</strong></p>
 
-<p>© 2001-2013 by Thorsten Rinne and phpMyFAQ Team under the <a href="http://www.mozilla.org/MPL/2.0/"> Mozilla Public License 2.0</a>. All rights reserved.</p>
+<p>© 2001-2014 by Thorsten Rinne and phpMyFAQ Team under the <a href="http://www.mozilla.org/MPL/2.0/"> Mozilla Public License 2.0</a>. All rights reserved.</p>
 
 <p><a href="#top">back to top</a></p>
 
@@ -1557,7 +1557,7 @@ <h3>[ phpMyFAQ 2.8.x Documentation ]</h3>
 
 <p>Date: 2013-04-21</p>
 
-<p>© 2001-2013 phpMyFAQ Team</p>
+<p>© 2001-2014 phpMyFAQ Team</p>
 
 <p>This documentation is licensed under a <a href="http://creativecommons.org/licenses/by/2.0/">Creative Commons License</a>.</p>
 

documentation/documentation.md

@@ -109,7 +109,7 @@ If you're interested, just take a look at our [support page](http://www.phpmyfaq
 
 **1.3. <a id="1.3"></a>Copyright**
 
-© 2001-2013 by Thorsten Rinne and phpMyFAQ Team under the [ Mozilla Public License 2.0](http://www.mozilla.org/MPL/2.0/). All rights reserved.
+© 2001-2014 by Thorsten Rinne and phpMyFAQ Team under the [ Mozilla Public License 2.0](http://www.mozilla.org/MPL/2.0/). All rights reserved.
 
 [back to top][64]
 
@@ -1137,7 +1137,7 @@ Co-Authors: [Stephan Hochhaus][89], [Markus Gläser][90]
 
 Date: 2013-04-21
 
-© 2001-2013 phpMyFAQ Team
+© 2001-2014 phpMyFAQ Team
 
 This documentation is licensed under a [Creative Commons License](http://creativecommons.org/licenses/by/2.0/).
 

phpmyfaq/add.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Frontend
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2002-2013 phpMyFAQ Team
+ * @copyright 2002-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2002-09-16

phpmyfaq/admin/ajax.attachment.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Anatoliy Belsky <[email protected]>
- * @copyright 2010-2013 phpMyFAQ Team
+ * @copyright 2010-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2010-12-20

phpmyfaq/admin/ajax.autosave.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Anatoliy Belsky <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2012-07-07

phpmyfaq/admin/ajax.category.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2012-2013 phpMyFAQ Team
+ * @copyright 2012-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2012-12-26

phpmyfaq/admin/ajax.comment.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2009-2013 phpMyFAQ Team
+ * @copyright 2009-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2009-03-20

phpmyfaq/admin/ajax.config.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Anatoliy Belsky <[email protected]>
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2009-2013 phpMyFAQ Team
+ * @copyright 2009-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2009-04-01

phpmyfaq/admin/ajax.config_list.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
  * @author    Thomas Zeithaml <[email protected]>
- * @copyright 2005-2013 phpMyFAQ Team
+ * @copyright 2005-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2005-12-26

phpmyfaq/admin/ajax.group.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2009-2013 phpMyFAQ Team
+ * @copyright 2009-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2009-04-06

phpmyfaq/admin/ajax.ondemandurl.php

@@ -20,7 +20,7 @@
  * @package   Administration
  * @author    Minoru TODA <[email protected]>
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2005-2013 NetJapan, Inc.
+ * @copyright 2005-2014 NetJapan, Inc.
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2005-09-30
@@ -73,7 +73,7 @@
     <meta name="author" content="phpMyFAQ Team">
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;">
     <meta name="application-name" content="phpMyFAQ <?php print $faqConfig->get('main.currentVersion'); ?>">
-    <meta name="copyright" content="(c) 2001-2013 phpMyFAQ Team">
+    <meta name="copyright" content="(c) 2001-2014 phpMyFAQ Team">
     <meta name="publisher" content="phpMyFAQ Team">
     <meta name="MSSmartTagsPreventParsing" content="true">
 

phpmyfaq/admin/ajax.records.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Anatoliy Belsky <[email protected]>
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2009-2013 phpMyFAQ Team
+ * @copyright 2009-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2009-03-31

phpmyfaq/admin/ajax.search.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2011-2013 phpMyFAQ Team
+ * @copyright 2011-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2011-08-24

phpmyfaq/admin/ajax.tags_list.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Ajax
  * @author    Matteo Scaramuccia <[email protected]>
- * @copyright 2005-2013 phpMyFAQ Team
+ * @copyright 2005-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2005-12-15

phpmyfaq/admin/ajax.trans.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Anatoliy Belsky <[email protected]>
  * @author    Alexander Melnik <[email protected]>
- * @copyright 2009-2013 phpMyFAQ Team
+ * @copyright 2009-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2009-05-12

phpmyfaq/admin/ajax.user.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2009-2013 phpMyFAQ Team
+ * @copyright 2009-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2009-04-04

phpmyfaq/admin/ajax.verifyurl.php

@@ -20,7 +20,7 @@
  * @package   Administration
  * @author    Minoru TODA <[email protected]>
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2005-2013 NetJapan, Inc. and phpMyFAQ Team
+ * @copyright 2005-2014 NetJapan, Inc. and phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2005-09-30

phpmyfaq/admin/att.main.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Anatoliy Belsky <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2010-12-13

phpmyfaq/admin/attachment.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
  * @author    Anatoliy Belsky <[email protected]>
- * @copyright 2002-2013 phpMyFAQ
+ * @copyright 2002-2014 phpMyFAQ
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2002-09-17

phpmyfaq/admin/backup.export.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ 
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2009-2013 phpMyFAQ Team
+ * @copyright 2009-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2009-08-18

phpmyfaq/admin/backup.import.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ 
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-02-24

phpmyfaq/admin/backup.main.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-02-24

phpmyfaq/admin/category.add.php

@@ -12,7 +12,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-12-20

phpmyfaq/admin/category.cut.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-12-25

phpmyfaq/admin/category.delete.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-12-20

phpmyfaq/admin/category.edit.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-03-10

phpmyfaq/admin/category.main.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-12-20

phpmyfaq/admin/category.move.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2004-2013 phpMyFAQ Team
+ * @copyright 2004-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2004-04-29

phpmyfaq/admin/category.showstructure.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
  * @author    Rudi Ferrari <[email protected]>
- * @copyright 2006-2013 phpMyFAQ Team
+ * @copyright 2006-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2006-09-18

phpmyfaq/admin/category.translate.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
  * @author    Rudi Ferrari <[email protected]>
- * @copyright 2006-2013 phpMyFAQ Team
+ * @copyright 2006-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2006-09-10

phpmyfaq/admin/configuration.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
  * @author    Matteo Scaramuccia <[email protected]>
- * @copyright 2005-2013 phpMyFAQ Team
+ * @copyright 2005-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2005-12-26

phpmyfaq/admin/dashboard.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
  * @author    Alexander M. Turek <[email protected]>
- * @copyright 2005-2013 phpMyFAQ Team
+ * @copyright 2005-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2013-02-05

phpmyfaq/admin/export.file.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Matteo Scaramuccia <[email protected]>
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2005-2013 phpMyFAQ Team
+ * @copyright 2005-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2005-11-02

phpmyfaq/admin/export.main.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
  * @author    Matteo Scaramuccia <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-04-17

phpmyfaq/admin/footer.php

@@ -12,7 +12,7 @@
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
  * @author    Matteo Scaramuccia <[email protected]>
- * @copyright 2003-2013 phpMyFAQ Team
+ * @copyright 2003-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2003-02-26

phpmyfaq/admin/glossary.add.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2005-2013 phpMyFAQ Team
+ * @copyright 2005-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2005-09-15

phpmyfaq/admin/glossary.edit.php

@@ -11,7 +11,7 @@
  * @category  phpMyFAQ
  * @package   Administration
  * @author    Thorsten Rinne <[email protected]>
- * @copyright 2005-2013 phpMyFAQ Team
+ * @copyright 2005-2014 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2005-09-15