Minor - Add license refs + change dirname(__FILE__) to __DIR__ (about 4 times faster). See http://stackoverflow.com/questions/2749416/is-there-any-difference-between-dir-and-dirname-file-in-php

main/auth/cas/lib/CAS.php

@@ -40,7 +40,7 @@ if (!$_SERVER['REQUEST_URI']) {
 // another one by Vangelis Haniotakis also to make phpCAS work with PHP5
 //
 if (version_compare(PHP_VERSION, '5', '>=')) {
-    require_once(dirname(__FILE__) . '/CAS/domxml-php4-to-php5.php');
+    require_once __DIR__.'/CAS/domxml-php4-to-php5.php';
 }
 
 /**
@@ -322,7 +322,7 @@ $GLOBALS['PHPCAS_DEBUG'] = array(
 // ########################################################################
 
 // include client class
-include_once(dirname(__FILE__) . '/CAS/client.php');
+include_once __DIR__.'/CAS/client.php';
 
 // ########################################################################
 //  INTERFACE CLASS

main/auth/cas/lib/CAS/PGTStorage/pgt-main.php

@@ -209,7 +209,7 @@ class PGTStorage
 } 
 
 // include specific PGT storage classes
-include_once(dirname(__FILE__).'/pgt-file.php'); 
-include_once(dirname(__FILE__).'/pgt-db.php');
+include_once __DIR__.'/pgt-file.php';
+include_once __DIR__.'/pgt-db.php';
   
 ?>

main/auth/cas/lib/CAS/client.php

@@ -35,10 +35,10 @@
  */
 
 // include internationalization stuff
-include_once(dirname(__FILE__) . '/languages/languages.php');
+include_once __DIR__.'/languages/languages.php';
 
 // include PGT storage classes
-include_once(dirname(__FILE__) . '/PGTStorage/pgt-main.php');
+include_once __DIR__.'/PGTStorage/pgt-main.php';
 
 /**
  * @class CASClient
@@ -240,10 +240,10 @@ class CASClient
     function setLang($lang)
     {
         // include the corresponding language file
-        include_once(dirname(__FILE__) . '/languages/' . $lang . '.php');
+        include_once __DIR__.'/languages/'.$lang.'.php';
 
         if (!is_array($this->_strings)) {
-            trigger_error('language `' . $lang . '\' is not implemented', E_USER_ERROR);
+            trigger_error('language `'.$lang.'\' is not implemented', E_USER_ERROR);
         }
         $this->_lang = $lang;
     }

main/auth/conditional_login/complete_phone_number.php

@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require_once dirname(__FILE__).'/../../inc/global.inc.php';
+require_once __DIR__.'/../../inc/global.inc.php';
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
 if (! isset($_SESSION['conditional_login']['uid']))

main/auth/external_login/facebook.inc.php

@@ -11,10 +11,9 @@
  * Please edit the facebook.conf.php file to adapt it to your fb application parameter
  */
 
-require_once dirname(__FILE__) . '/../../inc/global.inc.php';
-require_once dirname(__FILE__) . '/facebook.init.php';
-
-require_once dirname(__FILE__) . '/functions.inc.php';
+require_once __DIR__.'/../../inc/global.inc.php';
+require_once __DIR__.'/facebook.init.php';
+require_once __DIR__.'/functions.inc.php';
 
 /**
  * This function connect to facebook and retrieves the user info

main/auth/external_login/facebook.init.php

@@ -22,5 +22,5 @@
  * See facebook section of the auth.conf.php file
  */
 
-require dirname(__FILE__) . '/../../../app/config/auth.conf.php';
+require __DIR__.'/../../../app/config/auth.conf.php';
 

main/auth/external_login/ldap.inc.php

@@ -5,7 +5,7 @@
  * This files is included by newUser.ldap.php and login.ldap.php
  * It implements the functions nedded by both files
  * */
-require_once dirname(__FILE__).'/../../inc/global.inc.php';
+require_once __DIR__.'/../../inc/global.inc.php';
 
 $debug = false;
 

main/auth/external_login/ldap_import_all_users.php

@@ -13,9 +13,9 @@ if (PHP_SAPI != 'cli') {
 }
 use \ChamiloSession as Session;
 
-require dirname(__FILE__) . '/../../inc/global.inc.php';
-require dirname(__FILE__) . '/ldap.inc.php';
-require dirname(__FILE__) . '/../../inc/conf/auth.conf.php';
+require __DIR__.'/../../inc/global.inc.php';
+require __DIR__.'/ldap.inc.php';
+require __DIR__.'/../../inc/conf/auth.conf.php';
 /**
  * Code execution
  */

main/auth/external_login/login.ldap.php

@@ -40,8 +40,8 @@ use ChamiloSession as Session;
  *
  * */
 
-require_once dirname(__FILE__).'/ldap.inc.php';
-require_once dirname(__FILE__).'/functions.inc.php';
+require_once __DIR__.'/ldap.inc.php';
+require_once __DIR__.'/functions.inc.php';
 
 $debug = false;
 if ($debug) {

main/auth/external_login/login.ws.php

@@ -14,7 +14,7 @@ use ChamiloSession as Session;
 $wsUrl = '';
 
 // include common authentication functions
-require_once dirname(__FILE__) . '/functions.inc.php';
+require_once __DIR__.'/functions.inc.php';
 // call the login checker (defined below)
 $isValid = loginWSAuthenticate($login, $password, $wsUrl);
 

main/auth/external_login/newUser.ldap.php

@@ -39,8 +39,8 @@
 
 use ChamiloSession as Session;
 
-require_once dirname(__FILE__) . '/ldap.inc.php';
-require_once dirname(__FILE__) . '/functions.inc.php';
+require_once __DIR__.'/ldap.inc.php';
+require_once __DIR__.'/functions.inc.php';
 
 $ldap_user = extldap_authenticate($login, $password);
 if ($ldap_user !== false) {

main/auth/external_login/newUser.php

@@ -10,7 +10,7 @@
 
 use ChamiloSession as Session;
 
-require_once(dirname(__FILE__) . '/functions.inc.php');
+require_once __DIR__.'/functions.inc.php';
 
 //MAIN CODE
 //$login and $password variables are setted in main/inc/local.inc.php

main/auth/external_login/updateUser.php

@@ -7,7 +7,7 @@ This script must not exit.
 
 use ChamiloSession as Session;
 
-require_once(dirname(__FILE__) . '/functions.inc.php');
+require_once __DIR__.'/functions.inc.php';
 
 //MAIN CODE
 //$uData variable is set in local.inc.php

main/auth/shibboleth/app/model/admin.class.php

@@ -2,7 +2,7 @@
 
 namespace Shibboleth;
 
-require_once dirname(__FILE__) . '/scaffold/admin.class.php';
+require_once __DIR__.'/scaffold/admin.class.php';
 
 /**
  * A Chamilo admin. Model for the Admin table.

main/auth/shibboleth/app/model/user.class.php

@@ -2,7 +2,7 @@
 
 namespace Shibboleth;
 
-require_once dirname(__FILE__) . '/scaffold/user.class.php';
+require_once __DIR__.'/scaffold/user.class.php';
 
 /**
  * A Chamilo user. Model for the User table.

main/auth/shibboleth/app/shibboleth.class.php

@@ -78,7 +78,7 @@ class Shibboleth
 
     public static function sys_path()
     {
-        $path = dirname(__FILE__) . '/../';
+        $path = __DIR__.'/../';
         return $path;
     }
 

main/auth/shibboleth/app/view/admin_login.php

@@ -12,7 +12,7 @@ namespace Shibboleth;
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-$dir = dirname(__FILE__);
-include_once("$dir/../../init.php");
+$dir = __DIR__;
+include_once "$dir/../../init.php";
 
 ShibbolethController::instance()->admin_login();

main/auth/shibboleth/app/view/request.php

@@ -14,7 +14,7 @@ namespace Shibboleth;
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-$dir = dirname(__FILE__);
-include_once("$dir/../../init.php");
+$dir = __DIR__;
+include_once "$dir/../../init.php";
 
 ShibbolethController::instance()->request_status();

main/auth/shibboleth/config-dist.php

@@ -11,6 +11,6 @@ namespace Shibboleth;
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-require_once dirname(__FILE__) . '/config/aai.class.php';
+require_once __DIR__.'/config/aai.class.php';
 
 Shibboleth::set_config(aai::config());

main/auth/shibboleth/init.php

@@ -10,7 +10,7 @@ namespace Shibboleth;
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
 
-$__dir = dirname(__FILE__) . '/';
+$__dir = __DIR__.'/';
 $no_redirection = true;  //no redirection in global.
 include_once($__dir . '/../../inc/global.inc.php');
 

main/auth/shibboleth/lib/scaffolder/scaffolder.class.php

@@ -56,7 +56,7 @@ class Scaffolder
 
 
         ob_start();
-        include dirname(__FILE__) . '/template/model.php';
+        include __DIR__.'/template/model.php';
         $result = ob_get_clean();
         return $result;
     }

main/auth/shibboleth/login.php

@@ -15,7 +15,7 @@ namespace Shibboleth;
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-include_once(dirname(__FILE__) . '/init.php');
+include_once __DIR__.'/init.php';
 
 /*
   ==============================================================================

main/auth/shibboleth/script/scaffold.php

@@ -11,9 +11,9 @@ namespace Shibboleth;
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-$dir = dirname(__FILE__);
-include_once($dir . '/../init.php');
-include_once($dir . '/../app/lib/scaffolder/scaffolder.class.php');
+$dir = __DIR__;
+include_once $dir.'/../init.php';
+include_once $dir.'/../app/lib/scaffolder/scaffolder.class.php';
 
 if (!ShibbolethTest::is_enabled())
 {

main/auth/shibboleth/test/test.php

@@ -8,7 +8,7 @@ namespace Shibboleth;
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-include_once(dirname(__FILE__) . '/../init.php');
+include_once __DIR__.'/../init.php';
 
 if (!ShibbolethTest::is_enabled())
 {

main/auth/shibboleth/test/test_no_email.php

@@ -6,7 +6,7 @@ namespace Shibboleth;
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-include_once(dirname(__FILE__) . '/../init.php');
+include_once __DIR__.'/../init.php';
 
 if (!ShibbolethTest::is_enabled())
 {
@@ -17,4 +17,4 @@ if (!ShibbolethTest::is_enabled())
 Shibboleth::session()->logout();
 ShibbolethTest::helper()->setup_new_student_no_email();
 
-require_once dirname(__FILE__) . '/../login.php';
+require_once __DIR__.'/../login.php';

main/cron/user_import/client.php

@@ -12,7 +12,7 @@
 /**
  * Global cycle: init, execute, output
  */
-require_once dirname(__FILE__).'/../../inc/global.inc.php';
+require_once __DIR__.'/../../inc/global.inc.php';
 // check if this client has been called by php_cli (command line or cron)
 if (php_sapi_name()!='cli') {
     echo 'You can\'t call this service through a browser';

main/exercise/export/qti2/qti2_export.php

@@ -7,7 +7,7 @@
  * @package chamilo.exercise
  */
 
-require dirname(__FILE__) . '/qti2_classes.php';
+require __DIR__.'/qti2_classes.php';
 
 /**
  * An IMS/QTI item. It corresponds to a single question.

main/inc/lib/formvalidator/Rule/HTML.php

@@ -31,7 +31,7 @@ class HTML_QuickForm_Rule_HTML extends HTML_QuickForm_Rule
     static function get_allowed_tags($mode)
     {
         // Include the allowed tags.
-        //include(dirname(__FILE__).'/allowed_tags.inc.php');
+        //include __DIR__.'/allowed_tags.inc.php';
         global $allowed_tags_student, $allowed_tags_student_full_page, $allowed_tags_teacher, $allowed_tags_teacher_full_page;
         switch($mode)
         {

main/inc/lib/internationalization.lib.php

@@ -1825,7 +1825,7 @@ function _api_get_person_name_convention($language, $type)
     static $conventions;
     $language = api_purify_language_id($language);
     if (!isset($conventions)) {
-        $file = dirname(__FILE__).'/internationalization_database/name_order_conventions.php';
+        $file = __DIR__.'/internationalization_database/name_order_conventions.php';
         if (file_exists($file)) {
             $conventions = include ($file);
         } else {
@@ -1913,7 +1913,7 @@ function _api_get_character_map_name($encoding)
 {
     static $character_map_selector;
     if (!isset($character_map_selector)) {
-        $file = dirname(__FILE__).'/internationalization_database/conversion/character_map_selector.php';
+        $file = __DIR__.'/internationalization_database/conversion/character_map_selector.php';
         if (file_exists($file)) {
             $character_map_selector = include ($file);
         } else {

main/inc/lib/phpseclib/Crypt/RSA.php

@@ -171,7 +171,7 @@ define('CRYPT_RSA_MODE_OPENSSL', 2);
 /**
  * Default openSSL configuration file.
  */
-define('CRYPT_RSA_OPENSSL_CONFIG', dirname(__FILE__) . '/../openssl.cnf');
+define('CRYPT_RSA_OPENSSL_CONFIG', __DIR__.'/../openssl.cnf');
 
 
 /**#@+

main/inc/lib/search/ChamiloIndexer.class.php

@@ -7,7 +7,7 @@
 /**
  * code
  */
-require_once dirname(__FILE__) . '/../../global.inc.php';
+require_once __DIR__.'/../../global.inc.php';
 include_once 'xapian/XapianIndexer.class.php';
 
 /**

main/inc/lib/search/get_terms.php

@@ -17,7 +17,7 @@ if (empty($_GET['term']) || empty($_GET['prefix']) || !in_array($_GET['operator'
     return;
 }
 
-require_once dirname(__FILE__).'../../../global.inc.php';
+require_once __DIR__.'../../../global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
 
 /**

main/inc/lib/search/search_widget.php

@@ -7,7 +7,7 @@
 /**
  * Code
  */
-require_once dirname(__FILE__) . '/IndexableChunk.class.php';
+require_once __DIR__.'/IndexableChunk.class.php';
 require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
 /**

main/inc/lib/search/tool_processors/document_processor.class.php

@@ -5,8 +5,8 @@
  *
  * @package chamilo.include.search
  */
-include_once dirname(__FILE__).'/../../../global.inc.php';
-require_once dirname(__FILE__).'/search_processor.class.php';
+include_once __DIR__.'/../../../global.inc.php';
+require_once __DIR__.'/search_processor.class.php';
 
 /**
  * Process documents before pass it to search listing scripts

main/inc/lib/search/tool_processors/learnpath_processor.class.php

@@ -5,9 +5,9 @@
  *
  * @package chamilo.include.search
  */
-include_once dirname(__FILE__).'/../../../global.inc.php';
-require_once dirname(__FILE__).'/search_processor.class.php';
-require_once dirname(__FILE__).'/../IndexableChunk.class.php';
+include_once __DIR__.'/../../../global.inc.php';
+require_once __DIR__.'/search_processor.class.php';
+require_once __DIR__.'/../IndexableChunk.class.php';
 
 /**
  * Process learning paths before pass it to search listing scripts

main/inc/lib/search/tool_processors/link_processor.class.php

@@ -5,8 +5,8 @@
  *
  * @package chamilo.include.search
  */
-include_once dirname(__FILE__).'/../../../global.inc.php';
-require_once dirname(__FILE__).'/search_processor.class.php';
+include_once __DIR__.'/../../../global.inc.php';
+require_once __DIR__.'/search_processor.class.php';
 
 /**
  * Process links before pass it to search listing scripts

main/inc/lib/search/tool_processors/quiz_processor.class.php

@@ -5,8 +5,8 @@
  *
  * @package chamilo.include.search
  */
-include_once dirname(__FILE__).'/../../../global.inc.php';
-require_once dirname(__FILE__).'/search_processor.class.php';
+include_once __DIR__.'/../../../global.inc.php';
+require_once __DIR__.'/search_processor.class.php';
 
 /**
  * Process exercises before pass it to search listing scripts

main/inc/lib/search/xapian/XapianIndexer.class.php

@@ -6,7 +6,7 @@
  */
 
 require_once 'xapian.php';
-require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
+require_once __DIR__.'/../IndexableChunk.class.php';
 
 /**
  * Abstract helper class

main/inc/lib/search/xapian/XapianQuery.php

@@ -8,11 +8,11 @@
  * Code
  */
 require_once 'xapian.php';
-require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
+require_once __DIR__.'/../IndexableChunk.class.php';
 //TODO: think another way without including specific fields here
-require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
-define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH) . 'plugins/xapian/searchdb/');
+define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb/');
 
 /**
  * Queries the database.

main/inc/lib/xajax/xajax.inc.php

@@ -832,7 +832,7 @@ class xajax
 			$realJsFile = $sJsFullFilename;
 		}
 		else {
-			$realPath = realpath(dirname(__FILE__));
+			$realPath = realpath(__DIR__);
 			$realJsFile = $realPath . "/". $sJsFile;
 		}
 
@@ -842,7 +842,7 @@ class xajax
 			if (!file_exists($srcFile)) {
 				trigger_error("The xajax uncompressed Javascript file could not be found in the <b>" . dirname($realJsFile) . "</b> folder. Error ", E_USER_ERROR);
 			}
-			require(dirname(__FILE__)."/xajaxCompress.php");
+			require __DIR__."/xajaxCompress.php";
 			$javaScript = implode('', file($srcFile));
 			$compressedScript = xajaxCompressJavascript($javaScript);
 			$fH = @fopen($realJsFile, "w");

main/install/install.lib.php

@@ -357,7 +357,7 @@ function write_system_config_file($path)
     global $new_version_stable;
 
     $root_sys = api_add_trailing_slash(str_replace('\\', '/', realpath($pathForm)));
-    $content = file_get_contents(dirname(__FILE__).'/'.SYSTEM_CONFIG_FILENAME);
+    $content = file_get_contents(__DIR__.'/'.SYSTEM_CONFIG_FILENAME);
 
     $config['{DATE_GENERATED}'] = date('r');
     $config['{DATABASE_HOST}'] = $dbHostForm;

main/search/search_suggestions.php

@@ -6,7 +6,7 @@
  * @package chamilo.search
  */
 
-require_once dirname(__FILE__) . '/../inc/global.inc.php';
+require_once __DIR__.'/../inc/global.inc.php';
 
 function get_suggestions_from_search_engine($q)
 {

main/webservices/cm_soap.php

@@ -1,7 +1,10 @@
 <?php
-
+/* For licensing terms, see /license.txt */
+/**
+ * @package chamilo.webservices
+ */
 require_once __DIR__.'/../inc/global.inc.php';
-require_once(dirname(__FILE__).'/cm_webservice.php');
+require_once __DIR__.'/cm_webservice.php';
 $libpath = api_get_path(LIBRARY_PATH);
 
 /**
@@ -104,11 +107,11 @@ $s->register(
         ''
 );
 
-require_once(dirname(__FILE__).'/cm_soap_inbox.php');
-require_once(dirname(__FILE__).'/cm_soap_user.php');
-require_once(dirname(__FILE__).'/cm_soap_courses.php');
-require_once(dirname(__FILE__).'/cm_soap_announcements.php');
-require_once(dirname(__FILE__).'/cm_soap_forum.php');
+require_once __DIR__.'/cm_soap_inbox.php';
+require_once __DIR__.'/cm_soap_user.php';
+require_once __DIR__.'/cm_soap_courses.php';
+require_once __DIR__.'/cm_soap_announcements.php';
+require_once __DIR__.'/cm_soap_forum.php';
 
 // Use the request to (try to) invoke the service
 $HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';

main/webservices/cm_soap_announcements.php

@@ -1,7 +1,11 @@
 <?php
+/* For licensing terms, see /license.txt */
 
-require_once(dirname(__FILE__).'/cm_webservice_announcements.php');
-require_once(dirname(__FILE__).'/cm_soap.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/cm_webservice_announcements.php';
+require_once __DIR__.'/cm_soap.php';
 
 /**
  * Configures the WSCourse SOAP service

main/webservices/cm_soap_course.php

@@ -1,7 +1,11 @@
 <?php
+/* For licensing terms, see /license.txt */
 
-require_once(dirname(__FILE__).'/cm_webservice_course.php');
-require_once(dirname(__FILE__).'/cm_soap.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/cm_webservice_course.php';
+require_once __DIR__.'/cm_soap.php';
 
 /**
  * Configures the WSCourse SOAP service

main/webservices/cm_soap_courses.php

@@ -1,7 +1,11 @@
 <?php
+/* For licensing terms, see /license.txt */
 
-require_once(dirname(__FILE__).'/cm_webservice_courses.php');
-require_once(dirname(__FILE__).'/cm_soap.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/cm_webservice_courses.php';
+require_once __DIR__.'/cm_soap.php';
 
 /**
  * Configures the WSCourse SOAP service

main/webservices/cm_soap_forum.php

@@ -1,7 +1,11 @@
 <?php
+/* For licensing terms, see /license.txt */
 
-require_once(dirname(__FILE__).'/cm_webservice_forum.php');
-require_once(dirname(__FILE__).'/cm_soap.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/cm_webservice_forum.php';
+require_once __DIR__.'/cm_soap.php';
 
 /**
  * Configures the WSCourse SOAP service

main/webservices/cm_soap_inbox.php

@@ -1,7 +1,11 @@
 <?php
+/* For licensing terms, see /license.txt */
 
-require_once(dirname(__FILE__).'/cm_webservice_inbox.php');
-require_once(dirname(__FILE__).'/cm_soap.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/cm_webservice_inbox.php';
+require_once __DIR__.'/cm_soap.php';
 
 /**
  * Configures the WSCourse SOAP service

main/webservices/cm_soap_user.php

@@ -1,6 +1,11 @@
 <?php
-require_once(dirname(__FILE__).'/cm_webservice_user.php');
-require_once(dirname(__FILE__).'/cm_soap.php');
+/* For licensing terms, see /license.txt */
+
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/cm_webservice_user.php';
+require_once __DIR__.'/cm_soap.php';
 
 /**
  * Configures the WSCourse SOAP service

main/webservices/cm_webservice.php

@@ -1,8 +1,12 @@
 <?php
+/* For licensing terms, see /license.txt */
 
+/**
+ * @package chamilo.webservices
+ */
 use Chamilo\UserBundle\Entity\User;
 
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
+require_once __DIR__.'/../inc/global.inc.php';
 
 $libpath = api_get_path(LIBRARY_PATH);
 

main/webservices/cm_webservice_announcements.php

@@ -1,9 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once(dirname(__FILE__).'/cm_webservice.php');
+require_once __DIR__.'/cm_webservice.php';
 
 /**
  * Description of cm_soap_inbox

main/webservices/cm_webservice_course.php

@@ -1,9 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once(dirname(__FILE__).'/cm_webservice.php');
+require_once __DIR__.'/cm_webservice.php';
 
 /**
  * Web services available for the Course module. This class extends the WS class

main/webservices/cm_webservice_courses.php

@@ -1,10 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
 
-require_once(dirname(__FILE__).'/cm_webservice.php');
+require_once __DIR__.'/cm_webservice.php';
 
 /**
  * Description of cm_soap_inbox

main/webservices/cm_webservice_forum.php

@@ -1,13 +1,15 @@
 <?php
 /* For licensing terms, see /license.txt */
-
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
-require_once(dirname(__FILE__).'/../forum/forumconfig.inc.php');
-require_once(dirname(__FILE__).'/../forum/forumfunction.inc.php');
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/../inc/global.inc.php';
+require_once __DIR__.'/../forum/forumconfig.inc.php';
+require_once __DIR__.'/../forum/forumfunction.inc.php';
 
 $libpath = api_get_path(LIBRARY_PATH);
 
-require_once(dirname(__FILE__).'/cm_webservice.php');
+require_once __DIR__.'/cm_webservice.php';
 
 /**
  * Description of cm_soap_inbox

main/webservices/cm_webservice_inbox.php

@@ -1,7 +1,10 @@
 <?php
-
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
-require_once(dirname(__FILE__).'/cm_webservice.php');
+/* For licensing terms, see /license.txt */
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/../inc/global.inc.php';
+require_once __DIR__.'/cm_webservice.php';
 
 /**
  * Description of cm_soap_inbox

main/webservices/cm_webservice_user.php

@@ -1,7 +1,10 @@
 <?php
-
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
-require_once(dirname(__FILE__).'/cm_webservice.php');
+/* For licensing terms, see /license.txt */
+/**
+ * @package chamilo.webservices
+ */
+require_once __DIR__.'/../inc/global.inc.php';
+require_once __DIR__.'/cm_webservice.php';
 
 /**
  * Description of cm_soap_user

main/webservices/soap.php

@@ -4,7 +4,7 @@
  * @package chamilo.webservices
  */
 require_once __DIR__.'/../inc/global.inc.php';
-require_once(dirname(__FILE__).'/webservice.php');
+require_once __DIR__.'/webservice.php';
 $libpath = api_get_path(LIBRARY_PATH);
 
 /**
@@ -111,10 +111,10 @@ $s->register(
 	array('return' => 'xsd:string')
 );
 
-require_once(dirname(__FILE__).'/soap_user.php');
-require_once(dirname(__FILE__).'/soap_course.php');
-require_once(dirname(__FILE__).'/soap_session.php');
-require_once(dirname(__FILE__).'/soap_report.php');
+require_once __DIR__.'/soap_user.php';
+require_once __DIR__.'/soap_course.php';
+require_once __DIR__.'/soap_session.php';
+require_once __DIR__.'/soap_report.php';
 
 // Use the request to (try to) invoke the service
 $HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';

main/webservices/soap_course.php

@@ -4,8 +4,8 @@
  * Configures the WSCourse SOAP service
  * @package chamilo.webservices
  */
-require_once dirname(__FILE__).'/webservice_course.php';
-require_once dirname(__FILE__).'/soap.php';
+require_once __DIR__.'/webservice_course.php';
+require_once __DIR__.'/soap.php';
 
 /**
  * Configures the WSCourse SOAP service

main/webservices/soap_report.php

@@ -4,8 +4,8 @@
  * Configures the WSReport SOAP service
  * @package chamilo.webservices
  */
-require_once(dirname(__FILE__).'/webservice_report.php');
-require_once(dirname(__FILE__).'/soap.php');
+require_once __DIR__.'/webservice_report.php';
+require_once __DIR__.'/soap.php';
 $s = WSSoapServer::singleton();
 
 $s->wsdl->addComplexType(

main/webservices/soap_session.php

@@ -4,9 +4,8 @@
  * Configures the WSSession SOAP service
  * @package chamilo.webservices
  */
-
-require_once(dirname(__FILE__).'/webservice_session.php');
-require_once(dirname(__FILE__).'/soap.php');
+require_once __DIR__.'/webservice_session.php';
+require_once __DIR__.'/soap.php';
 
 $s = WSSoapServer::singleton();
 

main/webservices/soap_user.php

@@ -4,8 +4,8 @@
  * Configures the WSUser SOAP service
  * @package chamilo.webservices
  */
-require_once(dirname(__FILE__).'/webservice_user.php');
-require_once(dirname(__FILE__).'/soap.php');
+require_once __DIR__.'/webservice_user.php';
+require_once __DIR__.'/soap.php';
 
 /**
  * Configures the WSUser SOAP service

main/webservices/webservice.php

@@ -3,7 +3,7 @@
 /**
  * @package chamilo.webservices
  */
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
+require_once __DIR__.'/../inc/global.inc.php';
 
 /**
  * Error returned by one of the methods of the web service.

main/webservices/webservice_course.php

@@ -3,9 +3,9 @@
 /**
  * @package chamilo.webservices
  */
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
+require_once __DIR__.'/../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once(dirname(__FILE__).'/webservice.php');
+require_once __DIR__.'/webservice.php';
 
 /**
  * Web services available for the Course module. This class extends the WS class

main/webservices/webservice_report.php

@@ -3,8 +3,8 @@
 /**
  * @package chamilo.webservices
  */
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
-require_once(dirname(__FILE__).'/webservice.php');
+require_once __DIR__.'/../inc/global.inc.php';
+require_once __DIR__.'/webservice.php';
 
 /**
  * Web services available for the User module. This class extends the WS class

main/webservices/webservice_session.php

@@ -1,12 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
-
 /**
  * @package chamilo.webservices
  */
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
+require_once __DIR__.'/../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once(dirname(__FILE__).'/webservice.php');
+require_once __DIR__.'/webservice.php';
 
 /**
  * Web services available for the Session module. This class extends the WS class

main/webservices/webservice_user.php

@@ -3,8 +3,8 @@
 /**
  * @package chamilo.webservices
  */
-require_once(dirname(__FILE__).'/../inc/global.inc.php');
-require_once(dirname(__FILE__).'/webservice.php');
+require_once __DIR__.'/../inc/global.inc.php';
+require_once __DIR__.'/webservice.php';
 
 /**
  * Web services available for the User module. This class extends the WS class

plugin/advanced_subscription/install.php

@@ -10,7 +10,7 @@
  * Initialization
  */
 
-require_once dirname(__FILE__) . '/config.php';
+require_once __DIR__.'/config.php';
 if (!api_is_platform_admin()) {
     die ('You must have admin permissions to install plugins');
 }

plugin/advanced_subscription/uninstall.php

@@ -10,7 +10,7 @@
 /**
  * Queries
  */
-require_once dirname(__FILE__) . '/config.php';
+require_once __DIR__.'/config.php';
 if (!api_is_platform_admin()) {
     die ('You must have admin permissions to uninstall plugins');
 }

plugin/azure_active_directory/src/callback.php

@@ -1,6 +1,8 @@
 <?php
-require dirname(__FILE__) . '/../../../main/inc/global.inc.php';
-require_once dirname(__FILE__) . '/../../../main/auth/external_login/functions.inc.php';
+/* For license terms, see /license.txt */
+
+require __DIR__.'/../../../main/inc/global.inc.php';
+require_once __DIR__.'/../../../main/auth/external_login/functions.inc.php';
 
 if (isset($_POST['error']) || empty($_REQUEST)) {
     header('Location: ' . api_get_path(WEB_PATH) . 'index.php?logout=logout');

plugin/bbb/cron.php

@@ -1,16 +1,17 @@
 <?php
+/* For license terms, see /license.txt */
 
-require __DIR__ . '/../../vendor/autoload.php';
-if (file_exists(__DIR__ . '/config.vm.php')) {
+require __DIR__.'/../../vendor/autoload.php';
+if (file_exists(__DIR__.'/config.vm.php')) {
 
-    require_once dirname(__FILE__) . '/config.php';
+    require_once __DIR__.'/config.php';
 
-    require __DIR__ . '/lib/vm/AbstractVM.php';
-    require __DIR__ . '/lib/vm/VMInterface.php';
-    require __DIR__ . '/lib/vm/DigitalOceanVM.php';
-    require __DIR__ . '/lib/VM.php';
+    require __DIR__.'/lib/vm/AbstractVM.php';
+    require __DIR__.'/lib/vm/VMInterface.php';
+    require __DIR__.'/lib/vm/DigitalOceanVM.php';
+    require __DIR__.'/lib/VM.php';
 
-    $config = require __DIR__ . '/config.vm.php';
+    $config = require __DIR__.'/config.vm.php';
 
     $vm = new VM($config);
 

plugin/buycourses/install.php

@@ -8,7 +8,7 @@
 /**
  * Initialization
  */
-require_once dirname(__FILE__) . '/config.php';
+require_once __DIR__.'/config.php';
 if (!api_is_platform_admin()) {
     die ('You must have admin permissions to install plugins');
 }

plugin/buycourses/plugin.php

@@ -8,5 +8,5 @@
 /**
  * Plugin details (must be present)
  */
-require_once dirname(__FILE__) . '/config.php';
+require_once __DIR__.'/config.php';
 $plugin_info = BuyCoursesPlugin::create()->get_info();

plugin/buycourses/src/Requests.php

@@ -142,8 +142,8 @@ class Requests {
 		}
 
 		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-			require_once(dirname(__FILE__) . '/' . $file . '.php');
+		if (file_exists(__DIR__.'/'.$file.'.php')) {
+			require_once __DIR__.'/'.$file.'.php';
 		}
 	}
 
@@ -537,7 +537,7 @@ class Requests {
 			return self::$certificate_path;
 		}
 
-		return dirname(__FILE__) . '/Requests/Transport/cacert.pem';
+		return __DIR__.'/Requests/Transport/cacert.pem';
 	}
 
 	/**

plugin/buycourses/src/culqi.php

@@ -1,5 +1,5 @@
 <?php
-
+/* For license terms, see /license.txt */
 /**
  * CULQI PHP SDK
  *
@@ -14,15 +14,15 @@
  */
 
 // Errors
-include_once(dirname(__FILE__). '/Culqi/Error/Errors.php');
-include_once(dirname(__FILE__). '/Culqi/AuthBearer.php');
-include_once dirname(__FILE__).'/Culqi/Client.php';
-include_once dirname(__FILE__).'/Culqi/Resource.php';
+include_once __DIR__.'/Culqi/Error/Errors.php';
+include_once __DIR__.'/Culqi/AuthBearer.php';
+include_once __DIR__.'/Culqi/Client.php';
+include_once __DIR__.'/Culqi/Resource.php';
 
 // Culqi API
-include_once dirname(__FILE__).'/Culqi/Tokens.php';
-include_once dirname(__FILE__).'/Culqi/Cargos.php';
-include_once dirname(__FILE__).'/Culqi/Devoluciones.php';
-include_once dirname(__FILE__).'/Culqi/Suscripciones.php';
-include_once dirname(__FILE__).'/Culqi/Planes.php';
-include_once dirname(__FILE__).'/Culqi/Culqi.php';
+include_once __DIR__.'/Culqi/Tokens.php';
+include_once __DIR__.'/Culqi/Cargos.php';
+include_once __DIR__.'/Culqi/Devoluciones.php';
+include_once __DIR__.'/Culqi/Suscripciones.php';
+include_once __DIR__.'/Culqi/Planes.php';
+include_once __DIR__.'/Culqi/Culqi.php';

plugin/buycourses/uninstall.php

@@ -10,5 +10,5 @@
 /**
  * Queries
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 BuyCoursesPlugin::create()->uninstall();

plugin/clockworksms/install.php

@@ -11,5 +11,5 @@
 /**
  * Initialization
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 ClockworksmsPlugin::create()->install();

plugin/clockworksms/plugin.php

@@ -5,6 +5,6 @@
  * @package chamilo.plugin.clockworksms
  * @author  Imanol Losada <imanol.losada@beeznest.com>
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 
 $plugin_info = ClockworksmsPlugin::create()->get_info();

plugin/clockworksms/uninstall.php

@@ -12,5 +12,5 @@
 /**
  * Queries
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 ClockworksmsPlugin::create()->uninstall();

plugin/courseblock/install.php

@@ -1,7 +1,7 @@
 <?php
 /* For license terms, see /license.txt */
 
-require_once dirname(__FILE__) . '/config.php';
+require_once __DIR__.'/config.php';
 
 if (!api_is_platform_admin()) {
     die ('You must have admin permissions to install plugins');

plugin/courselegal/install.php

@@ -1,7 +1,7 @@
 <?php
 /* For license terms, see /license.txt */
 
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 
 if (!api_is_platform_admin()) {
     die ('You must have admin permissions to install plugins');

plugin/courselegal/start.php

@@ -1,7 +1,7 @@
 <?php
 /* For license terms, see /license.txt */
 
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 
 // Course legal
 $enabled = api_get_plugin_setting('courselegal', 'tool_enable');

plugin/courselegal/user_list.php

@@ -1,6 +1,6 @@
 <?php
 /* For license terms, see /license.txt */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 
 // Course legal
 $enabled = api_get_plugin_setting('courselegal', 'tool_enable');

plugin/jcapture/applet.php

@@ -5,7 +5,7 @@
 	  parse_str($HTTP_RAW_POST_DATA, $_POST);
 	}
 	
-	if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
+	if(!defined('DOKU_INC')) define('DOKU_INC',__DIR__.'/../../../');
 	require_once(DOKU_INC.'inc/init.php');
 	require_once(DOKU_INC.'inc/common.php');
 	require_once(DOKU_INC.'inc/pageutils.php');

plugin/kannelsms/install.php

@@ -11,5 +11,5 @@
 /**
  * Initialization
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 KannelsmsPlugin::create()->install();

plugin/kannelsms/plugin.php

@@ -5,6 +5,6 @@
  * @package chamilo.plugin.kannelsms
  * @author  Imanol Losada <imanol.losada@beeznest.com>
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 
 $plugin_info = KannelsmsPlugin::create()->get_info();

plugin/kannelsms/uninstall.php

@@ -12,5 +12,5 @@
 /**
  * Queries
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 KannelsmsPlugin::create()->uninstall();

plugin/olpc_peru_filter/install.php

@@ -9,5 +9,5 @@
  * Initialization
  */
 
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 OLPC_Peru_FilterPlugin::create()->install();

plugin/olpc_peru_filter/lib/olpc_peru_filter_plugin.class.php

@@ -33,7 +33,7 @@ class OLPC_Peru_FilterPlugin extends Plugin
             $this->course_settings[] =
               array('group'=> 'olpc_peru_filter_filter', 'name' => $k,  'type' => 'checkbox', 'init_value' => $v);
         }
-        require_once dirname(__FILE__).'/../config.php';
+        require_once __DIR__.'/../config.php';
         if (!empty($blacklist_enabled_file)) {
             $this->blacklist_enabled_file = $blacklist_enabled_file;
         }

plugin/olpc_peru_filter/plugin.php

@@ -1,4 +1,4 @@
 <?php
 $course_plugin = 'olpc_peru_filter'; //needed in order to load the plugin lang variables 
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 $plugin_info = OLPC_Peru_FilterPlugin::create()->get_info();

plugin/olpc_peru_filter/uninstall.php

@@ -9,5 +9,5 @@
 /**
  * Queries
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 OLPC_Peru_FilterPlugin::create()->uninstall();

plugin/openmeetings/install.php

@@ -8,5 +8,5 @@
  * Initialization
  */
 
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 openmeetingsPlugin::create()->install();

plugin/openmeetings/listing.php

@@ -8,7 +8,7 @@
  */
 
 $course_plugin = 'openmeetings'; //needed in order to load the plugin lang variables
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 $plugin = \OpenMeetingsPlugin::create();
 $tool_name = $plugin->get_lang('Videoconference');
 $tpl = new Template($tool_name);

plugin/openmeetings/start.php

@@ -6,7 +6,7 @@
  * Initialization
  */
 $course_plugin = 'openmeetings'; //needed in order to load the plugin lang variables
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 $tool_name = get_lang('Videoconference');
 $tpl = new Template($tool_name);
 $om = new \Chamilo\Plugin\OpenMeetings\OpenMeetings();

plugin/openmeetings/uninstall.php

@@ -9,5 +9,5 @@
 /**
  * Queries
  */
-require_once dirname(__FILE__).'/config.php';
+require_once __DIR__.'/config.php';
 openmeetingsPlugin::create()->uninstall();

plugin/pens/lib/pens/pens_client.php

@@ -26,8 +26,8 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
  
-require_once(dirname(__FILE__)."/pens_controller.php");
-require_once(dirname(__FILE__)."/pens_request_handler.php");
+require_once __DIR__.'/pens_controller.php';
+require_once __DIR__.'/pens_request_handler.php';
 
 /**
  * PENSClient

plugin/pens/lib/pens/pens_controller.php

@@ -26,7 +26,7 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once(dirname(__FILE__)."/pens_request_factory.php");
+require_once __DIR__.'/pens_request_factory.php';
 
 /**
  * PENSController

plugin/pens/lib/pens/pens_package_handler.php

@@ -26,7 +26,7 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once(dirname(__FILE__)."/pens_config.php");
+require_once __DIR__.'/pens_config.php';
 
 /**
  * PENSPackageHandler

plugin/pens/lib/pens/pens_request.php

@@ -26,10 +26,10 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once(dirname(__FILE__)."/pens_config.php");
-require_once(dirname(__FILE__)."/pens_message.php");
-require_once(dirname(__FILE__)."/pens_exception.php");
-require_once(dirname(__FILE__)."/lib/rfc2396regexes.php");
+require_once __DIR__.'/pens_config.php';
+require_once __DIR__.'/pens_message.php';
+require_once __DIR__.'/pens_exception.php';
+require_once __DIR__.'/lib/rfc2396regexes.php';
 
 /**
  * PENSRequest

plugin/pens/lib/tests/test_pens_package_handler.php

@@ -29,8 +29,8 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once("simpletest/autorun.php");
-require_once(dirname(__FILE__)."/../pens.php");
+require_once 'simpletest/autorun.php';
+require_once __DIR__.'/../pens.php';
 
 class MyPackageHandler extends PENSPackageHandler {
 	public function processPackage($request, $path_to_package) {

plugin/pens/lib/tests/test_pens_request.php

@@ -29,8 +29,8 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once("simpletest/autorun.php");
-require_once(dirname(__FILE__)."/../pens.php");
+require_once 'simpletest/autorun.php';
+require_once __DIR__.'/../pens.php';
 
 /**
  * Unit tests for the PENSRequest class