chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updating vendor

Browse Source
skala
Julio Montoya 13 years ago
parent 1b0989fe36
commit add27693b9
9 changed files with 140 additions and 121 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      composer.lock
  2. 7
      main/inc/global.inc.php
  3. 8
      src/ChamiloLMS/Controller/IndexController.php
  4. 2
      vendor/autoload.php
  5. 54
      vendor/chamilo/chash/src/Chash/Helpers/ConfigurationHelper.php
  6. 7
      vendor/chamilo/chash/vendor/autoload.php
  7. 6
      vendor/composer/autoload_real.php
  8. 154
      vendor/composer/installed.json
  9. 7
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Tool/Wrapper/AbstractWrapper.php

16
composer.lock generated
Unescape View File

@ -7,12 +7,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/chamilo/chash.git", "url": "https://github.com/chamilo/chash.git",
"reference": "b9f4f3b3ff7f04ce87df7bb9896f2b3aee710feb" "reference": "0db81e2ad152355baca3d968f0af04cce147d510"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/chamilo/chash/zipball/b9f4f3b3ff7f04ce87df7bb9896f2b3aee710feb", "url": "https://api.github.com/repos/chamilo/chash/zipball/0db81e2ad152355baca3d968f0af04cce147d510",
"reference": "b9f4f3b3ff7f04ce87df7bb9896f2b3aee710feb", "reference": "0db81e2ad152355baca3d968f0af04cce147d510",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -27,7 +27,7 @@
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"time": "2013-03-27 13:08:43" "time": "2013-03-28 10:43:52"
}, },
{ {
"name": "dflydev/doctrine-orm-service-provider", "name": "dflydev/doctrine-orm-service-provider",
@ -356,12 +356,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/l3pp4rd/DoctrineExtensions.git", "url": "https://github.com/l3pp4rd/DoctrineExtensions.git",
"reference": "03799ebed1067cff5bb7fa60b711ce34f3bb689f" "reference": "e96e48a988f7fffbe3cca4763df84f77ba79ddde"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/03799ebed1067cff5bb7fa60b711ce34f3bb689f", "url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/e96e48a988f7fffbe3cca4763df84f77ba79ddde",
"reference": "03799ebed1067cff5bb7fa60b711ce34f3bb689f", "reference": "e96e48a988f7fffbe3cca4763df84f77ba79ddde",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -427,7 +427,7 @@
"tree", "tree",
"uploadable" "uploadable"
], ],
"time": "2013-03-26 20:33:31" "time": "2013-03-27 16:49:35"
}, },
{ {
"name": "knplabs/knp-menu", "name": "knplabs/knp-menu",

7
main/inc/global.inc.php
Unescape View File

@ -242,6 +242,10 @@ $app['breadcrumb'] = array();
//Form provider //Form provider
$app->register(new Silex\Provider\FormServiceProvider()); $app->register(new Silex\Provider\FormServiceProvider());
//URL generator provider
$app->register(new Silex\Provider\UrlGeneratorServiceProvider());
/* /*
use Doctrine\Common\Persistence\AbstractManagerRegistry; use Doctrine\Common\Persistence\AbstractManagerRegistry;
@ -320,8 +324,7 @@ $app['twig'] = $app->share(
}) })
); );
//URL generator provider
$app->register(new Silex\Provider\UrlGeneratorServiceProvider());
//Monolog and web profiler only available if cache is writable //Monolog and web profiler only available if cache is writable
if (is_writable($app['cache.path'])) { if (is_writable($app['cache.path'])) {

8
src/ChamiloLMS/Controller/IndexController.php
Unescape View File

@ -31,7 +31,7 @@ class IndexController// extends Controller
{ {
$this->logout(); $this->logout();
return $app->redirect($app['url_generator']->generator('index')); return $app->redirect($app['url_generator']->generate('index'));
} }
/** /**
@ -112,8 +112,6 @@ class IndexController// extends Controller
facebook_connect(); facebook_connect();
} }
//$app['url_generator']->generator('index');
$this->setLoginForm($app); $this->setLoginForm($app);
if (!api_is_anonymous()) { if (!api_is_anonymous()) {
@ -207,7 +205,7 @@ class IndexController// extends Controller
/** /**
* @param \Silex\Application $app * @param \Silex\Application $app
*/ */
function setLoginForm(Application $app) public function setLoginForm(Application $app)
{ {
$userId = api_get_user_id(); $userId = api_get_user_id();
$loginForm = null; $loginForm = null;
@ -260,7 +258,7 @@ class IndexController// extends Controller
return $app['template']->assign('form', $form->createView()); return $app['template']->assign('form', $form->createView());
*/ */
$form = new \FormValidator('formLogin', 'POST', null, null, array('class' => 'form-vertical')); $form = new \FormValidator('formLogin', 'POST', $app['url_generator']->generate('index'), null, array('class' => 'form-vertical'));
$form->addElement( $form->addElement(
'text', 'text',
'login', 'login',

2
vendor/autoload.php vendored
Unescape View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php'; require_once __DIR__ . '/composer' . '/autoload_real.php';
return ComposerAutoloaderInit0e9c4675a86057df1d33aecce1a6569e::getLoader(); return ComposerAutoloaderInitebc4e42976108992b86543316b8b2ad8::getLoader();

54
vendor/chamilo/chash/src/Chash/Helpers/ConfigurationHelper.php vendored
Unescape View File

@ -45,41 +45,41 @@ class ConfigurationHelper extends Helper
if (is_dir($dir)) { if (is_dir($dir)) {
return $dir; return $dir;
} }
/*
$confFile = $dir.'configuration.php';
$confYML = $dir.'configuration.yml';
if (file_exists($confFile)) {
return $dir;
}
if (file_exists($confYML)) {
return $dir;
}*/
return false; return false;
} }
/**
* Reads the Chamilo configuration file.
* Merges the configuration.php with the configuration.yml if it exists
* @param null $path
* @return array|bool|mixed
*/
public function readConfigurationFile($path = null) public function readConfigurationFile($path = null)
{ {
$confPath = $this->getConfigurationPath($path); $confPath = $this->getConfigurationPath($path);
if (!empty($confPath)) { if (!empty($confPath)) {
$confFile = $confPath.'configuration.php'; $confFile = $confPath.'configuration.php';
$_configuration = array();
if (file_exists($confFile)) { if (file_exists($confFile)) {
require $confFile; require $confFile;
$this->setConfiguration($_configuration);
return $_configuration;
} }
$confYML = $confPath.'configuration.yml'; $confYML = $confPath.'configuration.yml';
if (file_exists($confYML)) { if (file_exists($confYML)) {
$yaml = new Parser(); $yaml = new Parser();
$_configuration = $yaml->parse(file_get_contents($confYML)); $_configurationYML = $yaml->parse(file_get_contents($confYML));
if (isset($_configuration) && !empty($_configuration) && isset($_configurationYML) && !empty($_configurationYML)) {
return $_configuration; $_configuration = array_merge($_configuration, $_configurationYML);
} else {
$_configuration = $_configurationYML;
}
} }
return $_configuration;
} }
return false; return false;
@ -179,16 +179,22 @@ class ConfigurationHelper extends Helper
$dbs[] = $_configuration['user_personal_database']; $dbs[] = $_configuration['user_personal_database'];
} }
$t = $_configuration['main_database'].'.course'; $courseTable = $_configuration['main_database'].'.course';
$sql = 'SELECT db_name from '.$t;
$res = mysql_query($sql); $singleDatabase = isset($_configuration['single_database']) ? $_configuration['single_database'] : false;
if (mysql_num_rows($res) > 0) {
while ($row = mysql_fetch_array($res)) { if ($singleDatabase == false) {
if (!empty($row['db_name'])) { $sql = 'SELECT db_name from '.$courseTable;
$dbs[] = $row['db_name']; $res = mysql_query($sql);
if (mysql_num_rows($res) > 0) {
while ($row = mysql_fetch_array($res)) {
if (!empty($row['db_name'])) {
$dbs[] = $row['db_name'];
}
} }
} }
} }
return $dbs; return $dbs;
} }

7
vendor/chamilo/chash/vendor/autoload.php vendored
Unescape View File

@ -0,0 +1,7 @@
<?php
// autoload.php generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php';
return ComposerAutoloaderInitc47774cf7b086bf8ad0a7620339b00ca::getLoader();

6
vendor/composer/autoload_real.php vendored
Unescape View File

@ -2,7 +2,7 @@
// autoload_real.php generated by Composer // autoload_real.php generated by Composer
class ComposerAutoloaderInit0e9c4675a86057df1d33aecce1a6569e class ComposerAutoloaderInitebc4e42976108992b86543316b8b2ad8
{ {
private static $loader; private static $loader;
@ -19,9 +19,9 @@ class ComposerAutoloaderInit0e9c4675a86057df1d33aecce1a6569e
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInit0e9c4675a86057df1d33aecce1a6569e', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInitebc4e42976108992b86543316b8b2ad8', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit0e9c4675a86057df1d33aecce1a6569e', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInitebc4e42976108992b86543316b8b2ad8', 'loadClassLoader'));
$vendorDir = dirname(__DIR__); $vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);

154
vendor/composer/installed.json vendored
Unescape View File

@ -1513,66 +1513,6 @@
"description": "Symfony Twig Bridge", "description": "Symfony Twig Bridge",
"homepage": "http://symfony.com" "homepage": "http://symfony.com"
}, },
{
"name": "symfony/routing",
"version": "v2.2.0",
"version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
"reference": "v2.2.0-RC3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC3",
"reference": "v2.2.0-RC3",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"doctrine/common": ">=2.2,<3.0",
"psr/log": ">=1.0,<2.0",
"symfony/config": ">=2.2,<2.3-dev",
"symfony/yaml": ">=2.0,<3.0"
},
"suggest": {
"doctrine/common": "~2.2",
"symfony/config": "2.2.*",
"symfony/yaml": "2.2.*"
},
"time": "2013-02-11 11:24:47",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-0": {
"Symfony\\Component\\Routing\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony Routing Component",
"homepage": "http://symfony.com"
},
{ {
"name": "symfony/web-profiler-bundle", "name": "symfony/web-profiler-bundle",
"version": "v2.2.0", "version": "v2.2.0",
@ -1852,6 +1792,36 @@
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "http://symfony.com" "homepage": "http://symfony.com"
}, },
{
"name": "chamilo/chash",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/chamilo/chash.git",
"reference": "0db81e2ad152355baca3d968f0af04cce147d510"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/chamilo/chash/zipball/0db81e2ad152355baca3d968f0af04cce147d510",
"reference": "0db81e2ad152355baca3d968f0af04cce147d510",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"symfony/console": "2.3.*@dev",
"symfony/yaml": "2.1.*"
},
"time": "2013-03-28 10:43:52",
"type": "library",
"installation-source": "source",
"autoload": {
"psr-0": {
"Chash": "src/"
}
},
"notification-url": "https://packagist.org/downloads/"
},
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "1.4.0", "version": "1.4.0",
@ -2062,12 +2032,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/l3pp4rd/DoctrineExtensions.git", "url": "https://github.com/l3pp4rd/DoctrineExtensions.git",
"reference": "03799ebed1067cff5bb7fa60b711ce34f3bb689f" "reference": "e96e48a988f7fffbe3cca4763df84f77ba79ddde"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/03799ebed1067cff5bb7fa60b711ce34f3bb689f", "url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/e96e48a988f7fffbe3cca4763df84f77ba79ddde",
"reference": "03799ebed1067cff5bb7fa60b711ce34f3bb689f", "reference": "e96e48a988f7fffbe3cca4763df84f77ba79ddde",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2087,7 +2057,7 @@
"doctrine/mongodb-odm": ">=1.0.0-BETA7", "doctrine/mongodb-odm": ">=1.0.0-BETA7",
"doctrine/orm": ">=2.3.2" "doctrine/orm": ">=2.3.2"
}, },
"time": "2013-03-26 20:33:31", "time": "2013-03-27 16:49:35",
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -2137,33 +2107,63 @@
] ]
}, },
{ {
"name": "chamilo/chash", "name": "symfony/routing",
"version": "dev-master", "version": "v2.2.0",
"version_normalized": "9999999-dev", "version_normalized": "2.2.0.0",
"target-dir": "Symfony/Component/Routing",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/chamilo/chash.git", "url": "https://github.com/symfony/Routing.git",
"reference": "b9f4f3b3ff7f04ce87df7bb9896f2b3aee710feb" "reference": "v2.2.0-RC3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/chamilo/chash/zipball/b9f4f3b3ff7f04ce87df7bb9896f2b3aee710feb", "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC3",
"reference": "b9f4f3b3ff7f04ce87df7bb9896f2b3aee710feb", "reference": "v2.2.0-RC3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.3"
"symfony/console": "2.3.*@dev",
"symfony/yaml": "2.1.*"
}, },
"time": "2013-03-27 13:08:43", "require-dev": {
"doctrine/common": ">=2.2,<3.0",
"psr/log": ">=1.0,<2.0",
"symfony/config": ">=2.2,<2.3-dev",
"symfony/yaml": ">=2.0,<3.0"
},
"suggest": {
"doctrine/common": "~2.2",
"symfony/config": "2.2.*",
"symfony/yaml": "2.2.*"
},
"time": "2013-02-11 11:24:47",
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
}
},
"installation-source": "source", "installation-source": "source",
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Chash": "src/" "Symfony\\Component\\Routing\\": ""
} }
}, },
"notification-url": "https://packagist.org/downloads/" "notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "Symfony Routing Component",
"homepage": "http://symfony.com"
} }
] ]

7
vendor/gedmo/doctrine-extensions/lib/Gedmo/Tool/Wrapper/AbstractWrapper.php vendored
Unescape View File

@ -70,6 +70,11 @@ abstract class AbstractWrapper implements WrapperInterface
return self::$wrappedObjectReferences[$oid]; return self::$wrappedObjectReferences[$oid];
} }
public static function clear()
{
self::$wrappedObjectReferences = array();
}
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@ -96,4 +101,4 @@ abstract class AbstractWrapper implements WrapperInterface
} }
return $this; return $this;
} }
} }

Write Preview
Loading…
Cancel
Save