Moving api_unserialize_content for Unserialize::unserialize

AngelFQC · AngelFQC · commit be4f22be03c3 · 2019-03-04T12:09:19.000-05:00
Moving to avoid overload api.lib.php
diff --git a/main/admin/career_diagram.php b/main/admin/career_diagram.php
@@ -109,7 +109,7 @@
 $html = Display::page_subheader2($careerInfo['name'].$urlToString);
 if (!empty($item) && isset($item['value']) && !empty($item['value'])) {
     /** @var Graph $graph */
-    $graph = api_unserialize_content('career', $item['value']);
+    $graph = UnserializeApi::unserialize('career', $item['value']);
     $html .= Career::renderDiagramByColumn($graph, $tpl);
 } else {
     Display::addFlash(
diff --git a/main/admin/gradebook_list.php b/main/admin/gradebook_list.php
@@ -188,7 +188,7 @@
 
             $options = [];
             if (!empty($categoryData['depends'])) {
-                $list = api_unserialize_content('not_allowed_classes', $categoryData['depends']);
+                $list = UnserializeApi::unserialize('not_allowed_classes', $categoryData['depends']);
                 foreach ($list as $itemId) {
                     $courseInfo = api_get_course_info_by_id($itemId);
                     $options[$itemId] = $courseInfo['name'];
diff --git a/main/auth/sso/sso.Drupal.class.php b/main/auth/sso/sso.Drupal.class.php
@@ -293,7 +293,7 @@ public function generateProfileEditingURL($userId = 0, $asAdmin = false)
      */
     private function decode_cookie($cookie)
     {
-        return api_unserialize_content(
+        return UnserializeApi::unserialize(
             'not_allowed_classes',
             base64_decode($cookie)
         );
diff --git a/main/auth/sso/sso.class.php b/main/auth/sso/sso.class.php
@@ -296,7 +296,7 @@ public function generateProfileEditingURL($userId = 0, $asAdmin = false)
      */
     private function decode_cookie($cookie)
     {
-        return api_unserialize_content(
+        return UnserializeApi::unserialize(
             'not_allowed_classes',
             base64_decode($cookie)
         );
diff --git a/main/course_home/course_home.php b/main/course_home/course_home.php
@@ -394,7 +394,7 @@
 
                 if (!empty($item) && isset($item['value']) && !empty($item['value'])) {
                     /** @var Graph $graph */
-                    $graph = api_unserialize_content(
+                    $graph = UnserializeApi::unserialize(
                         'career',
                         $item['value']
                     );
diff --git a/main/exercise/hotspot_admin.inc.php b/main/exercise/hotspot_admin.inc.php
@@ -56,13 +56,13 @@
         $objAnswer = new Answer($questionId);
     }
 
-    $color = api_unserialize_content('not_allowed_classes', $color);
-    $reponse = api_unserialize_content('not_allowed_classes', $reponse);
-    $comment = api_unserialize_content('not_allowed_classes', $comment);
-    $weighting = api_unserialize_content('not_allowed_classes', $weighting);
-    $hotspot_coordinates = api_unserialize_content('not_allowed_classes', $hotspot_coordinates);
-    $hotspot_type = api_unserialize_content('not_allowed_classes', $hotspot_type);
-    $destination = api_unserialize_content('not_allowed_classes', $destination);
+    $color = UnserializeApi::unserialize('not_allowed_classes', $color);
+    $reponse = UnserializeApi::unserialize('not_allowed_classes', $reponse);
+    $comment = UnserializeApi::unserialize('not_allowed_classes', $comment);
+    $weighting = UnserializeApi::unserialize('not_allowed_classes', $weighting);
+    $hotspot_coordinates = UnserializeApi::unserialize('not_allowed_classes', $hotspot_coordinates);
+    $hotspot_type = UnserializeApi::unserialize('not_allowed_classes', $hotspot_type);
+    $destination = UnserializeApi::unserialize('not_allowed_classes', $destination);
     unset($buttonBack);
 }
 
diff --git a/main/exercise/question.class.php b/main/exercise/question.class.php
@@ -1145,7 +1145,7 @@ public function search_engine_edit(
                 $se_doc = $di->get_document((int) $se_ref['search_did']);
                 if ($se_doc !== false) {
                     if (($se_doc_data = $di->get_document_data($se_doc)) !== false) {
-                        $se_doc_data = api_unserialize_content(
+                        $se_doc_data = UnserializeApi::unserialize(
                             'not_allowed_classes',
                             $se_doc_data
                         );
diff --git a/main/exercise/upload_exercise.php b/main/exercise/upload_exercise.php
@@ -549,7 +549,7 @@ function lp_upload_quiz_action_handling()
 
         if (!empty($lpObject)) {
             /** @var learnpath $oLP */
-            $oLP = api_unserialize_content('lp', $lpObject);
+            $oLP = UnserializeApi::unserialize('lp', $lpObject);
             if (is_object($oLP)) {
                 if ((empty($oLP->cc)) || $oLP->cc != api_get_course_id()) {
                     $oLP = null;
diff --git a/main/extra/upgrade_school_calendar.php b/main/extra/upgrade_school_calendar.php
@@ -30,7 +30,7 @@
 $sql4 = "UPDATE set_module SET cal_day_num = $d_number WHERE id = $d_id ";
 Database::query($sql4);
 print_r(
-    api_unserialize_content(
+    UnserializeApi::unserialize(
         'not_allowed_classes',
         Security::remove_XSS($_POST['aaa'])
     )
diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php
@@ -266,7 +266,7 @@ public function setCourseListDependency($value)
     {
         $this->courseDependency = [];
 
-        $unserialized = api_unserialize_content('not_allowed_classes', $value, true);
+        $unserialized = UnserializeApi::unserialize('not_allowed_classes', $value, true);
 
         if (false !== $unserialized) {
             $this->courseDependency = $unserialized;
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
@@ -1,43 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use Brumann\Polyfill\Unserialize;
 use Chamilo\CoreBundle\Entity\SettingsCurrent;
-use Chamilo\CourseBundle\Component\CourseCopy\Course;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Announcement;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Attendance;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\CalendarEvent;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\CourseCopyLearnpath;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\CourseCopyTestCategory;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\CourseDescription;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\CourseSession;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Document;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Forum;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\ForumCategory;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\ForumPost;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\ForumTopic;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Glossary;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\GradeBookBackup;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Link;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\LinkCategory;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Quiz;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\QuizQuestion;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\QuizQuestionOption;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\ScormDocument;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Survey;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\SurveyInvitation;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\SurveyQuestion;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Thematic;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\ToolIntro;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Wiki;
-use Chamilo\CourseBundle\Component\CourseCopy\Resources\Work;
 use Chamilo\CourseBundle\Entity\CItemProperty;
 use Chamilo\UserBundle\Entity\User;
 use ChamiloSession as Session;
-use Fhaculty\Graph\Graph;
-use Fhaculty\Graph\Set\Edges;
-use Fhaculty\Graph\Set\Vertices;
-use Fhaculty\Graph\Set\VerticesMap;
 use Symfony\Component\Finder\Finder;
 
 /**
@@ -2800,7 +2767,7 @@ function api_get_plugin_setting($plugin, $variable)
     if (isset($result[$plugin])) {
         $value = $result[$plugin];
 
-        $unserialized = api_unserialize_content('not_allowed_classes', $value, true);
+        $unserialized = UnserializeApi::unserialize('not_allowed_classes', $value, true);
 
         if (false !== $unserialized) {
             $value = $unserialized;
diff --git a/main/inc/lib/array.lib.php b/main/inc/lib/array.lib.php
@@ -27,7 +27,7 @@ function array_unique_dimensional($array)
     $array = array_unique($array);
 
     foreach ($array as &$myvalue) {
-        $myvalue = api_unserialize_content('not_allowed_clases', $myvalue);
+        $myvalue = UnserializeApi::unserialize('not_allowed_clases', $myvalue);
     }
 
     return $array;
diff --git a/main/inc/lib/nanogong/receiver.php b/main/inc/lib/nanogong/receiver.php
diff --git a/main/inc/lib/nanogong/upload_nanogong_file.php b/main/inc/lib/nanogong/upload_nanogong_file.php
diff --git a/main/inc/lib/plugin.class.php b/main/inc/lib/plugin.class.php
@@ -322,7 +322,7 @@ public function get($name)
         $settings = $this->get_settings();
         foreach ($settings as $setting) {
             if ($setting['variable'] == $this->get_name().'_'.$name) {
-                $unserialized = api_unserialize_content('not_allowed_classes', $setting['selected_value'], true);
+                $unserialized = UnserializeApi::unserialize('not_allowed_classes', $setting['selected_value'], true);
 
                 if (!empty($setting['selected_value']) &&
                     false !== $unserialized
diff --git a/main/inc/lib/plugin.lib.php b/main/inc/lib/plugin.lib.php
@@ -437,7 +437,7 @@ public function getPluginInfo($plugin_name, $forced = false)
             $settings_filtered = [];
             foreach ($plugin_settings as $item) {
                 if (!empty($item['selected_value'])) {
-                    $unserialized = api_unserialize_content('not_allowed_classes', $item['selected_value'], true);
+                    $unserialized = UnserializeApi::unserialize('not_allowed_classes', $item['selected_value'], true);
                     if (false !== $unserialized) {
                         $item['selected_value'] = $unserialized;
                     }
diff --git a/main/inc/lib/statistics.lib.php b/main/inc/lib/statistics.lib.php
@@ -305,7 +305,7 @@ public static function getActivitiesData(
             } else {
                 if (!empty($row[2])) {
                     $originalData = str_replace('\\', '', $row[2]);
-                    $row[2] = api_unserialize_content('not_allowed_classes', $originalData);
+                    $row[2] = UnserializeApi::unserialize('not_allowed_classes', $originalData);
                     if (is_array($row[2]) && !empty($row[2])) {
                         $row[2] = implode_with_key(', ', $row[2]);
                     } else {
diff --git a/main/lp/aicc_api.php b/main/lp/aicc_api.php
@@ -36,7 +36,7 @@
 // Is this needed? This is probabaly done in the header file.
 $file = Session::read('file');
 /** @var learnpath $oLP */
-$oLP = api_unserialize_content('lp', Session::read('lpobject'));
+$oLP = UnserializeApi::unserialize('lp', Session::read('lpobject'));
 $oItem = $oLP->items[$oLP->current];
 if (!is_object($oItem)) {
     error_log('New LP - scorm_api - Could not load oItem item', 0);
diff --git a/main/lp/aicc_hacp.php b/main/lp/aicc_hacp.php
@@ -64,7 +64,7 @@
 // Is this needed? This is probabaly done in the header file.
 $file = Session::read('file');
 /** @var learnpath $oLP */
-$oLP = api_unserialize_content(
+$oLP = UnserializeApi::unserialize(
     'not_allowed_classes',
     Session::read('lpobject')
 );
diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
@@ -12690,7 +12690,7 @@ public static function getLpFromSession($courseCode, $lpId, $user_id)
         $learnPath = null;
         $lpObject = Session::read('lpobject');
         if ($lpObject !== null) {
-            $learnPath = api_unserialize_content('lp', $lpObject);
+            $learnPath = UnserializeApi::unserialize('lp', $lpObject);
             if ($debug) {
                 error_log('getLpFromSession: unserialize');
                 error_log('------getLpFromSession------');
diff --git a/main/lp/lp_controller.php b/main/lp/lp_controller.php
@@ -215,7 +215,7 @@ function(reponse) {
         error_log(' SESSION[lpobject] is defined');
     }
     /** @var learnpath $oLP */
-    $oLP = api_unserialize_content('lp', $lpObject);
+    $oLP = UnserializeApi::unserialize('lp', $lpObject);
     if (isset($oLP) && is_object($oLP)) {
         if ($debug) {
             error_log(' oLP is object');
diff --git a/main/lp/scorm_api.php b/main/lp/scorm_api.php
@@ -31,7 +31,7 @@
 
 $file = Session::read('file');
 /** @var learnpath $oLP */
-$oLP = api_unserialize_content(
+$oLP = UnserializeApi::unserialize(
     'lp',
     Session::read('lpobject')
 );
diff --git a/main/mySpace/my_career.php b/main/mySpace/my_career.php
diff --git a/plugin/ims_lti/Entity/ImsLtiTool.php b/plugin/ims_lti/Entity/ImsLtiTool.php
diff --git a/src/Chamilo/CoreBundle/Entity/Sequence.php b/src/Chamilo/CoreBundle/Entity/Sequence.php
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/Course.php b/src/Chamilo/CourseBundle/Component/CourseCopy/Course.php
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseArchiver.php b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseArchiver.php
diff --git a/src/Chamilo/PageBundle/Entity/User.php b/src/Chamilo/PageBundle/Entity/User.php

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ public function generateProfileEditingURL($userId = 0, $asAdmin = false)`
`293`	`293`	`*/`
`294`	`294`	`private function decode_cookie($cookie)`
`295`	`295`	`{`
`296`		`- return api_unserialize_content(`
	`296`	`+ return UnserializeApi::unserialize(`
`297`	`297`	`'not_allowed_classes',`
`298`	`298`	`base64_decode($cookie)`
`299`	`299`	`);`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ public function generateProfileEditingURL($userId = 0, $asAdmin = false)`
`296`	`296`	`*/`
`297`	`297`	`private function decode_cookie($cookie)`
`298`	`298`	`{`
`299`		`- return api_unserialize_content(`
	`299`	`+ return UnserializeApi::unserialize(`
`300`	`300`	`'not_allowed_classes',`
`301`	`301`	`base64_decode($cookie)`
`302`	`302`	`);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`$sql4 = "UPDATE set_module SET cal_day_num = $d_number WHERE id = $d_id ";`
`31`	`31`	`Database::query($sql4);`
`32`	`32`	`print_r(`
`33`		`- api_unserialize_content(`
	`33`	`+ UnserializeApi::unserialize(`
`34`	`34`	`'not_allowed_classes',`
`35`	`35`	`Security::remove_XSS($_POST['aaa'])`
`36`	`36`	`)`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public function setCourseListDependency($value)`
`266`	`266`	`{`
`267`	`267`	`$this->courseDependency = [];`
`268`	`268`
`269`		`- $unserialized = api_unserialize_content('not_allowed_classes', $value, true);`
	`269`	`+ $unserialized = UnserializeApi::unserialize('not_allowed_classes', $value, true);`
`270`	`270`
`271`	`271`	`if (false !== $unserialized) {`
`272`	`272`	`$this->courseDependency = $unserialized;`