Remove use of PLUGIN_PATH

ofaj
jmontoyaa 10 years ago
parent da20d81947
commit 85ba0b8348
  1. 2
      plugin/tour/ajax/steps.ajax.php
  2. 2
      plugin/tour/config.php
  3. 2
      plugin/tour/index.php
  4. 5
      plugin/tour/src/tour_plugin.class.php
  5. 6
      plugin/vchamilo/lib.php

@ -7,7 +7,7 @@
*/ */
require_once __DIR__.'/../../../main/inc/global.inc.php'; require_once __DIR__.'/../../../main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php'; require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php';
require_once api_get_path(PLUGIN_PATH) . 'tour/src/tour_plugin.class.php'; require_once api_get_path(SYS_PLUGIN_PATH) . 'tour/src/tour_plugin.class.php';
if (!api_is_anonymous()) { if (!api_is_anonymous()) {
$currentPageClass = isset($_GET['page_class']) ? $_GET['page_class'] : ''; $currentPageClass = isset($_GET['page_class']) ? $_GET['page_class'] : '';

@ -11,5 +11,5 @@ define('TABLE_TOUR_LOG', 'plugin_tour_log');
require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php'; require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php'; require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php';
require_once api_get_path(PLUGIN_PATH) . 'tour/src/tour_plugin.class.php'; require_once api_get_path(SYS_PLUGIN_PATH) . 'tour/src/tour_plugin.class.php';
// Edit the config/tour.json file to add more pages or more elements to the guide // Edit the config/tour.json file to add more pages or more elements to the guide

@ -7,7 +7,7 @@
*/ */
require_once __DIR__ . '/config.php'; require_once __DIR__ . '/config.php';
$pluginPath = api_get_path(PLUGIN_PATH) . 'tour/'; $pluginPath = api_get_path(SYS_PLUGIN_PATH) . 'tour/';
$pluginWebPath = api_get_path(WEB_PLUGIN_PATH) . 'tour/'; $pluginWebPath = api_get_path(WEB_PLUGIN_PATH) . 'tour/';
$userId = api_get_user_id(); $userId = api_get_user_id();

@ -129,13 +129,10 @@ class Tour extends Plugin
*/ */
public function getTourConfig() public function getTourConfig()
{ {
$pluginPath = api_get_path(PLUGIN_PATH) . 'tour/'; $pluginPath = api_get_path(SYS_PLUGIN_PATH) . 'tour/';
$jsonContent = file_get_contents($pluginPath . 'config/tour.json'); $jsonContent = file_get_contents($pluginPath . 'config/tour.json');
$jsonData = json_decode($jsonContent, true); $jsonData = json_decode($jsonContent, true);
return $jsonData; return $jsonData;
} }
} }

@ -225,11 +225,9 @@ function vchamilo_drop_databases(&$vchamilo){
* @param $outputfile array The variables to inject in setup template SQL. * @param $outputfile array The variables to inject in setup template SQL.
* @return bool If TRUE, loading database from template was sucessful, otherwise FALSE. * @return bool If TRUE, loading database from template was sucessful, otherwise FALSE.
*/ */
function vchamilo_create_databases($vchamilo, $cnx = null) { function vchamilo_create_databases($vchamilo, $cnx = null)
global $_configuration, $DB; {
// availability of SQL commands // availability of SQL commands
$createstatement = 'CREATE DATABASE %DATABASE% DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci '; $createstatement = 'CREATE DATABASE %DATABASE% DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ';
$dbs = array($vchamilo->main_database); $dbs = array($vchamilo->main_database);

Loading…
Cancel
Save