Remove upload-button if uploads are disabled at PHP-level

tvdijen · tvdijen · commit a492d5759517 · 2024-04-09T12:16:31.000+02:00
diff --git a/modules/admin/src/Controller/Federation.php b/modules/admin/src/Controller/Federation.php
@@ -22,7 +22,9 @@
 use function array_pop;
 use function array_values;
 use function count;
+use function boolval;
 use function file_get_contents;
+use function ini_get;
 use function is_array;
 use function sprintf;
 use function str_replace;
@@ -243,7 +245,7 @@ private function getHostedIdP(): array
                     );
                     $entities[$index] = $entity;
                 }
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 Logger::error('Federation: Error loading saml20-idp: ' . $e->getMessage());
             }
         }
@@ -300,7 +302,7 @@ private function getHostedIdP(): array
                     );
                     $entities[$index] = $entity;
                 }
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 Logger::error('Federation: Error loading adfs-idp: ' . $e->getMessage());
             }
         }
@@ -477,6 +479,7 @@ public function metadataConverter(Request $request): Response
             'xmldata' => $xmldata,
             'output' => $output,
             'error' => $error,
+            'upload' => boolval(ini_get('file_upload')),
         ];
 
         $this->menu->addOption('logout', $t->data['logouturl'], Translate::noop('Log out'));
diff --git a/modules/admin/templates/metadata_converter.twig b/modules/admin/templates/metadata_converter.twig
@@ -14,6 +14,7 @@
         </div>
         <br>
         <div class="center">
+            {% if upload %}
             <div class="pure-button-group two-elements" role="group">
                 <label class="pure-button">
                     <span class="fa fa-folder-open"></span>{{ 'or select a file:'|trans }}
@@ -22,6 +23,7 @@
                 <label id="show-file" class="pure-button hollow show-files" disabled>{{ 'No file selected.'|trans }}</label>
             </div>
             <br>
+            {% endif %}
             <button class="pure-button pure-button-red pure-input-1-3">{{ 'Parse'|trans }}</button>
         </div>
     </form>

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@`
`22`	`22`	`use function array_pop;`
`23`	`23`	`use function array_values;`
`24`	`24`	`use function count;`
	`25`	`+use function boolval;`
`25`	`26`	`use function file_get_contents;`
	`27`	`+use function ini_get;`
`26`	`28`	`use function is_array;`
`27`	`29`	`use function sprintf;`
`28`	`30`	`use function str_replace;`
`@@ -243,7 +245,7 @@ private function getHostedIdP(): array`
`243`	`245`	`);`
`244`	`246`	`$entities[$index] = $entity;`
`245`	`247`	`}`
`246`		`- } catch (\Exception $e) {`
	`248`	`+ } catch (Exception $e) {`
`247`	`249`	`Logger::error('Federation: Error loading saml20-idp: ' . $e->getMessage());`
`248`	`250`	`}`
`249`	`251`	`}`
`@@ -300,7 +302,7 @@ private function getHostedIdP(): array`
`300`	`302`	`);`
`301`	`303`	`$entities[$index] = $entity;`
`302`	`304`	`}`
`303`		`- } catch (\Exception $e) {`
	`305`	`+ } catch (Exception $e) {`
`304`	`306`	`Logger::error('Federation: Error loading adfs-idp: ' . $e->getMessage());`
`305`	`307`	`}`
`306`	`308`	`}`
`@@ -477,6 +479,7 @@ public function metadataConverter(Request $request): Response`
`477`	`479`	`'xmldata' => $xmldata,`
`478`	`480`	`'output' => $output,`
`479`	`481`	`'error' => $error,`
	`482`	`+ 'upload' => boolval(ini_get('file_upload')),`
`480`	`483`	`];`
`481`	`484`
`482`	`485`	`$this->menu->addOption('logout', $t->data['logouturl'], Translate::noop('Log out'));`