Browse Source

Merge pull request #2863 from racam/master

login.html escape quotes + add qbittorrent-nox to gitignore + bug with startup info with qbittorrent-nox
adaptive-webui-19844
sledgehammer999 10 years ago
parent
commit
d14805d065
  1. 1
      .gitignore
  2. 2
      src/app/application.cpp
  3. 4
      src/core/preferences.cpp
  4. 4
      src/webui/abstractwebapplication.cpp

1
.gitignore vendored

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
src/gui/geoip/GeoIP.dat
src/gui/geoip/GeoIP.dat.gz
src/qbittorrent
src/qbittorrent-nox
qbittorrent.pro.user*
conf.pri
Makefile

2
src/app/application.cpp

@ -157,7 +157,6 @@ int Application::exec(const QStringList &params) @@ -157,7 +157,6 @@ int Application::exec(const QStringList &params)
#ifdef DISABLE_GUI
#ifndef DISABLE_WEBUI
Preferences* const pref = Preferences::instance();
if (pref->isWebUiEnabled()) {
// Display some information to the user
std::cout << std::endl << "******** " << qPrintable(tr("Information")) << " ********" << std::endl;
std::cout << qPrintable(tr("To control qBittorrent, access the Web UI at http://localhost:%1").arg(QString::number(pref->getWebUiPort()))) << std::endl;
@ -167,7 +166,6 @@ int Application::exec(const QStringList &params) @@ -167,7 +166,6 @@ int Application::exec(const QStringList &params)
std::cout << qPrintable(tr("The Web UI administrator password is still the default one: %1").arg("adminadmin")) << std::endl;
std::cout << qPrintable(tr("This is a security risk, please consider changing your password from program preferences.")) << std::endl;
}
}
#endif // DISABLE_WEBUI
#else
m_window = new MainWindow;

4
src/core/preferences.cpp

@ -1076,7 +1076,11 @@ void Preferences::setIgnoreSlowTorrentsForQueueing(bool ignore) @@ -1076,7 +1076,11 @@ void Preferences::setIgnoreSlowTorrentsForQueueing(bool ignore)
bool Preferences::isWebUiEnabled() const
{
#ifdef DISABLE_GUI
return true;
#else
return value("Preferences/WebUI/Enabled", false).toBool();
#endif
}
void Preferences::setWebUiEnabled(bool enabled)

4
src/webui/abstractwebapplication.cpp

@ -271,6 +271,10 @@ void AbstractWebApplication::translateDocument(QString& data) @@ -271,6 +271,10 @@ void AbstractWebApplication::translateDocument(QString& data)
// Remove keyboard shortcuts
translation.replace(mnemonic, "");
// Use HTML code for quotes to prevent issues with JS
translation.replace("'", "&#39;");
translation.replace("\"", "&#34;");
data.replace(i, regex.matchedLength(), translation);
i += translation.length();
}

Loading…
Cancel
Save