better output-inserting routines

Author: ddmitov

README.md

@@ -144,9 +144,9 @@ The following compile-time variable can tighten further the security of PEB.
 * Perl 5 distribution - any Linux, Mac or Windows Perl distribution.  
 
   Tested successfully using the following Perl distributions:  
-  Linux x64 [Perlbrew](https://perlbrew.pl/) Perl versions 5.18.4, 5.23.7  
-  Linux x64 [Relocatable Perl](https://github.com/skaji/relocatable-perl) version 5.24.1  
-  Windows x32 [Strawberry Perl](http://strawberryperl.com/) PortableZIP versions 5.12.2.0, 5.16.1.1, 5.20.2.1  
+  Linux 64-bit [Perlbrew](https://perlbrew.pl/) Perl versions 5.18.4, 5.23.7  
+  Linux 64-bit [Relocatable Perl](https://github.com/skaji/relocatable-perl) version 5.24.1  
+  Windows 32-bit [Strawberry Perl](http://strawberryperl.com/) PortableZIP versions 5.12.2.0, 5.16.1.1, 5.20.2.1  
 
   To use a Perlbrew Perl with PEB create a symlink to the wanted Perl interpreter named:  
   ``{PEB_binary_directory}/perl/bin/perl``  

REQUIREMENTS.md

@@ -28,9 +28,9 @@ If you are using the Qt Creator IDE, go to 'Projects' and disable the 'Shadow Bu
 * Perl 5 distribution - any Linux, Mac or Windows Perl distribution.  
 
   Tested successfully using the following Perl distributions:  
-  Linux x64 [Perlbrew](https://perlbrew.pl/) Perl versions 5.18.4, 5.23.7  
-  Linux x64 [Relocatable Perl](https://github.com/skaji/relocatable-perl) version 5.24.1  
-  Windows x32 [Strawberry Perl](http://strawberryperl.com/) PortableZIP versions 5.12.2.0, 5.16.1.1, 5.20.2.1  
+  Linux 64-bit [Perlbrew](https://perlbrew.pl/) Perl versions 5.18.4, 5.23.7  
+  Linux 64-bit [Relocatable Perl](https://github.com/skaji/relocatable-perl) version 5.24.1  
+  Windows 32-bit [Strawberry Perl](http://strawberryperl.com/) PortableZIP versions 5.12.2.0, 5.16.1.1, 5.20.2.1  
 
   To use a Perlbrew Perl with PEB create a symlink to the wanted Perl interpreter named:  
   ``{PEB_binary_directory}/perl/bin/perl``  

src/page.cpp

@@ -140,6 +140,5 @@ QPage::QPage()
     QObject::connect(this, SIGNAL(frameCreated(QWebFrame *)),
                      this, SLOT(qFrameCustomizerSlot(QWebFrame *)));
 
-    lastTargetFrame = currentFrame();
     windowCloseRequested = false;
 }

src/page.h

@@ -54,7 +54,6 @@ public slots:
     {
         if (ok) {
             emit changeTitleSignal();
-            qJavaScriptInjector(QPage::mainFrame());
         }
     }
 
@@ -113,9 +112,9 @@ public slots:
         if (stdoutTarget.length() > 0) {
             qOutputInserter(output, stdoutTarget);
         } else {
-            lastTargetFrame->setHtml(output,
-                                     QUrl(qApp->property("pseudoDomain")
-                                          .toString()));
+            currentFrame()->setHtml(output,
+                                    QUrl(qApp->property("pseudoDomain")
+                                         .toString()));
         }
     }
 
@@ -177,6 +176,8 @@ public slots:
 
     void qOutputInserter(QString stdoutData, QString stdoutTarget)
     {
+        qJavaScriptInjector(currentFrame());
+
         QString outputInsertionJavaScript =
                 "pebOutputInsertion(\"" +
                 stdoutData +
@@ -363,13 +364,8 @@ public slots:
     }
 
     // ==============================
-    // JavaScript-injecting routines:
+    // JavaScript-injecting routine:
     // ==============================
-    void qFrameCustomizerSlot(QWebFrame *frame)
-    {
-        qJavaScriptInjector(frame);
-    }
-
     void qJavaScriptInjector(QWebFrame *frame)
     {
         QFileReader *resourceReader =
@@ -544,8 +540,6 @@ public slots:
 
         if (request.url().authority() ==
                 qApp->property("pseudoDomain").toString()) {
-            lastTargetFrame = frame;
-
             if (pageStatus == "trusted") {
                 // ==============================
                 // User selected single file:
@@ -812,8 +806,6 @@ public slots:
     }
 
 private:
-    QWebFrame *lastTargetFrame;
-
     QString pageStatus;
     QRegExp htmlFileNameExtensionMarker;
     QString emptyString;

src/script-handler.h

@@ -47,14 +47,14 @@ public slots:
         scriptAccumulatedOutput.append(output);
 
         qDebug() << QDateTime::currentMSecsSinceEpoch()
-                << "msecs from epoch: output from" << scriptFullFilePath;
+                 << "msecs from epoch: output from" << scriptFullFilePath;
 
         // Handling 'script closed' confirmation:
         if (output == scriptCloseConfirmation) {
             qDebug() << QDateTime::currentMSecsSinceEpoch()
-                    << "msecs from epoch:"
-                    << "interactive script terminated normally:"
-                    << scriptFullFilePath;
+                     << "msecs from epoch:"
+                     << "interactive script terminated normally:"
+                     << scriptFullFilePath;
         } else {
             if (scriptStdoutTarget.length() > 0) {
                 emit displayScriptOutputSignal(output, scriptStdoutTarget);
@@ -69,7 +69,7 @@ public slots:
         scriptAccumulatedErrors.append("\n");
 
         qDebug() << QDateTime::currentMSecsSinceEpoch()
-                << "msecs from epoch: errors from" << scriptFullFilePath;
+                 << "msecs from epoch: errors from" << scriptFullFilePath;
         // qDebug() << "Script errors:" << scriptErrors;
     }
 
@@ -84,7 +84,7 @@ public slots:
         scriptProcess.close();
 
         qDebug() << QDateTime::currentMSecsSinceEpoch()
-                << "msecs from epoch: script finished:" << scriptFullFilePath;
+                 << "msecs from epoch: script finished:" << scriptFullFilePath;
     }
 
     void qRootPasswordTimeoutSlot()