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

Add archive_url, home_url, upload_url settings see BT#11414

Browse Source
ofaj
jmontoyaa 9 years ago
parent f7dade7c98
commit f15e59878a
5 changed files with 57 additions and 24 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. 6
      main/inc/lib/api.lib.php
  2. 52
      plugin/vchamilo/install.php
  3. 5
      plugin/vchamilo/lang/english.php
  4. 13
      plugin/vchamilo/lib/Virtual.php
  5. 5
      plugin/vchamilo/views/editinstance_form.php

6
main/inc/lib/api.lib.php
Unescape View File

@ -842,10 +842,14 @@ function api_get_path($path = '', $configuration = [])
if (!empty($virtualChamilo)) {
$paths[$root_web][SYS_ARCHIVE_PATH] = api_add_trailing_slash($virtualChamilo[SYS_ARCHIVE_PATH]);
$paths[$root_web][SYS_HOME_PATH] = api_add_trailing_slash($virtualChamilo[SYS_HOME_PATH]);
$paths[$root_web][WEB_HOME_PATH] = api_add_trailing_slash($virtualChamilo[WEB_HOME_PATH]);
$paths[$root_web][SYS_COURSE_PATH] = api_add_trailing_slash($virtualChamilo[SYS_COURSE_PATH]);
$paths[$root_web][SYS_UPLOAD_PATH] = api_add_trailing_slash($virtualChamilo[SYS_UPLOAD_PATH]);
$paths[$root_web][WEB_HOME_PATH] = api_add_trailing_slash($virtualChamilo[WEB_HOME_PATH]);
$paths[$root_web][WEB_UPLOAD_PATH] = api_add_trailing_slash($virtualChamilo[WEB_UPLOAD_PATH]);
$paths[$root_web][WEB_ARCHIVE_PATH] = api_add_trailing_slash($virtualChamilo[WEB_ARCHIVE_PATH]);
//$paths[$root_web][WEB_COURSE_PATH] = api_add_trailing_slash($virtualChamilo[WEB_COURSE_PATH]);
// WEB_UPLOAD_PATH should be handle by apache htaccess in the vhost
// RewriteEngine On

52
plugin/vchamilo/install.php
Unescape View File

@ -17,29 +17,39 @@ api_protect_admin_script();
$table = 'vchamilo';
$tablename = Database::get_main_table($table);
$sql = "CREATE TABLE IF NOT EXISTS $tablename (
id int NOT NULL AUTO_INCREMENT,
sitename varchar(80) NOT NULL,
slug varchar(255) NOT NULL,
institution varchar(80) NOT NULL,
root_web varchar(120),
db_host varchar(80) NOT NULL,
db_user varchar(16) DEFAULT 'root',
db_password varchar(32),
table_prefix varchar(16),
db_prefix varchar(16),
main_database varchar(60) DEFAULT 'chamilo',
url_append varchar(32),
course_folder varchar(80),
visible int,
lastcrongap int,
lastcron int,
croncount int,
template varchar(255),
password_encryption varchar(255),
PRIMARY KEY (id)
$sql = "
CREATE TABLE IF NOT EXISTS $tablename (
id int NOT NULL AUTO_INCREMENT,
sitename varchar(80) NOT NULL,
slug varchar(255) NOT NULL,
institution varchar(80) NOT NULL,
root_web varchar(120),
db_host varchar(80) NOT NULL,
db_user varchar(16) DEFAULT 'root',
db_password varchar(32),
table_prefix varchar(16),
db_prefix varchar(16),
main_database varchar(60) DEFAULT 'chamilo',
url_append varchar(32),
course_folder varchar(80),
visible int,
lastcrongap int,
lastcron int,
croncount int,
template varchar(255),
password_encryption varchar(255),
archive_url varchar(255),
home_url varchar(255),
upload_url varchar(255),
course_url varchar(255),
PRIMARY KEY (id)
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
";
/*ALTER TABLE vchamilo ADD COLUMN archive_url varchar(255);
ALTER TABLE vchamilo ADD COLUMN home_url varchar(255);
ALTER TABLE vchamilo ADD COLUMN upload_url varchar(255);
ALTER TABLE vchamilo ADD COLUMN course_url varchar(255);*/
Database::query($sql);
$table = 'vchamilo_config';

5
plugin/vchamilo/lang/english.php
Unescape View File

@ -117,3 +117,8 @@ $strings['CoursePath'] = 'Path to courses directory';
$strings['HomePath'] = 'Path to home directory';
$strings['UploadPath'] = 'Path to upload directory';
$strings['ArchiveUrl'] = 'Archive URL';
$strings['HomeUrl'] = 'Home URL';
$strings['UploadUrl'] = 'Upload URL';
$strings['CourseUrl'] = 'Course URL';

13
plugin/vchamilo/lib/Virtual.php
Unescape View File

@ -96,10 +96,13 @@ class Virtual
$data['SYS_ARCHIVE_PATH'] = self::addTrailingSlash($archivePath).$data['slug'];
$data['SYS_HOME_PATH'] = self::addTrailingSlash($homePath).$data['slug'];
$data['WEB_HOME_PATH'] = $_configuration['vchamilo_web_root'] . '/var/home/' . $data['slug'];
$data['SYS_COURSE_PATH'] = self::addTrailingSlash($coursePath).$data['slug'];
$data['SYS_UPLOAD_PATH'] = self::addTrailingSlash($uploadPath).$data['slug'];
//$data['WEB_UPLOAD_PATH'] = $_configuration['vchamilo_web_root'] . '/var/upload/' . $data['slug'];
$data['WEB_HOME_PATH'] = self::addTrailingSlash($data['home_url']);
$data['WEB_UPLOAD_PATH'] = self::addTrailingSlash($data['upload_url']);
$data['WEB_ARCHIVE_PATH'] = self::addTrailingSlash($data['archive_url']);
//$data['WEB_COURSE_PATH'] = self::addTrailingSlash($data['course_url']);
if (!empty($passwordEncryption)) {
$_configuration['password_encryption'] = $passwordEncryption;
@ -962,6 +965,12 @@ class Virtual
}
$data->root_web = api_add_trailing_slash($data->root_web);
$data->archive_url = api_add_trailing_slash($data->archive_url);
$data->home_url = api_add_trailing_slash($data->home_url);
$data->upload_url = api_add_trailing_slash($data->upload_url);
$data->course_url = api_add_trailing_slash($data->course_url);
if (substr($data->root_web, 0, 4) != 'http') {
$data->root_web = api_get_protocol().'://'.$data->root_web;
}

5
plugin/vchamilo/views/editinstance_form.php
Unescape View File

@ -415,6 +415,11 @@ class InstanceForm extends ChamiloForm
'onclick="opencnxpopup(\''.$_configuration['root_web'].'\'); return false;"'
);
$form->addText('archive_url', $this->_plugin->get_lang('ArchiveUrl'));
$form->addText('home_url', $this->_plugin->get_lang('HomeUrl'));
$form->addText('upload_url', $this->_plugin->get_lang('UploadUrl'));
//$form->addText('course_url', $this->_plugin->get_lang('CourseUrl'));
/**
* Template selection.
*/

Write Preview
Loading…
Cancel
Save