Browse Source

Updating configuration files.

jmontoya 10 years ago
parent
commit
c79aa82f55

+ 7 - 4
app/AppKernel.php

@@ -17,10 +17,16 @@ class AppKernel extends Kernel
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
 
+            new ChamiloLMS\CoreBundle\ChamiloLMSCoreBundle(),
+
+            new Braincrafted\Bundle\BootstrapBundle\BraincraftedBootstrapBundle(),
+
             new Knp\Bundle\MenuBundle\KnpMenuBundle(),
             // Vendor specifics bundles
             new Sonata\CoreBundle\SonataCoreBundle(),
             new Sonata\BlockBundle\SonataBlockBundle(),
+            new Sonata\MediaBundle\SonataMediaBundle(),
+            new Sonata\EasyExtendsBundle\SonataEasyExtendsBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
@@ -29,9 +35,6 @@ class AppKernel extends Kernel
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
         }
 
-        $bundles[] = new ChamiloLMS\CoreBundle\ChamiloLMSCoreBundle();
-        $bundles[] = new Braincrafted\Bundle\BootstrapBundle\BraincraftedBootstrapBundle();
-
         return $bundles;
     }
 
@@ -50,7 +53,7 @@ class AppKernel extends Kernel
         return $this->rootDir.'/../data/temp/'.$this->environment.'/cache/';
     }
 
-    // Custom
+    // Custom paths
 
     public function getRealRootDir()
     {

+ 37 - 1
app/config/config.yml

@@ -1,7 +1,6 @@
 imports:
     - { resource: parameters.yml }
     - { resource: security.yml }
-    - { resource: parameters.php }
 
 framework:
     #esi:             ~
@@ -31,6 +30,7 @@ twig:
     strict_variables: "%kernel.debug%"
     paths:
       "%kernel.root_dir%/../src/ChamiloLMS/CoreBundle/Resources/views/default": template_style
+
     globals:
 
       show_toolbar: true
@@ -132,8 +132,44 @@ sonata_block:
         #sonata.media.block.gallery:
         #sonata.media.block.feature_media:
 
+sonata_media:
+    # if you don't use default namespace configuration
+    #class:
+    #    media: MyVendor\MediaBundle\Entity\Media
+    #    gallery: MyVendor\MediaBundle\Entity\Gallery
+    #    gallery_has_media: MyVendor\MediaBundle\Entity\GalleryHasMedia
+    default_context: default
+    db_driver: doctrine_orm # or doctrine_mongodb, doctrine_phpcr
+    contexts:
+        default:  # the default context is mandatory
+            providers:
+                - sonata.media.provider.dailymotion
+                - sonata.media.provider.youtube
+                - sonata.media.provider.image
+                - sonata.media.provider.file
+
+            formats:
+                small: { width: 100 , quality: 70}
+                big:   { width: 500 , quality: 70}
+
+    cdn:
+        server:
+            path: /uploads/media # http://media.sonata-project.org/
+
+    filesystem:
+        local:
+            directory:  %kernel.root_dir%/../web/uploads/media
+            create:     false
+
 knp_menu:
     twig:  # use "twig: false" to disable the Twig extension and the TwigRenderer
         template: knp_menu.html.twig
     templating: false # if true, enables the helper for PHP templates
     default_renderer: twig # The renderer to use, list is also available by default
+
+chamilo:
+    system_version: 10.0.0
+    system_stable: false
+    software_name: chamilo
+    software_url: http://www.chamilo.org/
+    platform_charset: utf-8

+ 0 - 3
app/config/parameters.php

@@ -1,3 +0,0 @@
-<?php
-$_configuration = require_once __DIR__.'/../../config/configuration.php';
-$container->setParameter('configuration', $_configuration);

+ 0 - 14
app/config/parameters.yml

@@ -1,14 +0,0 @@
-# This file is auto-generated during the composer install
-parameters:
-    database_driver: pdo_mysql
-    database_host: 127.0.0.1
-    database_port: null
-    database_name: chamilo10
-    database_user: root
-    database_password: root
-    mailer_transport: smtp
-    mailer_host: 127.0.0.1
-    mailer_user: null
-    mailer_password: null
-    locale: es
-    secret: ThisTokenIsNotSoSecretChangeIt

+ 15 - 2
app/config/parameters.yml.dist

@@ -2,9 +2,9 @@ parameters:
     database_driver:   pdo_mysql
     database_host:     127.0.0.1
     database_port:     ~
-    database_name:     symfony
+    database_name:     chamilo10
     database_user:     root
-    database_password: ~
+    database_password: root
 
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
@@ -13,3 +13,16 @@ parameters:
 
     locale:            en
     secret:            ThisTokenIsNotSoSecretChangeIt
+
+    path.data: ~
+    path.temp: ~
+    path.courses: ~
+    path.logs: ~
+
+    session_lifetime: ~
+    security_key: ~
+    password_encryption: sha1
+    deny_delete_users: false
+    login_as_forbidden_globally: false
+    name_order_conventions:
+

+ 2 - 2
app/config/security.yml

@@ -1,9 +1,9 @@
 security:
     encoders:
         ChamiloLMS\CoreBundle\Entity\User:
-          algorithm: sha1
+          algorithm: %password_encryption%
           encode_as_base64: false
-          iterations:       1
+          iterations: 1
 
     role_hierarchy:
         ROLE_GLOBAL_ADMIN: [ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]

+ 0 - 1
config/.htaccess

@@ -1 +0,0 @@
-deny from all

+ 0 - 114
config/auth.conf.dist.php

@@ -1,114 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-
-/**
- * Configuration file for all authentication methods. Uncomment and configure only the section(s) you need.
- * @package chamilo.conf.auth
- */
-
-/**
- * Facebook
- */
-
-/*
- * Decomment those lines and put your facebook app parameters here
- * Find them here : https://developers.facebook.com/apps/
- 
-$facebook_config = array(   'appId'         => 'APPID',
-                            'secret'        => 'secret app',
-                            'return_url'    => api_get_path(WEB_PATH).'?action=fbconnect'
-);
-*/
- 
-
-/**
- * Shibboleth
- */
-
-// $shibb_login = ...;
-
-/**
- * LDAP
- */
-
-
-
-/** 
- * Array of connection parameters
- **/
-$extldap_config = array(
-  //base dommain string
-  'base_dn' => 'DC=cblue,DC=be',
-  //admin distinguished name
-  'admin_dn' => 'CN=admin,dc=cblue,dc=be',
-  //admin password
-  'admin_password' => 'pass',
-  //ldap host
-  'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
-  // filter
-//  'filter' => '', // no () arround the string
-  //'port' => , default on 389
-  //protocl version (2 or 3)
-  'protocol_version' => 3,
-  // set this to 0 to connect to AD server
-  'referrals' => 0,
-  //String used to search the user in ldap. %username will ber replaced by the username.
-  //See extldap_get_user_search_string() function below
-//  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
-  'user_search' => 'uid=%username%',  // no () arround the string
-  //encoding used in ldap (most common are UTF-8 and ISO-8859-1
-  'encoding' => 'UTF-8',
-  //Set to true if user info have to be update at each login
-  'update_userinfo' => true
-);
-
-
-
-/**
- * Correspondance array between chamilo user info and ldap user info
- * This array is of this form : 
- *  '<chamilo_field> => <ldap_field>
- *
- * If <ldap_field> is "func", then the value of <chamilo_field> will be the return value of the function
- * extldap_get_<chamilo_field>($ldap_array)
- * In this cas you will have to declare the extldap_get_<chamilo_field> function
- *
- * If <ldap_field> is a string beginning with "!", then the value will be this string without "!"
- * 
- * If <ldap_field> is any other string then the value of <chamilo_field> will be 
- * $ldap_array[<ldap_field>][0]
- *
- * If <ldap_field> is an array then its value will be an array of values with the same rules as above
- * 
- **/
-$extldap_user_correspondance = array(
-    'firstname' => 'givenName',
-    'lastname' => 'sn',
-    'status' => 'func',
-    'admin' => 'func',
-    'email' => 'mail',
-    'auth_source' => '!extldap',
-    //'username' => ,
-    'language' => '!english',
-    'password' => '!PLACEHOLDER',
-    'extra' => array(
-    'title' => 'title',
-    'globalid' => 'employeeID',
-    'department' => 'department',
-    'country' => 'co',
-    'bu' => 'Company')
-);
-
-/**
- * OpenID
- */
-
-$langMainInfo = 'You may login to this site using an OpenID. You may add your OpenId URLs below, and also see a list of any OpenIDs which have already been added.';
-$langMainInfoDetail = '<p>OpenID is a secure way to use one user ID and password to log in to many web sites without special software, giving the same password to each site, or losing control over which information is shared with each site that you visit.</p>';
-$langMainInfoDetail .= '<p>Users can create accounts using their OpenID, assign one or more OpenIDs to an existing account, and log in using an OpenID. This lowers the barrier to registration, which is good for the site, and offers convenience and security to the users. Logging in via OpenID is far more secure than cross-site logins using drupal.module.</p>';
-$langMainInfoDetail .= '<p>More information on OpenID is available at <a href="http://openid.net">OpenID.net</a></p>';
-
-/**
- * CAS
- */
-//$cas = ...;

+ 2 - 10
config/configuration.dist.php → config/configuration.php.dist

@@ -1,5 +1,5 @@
 <?php
-// Chamilo version {NEW_VERSION}
+    // Chamilo version {NEW_VERSION}
 // File generated by /install/index.php script - {DATE_GENERATED}
 /* For licensing terms, see /license.txt */
 /**
@@ -117,18 +117,10 @@ $_configuration['login_as_forbidden_globally'] = false;
 // Activation for multi-url access.
 //$_configuration['multiple_access_urls'] = true;
 
-/** Chamilo version settings */
-$_configuration['system_version']    = '{NEW_VERSION}';
-$_configuration['system_stable']     = NEW_VERSION_STABLE;
-$_configuration['software_name']     = 'Chamilo';
-$_configuration['software_url']	     = 'http://www.chamilo.org/';
-
 /** Chamilo dev settings */
 // Generate twig templates in every request, prompts SQL errors.
 $_configuration['debug']             = false;
-$_configuration['platform_charset']  = 'utf-8';
-// Show a useful toolbar with memory used, loaded time, request, session, logs information.
-$_configuration['show_profiler']     = false;
+
 $_configuration['name_order_conventions'] = array();
 
 return $_configuration;

+ 0 - 66
config/events.conf.dist.php

@@ -1,66 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-
-/**
- * Events' configuration
- * Used to configure each event and to link them to functions the event'll fire.
- * The flow is like the following :
- * 1. somewhere in the application an event is fired
- * 2. that event is intercepted by the switch EventsDispatcher
- * 3. that switch will go all over the "actions" in the event_config initialized beneath us according to the event
- * 4. that switch will see if the function actually exists (if not, we get dont do anything)
- * 5. then it will see if a filter for that function exists (if it does, the filter is executed)
- * 6. if the filter says it's ok, the function linked to the event is executed
- * 7. and that function will actually call the truly interesting function with the good require_once
- */
-global $event_config;
-
-$event_config = array(
-    'portal_homepage_edited' => array( // key for "user registration" event
-        'actions' => array( // we link this event to a bunch of functions that will be triggered when the event is fired
-            'event_send_mail' // don't forget to actually write this function in the events.lib.php file
-        ),
-        'self_sent' => false, // this key states that we can't add user to this event through the admin panel
-        'name_lang_var' => 'PortalHomepageEdited',
-        'desc_lang_var' => 'PortalHomepageEdited',
-        'available_keyvars' => array (// keys used for the mail template
-            'url'           => 'portal',
-            'sitename'      => 'sitename',
-            'firstname'     => 'firstname',
-            'lastname'      => 'lastname',
-            'username'      => 'username',
-            'usermail'      => 'usermail',
-            'password'      => 'password',
-            'user_lang'     => 'language',
-            'admin_name'    => 'administrator_name',
-            'admin_surname' => 'administrator_surname',
-            'admin_phone'   => 'administrator_phone',
-            'admin_email'   => 'administrator_email',
-        )
-    ),
-    'user_registration' => array( // key for "user registration" event
-        'actions' => array( // we link this event to a bunch of functions that will be triggered when the event is fired
-            'event_send_mail' // don't forget to actually write this function in the events.lib.php file
-        ),
-        'self_sent' => true, // this key states that we can't add user to this event through the admin panel
-        'name_lang_var' => 'UserRegistrationTitle',
-        'desc_lang_var' => 'UserRegistrationComment',
-        'available_keyvars' => array (// keys used for the mail template
-            'url'           => 'portal',
-            'sitename'      => 'sitename',
-            'firstname'     => 'firstname',
-            'lastname'      => 'lastname',
-            'username'      => 'username',
-            'usermail'      => 'usermail',
-            'password'      => 'password',
-            'user_lang'     => 'language',
-            'admin_name'    => 'administrator_name',
-            'admin_surname' => 'administrator_surname',
-            'admin_phone'   => 'administrator_phone',
-            'admin_email'   => 'administrator_email',
-        )
-    ),
-);
-
-
-//@include 'events.conf.local.php';

+ 0 - 16
config/mail.conf.dist.php

@@ -1,16 +0,0 @@
-<?php
-
-/**
- *	This file holds the email configuration settings
- *	@package chamilo.configuration
- */
-
-$platform_email['SMTP_FROM_EMAIL']   = (isset($administrator['email'])?$administrator['email']:'admin@example.com');
-$platform_email['SMTP_FROM_NAME']    = (isset($administrator['name'])?$administrator['name']:'Admin');
-$platform_email['SMTP_HOST']         = 'localhost';
-$platform_email['SMTP_PORT']         = 25;
-$platform_email['SMTP_MAILER']       = 'mail'; // mail, sendmail or smtp
-$platform_email['SMTP_AUTH']         = 0;
-$platform_email['SMTP_USER']         = '';
-$platform_email['SMTP_PASS']         = '';
-$platform_email['SMTP_CHARSET']      = 'UTF-8';

+ 0 - 19
config/portfolio.conf.dist.php

@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file contains the portfolios configuration.
- * 
- * Portfolios are external applicatoins used to display and share files. The
- * portfolio configuration set up where files can be sent.
- * 
- * @see \Portfolio
- */
-
-$portfolios = array();
-
-//$_mahara_portfolio = new Portfolio\Mahara('http(s)://...');
-//$portfolios[] = $_mahara_portfolio;
-
-//$download_portfolio = new Portfolio\Download();
-//$download_portfolio->set_title(get_lang('Download'));
-//$portfolios[] = $download_portfolio;

+ 0 - 42
config/profile.conf.dist.php

@@ -1,42 +0,0 @@
-<?php
-
-/**
- *	This file holds the configuration constants and variables
- *	for the user profile tool.
- *
- *	@package chamilo.configuration
- */
-
-// Autentication, password
-define('CHECK_PASS_EASY_TO_FIND', false);
-
-$profileIsEditable = true;
-$profileIsReadable = true;
-
-// User photos
-define('PREFIX_IMAGE_FILENAME_WITH_UID', true); // If true, filename of images on server begin with uid of the user.
-define('RESIZE_IMAGE_TO_THIS_HEIGTH', 180);
-define('IMAGE_THUMBNAIL_WIDTH', 100);
-
-// Replacing user photos
-define('KEEP_THE_NAME_WHEN_CHANGE_IMAGE', true);
-	// true  -> the new image have the name of previous.
-	// false -> a new name is build for each upladed image.
-define('KEEP_THE_OLD_IMAGE_AFTER_CHANGE', true);
-	// true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
-	// false -> only the last image still on server.
-
-// Official code
-// Don't forget to change name of offical code in your organization
-// See $langOfficialCode within the language file 'registration'
-define('CONFVAL_ASK_FOR_OFFICIAL_CODE', true); // not used but name fixed
-define('CONFVAL_CHECK_OFFICIAL_CODE', false);
-/* if CONFVAL_CHECK_OFFICIAL_CODE is true, build here the
-function personal_check_official_code($code, $valueToReturnIfOk, $valueToReturnIfBad) {
-	return $stateOfficialCode = true;
-}
-*/
-
-// For stats
-define('NB_LINE_OF_EVENTS', 15);
-