Permalink
Browse files

Merge branch '2.7' of into 2.8

  • Loading branch information...
2 parents 5b43bb1 + ed4eec4 commit 4caac0680685439bc88e33ee92a9e4c47454e6b6 Thorsten Rinne committed May 12, 2012
View
@@ -11,7 +11,6 @@
.DS_Store
# phpMyFAQ generated folders
-
phpmyfaq/config/database.php
phpmyfaq/config/database.bak.php
phpmyfaq/config/index.html
@@ -21,3 +20,6 @@ phpmyfaq/images*
phpmyfaq/attachments*
phpmyfaq/inc/data.php
phpmyfaq/inc/index.html
+
+# .htaccess, if used
+phpmyfaq/.htaccess
View
@@ -25,6 +25,9 @@ Version 2.8.0-alpha2 - 2012-
- updated bundled Twitter Bootstrap to version 2.0.3 (Thorsten)
- fixed some bugs (Thorsten, Florian)
+Version 2.7.6 - 2012-
+- updated Dutch translation
+
Version 2.7.5 - 2012-04-14
- fixed serious security issue in bundled ImageManager library (Thorsten)
- full support for Microsoft SQL Server Driver for PHP (Thorsten)
View
@@ -154,13 +154,15 @@ installation script.
%changelog
==========
-
* Wed Feb 29 2012 Thorsten Rinne <thorsten@phpmyfaq.de> - 2.8.0.alpha2-1
- New upstream version 2.8.0-alpha2
* Wed Sep 28 2011 Thorsten Rinne <thorsten@phpmyfaq.de> - 2.8.0.alpha-1
- New upstream version 2.8.0-alpha
+* Sun Apr 15 2012 Thorsten Rinne <thorsten@phpmyfaq.de> - 2.7.6-1
+- New upstream version 2.7.6
+
* Mon Feb 24 2012 Thorsten Rinne <thorsten@phpmyfaq.de> - 2.7.5-1
- New upstream version 2.7.5
View
@@ -1,5 +1,5 @@
##
-# phpMyFAQ 2.5 lighttpd.conf file
+# phpMyFAQ lighttpd.conf file
#
# @author Markus Kohlmeyer <rootservice@gmail.com>
# @author Thorsten Rinne <thorsten@phpmyfaq.de>
View
@@ -473,7 +473,9 @@
$faqSystem = new PMF_System();
$localHashes = $faqSystem->createHashes();
- $remoteHashes = file_get_contents('http://www.phpmyfaq.de/api/verify/' . PMF_System::getVersion());
+ $remoteHashes = file_get_contents(
+ 'http://www.phpmyfaq.de/api/verify/' . $faqconfig->get('main.currentVersion')
+ );
$diff = array_diff(
json_decode($localHashes, true),
@@ -26,7 +26,7 @@
// Re-evaluate $user
$user = PMF_User_CurrentUser::getFromSession($faqConfig);
-if ($permission['editbt']) {
+if ($permission['editbt']|| $permission['addbt']) {
// FAQ data
$dateStart = PMF_Filter::filterInput(INPUT_POST, 'dateStart', FILTER_SANITIZE_STRING);
@@ -25,7 +25,7 @@
// Re-evaluate $user
$user = PMF_User_CurrentUser::getFromSession($faqConfig);
-if ($permission["editbt"] && !PMF_Db::checkOnEmptyTable('faqcategories')) {
+if (($permission['editbt']|| $permission['addbt']) && !PMF_Db::checkOnEmptyTable('faqcategories')) {
$category = new PMF_Category($faqConfig, false);
$category->setUser($current_admin_user);
@@ -406,7 +406,9 @@ function verifyEntryURL_failure(XmlRequest)
?>
<tr class="record_<?php print $record['id']; ?>_<?php print $record['lang']; ?>">
<td style="width: 24px; text-align: right;">
- <?php print $record['id']; ?>
+ <a href="?action=editentry&amp;id=<?php print $record['id']; ?>&amp;lang=<?php print $record['lang']; ?>">
+ <?php print $record['id']; ?>
+ </a>
</td>
<td style="width: 16px;">
<?php print $record['lang']; ?>
@@ -430,7 +432,8 @@ function verifyEntryURL_failure(XmlRequest)
</a>
<?php
if (isset($numCommentsByFaq[$record['id']])) {
- printf('<br/>(<a href="?action=comments#record_id_%d">%d %s</a>)',
+ printf(
+ '<br/>(<a href="?action=comments#record_id_%d">%d %s</a>)',
$record['id'],
$numCommentsByFaq[$record['id']],
$PMF_LANG['ad_start_comments']
@@ -2,7 +2,9 @@
<header>
<h2>
{msgOpenQuestions}
- <a href="feed/openquestions/rss.php" target="_blank"><img src="assets/img/feed.png" width="16" height="16" alt="RSS" /></a>
+ <a href="feed/openquestions/rss.php" target="_blank">
+ <img src="assets/img/feed.png" width="16" height="16" alt="RSS" />
+ </a>
</h2>
</header>
View
@@ -287,13 +287,16 @@ public function createHashes()
'/config/database.php' => false,
'/config/ldap.php' => false
);
+ $current = '';
try {
foreach ($files as $file) {
- if (! preg_match('#/tests/#', $file->getPath()) && 'php' === $file->getExtension()) {
- $current = str_replace($path, '', $file->getPathname());
+ if ('php' === pathinfo($file->getFilename(), PATHINFO_EXTENSION) &&
+ ! preg_match('#/tests/#', $file->getPath())
+ ) {
+ $current = str_replace($path, '', $file->getPathname());
if (isset($blacklist[$current])) {
continue;
@@ -516,7 +516,7 @@ function selectDatabaseSetup(field) {
die();
}
- $dbSetup['dbPassword'] = PMF_Filter::filterInput(INPUT_POST, 'sql_passwort', FILTER_SANITIZE_STRING);
+ $dbSetup['dbPassword'] = PMF_Filter::filterInput(INPUT_POST, 'sql_passwort', FILTER_UNSAFE_RAW);
if (is_null($dbSetup['dbPassword']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
// Password can be empty...
$dbSetup['dbPassword'] = '';
@@ -865,4 +865,4 @@ function HTMLFooter()
}
HTMLFooter();
-}
+}
@@ -1133,4 +1133,4 @@
// added v2.8.0-alpha2 - 2012-03-15 by Thorsten
$PMF_LANG['rememberMe'] = 'Passwort merken';
-$PMF_LANG["ad_menu_instances"] = "FAQ Multi-Sites";
+$PMF_LANG["ad_menu_instances"] = "FAQ Multi-Sites";
Oops, something went wrong.

0 comments on commit 4caac06

Please sign in to comment.