Reformat Code.

extension/qfq/qfq/Evaluate.php

@@ -244,7 +244,7 @@ class Evaluate {
             $sqlMode = ROW_REGULAR;
         }
 
-        // Extract token: check if this is a SQL Statement
+        // Extract token: check if this is a 'SQL Statement', 'link'
         $arrToken = explode(' ', $token);
 
         // Variable Type 'SQL Statement'
@@ -262,7 +262,12 @@ class Evaluate {
 
             if (strcasecmp($type, 'link') == 0) {
 
-                $str = OnString::trimQuote(substr($token, 0, strlen($token) - 8));  // strlen('_as_link')=8
+                array_pop($arrToken); // remove 'link'
+                array_pop($arrToken); // remove 'as'
+                $token = trim(implode($arrToken));
+
+//                $str = OnString::trimQuote(substr($token, 0, strlen($token) - 8));  // strlen('_as_link')=8
+                $str = OnString::trimQuote($token);
 
                 if ($this->link === null) {
                     $this->link = new Link($this->store->getSipInstance(), $dbIndex);

extension/qfq/qfq/form/FormAction.php

@@ -28,12 +28,15 @@ class FormAction {
      * @var Evaluate instantiated class
      */
     protected $evaluate = null;  // copy of the loaded form
+
     private $formSpec = array();
     private $primaryTableName = '';
+
     /**
      * @var Database
      */
     private $db = null;
+
     /**
      * @var Store
      */
@@ -71,6 +74,7 @@ class FormAction {
      *              ACTION_ELEMENT_DELETED:  if a record has been deleted (only in recursive calls, not the initial one)
      * @throws CodeException
      * @throws DbException
+     * @throws DownloadException
      * @throws UserFormException
      * @throws UserReportException
      */
@@ -245,6 +249,7 @@ class FormAction {
      * @param array $feSpecAction
      * @throws CodeException
      * @throws DbException
+     * @throws DownloadException
      * @throws UserFormException
      * @throws UserReportException
      */