diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eb77e83 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build-peb-Desktop_Qt_5_2_1_clang_64bit-Debug/ +src/peb.pro.user +peb diff --git a/src/peb.cpp b/src/peb.cpp index 103f44f..cff5839 100755 --- a/src/peb.cpp +++ b/src/peb.cpp @@ -623,7 +623,7 @@ bool Page::acceptNavigationRequest (QWebFrame *frame, // Open not allowed web site using default browser: if (navigationType == QWebPage::NavigationTypeLinkClicked and request.url().scheme().contains ("http") and - (! (QUrl ("http://perl-executing-browser-pseudodomain/")) + (! (QUrl (PEB_DOMAIN)) .isParentOf (request.url())) and (! request.url().authority().contains ("localhost")) and (! request.url().authority().contains ("www.perl.org"))) { @@ -668,7 +668,7 @@ bool Page::acceptNavigationRequest (QWebFrame *frame, // Open local content in a new window // (with the exception of result from long-running script): if (frame != Page::currentFrame() and - (QUrl ("http://perl-executing-browser-pseudodomain/")) + (QUrl (PEB_DOMAIN)) .isParentOf (request.url())) { if (! Page::mainFrame()->childFrames().contains (frame)) { if (! request.url().path().contains ("longrun")) { @@ -702,7 +702,7 @@ bool Page::acceptNavigationRequest (QWebFrame *frame, // Load local HTML page invoked from hyperlink: if (navigationType == QWebPage::NavigationTypeLinkClicked and - (QUrl ("http://perl-executing-browser-pseudodomain/")) + (QUrl (PEB_DOMAIN)) .isParentOf (request.url()) and (request.url().path().contains (".htm"))) { filepath = request.url() @@ -724,7 +724,7 @@ bool Page::acceptNavigationRequest (QWebFrame *frame, // Execute local long-running script invoked from hyperlink: if (navigationType == QWebPage::NavigationTypeLinkClicked and - (QUrl ("http://perl-executing-browser-pseudodomain/")) + (QUrl (PEB_DOMAIN)) .isParentOf (request.url()) and (request.url().path().contains ("longrun"))){ qDebug() << "Long-running script:" << request.url().toString(); diff --git a/src/peb.h b/src/peb.h index f7003f7..c3145cc 100755 --- a/src/peb.h +++ b/src/peb.h @@ -12,6 +12,11 @@ #ifndef PEB_H #define PEB_H +// The domain of Perl Executing Browser +#ifndef PEB_DOMAIN +#define PEB_DOMAIN "http://perl-executing-browser-pseudodomain/" +#endif + #include #if QT_VERSION >= 0x050000 // Qt5 code: @@ -128,7 +133,7 @@ class ModifiedNetworkAccessManager : public QNetworkAccessManager // 2.) script started in a new window, // 3.) script, which was fed with data from local form using CGI GET method if (operation == GetOperation and - (QUrl ("http://perl-executing-browser-pseudodomain/")) + (QUrl (PEB_DOMAIN)) .isParentOf(request.url()) and (!request.url().path().contains ("longrun")) and (!request.url().toString().contains ("debugger"))) { @@ -238,7 +243,7 @@ class ModifiedNetworkAccessManager : public QNetworkAccessManager // Get data from local form using CGI POST method and // execute associated local script: if (operation == PostOperation and - (QUrl("http://perl-executing-browser-pseudodomain/")) + (QUrl(PEB_DOMAIN)) .isParentOf (request.url())) { QString postData; QByteArray outgoingByteArray; @@ -624,7 +629,7 @@ public slots: (QApplication::applicationDirPath()+ QDir::separator()+settings.startPage))); } else { - setUrl (QUrl (QString ("http://perl-executing-browser-pseudodomain/" + + setUrl (QUrl (QString (PEB_DOMAIN + settings.startPage))); } } @@ -713,7 +718,7 @@ public slots: QMenu *menu = mainPage->createStandardContextMenu(); if (!qWebHitTestResult.linkUrl().isEmpty()) { qWebHitTestURL = qWebHitTestResult.linkUrl(); - if (QUrl ("http://perl-executing-browser-pseudodomain/") + if (QUrl (PEB_DOMAIN) .isParentOf (qWebHitTestURL)) { menu->addSeparator (); QAction *editAct = menu->addAction (tr ("&Edit"));