浏览代码

Update settings

Julio Montoya 9 年之前
父节点
当前提交
bc8ba7dc4e

+ 0 - 9
main/course_info/start.php

@@ -26,12 +26,3 @@ $tpl->addGlobal('course_id', $course_info['code']);
 $tpl->addGlobal('just_created', isset($_GET['first']) && $_GET['first'] ? 1 : 0);
 $tpl->addGlobal('just_created', isset($_GET['first']) && $_GET['first'] ? 1 : 0);
 
 
 echo $tpl->render('ChamiloCoreBundle:default/create_course:add_course.html.twig');
 echo $tpl->render('ChamiloCoreBundle:default/create_course:add_course.html.twig');
-
-/*
-$add_course_tpl = $tpl->get_template('create_course/add_course.tpl');
-$content = $tpl->fetch($add_course_tpl);
-
-$tpl->assign('content', $content);
-$template = $tpl->get_template('layout/layout_1_col.tpl');
-$tpl->display($template);*/
-

+ 1 - 1
main/gradebook/lib/fe/displaygradebook.php

@@ -744,7 +744,7 @@ class DisplayGradebook
         $info .= get_lang('Name') . ' :  <a target="_blank" href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php?u=' . $userid . '"> ' .
         $info .= get_lang('Name') . ' :  <a target="_blank" href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php?u=' . $userid . '"> ' .
             $user['complete_name'] . '</a><br />';
             $user['complete_name'] . '</a><br />';
 
 
-        if (api_get_setting('show_email_addresses') == 'true') {
+        if (api_get_setting('display.show_email_addresses') == 'true') {
             $info .= get_lang('Email') . ' : <a href="mailto:' . $user['email'] . '">' . $user['email'] . '</a><br />';
             $info .= get_lang('Email') . ' : <a href="mailto:' . $user['email'] . '">' . $user['email'] . '</a><br />';
         }
         }
 
 

+ 2 - 2
main/group/group_space.php

@@ -339,7 +339,7 @@ if (api_is_western_name_order()) {
     $table->set_header(2, get_lang('FirstName'));
     $table->set_header(2, get_lang('FirstName'));
 }
 }
 
 
-if (api_get_setting('show_email_addresses') == 'true') {
+if (api_get_setting('display.show_email_addresses') == 'true') {
     $table->set_header(3, get_lang('Email'));
     $table->set_header(3, get_lang('Email'));
     $table->set_column_filter(3, 'email_filter');
     $table->set_column_filter(3, 'email_filter');
 } else {
 } else {
@@ -402,7 +402,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
     $course_id = api_get_course_int_id();
     $course_id = api_get_course_int_id();
 
 
     // Query
     // Query
-    if (api_get_setting('show_email_addresses') == 'true') {
+    if (api_get_setting('display.show_email_addresses') == 'true') {
         $sql = "SELECT user.user_id 	AS col0,
         $sql = "SELECT user.user_id 	AS col0,
 				".(api_is_western_name_order() ?
 				".(api_is_western_name_order() ?
                 "user.firstname 	AS col1,
                 "user.firstname 	AS col1,

+ 1 - 1
main/inc/ajax/message.ajax.php

@@ -130,7 +130,7 @@ switch ($action) {
         $sql .=' LIMIT 20';
         $sql .=' LIMIT 20';
         $result = Database::query($sql);
         $result = Database::query($sql);
 
 
-        $showEmail = api_get_setting('show_email_addresses');
+        $showEmail = api_get_setting('display.show_email_addresses');
         $return = array();
         $return = array();
         if (Database::num_rows($result) > 0) {
         if (Database::num_rows($result) > 0) {
             while ($row = Database::fetch_array($result, 'ASSOC')) {
             while ($row = Database::fetch_array($result, 'ASSOC')) {

+ 1 - 1
main/inc/ajax/user_manager.ajax.php

@@ -18,7 +18,7 @@ switch ($action) {
         echo '</div>';
         echo '</div>';
         echo '</div>';
         echo '</div>';
         echo '<div class="col-sm-7">';
         echo '<div class="col-sm-7">';
-        if (api_get_setting('show_email_addresses') == 'false') {
+        if (api_get_setting('display.show_email_addresses') == 'false') {
             $user_info['mail'] = ' ';
             $user_info['mail'] = ' ';
         } else {
         } else {
             $user_info['mail'] = ' '.$user_info['mail'].' ';
             $user_info['mail'] = ' '.$user_info['mail'].' ';

+ 1 - 0
main/inc/introductionSection.inc.php

@@ -139,6 +139,7 @@ if ($intro_editAllowed) {
 /* @todo use a lib to query the $TBL_INTRODUCTION table */
 /* @todo use a lib to query the $TBL_INTRODUCTION table */
 // Getting course intro
 // Getting course intro
 $intro_content = null;
 $intro_content = null;
+var_dump($moduleId);exit;
 $sql = "SELECT intro_text FROM $TBL_INTRODUCTION
 $sql = "SELECT intro_text FROM $TBL_INTRODUCTION
         WHERE
         WHERE
             c_id = $course_id AND
             c_id = $course_id AND

+ 1 - 3
main/inc/lib/add_course.lib.inc.php

@@ -1256,9 +1256,7 @@ class AddCourse
             $params['disk_quota'] : null;
             $params['disk_quota'] : null;
 
 
         if (!isset($params['visibility'])) {
         if (!isset($params['visibility'])) {
-            $default_course_visibility = api_get_setting(
-                'course.courses_default_creation_visibility'
-            );
+            $default_course_visibility = api_get_setting('course.courses_default_creation_visibility');
             if (isset($default_course_visibility)) {
             if (isset($default_course_visibility)) {
                 $visibility = $default_course_visibility;
                 $visibility = $default_course_visibility;
             } else {
             } else {

+ 4 - 3
main/inc/lib/api.lib.php

@@ -2571,8 +2571,11 @@ function api_get_setting_in_list($variable, $option)
  *
  *
  * @author Julio Montoya
  * @author Julio Montoya
  */
  */
-function api_get_setting($variable, $key = null)
+function api_get_setting($variable)
 {
 {
+    $variable = trim($variable);
+    //$variable = str_replace(array("\r","\n"), '', $variable);
+
     switch ($variable) {
     switch ($variable) {
         case 'server_type':
         case 'server_type':
             $test = ['dev', 'test'];
             $test = ['dev', 'test'];
@@ -2589,8 +2592,6 @@ function api_get_setting($variable, $key = null)
             return Container::getSettingsManager()->getSetting($variable);
             return Container::getSettingsManager()->getSetting($variable);
     }
     }
 
 
-
-
     global $_setting;
     global $_setting;
     if ($variable == 'header_extra_content') {
     if ($variable == 'header_extra_content') {
         $filename = api_get_path(SYS_PATH).api_get_home_path().'header_extra_content.txt';
         $filename = api_get_path(SYS_PATH).api_get_home_path().'header_extra_content.txt';

+ 1 - 0
main/inc/lib/formvalidator/Element/HtmlEditor.php

@@ -40,6 +40,7 @@ class HtmlEditor extends HTML_QuickForm_textarea
         $this->_type = 'html_editor';
         $this->_type = 'html_editor';
 
 
         $editor = Container::getHtmlEditor();
         $editor = Container::getHtmlEditor();
+
         if ($editor) {
         if ($editor) {
             $this->editor = $editor;
             $this->editor = $editor;
             $this->editor->setName($name);
             $this->editor->setName($name);

+ 1 - 1
main/inc/lib/groupmanager.lib.php

@@ -2276,7 +2276,7 @@ class GroupManager
                 foreach ($tutorsids_of_group as $tutor_id) {
                 foreach ($tutorsids_of_group as $tutor_id) {
                     $tutor = api_get_user_info($tutor_id);
                     $tutor = api_get_user_info($tutor_id);
                     $username = api_htmlentities(sprintf(get_lang('LoginX'), $tutor['username']), ENT_QUOTES);
                     $username = api_htmlentities(sprintf(get_lang('LoginX'), $tutor['username']), ENT_QUOTES);
-                    if (api_get_setting('show_email_addresses') == 'true') {
+                    if (api_get_setting('display.show_email_addresses') == 'true') {
                         $tutor_info .= Display::tag(
                         $tutor_info .= Display::tag(
                             'span',
                             'span',
                             Display::encrypted_mailto_link($tutor['mail'], api_get_person_name($tutor['firstName'], $tutor['lastName'])),
                             Display::encrypted_mailto_link($tutor['mail'], api_get_person_name($tutor['firstName'], $tutor['lastName'])),

+ 1 - 1
main/inc/lib/social.lib.php

@@ -1100,7 +1100,7 @@ class SocialManager extends UserManager
             }
             }
             $html .= '</div>';
             $html .= '</div>';
 
 
-            if (api_get_setting('show_email_addresses') == 'true') {
+            if (api_get_setting('display.show_email_addresses') == 'true') {
                 $html .= Display::encrypted_mailto_link($user_object->email, $user_object->email).'<br />';
                 $html .= Display::encrypted_mailto_link($user_object->email, $user_object->email).'<br />';
             }
             }
 
 

+ 1 - 1
main/user/user.php

@@ -123,7 +123,7 @@ if (api_is_allowed_to_edit(null, true)) {
                 $extra_fields = array_keys($extra_fields);
                 $extra_fields = array_keys($extra_fields);
                 $select_email_condition = '';
                 $select_email_condition = '';
 
 
-                if (api_get_setting('show_email_addresses') == 'true') {
+                if (api_get_setting('display.show_email_addresses') == 'true') {
                     $select_email_condition = ' user.email, ';
                     $select_email_condition = ' user.email, ';
                     if ($sort_by_first_name) {
                     if ($sort_by_first_name) {
                         $a_users[0] = array(
                         $a_users[0] = array(

+ 0 - 3
src/Chamilo/CoreBundle/Controller/LegacyController.php

@@ -59,9 +59,6 @@ class LegacyController extends BaseController
         Container::$dataDir = $this->container->get('kernel')->getDataDir();
         Container::$dataDir = $this->container->get('kernel')->getDataDir();
         Container::$courseDir = $this->container->get('kernel')->getDataDir();
         Container::$courseDir = $this->container->get('kernel')->getDataDir();
         //Container::$configDir = $this->container->get('kernel')->getConfigDir();
         //Container::$configDir = $this->container->get('kernel')->getConfigDir();
-        Container::$htmlEditor = $this->container->get(
-            'chamilo_core.html_editor'
-        );
 
 
         if (is_file($fileToLoad) &&
         if (is_file($fileToLoad) &&
             \Security::check_abs_path($fileToLoad, $mainPath)
             \Security::check_abs_path($fileToLoad, $mainPath)

+ 0 - 4
src/Chamilo/CoreBundle/EventListener/LegacyListener.php

@@ -111,10 +111,6 @@ class LegacyListener
         Container::$dataDir = $container->get('kernel')->getDataDir();
         Container::$dataDir = $container->get('kernel')->getDataDir();
         Container::$courseDir = $container->get('kernel')->getDataDir();
         Container::$courseDir = $container->get('kernel')->getDataDir();
 
 
-
-        // Setting editor
-        //Container::$htmlEditor = $container->get('chamilo_core.html_editor');
-
         if (!defined('DEFAULT_DOCUMENT_QUOTA')) {
         if (!defined('DEFAULT_DOCUMENT_QUOTA')) {
             $default_quota = api_get_setting('document.default_document_quotum');
             $default_quota = api_get_setting('document.default_document_quotum');
 
 

+ 1 - 1
src/Chamilo/CoreBundle/Framework/Container.php

@@ -140,7 +140,7 @@ class Container
      */
      */
     public static function getHtmlEditor()
     public static function getHtmlEditor()
     {
     {
-        return self::$htmlEditor;
+        return self::$container->get('chamilo_core.html_editor');
     }
     }
 
 
     /**
     /**

+ 2 - 0
src/Chamilo/CoreBundle/Settings/ProfileSettingsSchema.php

@@ -30,6 +30,7 @@ class ProfileSettingsSchema implements SchemaInterface
                     'use_users_timezone' => '',
                     'use_users_timezone' => '',
                     'allow_users_to_change_email_with_no_password' => '',
                     'allow_users_to_change_email_with_no_password' => '',
                     'login_is_email' => '',
                     'login_is_email' => '',
+                    'profiling_filter_adding_users' => ''
                 )
                 )
             )
             )
             ->setAllowedTypes(
             ->setAllowedTypes(
@@ -77,6 +78,7 @@ class ProfileSettingsSchema implements SchemaInterface
             ->add('use_users_timezone', 'yes_no')
             ->add('use_users_timezone', 'yes_no')
             ->add('allow_users_to_change_email_with_no_password', 'yes_no')
             ->add('allow_users_to_change_email_with_no_password', 'yes_no')
             ->add('login_is_email', 'yes_no', ['label' => 'LoginIsEmailTitle'])
             ->add('login_is_email', 'yes_no', ['label' => 'LoginIsEmailTitle'])
+            ->add('profiling_filter_adding_users', 'yes_no')
         ;
         ;
     }
     }
 }
 }