Update setup, doc, cie button

italia · Sep 21, 2024 · c767f52 · c767f52
2 parents f06b12f + 1529230
commit c767f52
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -132,20 +132,18 @@ server {
     index index.php;
     location ~ \.php$ {
       include snippets/fastcgi-php.conf;  
-      fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;  
+      fastcgi_pass unix:/run/php/php8.1-fpm.sock;
     }
   }
   
   location /myservice/ {
+    alias /var/www/spid-cie-php/vendor/simplesamlphp/simplesamlphp/www/;
     index index.php;
-    location ~ \.php(/|$) {
-      fastcgi_split_path_info ^(.+?\.php)(/.+)$;
-      try_files $fastcgi_script_name =404;
-      set $path_info $fastcgi_path_info;
-      fastcgi_param PATH_INFO $path_info;
-      fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;  
-      fastcgi_index index.php;
-      include fastcgi.conf;
+    location ~ ^(?<prefix>/myservice)(?<phpfile>.+?\.php)(?<pathinfo>/.*)?$ {
+      fastcgi_param SCRIPT_FILENAME $document_root$phpfile;
+      fastcgi_param PATH_INFO $pathinfo if_not_empty;
+      fastcgi_pass unix:/run/php/php8.1-fpm.sock;
+      include fastcgi_params;
     }
   }
 }

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "config": {
-        "version": "3.18.6",
+        "version": "3.18.7",
         "allow-plugins": {
             "simplesamlphp/composer-module-installer": true
         }

diff --git a/setup/Setup.php b/setup/Setup.php
@@ -73,8 +73,8 @@ public static function setup(Event $event) {
         $_fpaProvincia = "";
         $_fpaNazione = "IT";
         $_fpaOrganizationName = "";
-        $_fpaOrganizationEmailAddress = "";
-        $_fpaOrganizationTelephoneNumber = "";
+        $_fpaOrganizationEmailAddress = "info@organization.org"; // must be not null otherwise an error is raised in authentication
+        $_fpaOrganizationTelephoneNumber = "+3912345678"; // must be not null otherwise an error is raised in authentication
 
         $config = file_exists("spid-php-setup.json") ?
                 json_decode(file_get_contents("spid-php-setup.json"), true) : array();
@@ -1013,12 +1013,19 @@ public static function setup(Event $event) {
             } catch(Exception $e) {
                 $symlink_manual_creation_command= "WARNING! At the end of the installation execute as administrator this command:\n$mklink_cmd";
             }
-            
+
         } else {
             // linux
-            symlink($cmd_target, $cmd_link);
+            if (is_link($cmd_link)) {
+                if (readlink($cmd_link) != $cmd_target) {
+                    $symlink_manual_creation_command= "WARNING! At the end of the installation check the symbolic link at $cmd_link, it must link to $cmd_target";
+                }
+            }
+            else {
+                symlink($cmd_target, $cmd_link);
+            }
         }
-        
+
         if ($symlink_manual_creation_command === false) {
             echo $colors->getColoredString("OK", "green");
         } else {

diff --git a/setup/sdk/spid-php.tpl b/setup/sdk/spid-php.tpl
@@ -532,18 +532,16 @@
             return $button_li;
         }
 
-        public function insertCIEButton($size='default') {
-            echo "
-                <div class=\"cie-button\" style=\"width: 280px;\">
-                    <a class=\"cie-button\" role=\"button\"
-                        href=\"?idp=CIE TEST\" >
-                        <span class=\"cie-button-icon\">
-                            <img aria-hidden=\"true\" src=\"/{{SERVICENAME}}/cie-graphics/SVG/entra_con_cie.svg\" alt=\"Entra con CIE\" />
-                        </span>
-                        <span class=\"sr-only\" style=\"display:none\">Entra con CIE</span>
-                    </a>
-                </div>
-            ";    
+        public function insertCIEButton($size = 'L') {
+            $size = strtolower($size);
+            if ($size == 'default') {
+                $size = 'l';
+            }
+
+            echo "<a href=\"?idp=CIE TEST\" class=\"italia-it-button italia-it-button-size-$size button-cie\" aria-haspopup=\"true\" aria-expanded=\"false\">
+                <img src=\"/{{SERVICENAME}}/cie-graphics/SVG/entra_con_cie.svg\" alt=\"Entra con CIE\" />
+                <span class=\"sr-only\" style=\"display:none\">Entra con CIE</span>
+            </a>";
         }
     }