Back office : Fix TMDB age restriction import

clement-sanz · MacWarrior · web-flow · commit ce660af41936 · 2025-12-01T16:39:45.000+01:00
---------
Co-authored-by: MacWarrior &lt;macwarrior94@gmail.com&gt;
diff --git a/upload/admin_area/styles/cb_2014/theme/js/pages/edit_video/edit_video.js b/upload/admin_area/styles/cb_2014/theme/js/pages/edit_video/edit_video.js
@@ -132,7 +132,7 @@ function saveInfoTmdb(tmdb_video_id, type) {
                 hideSpinner();
                 $('.page-content').prepend(result['msg']);
             } else {
-                location.reload();
+                window.location.href = window.location.href;
             }
         },
     });
diff --git a/upload/admin_area/styles/cb_2014/theme/js/pages/edit_video/edit_video.min.js b/upload/admin_area/styles/cb_2014/theme/js/pages/edit_video/edit_video.min.js
diff --git a/upload/changelog/552.json b/upload/changelog/552.json
@@ -1,6 +1,6 @@
 {
   "version":"5.5.2",
-  "revision":"168",
+  "revision":"169",
   "status":"stable",
   "detail":[
     {
@@ -63,6 +63,7 @@
         ,"Fix settings saving issues"
         ,"Fix missing config warning"
         ,"Fix TMDB tags import"
+        ,"Fix TMDB age restriction import"
       ]
     },
     {
diff --git a/upload/includes/classes/tmdb.class.php b/upload/includes/classes/tmdb.class.php
@@ -83,8 +83,18 @@ public function movieCurrentLanguageAgeRestriction($movie_id)
     {
         $results = $this->requestAPI('movie/' . $movie_id . '/release_dates')['response']['results'];
         $restriction = array_search(strtoupper($this->language), array_column($results, 'iso_3166_1'));
+        if (empty($restriction) && $this->language == 'en') {
+            $restriction = array_search('US', array_column($results, 'iso_3166_1'));
+        }
         if ($restriction !== false) {
-            return (!empty($results[$restriction]['release_dates'][0]['certification']) ? $results[$restriction]['release_dates'][0]['certification'] : 0);
+            foreach ($results[$restriction]['release_dates'] as $certification) {
+                if (!empty($certification['certification'])) {
+                    if ($certification['certification'] == 'R') {
+                        return 17;
+                    }
+                    return $certification['certification'];
+                }
+            }
         }
         return 0;
     }
@@ -310,6 +320,7 @@ public function importDataFromTmdb(int $videoid, int $tmdb_id, $type = 'movie')
                     $credentials = $this->seriesCurrentLanguageAgeRestriction($tmdb_id);
                     break;
             }
+            $credentials = preg_replace('/\D/', '',$credentials);
             $video_info['age_restriction'] = $credentials;
             if (!$credentials && config('enable_tmdb_mature_content') == 'yes' && $details['adult']) {
                 $video_info['age_restriction'] = config('tmdb_mature_content_age');
diff --git a/upload/styles/cb_28/theme/js/pages/edit_video/edit_video.js b/upload/styles/cb_28/theme/js/pages/edit_video/edit_video.js
@@ -147,7 +147,7 @@ function saveInfoTmdb(tmdb_video_id, type, videoid) {
                 hideSpinner();
                 $('.page-content').prepend(result['msg']);
             } else {
-                location.reload();
+                window.location.href = window.location.href;
             }
         },
     });
diff --git a/upload/styles/cb_28/theme/js/pages/edit_video/edit_video.min.js b/upload/styles/cb_28/theme/js/pages/edit_video/edit_video.min.js

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ function saveInfoTmdb(tmdb_video_id, type) {`
`132`	`132`	`hideSpinner();`
`133`	`133`	`$('.page-content').prepend(result['msg']);`
`134`	`134`	`} else {`
`135`		`- location.reload();`
	`135`	`+ window.location.href = window.location.href;`
`136`	`136`	`}`
`137`	`137`	`},`
`138`	`138`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version":"5.5.2",`
`3`		`- "revision":"168",`
	`3`	`+ "revision":"169",`
`4`	`4`	`"status":"stable",`
`5`	`5`	`"detail":[`
`6`	`6`	`{`
`@@ -63,6 +63,7 @@`
`63`	`63`	`,"Fix settings saving issues"`
`64`	`64`	`,"Fix missing config warning"`
`65`	`65`	`,"Fix TMDB tags import"`
	`66`	`+ ,"Fix TMDB age restriction import"`
`66`	`67`	`]`
`67`	`68`	`},`
`68`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ function saveInfoTmdb(tmdb_video_id, type, videoid) {`
`147`	`147`	`hideSpinner();`
`148`	`148`	`$('.page-content').prepend(result['msg']);`
`149`	`149`	`} else {`
`150`		`- location.reload();`
	`150`	`+ window.location.href = window.location.href;`
`151`	`151`	`}`
`152`	`152`	`},`
`153`	`153`	`});`