Skip to content
Snippets Groups Projects
Commit dcaa60c7 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Reformat Code.

parent 4c365887
No related branches found
No related tags found
No related merge requests found
...@@ -244,7 +244,7 @@ class Evaluate { ...@@ -244,7 +244,7 @@ class Evaluate {
$sqlMode = ROW_REGULAR; $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); $arrToken = explode(' ', $token);
// Variable Type 'SQL Statement' // Variable Type 'SQL Statement'
...@@ -262,7 +262,12 @@ class Evaluate { ...@@ -262,7 +262,12 @@ class Evaluate {
if (strcasecmp($type, 'link') == 0) { 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) { if ($this->link === null) {
$this->link = new Link($this->store->getSipInstance(), $dbIndex); $this->link = new Link($this->store->getSipInstance(), $dbIndex);
......
...@@ -28,12 +28,15 @@ class FormAction { ...@@ -28,12 +28,15 @@ class FormAction {
* @var Evaluate instantiated class * @var Evaluate instantiated class
*/ */
protected $evaluate = null; // copy of the loaded form protected $evaluate = null; // copy of the loaded form
private $formSpec = array(); private $formSpec = array();
private $primaryTableName = ''; private $primaryTableName = '';
/** /**
* @var Database * @var Database
*/ */
private $db = null; private $db = null;
/** /**
* @var Store * @var Store
*/ */
...@@ -71,6 +74,7 @@ class FormAction { ...@@ -71,6 +74,7 @@ class FormAction {
* ACTION_ELEMENT_DELETED: if a record has been deleted (only in recursive calls, not the initial one) * ACTION_ELEMENT_DELETED: if a record has been deleted (only in recursive calls, not the initial one)
* @throws CodeException * @throws CodeException
* @throws DbException * @throws DbException
* @throws DownloadException
* @throws UserFormException * @throws UserFormException
* @throws UserReportException * @throws UserReportException
*/ */
...@@ -245,6 +249,7 @@ class FormAction { ...@@ -245,6 +249,7 @@ class FormAction {
* @param array $feSpecAction * @param array $feSpecAction
* @throws CodeException * @throws CodeException
* @throws DbException * @throws DbException
* @throws DownloadException
* @throws UserFormException * @throws UserFormException
* @throws UserReportException * @throws UserReportException
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment