瀏覽代碼

minor fixes to adapt to docker env

Olivier Massot 4 年之前
父節點
當前提交
0425028890

+ 7 - 2
ot_admin/Classes/Controller/SiteController.php

@@ -1993,8 +1993,10 @@ class SiteController extends ActionController
 
 
     private function fetchOrganizationExtraData(int $organizationId) {
     private function fetchOrganizationExtraData(int $organizationId) {
 
 
+        $db_host = $_SERVER['HTTP_HOST'] != 'local.sub.opentalent.fr' ? 'prod-back' : 'db';
+
         $cnn = new PDO(
         $cnn = new PDO(
-            "mysql:host=prod-back;dbname=opentalent",
+            "mysql:host=" . $db_host . ";dbname=opentalent",
             'dbcloner',
             'dbcloner',
             'wWZ4hYcrmHLW2mUK',
             'wWZ4hYcrmHLW2mUK',
             array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8')
             array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8')
@@ -2109,7 +2111,10 @@ class SiteController extends ActionController
         {
         {
             fwrite($f, $content);
             fwrite($f, $content);
             $this->createdFiles[] = $path;
             $this->createdFiles[] = $path;
-            chgrp($path, 'www-data');
+            try {
+                chgrp($path, 'www-data');
+            } catch (\TYPO3\CMS\Core\Error\Exception $e) {
+            }
         } finally {
         } finally {
             fclose($f);
             fclose($f);
         }
         }

+ 1 - 1
ot_core/Classes/Domain/Repository/BaseApiRepository.php

@@ -84,7 +84,7 @@ abstract class BaseApiRepository implements LoggerAwareInterface
         }
         }
 
 
         $trailing_part = $trailing_part ?? $this::URI_TRAILING_PART;
         $trailing_part = $trailing_part ?? $this::URI_TRAILING_PART;
-        $uri = trim($uri, '/') . '/' . trim($trailing_part, '/');
+        $uri = rtrim($uri, '/') . '/' . ltrim($trailing_part, '/');
         return $uri;
         return $uri;
     }
     }