@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | \danielgp\info_compare\ConfigurationCompare, |
| 41 | 41 | \danielgp\info_compare\OutputFormBuilder; |
| 42 | 42 | |
| 43 | - private $informatorInternalArray = []; |
|
| 43 | + private $informatorInternalArray = [ ]; |
|
| 44 | 44 | private $localConfiguration; |
| 45 | 45 | private $serverConfiguration; |
| 46 | 46 | private $config; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | public function __construct() |
| 49 | 49 | { |
| 50 | 50 | $this->getConfiguration(); |
| 51 | - $this->applicationFlags = [ |
|
| 51 | + $this->applicationFlags = [ |
|
| 52 | 52 | 'available_languages' => [ |
| 53 | 53 | 'en_US' => 'EN', |
| 54 | 54 | 'ro_RO' => 'RO', |
@@ -59,9 +59,9 @@ discard block |
||
| 59 | 59 | echo $this->setHeaderHtml(); |
| 60 | 60 | $this->setDefaultOptions(); |
| 61 | 61 | $rqst = new \Symfony\Component\HttpFoundation\Request; |
| 62 | - $this->informatorInternalArray['superGlobals'] = $rqst->createFromGlobals(); |
|
| 62 | + $this->informatorInternalArray[ 'superGlobals' ] = $rqst->createFromGlobals(); |
|
| 63 | 63 | echo $this->setFormOptions(); |
| 64 | - if (isset($_GET['Label'])) { |
|
| 64 | + if (isset($_GET[ 'Label' ])) { |
|
| 65 | 65 | $this->processInfos(); |
| 66 | 66 | echo $this->setFormCurlInfos(); |
| 67 | 67 | echo $this->setFormInfos(); |
@@ -74,62 +74,62 @@ discard block |
||
| 74 | 74 | if ((!is_array($firstArray)) || (!is_array($secondArray))) { |
| 75 | 75 | return ''; |
| 76 | 76 | } |
| 77 | - $firstRow = $this->mergeArraysIntoFirstSecond($firstArray, $secondArray, ['first', 'second']); |
|
| 78 | - $secondRow = $this->mergeArraysIntoFirstSecond($secondArray, $firstArray, ['second', 'first']); |
|
| 77 | + $firstRow = $this->mergeArraysIntoFirstSecond($firstArray, $secondArray, [ 'first', 'second' ]); |
|
| 78 | + $secondRow = $this->mergeArraysIntoFirstSecond($secondArray, $firstArray, [ 'second', 'first' ]); |
|
| 79 | 79 | $row = array_merge($firstRow, $secondRow); |
| 80 | 80 | ksort($row); |
| 81 | - $urlArguments = '?Label=' . $_GET['Label']; |
|
| 82 | - $sString[] = '<table style="width:100%">' |
|
| 81 | + $urlArguments = '?Label=' . $_GET[ 'Label' ]; |
|
| 82 | + $sString[ ] = '<table style="width:100%">' |
|
| 83 | 83 | . '<thead><tr>' |
| 84 | 84 | . '<th>Identifier</th>' |
| 85 | - . '<th><a href="' . $this->config['Servers'][$_GET['localConfig']]['url'] |
|
| 85 | + . '<th><a href="' . $this->config[ 'Servers' ][ $_GET[ 'localConfig' ] ][ 'url' ] |
|
| 86 | 86 | . $urlArguments . '" target="_blank">' |
| 87 | - . $this->config['Servers'][$_GET['localConfig']]['name'] . '</a></th>' |
|
| 88 | - . '<th><a href="' . $this->config['Servers'][$_GET['serverConfig']]['url'] |
|
| 87 | + . $this->config[ 'Servers' ][ $_GET[ 'localConfig' ] ][ 'name' ] . '</a></th>' |
|
| 88 | + . '<th><a href="' . $this->config[ 'Servers' ][ $_GET[ 'serverConfig' ] ][ 'url' ] |
|
| 89 | 89 | . $urlArguments . '" target="_blank">' |
| 90 | - . $this->config['Servers'][$_GET['serverConfig']]['name'] . '</a></th>' |
|
| 90 | + . $this->config[ 'Servers' ][ $_GET[ 'serverConfig' ] ][ 'name' ] . '</a></th>' |
|
| 91 | 91 | . '</tr></thead>' |
| 92 | 92 | . '<tbody>'; |
| 93 | - if ($_GET['displayOnlyDifferent'] == '1') { |
|
| 93 | + if ($_GET[ 'displayOnlyDifferent' ] == '1') { |
|
| 94 | 94 | $displayOnlyDifferent = true; |
| 95 | 95 | } else { |
| 96 | 96 | $displayOnlyDifferent = false; |
| 97 | 97 | } |
| 98 | 98 | foreach ($row as $key => $value) { |
| 99 | 99 | $rowString = '<tr><td style="width:20%;">' . $key . '</td><td style="width:40%;">' |
| 100 | - . str_replace(',', ', ', $value['first']) . '</td><td style="width:40%;">' |
|
| 101 | - . str_replace(',', ', ', $value['second']) . '</td></tr>'; |
|
| 100 | + . str_replace(',', ', ', $value[ 'first' ]) . '</td><td style="width:40%;">' |
|
| 101 | + . str_replace(',', ', ', $value[ 'second' ]) . '</td></tr>'; |
|
| 102 | 102 | if ($displayOnlyDifferent) { |
| 103 | - if ($value['first'] != $value['second']) { |
|
| 104 | - $sString[] = $rowString; |
|
| 103 | + if ($value[ 'first' ] != $value[ 'second' ]) { |
|
| 104 | + $sString[ ] = $rowString; |
|
| 105 | 105 | } |
| 106 | 106 | } else { |
| 107 | - $sString[] = $rowString; |
|
| 107 | + $sString[ ] = $rowString; |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | - $sString[] = '</tbody></table>'; |
|
| 110 | + $sString[ ] = '</tbody></table>'; |
|
| 111 | 111 | return implode('', $sString); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | private function getConfiguration() |
| 115 | 115 | { |
| 116 | 116 | $storedConfiguration = $this->configuredDeployedInformators(); |
| 117 | - foreach ($storedConfiguration['informators'] as $key => $value) { |
|
| 118 | - $this->config['Servers'][] = [ |
|
| 117 | + foreach ($storedConfiguration[ 'informators' ] as $key => $value) { |
|
| 118 | + $this->config[ 'Servers' ][ ] = [ |
|
| 119 | 119 | 'name' => $key, |
| 120 | 120 | 'url' => $value, |
| 121 | 121 | ]; |
| 122 | 122 | } |
| 123 | - $haystack = array_keys($storedConfiguration['informators']); |
|
| 124 | - $this->config['Defaults']['Label'] = $storedConfiguration['default']['label']; |
|
| 125 | - $this->config['Defaults']['Source'] = array_search($storedConfiguration['default']['source'], $haystack); |
|
| 126 | - $this->config['Defaults']['Target'] = array_search($storedConfiguration['default']['target'], $haystack); |
|
| 127 | - $this->config['Defaults']['ResultsType'] = $storedConfiguration['default']['typeOfResults']; |
|
| 123 | + $haystack = array_keys($storedConfiguration[ 'informators' ]); |
|
| 124 | + $this->config[ 'Defaults' ][ 'Label' ] = $storedConfiguration[ 'default' ][ 'label' ]; |
|
| 125 | + $this->config[ 'Defaults' ][ 'Source' ] = array_search($storedConfiguration[ 'default' ][ 'source' ], $haystack); |
|
| 126 | + $this->config[ 'Defaults' ][ 'Target' ] = array_search($storedConfiguration[ 'default' ][ 'target' ], $haystack); |
|
| 127 | + $this->config[ 'Defaults' ][ 'ResultsType' ] = $storedConfiguration[ 'default' ][ 'typeOfResults' ]; |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - private function mergeArraysIntoFirstSecond($firstArray, $secondArray, $pSequence = ['first', 'second']) |
|
| 130 | + private function mergeArraysIntoFirstSecond($firstArray, $secondArray, $pSequence = [ 'first', 'second' ]) |
|
| 131 | 131 | { |
| 132 | - $row = []; |
|
| 132 | + $row = [ ]; |
|
| 133 | 133 | foreach ($firstArray as $key => $value) { |
| 134 | 134 | if (is_array($value)) { |
| 135 | 135 | foreach ($value as $key2 => $value2) { |
@@ -138,39 +138,39 @@ discard block |
||
| 138 | 138 | if (is_array($value3)) { |
| 139 | 139 | foreach ($value3 as $key4 => $value4) { |
| 140 | 140 | $keyCrt = $key . '_' . $key2 . '__' . $key3 . '__' . $key4; |
| 141 | - $row[$keyCrt][$pSequence[0]] = $value4; |
|
| 142 | - if (isset($secondArray[$key][$key2][$key3][$key4])) { |
|
| 143 | - $row[$keyCrt][$pSequence[1]] = $secondArray[$key][$key2][$key3][$key4]; |
|
| 141 | + $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value4; |
|
| 142 | + if (isset($secondArray[ $key ][ $key2 ][ $key3 ][ $key4 ])) { |
|
| 143 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = $secondArray[ $key ][ $key2 ][ $key3 ][ $key4 ]; |
|
| 144 | 144 | } else { |
| 145 | - $row[$keyCrt][$pSequence[1]] = ''; |
|
| 145 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = ''; |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | } else { |
| 149 | 149 | $keyCrt = $key . '_' . $key2 . '__' . $key3; |
| 150 | - $row[$keyCrt][$pSequence[0]] = $value3; |
|
| 151 | - if (isset($secondArray[$key][$key2][$key3])) { |
|
| 152 | - $row[$keyCrt][$pSequence[1]] = $secondArray[$key][$key2][$key3]; |
|
| 150 | + $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value3; |
|
| 151 | + if (isset($secondArray[ $key ][ $key2 ][ $key3 ])) { |
|
| 152 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = $secondArray[ $key ][ $key2 ][ $key3 ]; |
|
| 153 | 153 | } else { |
| 154 | - $row[$keyCrt][$pSequence[1]] = ''; |
|
| 154 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = ''; |
|
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | 158 | } else { |
| 159 | 159 | $keyCrt = $key . '_' . $key2; |
| 160 | - $row[$keyCrt][$pSequence[0]] = $value2; |
|
| 161 | - if (isset($secondArray[$key][$key2])) { |
|
| 162 | - $row[$keyCrt][$pSequence[1]] = $secondArray[$key][$key2]; |
|
| 160 | + $row[ $keyCrt ][ $pSequence[ 0 ] ] = $value2; |
|
| 161 | + if (isset($secondArray[ $key ][ $key2 ])) { |
|
| 162 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = $secondArray[ $key ][ $key2 ]; |
|
| 163 | 163 | } else { |
| 164 | - $row[$keyCrt][$pSequence[1]] = ''; |
|
| 164 | + $row[ $keyCrt ][ $pSequence[ 1 ] ] = ''; |
|
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | 168 | } else { |
| 169 | - $row[$key][$pSequence[0]] = $value; |
|
| 170 | - if (isset($secondArray[$key])) { |
|
| 171 | - $row[$key][$pSequence[1]] = $secondArray[$key]; |
|
| 169 | + $row[ $key ][ $pSequence[ 0 ] ] = $value; |
|
| 170 | + if (isset($secondArray[ $key ])) { |
|
| 171 | + $row[ $key ][ $pSequence[ 1 ] ] = $secondArray[ $key ]; |
|
| 172 | 172 | } else { |
| 173 | - $row[$key][$pSequence[1]] = ''; |
|
| 173 | + $row[ $key ][ $pSequence[ 1 ] ] = ''; |
|
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | } |
@@ -179,41 +179,41 @@ discard block |
||
| 179 | 179 | |
| 180 | 180 | private function processInfos() |
| 181 | 181 | { |
| 182 | - if (isset($_GET['localConfig']) && isset($_GET['serverConfig'])) { |
|
| 183 | - $urlArguments = '?Label=' . urlencode($_GET['Label']); |
|
| 184 | - $source = $this->config['Servers'][$_GET['localConfig']]['url'] . $urlArguments; |
|
| 182 | + if (isset($_GET[ 'localConfig' ]) && isset($_GET[ 'serverConfig' ])) { |
|
| 183 | + $urlArguments = '?Label=' . urlencode($_GET[ 'Label' ]); |
|
| 184 | + $source = $this->config[ 'Servers' ][ $_GET[ 'localConfig' ] ][ 'url' ] . $urlArguments; |
|
| 185 | 185 | $this->localConfiguration = $this->getContentFromUrlThroughCurlAsArrayIfJson($source); |
| 186 | - $destination = $this->config['Servers'][$_GET['serverConfig']]['url'] . $urlArguments; |
|
| 186 | + $destination = $this->config[ 'Servers' ][ $_GET[ 'serverConfig' ] ][ 'url' ] . $urlArguments; |
|
| 187 | 187 | $this->serverConfiguration = $this->getContentFromUrlThroughCurlAsArrayIfJson($destination); |
| 188 | 188 | } else { |
| 189 | - $this->localConfiguration = ['response' => '', 'info' => '']; |
|
| 190 | - $this->serverConfiguration = ['response' => '', 'info' => '']; |
|
| 189 | + $this->localConfiguration = [ 'response' => '', 'info' => '' ]; |
|
| 190 | + $this->serverConfiguration = [ 'response' => '', 'info' => '' ]; |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | private function setDefaultOptions() |
| 195 | 195 | { |
| 196 | - if (!isset($_GET['displayOnlyDifferent'])) { |
|
| 197 | - $_GET['displayOnlyDifferent'] = $this->config['Defaults']['ResultsType']; |
|
| 196 | + if (!isset($_GET[ 'displayOnlyDifferent' ])) { |
|
| 197 | + $_GET[ 'displayOnlyDifferent' ] = $this->config[ 'Defaults' ][ 'ResultsType' ]; |
|
| 198 | 198 | } |
| 199 | - if (!isset($_GET['localConfig'])) { |
|
| 200 | - $_GET['localConfig'] = $this->config['Defaults']['Source']; |
|
| 199 | + if (!isset($_GET[ 'localConfig' ])) { |
|
| 200 | + $_GET[ 'localConfig' ] = $this->config[ 'Defaults' ][ 'Source' ]; |
|
| 201 | 201 | } |
| 202 | - if (!isset($_GET['serverConfig'])) { |
|
| 203 | - $_GET['serverConfig'] = $this->config['Defaults']['Target']; |
|
| 202 | + if (!isset($_GET[ 'serverConfig' ])) { |
|
| 203 | + $_GET[ 'serverConfig' ] = $this->config[ 'Defaults' ][ 'Target' ]; |
|
| 204 | 204 | } |
| 205 | - if (!isset($_GET['Label'])) { |
|
| 206 | - $_GET['Label'] = $this->config['Defaults']['Label']; |
|
| 205 | + if (!isset($_GET[ 'Label' ])) { |
|
| 206 | + $_GET[ 'Label' ] = $this->config[ 'Defaults' ][ 'Label' ]; |
|
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | private function setFooterHtml() |
| 211 | 211 | { |
| 212 | - $sReturn = []; |
|
| 213 | - $sReturn[] = '</div><!-- from main Tabber -->'; |
|
| 214 | - $sReturn[] = '<div class="resetOnly author">© 2015 Daniel Popiniuc</div>'; |
|
| 215 | - $sReturn[] = '<hr/>'; |
|
| 216 | - $sReturn[] = '<div class="disclaimer">' |
|
| 212 | + $sReturn = [ ]; |
|
| 213 | + $sReturn[ ] = '</div><!-- from main Tabber -->'; |
|
| 214 | + $sReturn[ ] = '<div class="resetOnly author">© 2015 Daniel Popiniuc</div>'; |
|
| 215 | + $sReturn[ ] = '<hr/>'; |
|
| 216 | + $sReturn[ ] = '<div class="disclaimer">' |
|
| 217 | 217 | . 'The developer cannot be liable of any data input or results, ' |
| 218 | 218 | . 'included but not limited to any implication of these ' |
| 219 | 219 | . '(anywhere and whomever there might be these)!' |
@@ -223,8 +223,8 @@ discard block |
||
| 223 | 223 | |
| 224 | 224 | private function setFormCurlInfos() |
| 225 | 225 | { |
| 226 | - $source = $this->localConfiguration['info']; |
|
| 227 | - $destination = $this->serverConfiguration['info']; |
|
| 226 | + $source = $this->localConfiguration[ 'info' ]; |
|
| 227 | + $destination = $this->serverConfiguration[ 'info' ]; |
|
| 228 | 228 | return '<div class="tabbertab" id="tabCurl" title="CURL infos">' |
| 229 | 229 | . $this->displayTableFromMultiLevelArray($source, $destination) |
| 230 | 230 | . '</div><!--from tabCurl-->'; |
@@ -232,10 +232,10 @@ discard block |
||
| 232 | 232 | |
| 233 | 233 | private function setFormInfos() |
| 234 | 234 | { |
| 235 | - $source = $this->localConfiguration['response']; |
|
| 236 | - $destination = $this->serverConfiguration['response']; |
|
| 235 | + $source = $this->localConfiguration[ 'response' ]; |
|
| 236 | + $destination = $this->serverConfiguration[ 'response' ]; |
|
| 237 | 237 | return '<div class="tabbertab' |
| 238 | - . (isset($_GET['Label']) ? ' tabbertabdefault' : '') |
|
| 238 | + . (isset($_GET[ 'Label' ]) ? ' tabbertabdefault' : '') |
|
| 239 | 239 | . '" id="tabConfigs" title="Informations">' |
| 240 | 240 | . $this->displayTableFromMultiLevelArray($source, $destination) |
| 241 | 241 | . '</div><!--from tabConfigs-->'; |
@@ -245,12 +245,12 @@ discard block |
||
| 245 | 245 | { |
| 246 | 246 | return $this->setHeaderCommon([ |
| 247 | 247 | 'lang' => 'en-US', |
| 248 | - 'title' => $this->applicationFlags['name'], |
|
| 248 | + 'title' => $this->applicationFlags[ 'name' ], |
|
| 249 | 249 | 'css' => 'css/main.css', |
| 250 | 250 | 'javascript' => 'js/tabber.min.js', |
| 251 | 251 | ]) |
| 252 | 252 | . $this->setJavascriptContent('document.write(\'<style type="text/css">.tabber{display:none;}</style>\');') |
| 253 | - . '<h1>' . $this->applicationFlags['name'] . '</h1>' |
|
| 253 | + . '<h1>' . $this->applicationFlags[ 'name' ] . '</h1>' |
|
| 254 | 254 | . '<div class="tabber" id="tab">'; |
| 255 | 255 | } |
| 256 | 256 | } |