Removing main/admin/admin_page.class.php fixing fatal errors due core changes.

main/admin/admin_page.class.php

@@ -1,41 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-/**
- * Admin pages class definition
- * @package chamilo.admin
- */
-/**
- *
- * @license see /license.txt
- * @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
- */
-class AdminPage extends Page
-{
-
-    /**
-     *
-     * @return AdminPage
-     */
-    static function create($title = '')
-    {
-        return new self($title);
-    }
-    
-    function __construct($title = '')
-    {
-        global $this_section;
-        $this_section = SECTION_PLATFORM_ADMIN;
-
-        api_protect_admin_script();
-
-        if (empty($title)) {
-            $title = get_lang(get_class($this));
-        }
-
-        $this->title = $title;
-
-        $this->breadcrumbs = array();
-        $this->breadcrumbs[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-    }
-
-}

main/inc/lib/api.lib.php

@@ -10,7 +10,7 @@
 
 use \ChamiloSession as Session;
 use Symfony\Component\Validator\Constraints as Assert;
-use ChamiloLMS\UserBundle\Entity\User;
+use Application\Sonata\UserBundle\Entity\User;
 use ChamiloLMS\CoreBundle\Entity\Course;
 
 /**
@@ -655,7 +655,7 @@ function api_get_path($path_type, $path = null) {
 
         // Initialization of a table that contains common-purpose paths.
         $paths[WEB_PATH]                = $root_web;
-        $paths[WEB_PUBLIC_PATH]         = $root_web.'web/';
+        $paths[WEB_PUBLIC_PATH]         = $root_web;
         $paths[SYS_PATH]                = $root_sys;
 
         // Update data path to get it from config file if defined
@@ -6783,6 +6783,7 @@ function api_get_language_interface()
 function api_get_user_roles()
 {
     $em = Database::getManager();
+    //var_dump(Session::getSecurity()->getToken()->getRoles());
     $roles = $em->getRepository('ChamiloLMSCoreBundle:Role')->findBy(array(), array('name'=>'asc'));
     $userRoles = array();
     foreach ($roles as $role) {

main/inc/lib/usergroup.lib.php

@@ -643,7 +643,7 @@ class UserGroup extends Model
         $res = Database::query($sql);
         return Database::num_rows($res) != 0;
     }
-    
+
     /**
      * @param int $sidx
      * @param int $sord
@@ -744,20 +744,6 @@ class UserGroup extends Model
         return Database::store_result($result, 'ASSOC');
     }
 
-    /**
-     * @param $params
-     * @param bool $show_query
-     * @return bool|void
-     */
-    public function save($params, $show_query = false)
-    {
-        $id = parent::save($params, $show_query);
-        if ($this->useMultipleUrl) {
-            $this->subscribeToUrl($id, api_get_current_access_url_id());
-        }
-        return $id;
-    }
-
     /**
      * @param int $id
      * @return bool|void
@@ -834,13 +820,22 @@ class UserGroup extends Model
         return $response;
     }
 
-    function save($values, $show_query = false)
+    /**
+     * @param $params
+     * @param bool $show_query
+     * @return bool|void
+     */
+    public function save($values, $show_query = false)
     {
         $values['updated_on'] = $values['created_on'] = api_get_utc_datetime();
         $values['group_type'] = isset($values['group_type']) ? intval($values['group_type']) : $this->getGroupType();
 
         $groupId = parent::save($values, $show_query);
 
+        if ($this->useMultipleUrl) {
+            $this->subscribeToUrl($groupId, api_get_current_access_url_id());
+        }
+
         if ($groupId) {
             $this->add_user_to_group(api_get_user_id(), $groupId, $values['visibility']);
             $picture = isset($_FILES['picture']) ? $_FILES['picture'] : null;

main/mySpace/company_reports.php

@@ -10,7 +10,7 @@
 $language_file = array('admin', 'gradebook', 'tracking');
 
 $cidReset = true;
-require_once '../inc/global.inc.php';
+//require_once '../inc/global.inc.php';
 
 api_protect_admin_script();
 
@@ -78,4 +78,4 @@ $app['title'] = $tool_name;
 $tpl = $app['template'];
 
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+