Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions client/DocumentModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@
#include "DocumentModel.h"

#include "Application.h"
#include "Configuration.h"
#include "dialogs/FileDialog.h"
#include "dialogs/WarningDialog.h"

#include <QtCore/QCoreApplication>
#include <QtCore/QCryptographicHash>
#include <QtCore/QDir>
#include <QtCore/QDirIterator>
#include <QtCore/QFileInfo>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonObject>
#include <QtCore/QUrl>
#include <QtGui/QDesktopServices>

Expand Down Expand Up @@ -125,7 +126,11 @@ void DocumentModel::open(int row)
QStringLiteral("wpd"), QStringLiteral("rtf"), QStringLiteral("xlr"), QStringLiteral("xls"), QStringLiteral("xlsx"), QStringLiteral("pdf"), QStringLiteral("key"), QStringLiteral("odp"),
QStringLiteral("pps"), QStringLiteral("ppt"), QStringLiteral("pptx"), QStringLiteral("png"), QStringLiteral("jpg"), QStringLiteral("jpeg"), QStringLiteral("bmp"), QStringLiteral("ai"),
QStringLiteral("gif"), QStringLiteral("ico"), QStringLiteral("ps"), QStringLiteral("psd"), QStringLiteral("tif"), QStringLiteral("tiff"), QStringLiteral("csv")};
QJsonArray allowedExts = Application::confValue(QLatin1String("ALLOWED-EXTENSIONS")).toArray(defaultArray);
#ifdef CONFIG_URL
auto allowedExts = qApp->conf()->rawObject().value(QLatin1String("ALLOWED-EXTENSIONS")).toArray(defaultArray);
#else
auto allowedExts = defaultArray;
#endif
if(!allowedExts.contains(QJsonValue(QFileInfo(data(row)).suffix().toLower())))
{
WarningDialog::create()
Expand Down
2 changes: 1 addition & 1 deletion common
Loading