Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@976901 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 52 insertions, 529 deletions

diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp
index fd823553..4e4ef2c2 100644
--- a/src/cookiejar.cpp
+++ b/src/cookiejar.cpp
@@ -49,54 +49,37 @@
 
 static const unsigned int JAR_VERSION = 23;
 
+static const char cookieFileName[] = "cookies";
 
-QDataStream &operator<<(QDataStream &stream, const QList<QNetworkCookie> &list)
-{
-    stream << JAR_VERSION;
-    stream << quint32(list.size());
-    for (int i = 0; i < list.size(); ++i)
-        stream << list.at(i).toRawForm();
-    return stream;
-}
 
-
-QDataStream &operator>>(QDataStream &stream, QList<QNetworkCookie> &list)
+CookieJar::CookieJar(QObject *parent)
+        : QNetworkCookieJar(parent)
+        , m_acceptCookies(AcceptOnlyFromSitesNavigatedTo)
 {
-    list.clear();
-
-    quint32 version;
-    stream >> version;
+    // load cookies and exceptions
+    QString filepath = KStandardDirs::locateLocal("appdata", cookieFileName);
+    KConfig iniconfig(filepath);
 
-    if (version != JAR_VERSION)
-        return stream;
+    KConfigGroup inigroup1 = iniconfig.group("cookielist");
 
-    quint32 count;
-    stream >> count;
-    for (quint32 i = 0; i < count; ++i)
+    QStringList cookieStringList = inigroup1.readEntry( QString("cookies"), QStringList() );
+    QList<QNetworkCookie> cookieNetworkList;
+    foreach( QString str, cookieStringList )
     {
-        QByteArray value;
-        stream >> value;
-        QList<QNetworkCookie> newCookies = QNetworkCookie::parseCookies(value);
-        if (newCookies.count() == 0 && value.length() != 0)
-        {
-            kWarning() << "CookieJar: Unable to parse saved cookie:" << value;
-        }
-        for (int j = 0; j < newCookies.count(); ++j)
-            list.append(newCookies.at(j));
-        if (stream.atEnd())
-            break;
+        cookieNetworkList << QNetworkCookie( str.toLocal8Bit() );
     }
-    return stream;
-}
+    setAllCookies( cookieNetworkList );
 
+    KConfigGroup inigroup2 = iniconfig.group("exceptions");
+    m_exceptions_block = inigroup2.readEntry( QString("block") , QStringList() );
+    m_exceptions_allow = inigroup2.readEntry( QString("allow"), QStringList() );
+    m_exceptions_allowForSession = inigroup2.readEntry( QString("allowForSession"), QStringList() );
 
-CookieJar::CookieJar(QObject *parent)
-        : QNetworkCookieJar(parent)
-        , m_loaded(false)
-        , m_saveTimer(new AutoSaver(this))
-        , m_acceptCookies(AcceptOnlyFromSitesNavigatedTo)
-{
-    load();
+    qSort( m_exceptions_block.begin(), m_exceptions_block.end() );
+    qSort( m_exceptions_allow.begin(), m_exceptions_allow.end() );
+    qSort( m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end() );
+
+    loadSettings();
 }
 
 
@@ -104,39 +87,18 @@ CookieJar::~CookieJar()
 {
     if (m_keepCookies == KeepUntilExit)
         clear();
-    m_saveTimer->saveIfNeccessary();
+
+    save();
 }
 
 
 void CookieJar::clear()
 {
     setAllCookies(QList<QNetworkCookie>());
-    m_saveTimer->changeOccurred();
-    emit cookiesChanged();
-}
-
-
-void CookieJar::load()
-{
-    if (m_loaded)
-        return;
-
-    // load cookies and exceptions
-    QString filepath = KStandardDirs::locateLocal("appdata", "cookies.ini");
-    qRegisterMetaTypeStreamOperators<QList<QNetworkCookie> >("QList<QNetworkCookie>");
-    QSettings cookieSettings(filepath, QSettings::IniFormat);
-    setAllCookies(qvariant_cast<QList<QNetworkCookie> >(cookieSettings.value(QLatin1String("cookies"))));
-    cookieSettings.beginGroup(QLatin1String("Exceptions"));
-    m_exceptions_block = cookieSettings.value(QLatin1String("block")).toStringList();
-    m_exceptions_allow = cookieSettings.value(QLatin1String("allow")).toStringList();
-    m_exceptions_allowForSession = cookieSettings.value(QLatin1String("allowForSession")).toStringList();
-    qSort(m_exceptions_block.begin(), m_exceptions_block.end());
-    qSort(m_exceptions_allow.begin(), m_exceptions_allow.end());
-    qSort(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end());
-
-    loadSettings();
 
     save();
+
+    emit cookiesChanged();
 }
 
 
@@ -175,19 +137,18 @@ void CookieJar::loadSettings()
         break;
     }
 
-    m_loaded = true;
     emit cookiesChanged();
 }
 
 
 void CookieJar::save()
 {
-    if (!m_loaded)
-        return;
     purgeOldCookies();
 
-    QString filepath = KStandardDirs::locateLocal("appdata", "cookies.ini");
-    QSettings cookieSettings(filepath, QSettings::IniFormat);
+    QString filepath = KStandardDirs::locateLocal("appdata", cookieFileName);
+    KConfig iniconfig( filepath );
+
+    KConfigGroup inigroup1 = iniconfig.group("cookielist");
     QList<QNetworkCookie> cookies = allCookies();
     for (int i = cookies.count() - 1; i >= 0; --i)
     {
@@ -195,11 +156,17 @@ void CookieJar::save()
             cookies.removeAt(i);
     }
 
-    cookieSettings.setValue(QLatin1String("cookies"), qVariantFromValue<QList<QNetworkCookie> >(cookies));
-    cookieSettings.beginGroup(QLatin1String("Exceptions"));
-    cookieSettings.setValue(QLatin1String("block"), m_exceptions_block);
-    cookieSettings.setValue(QLatin1String("allow"), m_exceptions_allow);
-    cookieSettings.setValue(QLatin1String("allowForSession"), m_exceptions_allowForSession);
+    QStringList cookieStringList;
+    foreach( QNetworkCookie cookie, cookies )
+    {
+        cookieStringList << QString( cookie.toRawForm() );
+    }
+    inigroup1.writeEntry( QString("cookies"), cookieStringList );
+
+    KConfigGroup inigroup2 = iniconfig.group("exceptions");
+    inigroup2.writeEntry( QString("block"), m_exceptions_block );
+    inigroup2.writeEntry( QString("allow"), m_exceptions_allow );
+    inigroup2.writeEntry( QString("allowForSession"), m_exceptions_allowForSession );
 
     // save cookie settings
     int n;
@@ -251,16 +218,13 @@ void CookieJar::purgeOldCookies()
     if (oldCount == cookies.count())
         return;
     setAllCookies(cookies);
+
     emit cookiesChanged();
 }
 
 
 QList<QNetworkCookie> CookieJar::cookiesForUrl(const QUrl &url) const
 {
-    CookieJar *that = const_cast<CookieJar*>(this);
-    if (!m_loaded)
-        that->load();
-
     QWebSettings *globalSettings = QWebSettings::globalSettings();
     if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
     {
@@ -274,9 +238,6 @@ QList<QNetworkCookie> CookieJar::cookiesForUrl(const QUrl &url) const
 
 bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
 {
-    if (!m_loaded)
-        load();
-
     QWebSettings *globalSettings = QWebSettings::globalSettings();
     if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
         return false;
@@ -318,17 +279,13 @@ bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const
                     setAllCookies(cookies);
                     addedCookies = true;
                 }
-#if 0
-                else
-                    kWarning() << "setCookiesFromUrl failed" << url << cookieList.value(0).toRawForm();
-#endif
             }
         }
     }
 
     if (addedCookies)
     {
-        m_saveTimer->changeOccurred();
+        save();
         emit cookiesChanged();
     }
     return addedCookies;
@@ -337,510 +294,76 @@ bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const
 
 CookieJar::AcceptPolicy CookieJar::acceptPolicy() const
 {
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
     return m_acceptCookies;
 }
 
 
 void CookieJar::setAcceptPolicy(AcceptPolicy policy)
 {
-    if (!m_loaded)
-        load();
     if (policy == m_acceptCookies)
         return;
     m_acceptCookies = policy;
-    m_saveTimer->changeOccurred();
+
+    save();
 }
 
 
 CookieJar::KeepPolicy CookieJar::keepPolicy() const
 {
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
     return m_keepCookies;
 }
 
 
 void CookieJar::setKeepPolicy(KeepPolicy policy)
 {
-    if (!m_loaded)
-        load();
     if (policy == m_keepCookies)
         return;
     m_keepCookies = policy;
-    m_saveTimer->changeOccurred();
+
+    save();
 }
 
 
 QStringList CookieJar::blockedCookies() const
 {
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
     return m_exceptions_block;
 }
 
 
 QStringList CookieJar::allowedCookies() const
 {
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
     return m_exceptions_allow;
 }
 
 
 QStringList CookieJar::allowForSessionCookies() const
 {
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
     return m_exceptions_allowForSession;
 }
 
 
 void CookieJar::setBlockedCookies(const QStringList &list)
 {
-    if (!m_loaded)
-        load();
     m_exceptions_block = list;
     qSort(m_exceptions_block.begin(), m_exceptions_block.end());
-    m_saveTimer->changeOccurred();
+
+    save();
 }
 
 
 void CookieJar::setAllowedCookies(const QStringList &list)
 {
-    if (!m_loaded)
-        load();
     m_exceptions_allow = list;
     qSort(m_exceptions_allow.begin(), m_exceptions_allow.end());
-    m_saveTimer->changeOccurred();
+
+    save();
 }
 
 
 void CookieJar::setAllowForSessionCookies(const QStringList &list)
 {
-    if (!m_loaded)
-        load();
     m_exceptions_allowForSession = list;
     qSort(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end());
-    m_saveTimer->changeOccurred();
-}
-
-
-// -------------------------------------------------------------------------------------------
-
-
-CookieModel::CookieModel(CookieJar *cookieJar, QObject *parent)
-        : QAbstractTableModel(parent)
-        , m_cookieJar(cookieJar)
-{
-    connect(m_cookieJar, SIGNAL(cookiesChanged()), this, SLOT(cookiesChanged()));
-    m_cookieJar->load();
-}
-
-
-QVariant CookieModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (role == Qt::SizeHintRole)
-    {
-        QFont font;
-        font.setPointSize(10);
-        QFontMetrics fm(font);
-        int height = fm.height() + fm.height() / 3;
-        int width = fm.width(headerData(section, orientation, Qt::DisplayRole).toString());
-        return QSize(width, height);
-    }
-
-    if (orientation == Qt::Horizontal)
-    {
-        if (role != Qt::DisplayRole)
-            return QVariant();
-
-        switch (section)
-        {
-        case 0:
-            return i18n("Website");
-        case 1:
-            return i18n("Name");
-        case 2:
-            return i18n("Path");
-        case 3:
-            return i18n("Secure");
-        case 4:
-            return i18n("Expires");
-        case 5:
-            return i18n("Contents");
-        default:
-            return QVariant();
-        }
-    }
-    return QAbstractTableModel::headerData(section, orientation, role);
-}
-
-
-QVariant CookieModel::data(const QModelIndex &index, int role) const
-{
-    QList<QNetworkCookie> lst;
-    if (m_cookieJar)
-        lst = m_cookieJar->allCookies();
-    if (index.row() < 0 || index.row() >= lst.size())
-        return QVariant();
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-    case Qt::EditRole:
-    {
-        QNetworkCookie cookie = lst.at(index.row());
-        switch (index.column())
-        {
-        case 0:
-            return cookie.domain();
-        case 1:
-            return cookie.name();
-        case 2:
-            return cookie.path();
-        case 3:
-            return cookie.isSecure();
-        case 4:
-            return cookie.expirationDate();
-        case 5:
-            return cookie.value();
-        }
-    }
-    case Qt::FontRole:
-    {
-        QFont font;
-        font.setPointSize(10);
-        return font;
-    }
-    }
-
-    return QVariant();
-}
-
-
-int CookieModel::columnCount(const QModelIndex &parent) const
-{
-    return (parent.isValid()) ? 0 : 6;
-}
-
-
-int CookieModel::rowCount(const QModelIndex &parent) const
-{
-    return (parent.isValid() || !m_cookieJar) ? 0 : m_cookieJar->allCookies().count();
-}
-
-
-bool CookieModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-    if (parent.isValid() || !m_cookieJar)
-        return false;
-    int lastRow = row + count - 1;
-    beginRemoveRows(parent, row, lastRow);
-    QList<QNetworkCookie> lst = m_cookieJar->allCookies();
-    for (int i = lastRow; i >= row; --i)
-    {
-        lst.removeAt(i);
-    }
-    m_cookieJar->setAllCookies(lst);
-    endRemoveRows();
-    return true;
-}
-
-
-void CookieModel::cookiesChanged()
-{
-    reset();
-}
 
-
-
-// ------------------------------------------------------------------------------------------------
-
-
-CookiesDialog::CookiesDialog(CookieJar *cookieJar, QWidget *parent)
-        : QDialog(parent)
-{
-    setupUi(this);
-    setWindowFlags(Qt::Sheet);
-    CookieModel *model = new CookieModel(cookieJar, this);
-    m_proxyModel = new QSortFilterProxyModel(this);
-    connect(search, SIGNAL(textChanged(QString)),
-            m_proxyModel, SLOT(setFilterFixedString(QString)));
-    connect(removeButton, SIGNAL(clicked()), cookiesTable, SLOT(removeOne()));
-    connect(removeAllButton, SIGNAL(clicked()), cookiesTable, SLOT(removeAll()));
-    m_proxyModel->setSourceModel(model);
-    cookiesTable->verticalHeader()->hide();
-    cookiesTable->setSelectionBehavior(QAbstractItemView::SelectRows);
-    cookiesTable->setModel(m_proxyModel);
-    cookiesTable->setAlternatingRowColors(true);
-    cookiesTable->setTextElideMode(Qt::ElideMiddle);
-    cookiesTable->setShowGrid(false);
-    cookiesTable->setSortingEnabled(true);
-    QFont f = font();
-    f.setPointSize(10);
-    QFontMetrics fm(f);
-    int height = fm.height() + fm.height() / 3;
-    cookiesTable->verticalHeader()->setDefaultSectionSize(height);
-    cookiesTable->verticalHeader()->setMinimumSectionSize(-1);
-    for (int i = 0; i < model->columnCount(); ++i)
-    {
-        int header = cookiesTable->horizontalHeader()->sectionSizeHint(i);
-        switch (i)
-        {
-        case 0:
-            header = fm.width(QLatin1String("averagehost.domain.com"));
-            break;
-        case 1:
-            header = fm.width(QLatin1String("_session_id"));
-            break;
-        case 4:
-            header = fm.width(QDateTime::currentDateTime().toString(Qt::LocalDate));
-            break;
-        }
-        int buffer = fm.width(QLatin1String("xx"));
-        header += buffer;
-        cookiesTable->horizontalHeader()->resizeSection(i, header);
-    }
-    cookiesTable->horizontalHeader()->setStretchLastSection(true);
-}
-
-
-// ---------------------------------------------------------------------------------------------------
-
-
-CookieExceptionsModel::CookieExceptionsModel(CookieJar *cookiejar, QObject *parent)
-        : QAbstractTableModel(parent)
-        , m_cookieJar(cookiejar)
-{
-    m_allowedCookies = m_cookieJar->allowedCookies();
-    m_blockedCookies = m_cookieJar->blockedCookies();
-    m_sessionCookies = m_cookieJar->allowForSessionCookies();
-}
-
-
-QVariant CookieExceptionsModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (role == Qt::SizeHintRole)
-    {
-        QFont font;
-        font.setPointSize(10);
-        QFontMetrics fm(font);
-        int height = fm.height() + fm.height() / 3;
-        int width = fm.width(headerData(section, orientation, Qt::DisplayRole).toString());
-        return QSize(width, height);
-    }
-
-    if (orientation == Qt::Horizontal
-            && role == Qt::DisplayRole)
-    {
-        switch (section)
-        {
-        case 0:
-            return i18n("Website");
-        case 1:
-            return i18n("Status");
-        }
-    }
-    return QAbstractTableModel::headerData(section, orientation, role);
-}
-
-
-QVariant CookieExceptionsModel::data(const QModelIndex &index, int role) const
-{
-    if (index.row() < 0 || index.row() >= rowCount())
-        return QVariant();
-
-    switch (role)
-    {
-    case Qt::DisplayRole:
-    case Qt::EditRole:
-    {
-        int row = index.row();
-        if (row < m_allowedCookies.count())
-        {
-            switch (index.column())
-            {
-            case 0:
-                return m_allowedCookies.at(row);
-            case 1:
-                return i18n("Allow");
-            }
-        }
-        row = row - m_allowedCookies.count();
-        if (row < m_blockedCookies.count())
-        {
-            switch (index.column())
-            {
-            case 0:
-                return m_blockedCookies.at(row);
-            case 1:
-                return i18n("Block");
-            }
-        }
-        row = row - m_blockedCookies.count();
-        if (row < m_sessionCookies.count())
-        {
-            switch (index.column())
-            {
-            case 0:
-                return m_sessionCookies.at(row);
-            case 1:
-                return i18n("Allow For Session");
-            }
-        }
-    }
-    case Qt::FontRole:
-    {
-        QFont font;
-        font.setPointSize(10);
-        return font;
-    }
-    }
-    return QVariant();
-}
-
-
-int CookieExceptionsModel::columnCount(const QModelIndex &parent) const
-{
-    return (parent.isValid()) ? 0 : 2;
-}
-
-
-int CookieExceptionsModel::rowCount(const QModelIndex &parent) const
-{
-    return (parent.isValid() || !m_cookieJar) ? 0 : m_allowedCookies.count() + m_blockedCookies.count() + m_sessionCookies.count();
-}
-
-
-bool CookieExceptionsModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-    if (parent.isValid() || !m_cookieJar)
-        return false;
-
-    int lastRow = row + count - 1;
-    beginRemoveRows(parent, row, lastRow);
-    for (int i = lastRow; i >= row; --i)
-    {
-        if (i < m_allowedCookies.count())
-        {
-            m_allowedCookies.removeAt(row);
-            continue;
-        }
-        i = i - m_allowedCookies.count();
-        if (i < m_blockedCookies.count())
-        {
-            m_blockedCookies.removeAt(row);
-            continue;
-        }
-        i = i - m_blockedCookies.count();
-        if (i < m_sessionCookies.count())
-        {
-            m_sessionCookies.removeAt(row);
-            continue;
-        }
-    }
-    m_cookieJar->setAllowedCookies(m_allowedCookies);
-    m_cookieJar->setBlockedCookies(m_blockedCookies);
-    m_cookieJar->setAllowForSessionCookies(m_sessionCookies);
-    endRemoveRows();
-    return true;
-}
-
-
-// ----------------------------------------------------------------------------------------------------------------
-
-
-CookiesExceptionsDialog::CookiesExceptionsDialog(CookieJar *cookieJar, QWidget *parent)
-        : QDialog(parent)
-        , m_cookieJar(cookieJar)
-{
-    setupUi(this);
-    setWindowFlags(Qt::Sheet);
-    connect(removeButton, SIGNAL(clicked()), exceptionTable, SLOT(removeOne()));
-    connect(removeAllButton, SIGNAL(clicked()), exceptionTable, SLOT(removeAll()));
-    exceptionTable->verticalHeader()->hide();
-    exceptionTable->setSelectionBehavior(QAbstractItemView::SelectRows);
-    exceptionTable->setAlternatingRowColors(true);
-    exceptionTable->setTextElideMode(Qt::ElideMiddle);
-    exceptionTable->setShowGrid(false);
-    exceptionTable->setSortingEnabled(true);
-    m_exceptionsModel = new CookieExceptionsModel(cookieJar, this);
-    m_proxyModel = new QSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_exceptionsModel);
-    connect(search, SIGNAL(textChanged(QString)),
-            m_proxyModel, SLOT(setFilterFixedString(QString)));
-    exceptionTable->setModel(m_proxyModel);
-
-    CookieModel *cookieModel = new CookieModel(cookieJar, this);
-    domainLineEdit->setCompleter(new QCompleter(cookieModel, domainLineEdit));
-
-    connect(domainLineEdit, SIGNAL(textChanged(const QString &)),
-            this, SLOT(textChanged(const QString &)));
-    connect(blockButton, SIGNAL(clicked()), this, SLOT(block()));
-    connect(allowButton, SIGNAL(clicked()), this, SLOT(allow()));
-    connect(allowForSessionButton, SIGNAL(clicked()), this, SLOT(allowForSession()));
-
-    QFont f = font();
-    f.setPointSize(10);
-    QFontMetrics fm(f);
-    int height = fm.height() + fm.height() / 3;
-    exceptionTable->verticalHeader()->setDefaultSectionSize(height);
-    exceptionTable->verticalHeader()->setMinimumSectionSize(-1);
-    for (int i = 0; i < m_exceptionsModel->columnCount(); ++i)
-    {
-        int header = exceptionTable->horizontalHeader()->sectionSizeHint(i);
-        switch (i)
-        {
-        case 0:
-            header = fm.width(QLatin1String("averagebiglonghost.domain.com"));
-            break;
-        case 1:
-            header = fm.width(QLatin1String("Allow For Session"));
-            break;
-        }
-        int buffer = fm.width(QLatin1String("xx"));
-        header += buffer;
-        exceptionTable->horizontalHeader()->resizeSection(i, header);
-    }
-}
-
-
-void CookiesExceptionsDialog::textChanged(const QString &text)
-{
-    bool enabled = !text.isEmpty();
-    blockButton->setEnabled(enabled);
-    allowButton->setEnabled(enabled);
-    allowForSessionButton->setEnabled(enabled);
-}
-
-
-void CookiesExceptionsDialog::block()
-{
-    if (domainLineEdit->text().isEmpty())
-        return;
-    m_exceptionsModel->m_blockedCookies.append(domainLineEdit->text());
-    m_cookieJar->setBlockedCookies(m_exceptionsModel->m_blockedCookies);
-    m_exceptionsModel->reset();
-}
-
-
-void CookiesExceptionsDialog::allow()
-{
-    if (domainLineEdit->text().isEmpty())
-        return;
-    m_exceptionsModel->m_allowedCookies.append(domainLineEdit->text());
-    m_cookieJar->setAllowedCookies(m_exceptionsModel->m_allowedCookies);
-    m_exceptionsModel->reset();
-}
-
-
-void CookiesExceptionsDialog::allowForSession()
-{
-    if (domainLineEdit->text().isEmpty())
-        return;
-    m_exceptionsModel->m_sessionCookies.append(domainLineEdit->text());
-    m_cookieJar->setAllowForSessionCookies(m_exceptionsModel->m_sessionCookies);
-    m_exceptionsModel->reset();
+    save();
 }