adds parameter to tell adodb view operations if it's a materialized or regular view

1 files changed, 38 insertions, 36 deletions

diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php
index 5e633124..90b7c581 100644
--- a/src/controllers/FunctionsController.php
+++ b/src/controllers/FunctionsController.php
@@ -107,7 +107,7 @@ class FunctionsController extends BaseController
             'function'     => [
                 'title' => $this->lang['strfunction'],
                 'field' => Decorator::field('proproto'),
-                'url'   => \SUBFOLDER . "/redirect/function?action=properties&{$this->misc->href}&",
+                'url'   => \SUBFOLDER."/redirect/function?action=properties&{$this->misc->href}&",
                 'vars'  => ['function' => 'proproto', 'function_oid' => 'prooid'],
             ],
             'returns'      => [
@@ -413,10 +413,11 @@ class FunctionsController extends BaseController
             }
             if (isset($names_arr[$i]) && '' != $names_arr[$i]) {
                 $data->fieldClean($names_arr[$i]);
-                $args .= '"' . $names_arr[$i] . '" ';
+                $args .= '"'.$names_arr[$i].'" ';
             }
             $args .= $args_arr[$i];
         }
+
         return $args;
     }
 
@@ -437,6 +438,7 @@ class FunctionsController extends BaseController
 
         if ($fndata->recordCount() <= 0) {
             echo "<p>{$this->lang['strnodata']}</p>\n";
+
             return;
         }
         $fndata->fields['proretset'] = $data->phpBool($fndata->fields['proretset']);
@@ -471,7 +473,7 @@ class FunctionsController extends BaseController
             $args = $fndata->fields['proarguments'];
         }
 
-        echo '<form action="' . \SUBFOLDER . "/src/views/functions\" method=\"post\">\n";
+        echo '<form action="'.\SUBFOLDER."/src/views/functions\" method=\"post\">\n";
         echo "<table style=\"width: 90%\">\n";
         echo "<tr>\n";
         echo "<th class=\"data required\">{$this->lang['strschema']}</th>\n";
@@ -542,7 +544,7 @@ class FunctionsController extends BaseController
             echo "<tr><th class=\"data required\" colspan=\"5\">{$this->lang['strdefinition']}</th></tr>\n";
             echo '<tr><td class="data1" colspan="5">';
             $textarea_id = ($fnlang === 'sql' || $fnlang === 'plpgsql') ? 'query' : 'formDefinition';
-            echo '<textarea style="width:100%;" rows="20" cols="50" id="' . $textarea_id . '" name="formDefinition">';
+            echo '<textarea style="width:100%;" rows="20" cols="50" id="'.$textarea_id.'" name="formDefinition">';
             echo htmlspecialchars($_POST['formDefinition']);
             echo "</textarea></td></tr>\n";
         }
@@ -557,8 +559,8 @@ class FunctionsController extends BaseController
         // Display function cost options
         if ($data->hasFunctionCosting()) {
             echo "<tr><th class=\"data required\" colspan=\"5\">{$this->lang['strfunctioncosting']}</th></tr>\n";
-            echo "<td class=\"data1\" colspan=\"2\">{$this->lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"" .
-            htmlspecialchars($_POST['formCost']) . '" /></td>';
+            echo "<td class=\"data1\" colspan=\"2\">{$this->lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"".
+            htmlspecialchars($_POST['formCost']).'" /></td>';
             echo "<td class=\"data1\" colspan=\"2\">{$this->lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"",
             htmlspecialchars($_POST['formRows']), '"', (!$fndata->fields['proretset']) ? 'disabled' : '', '/></td>';
         }
@@ -630,7 +632,7 @@ class FunctionsController extends BaseController
             }
 
             $funcdata->fields['proretset'] = $data->phpBool($funcdata->fields['proretset']);
-            $func_full                     = $funcdata->fields['proname'] . '(' . $funcdata->fields['proarguments'] . ')';
+            $func_full                     = $funcdata->fields['proname'].'('.$funcdata->fields['proarguments'].')';
             echo "<table style=\"width: 90%\">\n";
             echo sprintf('<tr><th class="data">%s</th>%s', $this->lang['strfunction'], "\n");
             echo sprintf('<th class="data">%s</th>%s', $this->lang['strarguments'], "\n");
@@ -707,7 +709,7 @@ class FunctionsController extends BaseController
             $this->printTrail('schema');
             $this->printTitle($this->lang['strdrop'], 'pg.function.drop');
 
-            echo '<form action="' . \SUBFOLDER . "/src/views/functions\" method=\"post\">\n";
+            echo '<form action="'.\SUBFOLDER."/src/views/functions\" method=\"post\">\n";
 
             //If multi drop
             if (isset($_REQUEST['ma'])) {
@@ -831,16 +833,16 @@ class FunctionsController extends BaseController
                 $szSelected = ' selected="selected"';
             }
             // this variable is include in the JS code bellow, so we need to ENT_QUOTES
-            $szTypes .= '<option value="' . htmlspecialchars($types->fields['typname'], ENT_QUOTES) . "\"{$szSelected}>";
-            $szTypes .= htmlspecialchars($types->fields['typname'], ENT_QUOTES) . '</option>';
+            $szTypes .= '<option value="'.htmlspecialchars($types->fields['typname'], ENT_QUOTES)."\"{$szSelected}>";
+            $szTypes .= htmlspecialchars($types->fields['typname'], ENT_QUOTES).'</option>';
             $types->moveNext();
         }
 
-        $szFunctionName = "<td class=\"data1\"><input name=\"formFunction\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"" .
-        htmlspecialchars($_POST['formFunction']) . '" /></td>';
+        $szFunctionName = "<td class=\"data1\"><input name=\"formFunction\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"".
+        htmlspecialchars($_POST['formFunction']).'" /></td>';
 
-        $szArguments = '<td class="data1"><input name="formArguments" style="width:100%;" size="16" value="' .
-        htmlspecialchars($_POST['formArguments']) . '" /></td>';
+        $szArguments = '<td class="data1"><input name="formArguments" style="width:100%;" size="16" value="'.
+        htmlspecialchars($_POST['formArguments']).'" /></td>';
 
         $szSetOfSelected    = '';
         $szNotSetOfSelected = '';
@@ -855,7 +857,7 @@ class FunctionsController extends BaseController
         $szReturns .= "<option value=\"SETOF\"{$szSetOfSelected}>SETOF</option>";
         $szReturns .= '</select>';
 
-        $szReturns .= '<select class="select2" name="formReturns">' . $szTypes . '</select>';
+        $szReturns .= '<select class="select2" name="formReturns">'.$szTypes.'</select>';
 
         // Create string array type selector
 
@@ -875,7 +877,7 @@ class FunctionsController extends BaseController
         // Create string for language
         $szLanguage = '<td class="data1">';
         if ('c' == $fnlang || 'internal' == $fnlang) {
-            $szLanguage .= $_POST['formLanguage'] . "\n";
+            $szLanguage .= $_POST['formLanguage']."\n";
             $szLanguage .= "<input type=\"hidden\" name=\"formLanguage\" value=\"{$_POST['formLanguage']}\" />\n";
         } else {
             $szLanguage .= "<select name=\"formLanguage\">\n";
@@ -885,8 +887,8 @@ class FunctionsController extends BaseController
                     $szSelected = ' selected="selected"';
                 }
                 if ('c' != strtolower($langs->fields['lanname']) && 'internal' != strtolower($langs->fields['lanname'])) {
-                    $szLanguage .= '<option value="' . htmlspecialchars($langs->fields['lanname']) . "\"{$szSelected}>\n" .
-                    $this->misc->printVal($langs->fields['lanname']) . '</option>';
+                    $szLanguage .= '<option value="'.htmlspecialchars($langs->fields['lanname'])."\"{$szSelected}>\n".
+                    $this->misc->printVal($langs->fields['lanname']).'</option>';
                 }
 
                 $langs->moveNext();
@@ -908,9 +910,9 @@ class FunctionsController extends BaseController
         $szArgReturns .= '</select>';
         $subfolder = \SUBFOLDER;
         if (!empty($this->conf['theme'])) {
-            $szImgPath = \SUBFOLDER . "/assets/images/themes/{$this->conf['theme']}";
+            $szImgPath = \SUBFOLDER."/assets/images/themes/{$this->conf['theme']}";
         } else {
-            $szImgPath = \SUBFOLDER . '/assets/images/themes/default';
+            $szImgPath = \SUBFOLDER.'/assets/images/themes/default';
         }
         if (empty($msg)) {
             // $this->prtrace($subfolder);
@@ -923,7 +925,7 @@ class FunctionsController extends BaseController
         $szJSAddTR .= "<img src=\"{$szImgPath}/AddArguments.png\" alt=\"Add Argument\" /></td>";
         $szJSAddTR .= "<td class=\"data3\"><span style=\"font-size: 8pt\">{$this->lang['strargadd']}</span></td></tr></table></td>\n</tr>\n";
 
-        echo '<script src="' . \SUBFOLDER . "/assets/js/functions.js\" type=\"text/javascript\"></script>
+        echo '<script src="'.\SUBFOLDER."/assets/js/functions.js\" type=\"text/javascript\"></script>
 		<script type=\"text/javascript\">
 			//<![CDATA[
 			var g_types_select = '<select class=\"select2\" name=\"formArgType[]\">{$szTypes}</select>{$szArgReturns}';
@@ -940,7 +942,7 @@ class FunctionsController extends BaseController
 			//]]>
 		</script>
 		";
-        echo '<form action="' . \SUBFOLDER . "/src/views/functions\" method=\"post\">\n";
+        echo '<form action="'.\SUBFOLDER."/src/views/functions\" method=\"post\">\n";
         echo "<table><tbody id=\"args_table\">\n";
         echo "<tr><th class=\"data required\">{$this->lang['strname']}</th>\n";
         echo "<th class=\"data required\" colspan=\"2\">{$this->lang['strreturns']}</th>\n";
@@ -985,10 +987,10 @@ class FunctionsController extends BaseController
         // Display function cost options
         if ($data->hasFunctionCosting()) {
             echo "<tr><th class=\"data required\" colspan=\"4\">{$this->lang['strfunctioncosting']}</th></tr>\n";
-            echo "<td class=\"data1\" colspan=\"2\">{$this->lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"" .
-            htmlspecialchars($_POST['formCost']) . '" /></td>';
-            echo "<td class=\"data1\" colspan=\"2\">{$this->lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"" .
-            htmlspecialchars($_POST['formRows']) . '" /></td>';
+            echo "<td class=\"data1\" colspan=\"2\">{$this->lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"".
+            htmlspecialchars($_POST['formCost']).'" /></td>';
+            echo "<td class=\"data1\" colspan=\"2\">{$this->lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"".
+            htmlspecialchars($_POST['formRows']).'" /></td>';
         }
 
         // Display function properties
@@ -1037,14 +1039,14 @@ class FunctionsController extends BaseController
 
         $szJS = '';
 
-        echo '<script src="' . \SUBFOLDER . '/assets/js/functions.js" type="text/javascript"></script>';
-        echo '<script type="text/javascript">' . $this->_buildJSData() . '</script>';
+        echo '<script src="'.\SUBFOLDER.'/assets/js/functions.js" type="text/javascript"></script>';
+        echo '<script type="text/javascript">'.$this->_buildJSData().'</script>';
         if (!empty($_POST['formArgName'])) {
             $szJS = $this->_buildJSRows($this->_buildFunctionArguments($_POST));
         } else {
             $subfolder = \SUBFOLDER;
             // $this->prtrace($subfolder);
-            $szJS = '<script type="text/javascript" src="' . \SUBFOLDER . '/assets/js/functions.js">noArgsRebuild(addArg("' . $subfolder . '"));</script>';
+            $szJS = '<script type="text/javascript" src="'.\SUBFOLDER.'/assets/js/functions.js">noArgsRebuild(addArg("'.$subfolder.'"));</script>';
         }
 
         $cost = (isset($_POST['formCost'])) ? $_POST['formCost'] : null;
@@ -1067,7 +1069,7 @@ class FunctionsController extends BaseController
             $status = $data->createFunction(
                 $_POST['formFunction'],
                 empty($_POST['nojs']) ? $this->_buildFunctionArguments($_POST) : $_POST['formArguments'],
-                $_POST['formReturns'] . $_POST['formArray'],
+                $_POST['formReturns'].$_POST['formArray'],
                 $def,
                 $_POST['formLanguage'],
                 $_POST['formProperties'],
@@ -1097,7 +1099,7 @@ class FunctionsController extends BaseController
         if (isset($_POST['formArgName'])) {
             $arrayArgs = [];
             foreach ($arrayVars['formArgName'] as $pK => $pV) {
-                $arrayArgs[] = $arrayVars['formArgModes'][$pK] . ' ' . trim($pV) . ' ' . trim($arrayVars['formArgType'][$pK]) . $arrayVars['formArgArray'][$pK];
+                $arrayArgs[] = $arrayVars['formArgModes'][$pK].' '.trim($pV).' '.trim($arrayVars['formArgType'][$pK]).$arrayVars['formArgArray'][$pK];
             }
 
             return implode(',', $arrayArgs);
@@ -1155,7 +1157,7 @@ class FunctionsController extends BaseController
         $arrayPModes = [];
 
         while (!$arrayTypes->EOF) {
-            $arrayPTypes[] = "'" . $arrayTypes->fields['typname'] . "'";
+            $arrayPTypes[] = "'".$arrayTypes->fields['typname']."'";
             $arrayTypes->moveNext();
         }
 
@@ -1163,10 +1165,10 @@ class FunctionsController extends BaseController
             $arrayPModes[] = "'{$pV}'";
         }
 
-        $szTypes = 'g_main_types = new Array(' . implode(',', $arrayPTypes) . ');';
-        $szModes = 'g_main_modes = new Array(' . implode(',', $arrayPModes) . ');';
+        $szTypes = 'g_main_types = new Array('.implode(',', $arrayPTypes).');';
+        $szModes = 'g_main_modes = new Array('.implode(',', $arrayPModes).');';
 
-        return $szTypes . $szModes;
+        return $szTypes.$szModes;
     }
 
     /**
@@ -1221,7 +1223,7 @@ class FunctionsController extends BaseController
                 }
                 if (isset($names_arr[$i]) && '' != $names_arr[$i]) {
                     $data->fieldClean($names_arr[$i]);
-                    $args .= '"' . $names_arr[$i] . '" ';
+                    $args .= '"'.$names_arr[$i].'" ';
                 }
                 $args .= $args_arr[$i];
             }