chamilo / chamilo-lms

main/document/create_paint.php

Spacing +15 added lines, -15 removed lines

@@ -129,27 +129,27 @@
 
 // pixlr
 // max size 1 Mb ??
-$title = urlencode(utf8_encode(get_lang('NewImage')));//TODO:check
+$title = urlencode(utf8_encode(get_lang('NewImage'))); //TODO:check
 //
 $image = Display::returnIconPath('canvas1024x768.png');
 //
 $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-$langpixlr  = api_get_language_isocode();
+$langpixlr = api_get_language_isocode();
 $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr;
-$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser
-
-$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
-$_SESSION['exit_pixlr']=$document_data['path'];
-$referrer="Chamilo";
-$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
-$target=$target_path;
-$locktarget="true";
-$locktitle="false";
-
-if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
+$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser
+
+$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
+$_SESSION['exit_pixlr'] = $document_data['path'];
+$referrer = "Chamilo";
+$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
+$target = $target_path;
+$locktarget = "true";
+$locktitle = "false";
+
+if ($_SERVER['HTTP_HOST'] == "localhost") {
+	$path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml';
 	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+		$crossdomain = '<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />

Indentation +13 added lines, -13 removed lines

@@ -52,26 +52,26 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $groupId = api_get_group_id();
@@ -99,7 +99,7 @@ 
 }
 
 if (!($is_allowed_to_edit || $groupRights ||
-	DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id()))
+    DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id()))
 ) {
     api_not_allowed(true);
 }
@@ -116,7 +116,7 @@ 
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
-	$interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
+    $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
 } else {
     foreach ($document_data['parents'] as $document_sub_data) {
         $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
@@ -149,17 +149,17 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
+        @file_put_contents($path_and_file, $crossdomain);
+    }
     $credentials = "true";
 } else {
     $credentials = "false";

src/Chamilo/FaqBundle/Entity/Question.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
      */
     public function getEntityIdentifier()
     {
-        return 'GenjFaqBundle:Question:' . $this->getId();
+        return 'GenjFaqBundle:Question:'.$this->getId();
     }
 
     /**

src/Chamilo/FaqBundle/Entity/Category.php

Doc Comments +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
      *
      * @param string $rank
      *
-     * @return Question
+     * @return Category
      */
     public function setRank($rank)
     {
@@ -201,7 +201,7 @@ 
     /**
      * Get questions
      *
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Question[]
      */
     public function getQuestions()
     {

main/auth/external_login/facebook.init.php

Spacing +1 added lines, -1 removed lines

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

main/mySpace/company_reports.php

Spacing +15 added lines, -15 removed lines

@@ -16,7 +16,7 @@ 
     api_not_allowed(true);
 }
 
-$interbreadcrumb[] = array ('url' => api_is_student_boss()?'#':'index.php', 'name' => get_lang('MySpace'));
+$interbreadcrumb[] = array('url' => api_is_student_boss() ? '#' : 'index.php', 'name' => get_lang('MySpace'));
 $tool_name = get_lang('Report');
 
 $this_section = SECTION_TRACKING;
@@ -42,13 +42,13 @@ 
 
 //Column config
 $column_model = array(
-    array('name'=>'course',         'index'=>'title',       'width'=>'180', 'align'=>'left', 'wrap_cell' => 'true'),
-    array('name'=>'user',           'index'=>'user',        'width'=>'100', 'align'=>'left','sortable'=>'false', 'wrap_cell' => 'true'),
-    array('name'=>'email',          'index'=>'email',       'width'=>'100', 'align'=>'left','sortable'=>'false', 'wrap_cell' => 'true'),
-    array('name'=>'time',           'index'=>'time',        'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'certificate',    'index'=>'certificate', 'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'progress_100',   'index'=>'progress_100',       'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'progress',       'index'=>'progress',    'width'=>'50',  'align'=>'left','sortable'=>'false')
+    array('name'=>'course', 'index'=>'title', 'width'=>'180', 'align'=>'left', 'wrap_cell' => 'true'),
+    array('name'=>'user', 'index'=>'user', 'width'=>'100', 'align'=>'left', 'sortable'=>'false', 'wrap_cell' => 'true'),
+    array('name'=>'email', 'index'=>'email', 'width'=>'100', 'align'=>'left', 'sortable'=>'false', 'wrap_cell' => 'true'),
+    array('name'=>'time', 'index'=>'time', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'certificate', 'index'=>'certificate', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'progress_100', 'index'=>'progress_100', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'progress', 'index'=>'progress', 'width'=>'50', 'align'=>'left', 'sortable'=>'false')
 );
 
 if (!empty($extra_fields)) {
@@ -67,7 +67,7 @@ 
 }
 
 if (api_is_student_boss()) {
-    $column_model[] = array('name'=>'group', 'index'=>'group', 'width'=>'50', 'align'=>'left','sortable'=>'false');
+    $column_model[] = array('name'=>'group', 'index'=>'group', 'width'=>'50', 'align'=>'left', 'sortable'=>'false');
     $columns[] = get_lang('Group');
 }
 
@@ -78,7 +78,7 @@ 
 
 $htmlHeadXtra[] = '<script>
 $(function() {
-    '.Display::grid_js('user_course_report',  $url, $columns, $column_model, $extra_params, array(), null, true).'
+    '.Display::grid_js('user_course_report', $url, $columns, $column_model, $extra_params, array(), null, true).'
     jQuery("#user_course_report").jqGrid("navGrid","#user_course_report_pager",{
         view:false,
         edit:false,
@@ -102,11 +102,11 @@ 
 if (api_is_student_boss()) {
     $actions .= Display::url(
         Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "auth/my_progress.php"
+        api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
     );
     $actions .= Display::url(
         Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/student.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/student.php"
     );
     $actions .= Display::url(
         Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM),
@@ -119,7 +119,7 @@ 
             [],
             ICON_SIZE_MEDIUM
         ),
-        api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php"
+        api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
     );
 }
 
@@ -130,13 +130,13 @@ 
 }
 $content .= Display::url(
     get_lang("CompanyReportResumed"),
-    api_get_path(WEB_CODE_PATH) . "mySpace/company_reports_resumed.php",
+    api_get_path(WEB_CODE_PATH)."mySpace/company_reports_resumed.php",
     array(
         'class' => 'btn btn-success'
     )
 );
 $content .= '</div>';
-$content .= '<h1 class="page-header">' . get_lang('CompanyReport') . '</h1>';
+$content .= '<h1 class="page-header">'.get_lang('CompanyReport').'</h1>';
 $content .= Display::grid_html('user_course_report');
 
 $tpl = new Template($tool_name);

main/mySpace/company_reports_resumed.php

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
     api_not_allowed(true);
 }
 
-$interbreadcrumb[] = array('url' => api_is_student_boss()?'#':'index.php', 'name' => get_lang('MySpace'));
+$interbreadcrumb[] = array('url' => api_is_student_boss() ? '#' : 'index.php', 'name' => get_lang('MySpace'));
 
 $tool_name = get_lang('Report');
 $this_section = SECTION_TRACKING;
@@ -89,15 +89,15 @@ 
 if (api_is_student_boss()) {
     $actions .= Display::url(
         Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "auth/my_progress.php"
+        api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
     );
     $actions .= Display::url(
         Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/student.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/student.php"
     );
     $actions .= Display::url(
         Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php"
     );
     $actions .= Display::url(
         Display::return_icon(
@@ -106,7 +106,7 @@ 
             [],
             ICON_SIZE_MEDIUM
         ),
-        api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php"
+        api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
     );
 }
 
@@ -119,7 +119,7 @@ 
 if (!api_is_student_boss()) {
     $content .= Display::url(
         get_lang("CompanyReport"),
-        api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php",
+        api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php",
         array(
             'class' => 'btn btn-success'
         )
@@ -127,7 +127,7 @@ 
 }
 
 $content .= '</div>';
-$content .= '<h1 class="page-header">' . get_lang('CompanyReportResumed') . '</h1>';
+$content .= '<h1 class="page-header">'.get_lang('CompanyReportResumed').'</h1>';
 $content .= Display::grid_html('user_course_report');
 
 $tpl = new Template($tool_name);

main/upload/index.php

Spacing +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
 	api_not_allowed(true);
 }
 
-$courseDir = $_course['path'] . "/document";
+$courseDir = $_course['path']."/document";
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
-$base_work_dir = $sys_course_path . $courseDir;
+$base_work_dir = $sys_course_path.$courseDir;
 $noPHP_SELF = true;
 $max_filled_space = DocumentManager::get_course_quota();
 

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 if (!$is_allowed_to_edit) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $courseDir = $_course['path'] . "/document";

main/document/download_scorm.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 $doc_url = str_replace(' ', '+', $doc_url);
 $doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), $doc_url); //echo $doc_url;
 
-if (strpos($doc_url,'../') || strpos($doc_url,'/..')) {
+if (strpos($doc_url, '../') || strpos($doc_url, '/..')) {
     $doc_url = '';
 }
 

plugin/vchamilo/views/editinstance_form.php

Doc Comments +5 added lines, -5 removed lines

@@ -13,9 +13,9 @@ 
 
     /**
      * ChamiloForm constructor.
-     * @param $mode
-     * @param $returnurl
-     * @param $cancelurl
+     * @param string $mode
+     * @param string $returnurl
+     * @param string $cancelurl
      * @param $customdata
      */
     public function __construct($mode, $returnurl, $cancelurl, $customdata = [])
@@ -137,7 +137,7 @@ 
      * Check that form data is valid.
      * You should almost always use this, rather than {@see validate_defined_fields}
      *
-     * @return bool true if form data valid
+     * @return boolean|null true if form data valid
      */
     public function is_validated()
     {
@@ -166,7 +166,7 @@ 
      *                is NOT to validate the form when a no submit button has been pressed.
      *                pass true here to override this behaviour
      *
-     * @return bool true if form data valid
+     * @return boolean|null true if form data valid
      */
     public function validate_defined_fields($validateonnosubmit=false)
     {

Spacing +19 added lines, -19 removed lines

@@ -44,7 +44,7 @@ 
         return $this->_form->display();
     }
 
-    public function definition_after_data(){
+    public function definition_after_data() {
     }
 
     public function return_form()
@@ -64,9 +64,9 @@ 
      * @param bool $slashed true means return data with addslashes applied
      * @return object submitted data; NULL if not valid or not submitted
      */
-    public function get_data($slashed=true)
+    public function get_data($slashed = true)
     {
-        $cform =& $this->_form;
+        $cform = & $this->_form;
 
         if ($this->is_submitted() and $this->is_validated()) {
             $data = $cform->exportValues(null, $slashed);
@@ -74,7 +74,7 @@ 
             if (empty($data)) {
                 return null;
             } else {
-                return (object)$data;
+                return (object) $data;
             }
         } else {
             return null;
@@ -87,9 +87,9 @@ 
      * @param bool $slashed true means return data with addslashes applied
      * @return object submitted data; NULL if not submitted
      */
-    public function get_submitted_data($slashed=true)
+    public function get_submitted_data($slashed = true)
     {
-        $cform =& $this->_form;
+        $cform = & $this->_form;
 
         if ($this->is_submitted()) {
             $data = $cform->exportValues(null, $slashed);
@@ -97,7 +97,7 @@ 
             if (empty($data)) {
                 return null;
             } else {
-                return (object)$data;
+                return (object) $data;
             }
         } else {
             return null;
@@ -121,10 +121,10 @@ 
      */
     public function is_cancelled()
     {
-        $cform =& $this->_form;
-        if ($cform->isSubmitted()){
-            foreach ($cform->_cancelButtons as $cancelbutton){
-                if (optional_param($cancelbutton, 0, PARAM_RAW)){
+        $cform = & $this->_form;
+        if ($cform->isSubmitted()) {
+            foreach ($cform->_cancelButtons as $cancelbutton) {
+                if (optional_param($cancelbutton, 0, PARAM_RAW)) {
                     return true;
                 }
             }
@@ -168,12 +168,12 @@ 
      *
      * @return bool true if form data valid
      */
-    public function validate_defined_fields($validateonnosubmit=false)
+    public function validate_defined_fields($validateonnosubmit = false)
     {
         static $validated = null; // one validation is enough
-        $cform =& $this->_form;
+        $cform = & $this->_form;
 
-        if ($this->no_submit_button_pressed() && empty($validateonnosubmit)){
+        if ($this->no_submit_button_pressed() && empty($validateonnosubmit)) {
             return false;
         } elseif ($validated === null) {
             $internal_val = $cform->validate();
@@ -191,7 +191,7 @@ 
 
             $data = $cform->exportValues(null, true);
             $chamilo_val = $this->validation($data, $files);
-            if ((is_array($chamilo_val) && count($chamilo_val)!==0)) {
+            if ((is_array($chamilo_val) && count($chamilo_val) !== 0)) {
                 // non-empty array means errors
                 foreach ($chamilo_val as $element => $msg) {
                     $cform->setElementError($element, $msg);
@@ -217,7 +217,7 @@ 
             return $nosubmit;
         }
 
-        $cform =& $this->_form;
+        $cform = & $this->_form;
         $nosubmit = false;
         if (!$this->is_submitted()) {
             return false;
@@ -246,7 +246,7 @@ 
     public function set_data($default_values, $slashed = false)
     {
         if (is_object($default_values)) {
-            $default_values = (array)$default_values;
+            $default_values = (array) $default_values;
         }
         $filter = $slashed ? 'stripslashes' : NULL;
         $this->_form->setDefaults($default_values, $filter);
@@ -266,14 +266,14 @@ 
         }
 
         $errors = array();
-        $mform =& $this->_form;
+        $mform = & $this->_form;
 
         // check the files
         $status = $this->_upload_manager->preprocess_files();
 
         // now check that we really want each file
         foreach ($_FILES as $elname => $file) {
-            if ($mform->elementExists($elname) and $mform->getElementType($elname)=='file') {
+            if ($mform->elementExists($elname) and $mform->getElementType($elname) == 'file') {
                 $required = $mform->isElementRequired($elname);
                 if (!empty($this->_upload_manager->files[$elname]['uploadlog']) &&
                     empty($this->_upload_manager->files[$elname]['clear'])