diff options
author | Felipe Figueroa <amenadiel@gmail.com> | 2018-04-19 23:59:05 +0300 |
---|---|---|
committer | Felipe Figueroa <amenadiel@gmail.com> | 2018-04-19 23:59:05 +0300 |
commit | 1286c500e1ba275fc96f75d0b2b1d887a0f00a07 (patch) | |
tree | d577014367376b8c3f816ba11e9d566b2417b484 /src/controllers/FunctionsController.php | |
parent | a4f48525a98d0c67e19ca5fc3bb21589dca6070c (diff) |
Tag v 6.0.0-beta.39 enable php_console only on explicit settingv6.0.0-beta.39
Diffstat (limited to 'src/controllers/FunctionsController.php')
-rw-r--r-- | src/controllers/FunctionsController.php | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php index d32867ab..73b9b77b 100644 --- a/src/controllers/FunctionsController.php +++ b/src/controllers/FunctionsController.php @@ -1,7 +1,7 @@ <?php /** - * PHPPgAdmin v6.0.0-beta.33 + * PHPPgAdmin v6.0.0-beta.39 */ namespace PHPPgAdmin\Controller; @@ -103,7 +103,7 @@ class FunctionsController extends BaseController 'function' => [ 'title' => $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' => [ @@ -412,7 +412,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]; } @@ -420,8 +420,8 @@ class FunctionsController extends BaseController $args = $fndata->fields['proarguments']; } - $func_full = $fndata->fields['proname'] . '(' . $fndata->fields['proarguments'] . ')'; - echo '<form action="' . \SUBFOLDER . "/src/views/functions\" method=\"post\">\n"; + $func_full = $fndata->fields['proname'].'('.$fndata->fields['proarguments'].')'; + echo '<form action="'.\SUBFOLDER."/src/views/functions\" method=\"post\">\n"; echo "<table style=\"width: 90%\">\n"; echo "<tr>\n"; echo "<th class=\"data required\">{$lang['strschema']}</th>\n"; @@ -502,8 +502,8 @@ class FunctionsController extends BaseController // Display function cost options if ($data->hasFunctionCosting()) { echo "<tr><th class=\"data required\" colspan=\"5\">{$lang['strfunctioncosting']}</th></tr>\n"; - echo "<td class=\"data1\" colspan=\"2\">{$lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"" . - htmlspecialchars($_POST['formCost']) . '" /></td>'; + echo "<td class=\"data1\" colspan=\"2\">{$lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"". + htmlspecialchars($_POST['formCost']).'" /></td>'; echo "<td class=\"data1\" colspan=\"2\">{$lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"", htmlspecialchars($_POST['formRows']), '"', (!$fndata->fields['proretset']) ? 'disabled' : '', '/></td>'; } @@ -612,7 +612,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]; } @@ -626,7 +626,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 "<tr><th class=\"data\">{$lang['strfunction']}</th>\n"; echo "<th class=\"data\">{$lang['strarguments']}</th>\n"; @@ -761,7 +761,7 @@ class FunctionsController extends BaseController $this->printTrail('schema'); $this->printTitle($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'])) { @@ -912,16 +912,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 = ''; @@ -936,7 +936,7 @@ class FunctionsController extends BaseController $szReturns .= "<option value=\"SETOF\"{$szSetOfSelected}>SETOF</option>"; $szReturns .= '</select>'; - $szReturns .= '<select name="formReturns">' . $szTypes . '</select>'; + $szReturns .= '<select name="formReturns">'.$szTypes.'</select>'; // Create string array type selector @@ -956,7 +956,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"; @@ -966,8 +966,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(); @@ -999,7 +999,7 @@ class FunctionsController extends BaseController } $szJSAddTR = "<tr id=\"parent_add_tr\" onclick=\"addArg();\" onmouseover=\"this.style.cursor='pointer'\">\n<td style=\"text-align: right\" colspan=\"6\" class=\"data3\"><table><tr><td class=\"data3\"><img src=\"{$szImgPath}/AddArguments.png\" alt=\"Add Argument\" /></td><td class=\"data3\"><span style=\"font-size: 8pt\">{$lang['strargadd']}</span></td></tr></table></td>\n</tr>\n"; - echo '<script src="' . \SUBFOLDER . "/js/functions.js\" type=\"text/javascript\"></script> + echo '<script src="'.\SUBFOLDER."/js/functions.js\" type=\"text/javascript\"></script> <script type=\"text/javascript\"> //<![CDATA[ var g_types_select = '<select name=\"formArgType[]\">{$szTypes}</select>{$szArgReturns}'; @@ -1016,7 +1016,7 @@ class FunctionsController extends BaseController //]]> </script> "; - echo '<form action="' . \SUBFOLDER . "/src/views//views/functions\" method=\"post\">\n"; + echo '<form action="'.\SUBFOLDER."/src/views//views/functions\" method=\"post\">\n"; echo "<table><tbody id=\"args_table\">\n"; echo "<tr><th class=\"data required\">{$lang['strname']}</th>\n"; echo "<th class=\"data required\" colspan=\"2\">{$lang['strreturns']}</th>\n"; @@ -1059,10 +1059,10 @@ class FunctionsController extends BaseController // Display function cost options if ($data->hasFunctionCosting()) { echo "<tr><th class=\"data required\" colspan=\"4\">{$lang['strfunctioncosting']}</th></tr>\n"; - echo "<td class=\"data1\" colspan=\"2\">{$lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"" . - htmlspecialchars($_POST['formCost']) . '" /></td>'; - echo "<td class=\"data1\" colspan=\"2\">{$lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"" . - htmlspecialchars($_POST['formRows']) . '" /></td>'; + echo "<td class=\"data1\" colspan=\"2\">{$lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"". + htmlspecialchars($_POST['formCost']).'" /></td>'; + echo "<td class=\"data1\" colspan=\"2\">{$lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"". + htmlspecialchars($_POST['formRows']).'" /></td>'; } // Display function properties @@ -1112,12 +1112,12 @@ class FunctionsController extends BaseController $szJS = ''; - echo '<script src="' . \SUBFOLDER . '/js/functions.js" type="text/javascript"></script>'; - echo '<script type="text/javascript">' . $this->buildJSData() . '</script>'; + echo '<script src="'.\SUBFOLDER.'/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 { - $szJS = '<script type="text/javascript" src="' . \SUBFOLDER . '/js/functions.js">noArgsRebuild(addArg());</script>'; + $szJS = '<script type="text/javascript" src="'.\SUBFOLDER.'/js/functions.js">noArgsRebuild(addArg());</script>'; } $cost = (isset($_POST['formCost'])) ? $_POST['formCost'] : null; @@ -1140,7 +1140,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'], @@ -1168,7 +1168,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); @@ -1223,7 +1223,7 @@ class FunctionsController extends BaseController $szTypes = ''; while (!$arrayTypes->EOF) { - $arrayPTypes[] = "'" . $arrayTypes->fields['typname'] . "'"; + $arrayPTypes[] = "'".$arrayTypes->fields['typname']."'"; $arrayTypes->moveNext(); } @@ -1231,9 +1231,9 @@ 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; } } |