Skip to content

Commit

Permalink
Add archive_url, home_url, upload_url settings see BT#11414
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmontoyaa
jmontoyaa committed Feb 6, 2017
1 parent f7dade7 commit f15e598
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 24 deletions.
6 changes: 5 additions & 1 deletion main/inc/lib/api.lib.php
View file
Expand Up @@ -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
Expand Down
52 changes: 31 additions & 21 deletions plugin/vchamilo/install.php
View file
Expand Up @@ -17,29 +17,39 @@

$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';
Expand Down
5 changes: 5 additions & 0 deletions plugin/vchamilo/lang/english.php
View file
Expand Up @@ -117,3 +117,8 @@
$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 changes: 11 additions & 2 deletions plugin/vchamilo/lib/Virtual.php
View file
Expand Up @@ -96,10 +96,13 @@ public static function hookConfiguration(& $_configuration)

$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;
Expand Down Expand Up @@ -962,6 +965,12 @@ public static function addInstance($data)
}

$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;
}
Expand Down
5 changes: 5 additions & 0 deletions plugin/vchamilo/views/editinstance_form.php
View file
Expand Up @@ -415,6 +415,11 @@ public function definition()
'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.
*/
Expand Down

0 comments on commit f15e598

Please sign in to comment.