chamilo / chamilo-lms

main/inc/lib/zombie/zombie_report.class.php

Doc Comments +3 added lines

@@ -121,6 +121,9 @@
         return $form->isSubmitted() == false || $form->validate();
     }
 
+    /**
+     * @param string $format
+     */
     function get_ceiling($format = null)
     {
         $result = Request::get('ceiling');

Spacing +2 added lines, -2 removed lines

@@ -167,7 +167,7 @@ 
         }
 
         $action = $this->get_action();
-        $f = array($this, 'action_' . $action);
+        $f = array($this, 'action_'.$action);
         if (is_callable($f)) {
             return call_user_func($f, $ids);
         }
@@ -292,7 +292,7 @@ 
             $text = get_lang('No');
         }
 
-        $result = Display::return_icon($image . '.png', $text);
+        $result = Display::return_icon($image.'.png', $text);
         return $result;
     }
 

main/install/install.lib.php

Doc Comments +14 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
  * This function return the value of a php.ini setting if not "" or if exists,
  * otherwise return false
  * @param   string  $phpSetting The name of a PHP setting
- * @return  mixed   The value of the setting, or false if not found
+ * @return  string|false   The value of the setting, or false if not found
  */
 function checkPhpSettingExists($phpSetting)
 {
@@ -1268,6 +1268,10 @@ 
  * @param   string  Extra notice (to show on the right side)
  * @param   boolean Whether to display in update mode
  * @param   string  Additional attribute for the <tr> element
+ * @param string $installType
+ * @param string $parameterName
+ * @param string $formFieldName
+ * @param string $extra_notice
  * @return  void    Direct output
  */
 function displayDatabaseParameter(
@@ -1481,6 +1485,11 @@ 
 
     <?php
 }
+/**
+ * @param string $content
+ * @param string $title
+ * @param string $id
+ */
 function panel($content = null, $title = null, $id = null, $style = null) {
     $html = '';
     if (empty($style)) {
@@ -1837,8 +1846,8 @@ 
 }
 
 /**
- * @param $current_value
- * @param $wanted_value
+ * @param string $current_value
+ * @param string $wanted_value
  * @return string
  */
 function compare_setting_values($current_value, $wanted_value)
@@ -1855,8 +1864,8 @@ 
 }
 
 /**
- * @param $course_dir
- * @param $course_attempt_name
+ * @param string $course_dir
+ * @param string $course_attempt_name
  * @param string $file
  * @return bool
  */

Braces +12 added lines, -7 removed lines

@@ -972,8 +972,7 @@ 
                 <?php echo get_lang('Error'); ?>!<br />
                 Chamilo <?php echo implode('|', $update_from_version_8).' '.get_lang('HasNotBeenFoundInThatDir'); ?>.
             </div>
-        <?php }
-        else {
+        <?php } else {
             echo '<br />';
         }
         ?>
@@ -1088,7 +1087,10 @@ 
         <button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" >
             <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>
         </button>
-        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) echo 'disabled="disabled"'; ?> >
+        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) {
+    echo 'disabled="disabled"';
+}
+?> >
             <em class="fa fa-forward"> </em> <?php echo get_lang('NewInstallation'); ?>
         </button>
         <input type="hidden" name="is_executable" id="is_executable" value="-" />
@@ -1374,7 +1376,7 @@ 
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else{ ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
             </div>
@@ -1388,7 +1390,7 @@ 
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else{ ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
             </div>
@@ -1470,9 +1472,12 @@ 
             Database port: <strong><?php echo $manager->getConnection()->getPort(); ?></strong><br/>
             Database driver: <strong><?php echo $manager->getConnection()->getDriver()->getName(); ?></strong><br/>
         </div>
-    <?php else: ?>
+    <?php else {
+    : ?>
         <div id="db_status" class="alert alert-danger">
-            <p><?php echo get_lang('FailedConectionDatabase'); ?></strong></p>
+            <p><?php echo get_lang('FailedConectionDatabase');
+}
+?></strong></p>
             <code><?php echo $database_exists_text ?></code>
         </div>
     <?php endif; ?>

Spacing +60 added lines, -60 removed lines

@@ -378,7 +378,7 @@ 
     if (!is_array($result)) {
         $result = array();
         $exceptions = array('.', '..', 'CVS', '.svn');
-        $search       = array('_latin',   '_unicode',   '_corporate',   '_org'  , '_KM',   '_');
+        $search       = array('_latin', '_unicode', '_corporate', '_org', '_KM', '_');
         $replace_with = array(' (Latin)', ' (unicode)', ' (corporate)', ' (org)', ' (KM)', ' ');
         $dirname = api_get_path(SYS_LANG_PATH);
         $handle = opendir($dirname);
@@ -413,9 +413,9 @@ 
     if ($handle = opendir($directory)) {
         while (false !== ($file = readdir($handle))) {
             if ($file != "." && $file != "..") {
-                if (is_dir($directory. "/" . $file)) {
-                    $array_items = array_merge($array_items, my_directory_to_array($directory. '/' . $file));
-                    $file = $directory . "/" . $file;
+                if (is_dir($directory."/".$file)) {
+                    $array_items = array_merge($array_items, my_directory_to_array($directory.'/'.$file));
+                    $file = $directory."/".$file;
                     $array_items[] = preg_replace("/\/\//si", '/', $file);
                 }
             }
@@ -460,7 +460,7 @@ 
         // try to recover config file from Chamilo 1.9.x
         if (file_exists($updatePath.'main/inc/conf/configuration.php')) {
             $updateFromConfigFile = 'main/inc/conf/configuration.php';
-        } elseif (file_exists($updatePath . 'app/config/configuration.php')) {
+        } elseif (file_exists($updatePath.'app/config/configuration.php')) {
             $updateFromConfigFile = 'app/config/configuration.php';
         } else {
             // Give up recovering.
@@ -621,7 +621,7 @@ 
     <h2><?php get_lang('WelcomeToTheChamiloInstaller'); ?></h2>
     <div class="RequirementHeading">
         <h2><?php echo display_step_sequence(); ?>
-            <?php echo get_lang('InstallationLanguage');?>
+            <?php echo get_lang('InstallationLanguage'); ?>
         </h2>
         <p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
         <form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
@@ -694,7 +694,7 @@ 
     if (phpversion() < REQUIRED_PHP_VERSION) {
         echo '<strong><font color="red">'.get_lang('PHPVersionError').'</font></strong>';
     } else {
-        echo '<strong><font color="green">'.get_lang('PHPVersionOK'). ' '.phpversion().'</font></strong>';
+        echo '<strong><font color="green">'.get_lang('PHPVersionOK').' '.phpversion().'</font></strong>';
     }
     echo '</td>
             </tr>
@@ -1046,9 +1046,9 @@ 
         }
 
         $deprecated = [
-            api_get_path(SYS_CODE_PATH) . 'exercice/',
-            api_get_path(SYS_CODE_PATH) . 'newscorm/',
-            api_get_path(SYS_PLUGIN_PATH) . 'ticket/'
+            api_get_path(SYS_CODE_PATH).'exercice/',
+            api_get_path(SYS_CODE_PATH).'newscorm/',
+            api_get_path(SYS_PLUGIN_PATH).'ticket/'
         ];
         $deprecatedToRemove = [];
 
@@ -1153,7 +1153,7 @@ 
 function get_contact_registration_form()
 {
 
-    $html ='
+    $html = '
    <form class="form-horizontal">
     <div class="panel panel-default">
     <div class="panel-body">
@@ -1250,7 +1250,7 @@ 
         <div class="col-sm-9">
             <div class="radio">
                 <label>
-                    <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes') . '
+                    <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes').'
                 </label>
             </div>
             <div class="radio">
@@ -1309,8 +1309,8 @@ 
             echo '<input type="hidden" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />';
             echo api_htmlentities($parameterValue);
         } else {
-            echo '<div class="col-sm-5"><input type="' . $inputType . '" class="form-control" size="' . DATABASE_FORM_FIELD_DISPLAY_LENGTH . '" maxlength="' . $maxLength . '" name="' . $formFieldName . '" id="' . $formFieldName . '" value="' . api_htmlentities($parameterValue) . '" />' . "</div>";
-            echo '<div class="col-sm-3">' . $extra_notice . '</div>';
+            echo '<div class="col-sm-5"><input type="'.$inputType.'" class="form-control" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxLength.'" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />'."</div>";
+            echo '<div class="col-sm-3">'.$extra_notice.'</div>';
         }
     }
 }
@@ -1344,12 +1344,12 @@ 
         $dbNameForm = $_configuration['main_database'];
         $dbPortForm = isset($_configuration['db_port']) ? $_configuration['db_port'] : '';
 
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingUpgradeIntro');
         echo '</div>';
     } else {
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingIntro');
         echo '</div>';
@@ -1359,12 +1359,12 @@ 
         <div class="panel-body">
         <div class="form-group">
             <label class="col-sm-4"><?php echo get_lang('DBHost'); ?> </label>
-            <?php if ($installType == 'update'){ ?>
+            <?php if ($installType == 'update') { ?>
             <div class="col-sm-5">
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else { ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
             </div>
@@ -1373,12 +1373,12 @@ 
         </div>
         <div class="form-group">
             <label class="col-sm-4"><?php echo get_lang('DBPort'); ?> </label>
-            <?php if ($installType == 'update'){ ?>
+            <?php if ($installType == 'update') { ?>
             <div class="col-sm-5">
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else { ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
             </div>
@@ -1404,7 +1404,7 @@ 
             <?php
             //Database Name fix replace weird chars
             if ($installType != INSTALL_TYPE_UPDATE) {
-                $dbNameForm = str_replace(array('-','*', '$', ' ', '.'), '', $dbNameForm);
+                $dbNameForm = str_replace(array('-', '*', '$', ' ', '.'), '', $dbNameForm);
             }
 
             displayDatabaseParameter(
@@ -1497,7 +1497,7 @@ 
     if (!empty($title)) {
         $panelTitle = Display::div($title, array('class' => 'panel-heading'));
         $panelBody = Display::div($content, array('class' => 'panel-body'));
-        $panelParent = Display::div($panelTitle . $panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
+        $panelParent = Display::div($panelTitle.$panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
     } else {
         $panelBody = Display::div($html, array('class' => 'panel-body'));
         $panelParent = Display::div($panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
@@ -1523,9 +1523,9 @@ 
     $displayWhenUpdate = 'true'
 ) {
     $html = '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">' . $parameterName . '</label>';
+    $html .= '<label class="col-sm-6 control-label">'.$parameterName.'</label>';
     if ($installType == INSTALL_TYPE_UPDATE && $displayWhenUpdate) {
-        $html .= '<input type="hidden" name="' . $formFieldName . '" value="'. api_htmlentities($parameterValue, ENT_QUOTES). '" />' . $parameterValue;
+        $html .= '<input type="hidden" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'.$parameterValue;
     } else {
         $html .= '<div class="col-sm-6"><input class="form-control" type="text" size="'.FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.MAX_FORM_FIELD_LENGTH.'" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'."</div>";
     }
@@ -1573,7 +1573,7 @@ 
         $languageForm = $_SESSION['install_language'];
     }
     echo '<div class="RequirementHeading">';
-    echo "<h2>" . display_step_sequence() . get_lang("CfgSetting") . "</h2>";
+    echo "<h2>".display_step_sequence().get_lang("CfgSetting")."</h2>";
     echo '</div>';
 
     echo '<p>'.get_lang('ConfigSettingsInfo').' <strong>app/config/configuration.php</strong></p>';
@@ -1591,14 +1591,14 @@ 
 
     // Parameters 3 and 4: administrator's names
 
-    $html .=  display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
-    $html .=  display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
+    $html .= display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
+    $html .= display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
 
     //Parameter 3: administrator's email
-    $html .=  display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
+    $html .= display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
 
     //Parameter 6: administrator's telephone
-    $html .=  display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
+    $html .= display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
 
 
     echo panel($html, get_lang('Administrator'), 'administrator');
@@ -1617,12 +1617,12 @@ 
         $html .= display_language_selection_box('languageForm', $languageForm);
         $html .= '</div>';
     }
-    $html.= "</div>";
+    $html .= "</div>";
 
 
     //Second parameter: Chamilo URL
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL') .get_lang('ThisFieldIsRequired').'</label>';
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL').get_lang('ThisFieldIsRequired').'</label>';
 
 
 
@@ -1646,34 +1646,34 @@ 
 
 
     $html .= '<div class="form-group">
-            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass") . '</label>
+            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass").'</label>
         <div class="col-sm-6">';
     if ($installType == 'update') {
-        $html .= '<input type="hidden" name="encryptPassForm" value="'. $encryptPassForm .'" />'. $encryptPassForm;
+        $html .= '<input type="hidden" name="encryptPassForm" value="'.$encryptPassForm.'" />'.$encryptPassForm;
     } else {
 
         $html .= '<div class="checkbox">
                     <label>
-                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ':'') .'/> bcrypt
+                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ' : '').'/> bcrypt
                     </label>';
 
         $html .= '<label>
-                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ':'') .'/> sha1
+                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ' : '').'/> sha1
                     </label>';
 
         $html .= '<label>
-                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ':'') .'/> md5
+                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ' : '').'/> md5
                     </label>';
 
         $html .= '<label>
-                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ':'') .'/>'. get_lang('None').'
+                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ' : '').'/>'.get_lang('None').'
                     </label>';
         $html .= '</div>';
     }
     $html .= '</div></div>';
 
     $html .= '<div class="form-group">
-            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg') . '</label>
+            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg').'</label>
             <div class="col-sm-6">';
     if ($installType == 'update') {
         if ($allowSelfReg == 'true') {
@@ -1683,17 +1683,17 @@ 
         } else {
             $label = get_lang('AfterApproval');
         }
-        $html .= '<input type="hidden" name="allowSelfReg" value="'. $allowSelfReg .'" />'. $label;
+        $html .= '<input type="hidden" name="allowSelfReg" value="'.$allowSelfReg.'" />'.$label;
     } else {
         $html .= '<div class="control-group">';
         $html .= '<label class="checkbox-inline">
-                        <input type="radio" name="allowSelfReg" value="true" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '') . ' /> '. get_lang('Yes') .'
+                        <input type="radio" name="allowSelfReg" value="true" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '').' /> '.get_lang('Yes').'
                     </label>';
         $html .= '<label class="checkbox-inline">
-                        <input type="radio" name="allowSelfReg" value="false" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
+                        <input type="radio" name="allowSelfReg" value="false" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ').' /> '.get_lang('No').'
                     </label>';
          $html .= '<label class="checkbox-inline">
-                    <input type="radio" name="allowSelfReg" value="approval" id="allowSelfReg2" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
+                    <input type="radio" name="allowSelfReg" value="approval" id="allowSelfReg2" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ').' /> '.get_lang('AfterApproval').'
                 </label>';
         $html .= '</div>';
     }
@@ -1701,7 +1701,7 @@ 
     $html .= '</div>';
 
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">'. get_lang('AllowSelfRegProf') .'</label>
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('AllowSelfRegProf').'</label>
         <div class="col-sm-6">';
     if ($installType == 'update') {
         if ($allowSelfRegProf == 'true') {
@@ -1709,16 +1709,16 @@ 
         } else {
             $label = get_lang('No');
         }
-        $html .= '<input type="hidden" name="allowSelfRegProf" value="'. $allowSelfRegProf.'" />'. $label;
+        $html .= '<input type="hidden" name="allowSelfRegProf" value="'.$allowSelfRegProf.'" />'.$label;
     } else {
         $html .= '<div class="control-group">
                 <label class="checkbox-inline">
-                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '') .'/>
-                ' . get_lang('Yes') .'
+                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '').'/>
+                ' . get_lang('Yes').'
                 </label>';
         $html .= '<label class="checkbox-inline">
-                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ') .' />
-                   '. get_lang('No') .'
+                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ').' />
+                   '. get_lang('No').'
                 </label>';
         $html .= '</div>';
     }
@@ -1783,7 +1783,7 @@ 
         "Macedonia", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia", "Morocco", "Mozambique", "Myanmar",
         "Namibia", "Nauru", "Nepa", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Norway",
         "Oman",
-        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland","Portugal",
+        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland", "Portugal",
         "Qatar",
         "Romania", "Russia", "Rwanda",
         "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia and Montenegro", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "Spain", "Sri Lanka", "Sudan", "Suriname", "Swaziland", "Sweden", "Switzerland", "Syria",
@@ -1830,11 +1830,11 @@ 
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
     // use decoct() to store as string
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_directories) . "'
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_directories)."'
               WHERE variable  = 'permissions_for_new_directories'";
     Database::query($sql);
 
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_files) . "' WHERE variable  = 'permissions_for_new_files'";
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_files)."' WHERE variable  = 'permissions_for_new_files'";
     Database::query($sql);
 
     if (isset($_SESSION['permissions_for_new_directories'])) {
@@ -1854,8 +1854,8 @@ 
 function compare_setting_values($current_value, $wanted_value)
 {
     $current_value_string = $current_value;
-    $current_value = (float)$current_value;
-    $wanted_value = (float)$wanted_value;
+    $current_value = (float) $current_value;
+    $wanted_value = (float) $wanted_value;
 
     if ($current_value >= $wanted_value) {
         return Display::label($current_value_string, 'success');
@@ -1918,7 +1918,7 @@ 
 
                     fwrite($fp, $out);
                     while (!feof($fp)) {
-                        $result = str_replace("\r\n", '',fgets($fp, 128));
+                        $result = str_replace("\r\n", '', fgets($fp, 128));
                         if (!empty($result) && $result == '123') {
                             $output = true;
                         }
@@ -1941,7 +1941,7 @@ 
                     curl_setopt($ch, CURLOPT_URL, $url);
                     //curl_setopt($ch, CURLOPT_TIMEOUT, 30);
                     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-                    $result = curl_exec ($ch);
+                    $result = curl_exec($ch);
                     if (!empty($result) && $result == '123') {
                         $output = true;
                     }
@@ -2714,12 +2714,12 @@ 
         $adminPhoneForm,
         '', //$picture_uri = '',
         PLATFORM_AUTH_SOURCE,
-        '',//$expirationDate,
+        '', //$expirationDate,
         1,
         0,
         null,
         '',
-        false,  //$send_mail = false,
+        false, //$send_mail = false,
         true //$isAdmin = false
     );
 
@@ -2741,7 +2741,7 @@ 
         0,
         null,
         '',
-        false,  //$send_mail = false,
+        false, //$send_mail = false,
         false //$isAdmin = false
     );
 
@@ -2771,7 +2771,7 @@ 
     $finder = new \Symfony\Component\Finder\Finder();
     $files = $finder->files()->in($path);
     foreach ($files as $version) {
-        $version = str_replace(['Version',  '.php' ], '', $version->getFilename());
+        $version = str_replace(['Version', '.php'], '', $version->getFilename());
         $sql = "INSERT INTO version (version) VALUES ('$version')";
         Database::query($sql);
     }
@@ -2817,7 +2817,7 @@ 
                 SET selected_value = '".$param->selected_value."'
                 WHERE variable = '".$param->variable."'";
         if (!empty($param->subkey)) {
-            $sql .= " AND subkey='" . $param->subkey . "'";
+            $sql .= " AND subkey='".$param->subkey."'";
         }
         Database::query($sql);
     }

Indentation +6 added lines, -6 removed lines

@@ -1713,7 +1713,7 @@ 
         $html .= '<label class="checkbox-inline">
                         <input type="radio" name="allowSelfReg" value="false" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
                     </label>';
-         $html .= '<label class="checkbox-inline">
+            $html .= '<label class="checkbox-inline">
                     <input type="radio" name="allowSelfReg" value="approval" id="allowSelfReg2" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
                 </label>';
         $html .= '</div>';
@@ -1747,7 +1747,7 @@ 
     </div>';
 
     echo panel($html, get_lang('Platform'), 'platform');
- ?>
+    ?>
     <div class='form-group'>
         <div class="col-sm-6">
             <button type="submit" class="btn btn-default pull-right" name="step3" value="&lt; <?php echo get_lang('Previous'); ?>" ><em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?></button>
@@ -3068,10 +3068,10 @@ 
                     $sessionId = $row['session_id'];
                     $workId = $row['id'];
                     $itemInfo = api_get_item_property_info(
-                      $courseId,
-                       'work',
-                      $workId,
-                      $sessionId
+                        $courseId,
+                        'work',
+                        $workId,
+                        $sessionId
                     );
                     $courseInfo = api_get_course_info_by_id($courseId);
                     if (empty($item_info)) {

main/permissions/permissions_functions.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
 
 /**
 * This function retrieves the existing permissions of a user, group or role.
-* @param $content are we retrieving the rights of a user, a group or a role (the database depends on it)
+* @param string $content are we retrieving the rights of a user, a group or a role (the database depends on it)
 * @param $id the id of the user, group or role
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
@@ -526,7 +526,7 @@ 
 
 /**
 * This function gets all the roles that are defined
-* @param $content are we finding the roles for a user or a group (the database depends on it)
+* @param string $content are we finding the roles for a user or a group (the database depends on it)
 * @param $id the id of the user or group
 * @param string	Deprecated parameter allowing use of 'platform' scope - the corresponding tables don't exist anymore so the scope is always set to 'course'
 * @return array that contains the name of the roles the user has

Braces +10 added lines, -16 removed lines

@@ -132,24 +132,20 @@ 
 	{
 		$table=Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = 'user_id';
-	}
-	elseif ($content == 'group')
+	} elseif ($content == 'group')
 	{
 		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = 'group_id';
-	}
-	elseif ($content == 'role')
+	} elseif ($content == 'role')
 	{
 		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
-	}
-	elseif ($content == 'platform_role')
+	} elseif ($content == 'platform_role')
 	{
 		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
         $course_id_condition = '';
-	}
-	elseif ($content == 'task')
+	} elseif ($content == 'task')
 	{
 		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 		$id_field = 'task_id';
@@ -162,8 +158,9 @@ 
 		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
 	$result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
-		$currentpermissions[$row['tool']][] = $row['action'];
+	while($row = Database::fetch_array($result)) {
+			$currentpermissions[$row['tool']][] = $row['action'];
+	}
 
 	return $currentpermissions;
 }
@@ -321,14 +318,12 @@ 
 	if ($course_admin)
 	{
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	}
-	else
+	} else
 	{
 		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
 		{
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		}
-		else
+		} else
 		{
 			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
 			{
@@ -439,8 +434,7 @@ 
 			$checked='checked';
 			$image='checkbox_on2.gif';
 			$action='revoke';
-		}
-		else
+		} else
 		{
 			$checked='';
 			$image='wrong.gif';

Indentation +401 added lines, -401 removed lines

@@ -25,38 +25,38 @@ 
 function store_permissions($content, $id) {
     $course_id = api_get_course_int_id();
     
-	// Which database are we using (depending on the $content parameter)
-	if ($content=='user')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = group_id;
-	}
-	if ($content=='role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = role_id;
-	}
-
-	// We first delete all the existing permissions for that user/group/role
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
-	$result=Database::query($sql);
-
-	// looping through the post values to find the permission (containing the string permission* )
-	foreach ($_POST as $key => $value)
-	{
-		if (strstr($key,"permission*"))
-		{
-			list($brol,$tool,$action)=explode("*",$key);
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
-			$result=Database::query($sql);
-		}
-	}
-	return get_lang('PermissionsStored');
+    // Which database are we using (depending on the $content parameter)
+    if ($content=='user')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = group_id;
+    }
+    if ($content=='role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = role_id;
+    }
+
+    // We first delete all the existing permissions for that user/group/role
+    $sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
+    $result=Database::query($sql);
+
+    // looping through the post values to find the permission (containing the string permission* )
+    foreach ($_POST as $key => $value)
+    {
+        if (strstr($key,"permission*"))
+        {
+            list($brol,$tool,$action)=explode("*",$key);
+            $sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
+            $result=Database::query($sql);
+        }
+    }
+    return get_lang('PermissionsStored');
 }
 
 /**
@@ -70,50 +70,50 @@ 
 * @version 1.0
 */
 function store_one_permission($content, $action, $id, $tool,$permission) {
-	global $rights_full;
+    global $rights_full;
     $course_id = api_get_course_int_id();
-	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
+    // for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
 
-	// check
-	//if(!in_array($permission, $rights_full))
-	//{
-	//	return get_lang('Error');
-	//}
+    // check
+    //if(!in_array($permission, $rights_full))
+    //{
+    //	return get_lang('Error');
+    //}
 
-	// Which database are we using (depending on the $content parameter)
+    // Which database are we using (depending on the $content parameter)
     
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = group_id;
-	}
-	if ($content=='role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = role_id;
-	}
-
-	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionGranted');
-		}
-	}
-	if ($action=='revoke')
-	{
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionRevoked');
-		}
-	}
-	return $result_message;
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = group_id;
+    }
+    if ($content=='role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = role_id;
+    }
+
+    // grating a right
+    if ($action=='grant') {
+        $sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
+        $result=Database::query($sql);
+        if($result) {
+            $result_message=get_lang('PermissionGranted');
+        }
+    }
+    if ($action=='revoke')
+    {
+        $sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
+        $result=Database::query($sql);
+        if($result) {
+            $result_message=get_lang('PermissionRevoked');
+        }
+    }
+    return $result_message;
 }
 
 /**
@@ -125,47 +125,47 @@ 
 */
 function get_permissions($content, $id) {
     $course_id = api_get_course_int_id();
-	$currentpermissions=array();
-	// Which database are we using (depending on the $content parameter)
+    $currentpermissions=array();
+    // Which database are we using (depending on the $content parameter)
     $course_id_condition = " c_id = $course_id AND ";
-	if ($content == 'user')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
-		$id_field = 'user_id';
-	}
-	elseif ($content == 'group')
-	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
-		$id_field = 'group_id';
-	}
-	elseif ($content == 'role')
-	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
-		$id_field = 'role_id';
-	}
-	elseif ($content == 'platform_role')
-	{
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
-		$id_field = 'role_id';
+    if ($content == 'user')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_USER);
+        $id_field = 'user_id';
+    }
+    elseif ($content == 'group')
+    {
+        $table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+        $id_field = 'group_id';
+    }
+    elseif ($content == 'role')
+    {
+        $table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+        $id_field = 'role_id';
+    }
+    elseif ($content == 'platform_role')
+    {
+        $table=Database::get_main_table(TABLE_ROLE_PERMISSION);
+        $id_field = 'role_id';
         $course_id_condition = '';
-	}
-	elseif ($content == 'task')
-	{
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
-		$id_field = 'task_id';
-	}
-
-	// finding all the permissions. We store this in a multidimensional array
-	// where the first dimension is the tool.
-	$sql="
+    }
+    elseif ($content == 'task')
+    {
+        $table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+        $id_field = 'task_id';
+    }
+
+    // finding all the permissions. We store this in a multidimensional array
+    // where the first dimension is the tool.
+    $sql="
 		SELECT * FROM " . $table . "
 		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
-	$result = Database::query($sql);
+    $result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
-		$currentpermissions[$row['tool']][] = $row['action'];
+    while($row = Database::fetch_array($result))
+        $currentpermissions[$row['tool']][] = $row['action'];
 
-	return $currentpermissions;
+    return $currentpermissions;
 }
 
 /**
@@ -179,38 +179,38 @@ 
 */
 function limited_or_full($current_permissions)
 {
-	if (api_get_setting('permissions')=='limited')
-	{
-		foreach ($current_permissions as $tool=>$tool_rights)
-		{
-			// we loop through the possible permissions of a tool and unset the entry if it is view
-			// if it is visibility or move we have to grant the edit right
-			foreach ($tool_rights as $key=>$value)
-			{
-				if ($value=='View')
-				{
-					unset($current_permissions[$tool][$key]);
-				}
-				if ($value=='Visibility' OR $value=='Move')
-				{
-					if (!in_array('Edit',$current_permissions[$tool]))
-					{
-						$current_permissions[$tool][]='Edit';
-					}
-					unset($current_permissions[$tool][$key]);
-				}
-				//else
-				//{
-				//	$current_permissions[$tool][]=$value;
-				//}
-			}
-		}
-		return $current_permissions;
-	}
-	if (api_get_setting('permissions')=='full')
-	{
-		return $current_permissions;
-	}
+    if (api_get_setting('permissions')=='limited')
+    {
+        foreach ($current_permissions as $tool=>$tool_rights)
+        {
+            // we loop through the possible permissions of a tool and unset the entry if it is view
+            // if it is visibility or move we have to grant the edit right
+            foreach ($tool_rights as $key=>$value)
+            {
+                if ($value=='View')
+                {
+                    unset($current_permissions[$tool][$key]);
+                }
+                if ($value=='Visibility' OR $value=='Move')
+                {
+                    if (!in_array('Edit',$current_permissions[$tool]))
+                    {
+                        $current_permissions[$tool][]='Edit';
+                    }
+                    unset($current_permissions[$tool][$key]);
+                }
+                //else
+                //{
+                //	$current_permissions[$tool][]=$value;
+                //}
+            }
+        }
+        return $current_permissions;
+    }
+    if (api_get_setting('permissions')=='full')
+    {
+        return $current_permissions;
+    }
 }
 /**
 * This function displays a checked or unchecked checkbox. The checkbox will be checked if the
@@ -224,12 +224,12 @@ 
 */
 function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
 {
-	$checked="";
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
-	{
-		$checked="checked";
-	}
-	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
+    $checked="";
+    if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+    {
+        $checked="checked";
+    }
+    echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
 
 }
 
@@ -245,62 +245,62 @@ 
 */
 function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
 {
-	if ($course_admin) {
-		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	} else {
-		if (in_array($permission,$inherited_permissions[$tool])) {
-			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		} else {
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
-				if ($editable) {
-					$url=api_get_self();
-					$urlparameters = '';
-					foreach($_GET as $key=>$value) {
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					foreach ($parameter as $key=>$value) {
-						$urlparameters.=$key.'='.$value.'&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/>";
-				if ($editable) {
-					echo "</a>";
-				}
-			} else {
-				if ($editable)
-				{
-					$url=api_get_self();
-					$urlparameters = '';
-					foreach ($_GET as $key=>$value)
-					{
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					foreach ($parameter as $key=>$value)
-					{
-						$urlparameters.=$key.'='.$value.'&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/wrong.gif\" border=\"0\"/>";
-				if ($editable)
-				{
-					echo "</a>";
-				}
-			}
-		}
-	}
+    if ($course_admin) {
+        echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+    } else {
+        if (in_array($permission,$inherited_permissions[$tool])) {
+            echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+        } else {
+            if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
+                if ($editable) {
+                    $url=api_get_self();
+                    $urlparameters = '';
+                    foreach($_GET as $key=>$value) {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='revoke';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    foreach ($parameter as $key=>$value) {
+                        $urlparameters.=$key.'='.$value.'&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/>";
+                if ($editable) {
+                    echo "</a>";
+                }
+            } else {
+                if ($editable)
+                {
+                    $url=api_get_self();
+                    $urlparameters = '';
+                    foreach ($_GET as $key=>$value)
+                    {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='grant';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    foreach ($parameter as $key=>$value)
+                    {
+                        $urlparameters.=$key.'='.$value.'&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    //echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/wrong.gif\" border=\"0\"/>";
+                if ($editable)
+                {
+                    echo "</a>";
+                }
+            }
+        }
+    }
 }
 
 
@@ -318,72 +318,72 @@ 
 function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
 {
 
-	if ($course_admin)
-	{
-		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-	}
-	else
-	{
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
-		{
-			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
-		}
-		else
-		{
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
-			{
-				if ($editable)
-				{
-					$url = api_get_self();
-					$urlparameters = '';
-					foreach($_GET as $key => $value)
-					{
-						$parameter[$key] = $value;
-					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
-					foreach ($parameter as $key=>$value)
-					{
-						$urlparameters .= $key . '=' . $value . '&amp;';
-					}
-					$url = $url . '?' . $urlparameters;
-
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermission')."\">";
-				if ($editable) {
-					echo "</a>";
-				}
-			} else {
-				if ($editable) {
-					$url = api_get_self();
-					$urlparameters = '';
-					foreach ($_GET as $key=>$value) {
-						$parameter[$key]=$value;
-					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
-					foreach ($parameter as $key=>$value) {
-						$urlparameters .= $key . '=' . $value . '&amp;';
-					}
-					$url=$url.'?'.$urlparameters;
-
-					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
-					echo "\t\t\t <a href=\"".$url."\">";
-				}
-				echo "<img src=\"../img/wrong.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermissionNot')."\">";
-				if ($editable) {
-					echo "</a>";
-				}
-			}
-		}
-	}
+    if ($course_admin)
+    {
+        echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+    }
+    else
+    {
+        if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
+        {
+            echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
+        }
+        else
+        {
+            if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+            {
+                if ($editable)
+                {
+                    $url = api_get_self();
+                    $urlparameters = '';
+                    foreach($_GET as $key => $value)
+                    {
+                        $parameter[$key] = $value;
+                    }
+                    $parameter['action']='manage_rights';
+                    $parameter['do']='revoke';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    $parameter['user_id']=$user_id;
+                    foreach ($parameter as $key=>$value)
+                    {
+                        $urlparameters .= $key . '=' . $value . '&amp;';
+                    }
+                    $url = $url . '?' . $urlparameters;
+
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/checkbox_on2.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermission')."\">";
+                if ($editable) {
+                    echo "</a>";
+                }
+            } else {
+                if ($editable) {
+                    $url = api_get_self();
+                    $urlparameters = '';
+                    foreach ($_GET as $key=>$value) {
+                        $parameter[$key]=$value;
+                    }
+                    $parameter['action']='manage_rights';
+                    $parameter['do']='grant';
+                    $parameter['permission']=$permission;
+                    $parameter['tool']=$tool;
+                    $parameter['user_id']=$user_id;
+                    foreach ($parameter as $key=>$value) {
+                        $urlparameters .= $key . '=' . $value . '&amp;';
+                    }
+                    $url=$url.'?'.$urlparameters;
+
+                    //echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
+                    echo "\t\t\t <a href=\"".$url."\">";
+                }
+                echo "<img src=\"../img/wrong.gif\" border=\"0\"/ title=\"".get_lang('UserHasPermissionNot')."\">";
+                if ($editable) {
+                    echo "</a>";
+                }
+            }
+        }
+    }
 }
 
 
@@ -394,41 +394,41 @@ 
 */
 function display_role_list($current_course_roles, $current_platform_roles)
 {
-	global $setting_visualisation;
+    global $setting_visualisation;
     $course_id = api_get_course_int_id();
 
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
-
-	// course roles
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
-	{
-		if (in_array($row['role_id'], $current_course_roles))
-		{
-			$checked='checked';
-			$image='checkbox_on2.gif';
-			$action='revoke';
-		}
-		else
-		{
-			$checked='';
-			$image='wrong.gif';
-			$action='grant';
-		}
-		if ($setting_visualisation=='checkbox')
-		{
-			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
-		}
-		if ($setting_visualisation=='image')
-		{
-			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
-		}
-
-
-		echo $row['role_name']." <a href=\"../permissions/roles.php?role_id=".$row['role_id']."&amp;scope=course\"><img src=\"../img/edit.gif\" /></a><br />\n";
-		echo $row['role_comment']."<br />\n";
-	}
+    $coures_roles_table=Database::get_course_table(TABLE_ROLE);
+
+    // course roles
+    $sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))
+    {
+        if (in_array($row['role_id'], $current_course_roles))
+        {
+            $checked='checked';
+            $image='checkbox_on2.gif';
+            $action='revoke';
+        }
+        else
+        {
+            $checked='';
+            $image='wrong.gif';
+            $action='grant';
+        }
+        if ($setting_visualisation=='checkbox')
+        {
+            echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
+        }
+        if ($setting_visualisation=='image')
+        {
+            echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
+        }
+
+
+        echo $row['role_name']." <a href=\"../permissions/roles.php?role_id=".$row['role_id']."&amp;scope=course\"><img src=\"../img/edit.gif\" /></a><br />\n";
+        echo $row['role_comment']."<br />\n";
+    }
 }
 
 /**
@@ -442,24 +442,24 @@ 
 */
 function get_roles($content,$id, $scope='course') {
     $course_id  = api_get_course_int_id();    
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = user_id;
-	}
-	if ($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	}
-	$table_role=Database::get_course_table(TABLE_ROLE);
-
-	$current_roles=array();
-	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result)) {
-		$current_roles[]=$row['role_id'];
-	}
-	return $current_roles;
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = user_id;
+    }
+    if ($content=='group') {
+        $table=Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    }
+    $table_role=Database::get_course_table(TABLE_ROLE);
+
+    $current_roles=array();
+    //$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
+    $sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result)) {
+        $current_roles[]=$row['role_id'];
+    }
+    return $current_roles;
 }
 
 /**
@@ -472,25 +472,25 @@ 
     $course_id = api_get_course_int_id();
     $course_id_condition = " WHERE c_id = $course_id ";
     
-	if ($content=='course')
-	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
-	}
-	if ($content=='platform')
-	{
-		$table_role=Database::get_main_table(TABLE_ROLE);
-		$course_id_condition = '';
-	}
-
-	$current_roles=array();
-	$sql="SELECT * FROM $table_role $course_id_condition ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
-	{
-		$roles[]=$row;
-	}
-
-	return $roles;
+    if ($content=='course')
+    {
+        $table_role=Database::get_course_table(TABLE_ROLE);
+    }
+    if ($content=='platform')
+    {
+        $table_role=Database::get_main_table(TABLE_ROLE);
+        $course_id_condition = '';
+    }
+
+    $current_roles=array();
+    $sql="SELECT * FROM $table_role $course_id_condition ";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))
+    {
+        $roles[]=$row;
+    }
+
+    return $roles;
 }
 
 
@@ -506,34 +506,34 @@ 
 */
 function get_roles_permissions($content,$id, $scope='course') {
     $course_id = api_get_course_int_id();
-	if ($content == 'user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = 'user_id';
-	}
-
-	if ($content == 'group') {
-		$table = Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	}
-
-	// course roles or platform roles
-	$scope = 'course';
-	if ($scope == 'course') {
-		$table_role = Database::get_course_table(TABLE_ROLE);
-		$table_role_permissions = Database::get_course_table(TABLE_ROLE_PERMISSION);
+    if ($content == 'user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = 'user_id';
+    }
+
+    if ($content == 'group') {
+        $table = Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    }
+
+    // course roles or platform roles
+    $scope = 'course';
+    if ($scope == 'course') {
+        $table_role = Database::get_course_table(TABLE_ROLE);
+        $table_role_permissions = Database::get_course_table(TABLE_ROLE_PERMISSION);
         
         $role_condition = " role.c_id = $course_id AND role_permissions.c_id = $course_id AND ";
-	}
+    }
 
-	if ($scope == 'platform') {
-		$table_role = Database::get_main_table(TABLE_ROLE);
-		$table_role_permissions = Database::get_main_table(TABLE_ROLE_PERMISSION);
+    if ($scope == 'platform') {
+        $table_role = Database::get_main_table(TABLE_ROLE);
+        $table_role_permissions = Database::get_main_table(TABLE_ROLE_PERMISSION);
         $role_condition = '';
-	}
+    }
 
-	$current_roles = array();
+    $current_roles = array();
 
-	$sql = "
+    $sql = "
 		SELECT *
 		FROM
 			" . $table . " role_group_user,
@@ -547,12 +547,12 @@ 
 			role_group_user.role_id = role.role_id AND
 			role.role_id = role_permissions.role_id";
 
-	$result = Database::query($sql);
+    $result = Database::query($sql);
     $current_role_permissions = array();
-	while ($row=Database::fetch_array($result)) {
-		$current_role_permissions[$row['tool']][]=$row['action'];
+    while ($row=Database::fetch_array($result)) {
+        $current_role_permissions[$row['tool']][]=$row['action'];
     }
-	return $current_role_permissions;
+    return $current_role_permissions;
 }
 
 /**
@@ -566,34 +566,34 @@ 
 
 function assign_role($content, $action, $id, $role_id, $scope='course') {
     $course_id = api_get_course_int_id();
-	// Which database are we using (depending on the $content parameter)
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
-		$id_field = 'user_id';
-	} elseif($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
-		$id_field = 'group_id';
-	} else {
-		return  get_lang('Error');
-	}
-
-	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
-		$result=Database::query($sql);
-		if ($result) {
-			$result_message=get_lang('RoleGranted');
-		}
-	}
+    // Which database are we using (depending on the $content parameter)
+    if ($content=='user') {
+        $table=Database::get_course_table(TABLE_ROLE_USER);
+        $id_field = 'user_id';
+    } elseif($content=='group') {
+        $table=Database::get_course_table(TABLE_ROLE_GROUP);
+        $id_field = 'group_id';
+    } else {
+        return  get_lang('Error');
+    }
+
+    // grating a right
+    if ($action=='grant') {
+        $sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
+        $result=Database::query($sql);
+        if ($result) {
+            $result_message=get_lang('RoleGranted');
+        }
+    }
     
-	if ($action=='revoke') {
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
-		$result=Database::query($sql);
-		if ($result) {
-			$result_message=get_lang('RoleRevoked');
-		}
-	}
-	return $result_message;
+    if ($action=='revoke') {
+        $sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
+        $result=Database::query($sql);
+        if ($result) {
+            $result_message=get_lang('RoleRevoked');
+        }
+    }
+    return $result_message;
 }
 
 
@@ -603,21 +603,21 @@ 
 */
 function permission_array_merge($array1, $array2)
 {
-	foreach ($array2 as $tool=>$permissions)
-	{
-		foreach ($permissions as $permissionkey=>$permissionvalue)
-		{
-			$array1[$tool][]=$permissionvalue;
-		}
-	}
-	return $array1;
+    foreach ($array2 as $tool=>$permissions)
+    {
+        foreach ($permissions as $permissionkey=>$permissionvalue)
+        {
+            $array1[$tool][]=$permissionvalue;
+        }
+    }
+    return $array1;
 }
 
 
 function my_print_r($array)
 {
-	echo '<pre>';
-	print_r($array);
-	echo '</pre>';
+    echo '<pre>';
+    print_r($array);
+    echo '</pre>';
 }
 ?>

Spacing +143 added lines, -143 removed lines

@@ -26,34 +26,34 @@ 
     $course_id = api_get_course_int_id();
     
 	// Which database are we using (depending on the $content parameter)
-	if ($content=='user')
+	if ($content == 'user')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group')
+	if ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = group_id;
 	}
-	if ($content=='role')
+	if ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = role_id;
 	}
 
 	// We first delete all the existing permissions for that user/group/role
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
-	$result=Database::query($sql);
+	$sql = "DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
+	$result = Database::query($sql);
 
 	// looping through the post values to find the permission (containing the string permission* )
 	foreach ($_POST as $key => $value)
 	{
-		if (strstr($key,"permission*"))
+		if (strstr($key, "permission*"))
 		{
-			list($brol,$tool,$action)=explode("*",$key);
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
-			$result=Database::query($sql);
+			list($brol, $tool, $action) = explode("*", $key);
+			$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
+			$result = Database::query($sql);
 		}
 	}
 	return get_lang('PermissionsStored');
@@ -69,7 +69,7 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function store_one_permission($content, $action, $id, $tool,$permission) {
+function store_one_permission($content, $action, $id, $tool, $permission) {
 	global $rights_full;
     $course_id = api_get_course_int_id();
 	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
@@ -82,35 +82,35 @@ 
 
 	// Which database are we using (depending on the $content parameter)
     
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group')
+	if ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = group_id;
 	}
-	if ($content=='role')
+	if ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = role_id;
 	}
 
 	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionGranted');
+	if ($action == 'grant') {
+		$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
+		$result = Database::query($sql);
+		if ($result) {
+			$result_message = get_lang('PermissionGranted');
 		}
 	}
-	if ($action=='revoke')
+	if ($action == 'revoke')
 	{
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
-		$result=Database::query($sql);
-		if($result) {
-			$result_message=get_lang('PermissionRevoked');
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
+		$result = Database::query($sql);
+		if ($result) {
+			$result_message = get_lang('PermissionRevoked');
 		}
 	}
 	return $result_message;
@@ -125,44 +125,44 @@ 
 */
 function get_permissions($content, $id) {
     $course_id = api_get_course_int_id();
-	$currentpermissions=array();
+	$currentpermissions = array();
 	// Which database are we using (depending on the $content parameter)
     $course_id_condition = " c_id = $course_id AND ";
 	if ($content == 'user')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = 'user_id';
 	}
 	elseif ($content == 'group')
 	{
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
 		$id_field = 'group_id';
 	}
 	elseif ($content == 'role')
 	{
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
 	}
 	elseif ($content == 'platform_role')
 	{
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
+		$table = Database::get_main_table(TABLE_ROLE_PERMISSION);
 		$id_field = 'role_id';
         $course_id_condition = '';
 	}
 	elseif ($content == 'task')
 	{
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+		$table = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 		$id_field = 'task_id';
 	}
 
 	// finding all the permissions. We store this in a multidimensional array
 	// where the first dimension is the tool.
-	$sql="
-		SELECT * FROM " . $table . "
-		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
+	$sql = "
+		SELECT * FROM " . $table."
+		WHERE $course_id_condition ".$id_field."='".Database::escape_string($id)."'";
 	$result = Database::query($sql);
 
-	while($row = Database::fetch_array($result))
+	while ($row = Database::fetch_array($result))
 		$currentpermissions[$row['tool']][] = $row['action'];
 
 	return $currentpermissions;
@@ -179,7 +179,7 @@ 
 */
 function limited_or_full($current_permissions)
 {
-	if (api_get_setting('permissions')=='limited')
+	if (api_get_setting('permissions') == 'limited')
 	{
 		foreach ($current_permissions as $tool=>$tool_rights)
 		{
@@ -187,15 +187,15 @@ 
 			// if it is visibility or move we have to grant the edit right
 			foreach ($tool_rights as $key=>$value)
 			{
-				if ($value=='View')
+				if ($value == 'View')
 				{
 					unset($current_permissions[$tool][$key]);
 				}
-				if ($value=='Visibility' OR $value=='Move')
+				if ($value == 'Visibility' OR $value == 'Move')
 				{
-					if (!in_array('Edit',$current_permissions[$tool]))
+					if (!in_array('Edit', $current_permissions[$tool]))
 					{
-						$current_permissions[$tool][]='Edit';
+						$current_permissions[$tool][] = 'Edit';
 					}
 					unset($current_permissions[$tool][$key]);
 				}
@@ -207,7 +207,7 @@ 
 		}
 		return $current_permissions;
 	}
-	if (api_get_setting('permissions')=='full')
+	if (api_get_setting('permissions') == 'full')
 	{
 		return $current_permissions;
 	}
@@ -222,12 +222,12 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
+function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions = array())
 {
-	$checked="";
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+	$checked = "";
+	if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
 	{
-		$checked="checked";
+		$checked = "checked";
 	}
 	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
 
@@ -243,28 +243,28 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
+function display_image_matrix($permission_array, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
 {
 	if ($course_admin) {
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 	} else {
-		if (in_array($permission,$inherited_permissions[$tool])) {
+		if (in_array($permission, $inherited_permissions[$tool])) {
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 		} else {
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool])) {
 				if ($editable) {
-					$url=api_get_self();
+					$url = api_get_self();
 					$urlparameters = '';
-					foreach($_GET as $key=>$value) {
-						$parameter[$key]=$value;
+					foreach ($_GET as $key=>$value) {
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
+					$parameter['action'] = 'revoke';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
 					foreach ($parameter as $key=>$value) {
-						$urlparameters.=$key.'='.$value.'&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					echo "\t\t\t <a href=\"".$url."\">";
 				}
@@ -275,20 +275,20 @@ 
 			} else {
 				if ($editable)
 				{
-					$url=api_get_self();
+					$url = api_get_self();
 					$urlparameters = '';
 					foreach ($_GET as $key=>$value)
 					{
-						$parameter[$key]=$value;
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
+					$parameter['action'] = 'grant';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
 					foreach ($parameter as $key=>$value)
 					{
-						$urlparameters.=$key.'='.$value.'&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -315,7 +315,7 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
+function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
 {
 
 	if ($course_admin)
@@ -324,32 +324,32 @@ 
 	}
 	else
 	{
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
+		if (!empty($inherited_permissions) and in_array($permission, $inherited_permissions[$tool]))
 		{
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
 		}
 		else
 		{
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
 			{
 				if ($editable)
 				{
 					$url = api_get_self();
 					$urlparameters = '';
-					foreach($_GET as $key => $value)
+					foreach ($_GET as $key => $value)
 					{
 						$parameter[$key] = $value;
 					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='revoke';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
+					$parameter['action'] = 'manage_rights';
+					$parameter['do'] = 'revoke';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
+					$parameter['user_id'] = $user_id;
 					foreach ($parameter as $key=>$value)
 					{
-						$urlparameters .= $key . '=' . $value . '&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url = $url . '?' . $urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					echo "\t\t\t <a href=\"".$url."\">";
 				}
@@ -362,17 +362,17 @@ 
 					$url = api_get_self();
 					$urlparameters = '';
 					foreach ($_GET as $key=>$value) {
-						$parameter[$key]=$value;
+						$parameter[$key] = $value;
 					}
-					$parameter['action']='manage_rights';
-					$parameter['do']='grant';
-					$parameter['permission']=$permission;
-					$parameter['tool']=$tool;
-					$parameter['user_id']=$user_id;
+					$parameter['action'] = 'manage_rights';
+					$parameter['do'] = 'grant';
+					$parameter['permission'] = $permission;
+					$parameter['tool'] = $tool;
+					$parameter['user_id'] = $user_id;
 					foreach ($parameter as $key=>$value) {
-						$urlparameters .= $key . '=' . $value . '&amp;';
+						$urlparameters .= $key.'='.$value.'&amp;';
 					}
-					$url=$url.'?'.$urlparameters;
+					$url = $url.'?'.$urlparameters;
 
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -397,30 +397,30 @@ 
 	global $setting_visualisation;
     $course_id = api_get_course_int_id();
 
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
+	$coures_roles_table = Database::get_course_table(TABLE_ROLE);
 
 	// course roles
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$sql = "SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
 		if (in_array($row['role_id'], $current_course_roles))
 		{
-			$checked='checked';
-			$image='checkbox_on2.gif';
-			$action='revoke';
+			$checked = 'checked';
+			$image = 'checkbox_on2.gif';
+			$action = 'revoke';
 		}
 		else
 		{
-			$checked='';
-			$image='wrong.gif';
-			$action='grant';
+			$checked = '';
+			$image = 'wrong.gif';
+			$action = 'grant';
 		}
-		if ($setting_visualisation=='checkbox')
+		if ($setting_visualisation == 'checkbox')
 		{
 			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
 		}
-		if ($setting_visualisation=='image')
+		if ($setting_visualisation == 'image')
 		{
 			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
 		}
@@ -440,24 +440,24 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_roles($content,$id, $scope='course') {
-    $course_id  = api_get_course_int_id();    
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+function get_roles($content, $id, $scope = 'course') {
+    $course_id = api_get_course_int_id();    
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = user_id;
 	}
-	if ($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
+	if ($content == 'group') {
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
 		$id_field = 'group_id';
 	}
-	$table_role=Database::get_course_table(TABLE_ROLE);
+	$table_role = Database::get_course_table(TABLE_ROLE);
 
-	$current_roles=array();
+	$current_roles = array();
 	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result)) {
-		$current_roles[]=$row['role_id'];
+	$sql = "SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result)) {
+		$current_roles[] = $row['role_id'];
 	}
 	return $current_roles;
 }
@@ -468,26 +468,26 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_all_roles($content='course') {
+function get_all_roles($content = 'course') {
     $course_id = api_get_course_int_id();
     $course_id_condition = " WHERE c_id = $course_id ";
     
-	if ($content=='course')
+	if ($content == 'course')
 	{
-		$table_role=Database::get_course_table(TABLE_ROLE);
+		$table_role = Database::get_course_table(TABLE_ROLE);
 	}
-	if ($content=='platform')
+	if ($content == 'platform')
 	{
-		$table_role=Database::get_main_table(TABLE_ROLE);
+		$table_role = Database::get_main_table(TABLE_ROLE);
 		$course_id_condition = '';
 	}
 
-	$current_roles=array();
-	$sql="SELECT * FROM $table_role $course_id_condition ";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$current_roles = array();
+	$sql = "SELECT * FROM $table_role $course_id_condition ";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
-		$roles[]=$row;
+		$roles[] = $row;
 	}
 
 	return $roles;
@@ -504,10 +504,10 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 * @version 1.0
 */
-function get_roles_permissions($content,$id, $scope='course') {
+function get_roles_permissions($content, $id, $scope = 'course') {
     $course_id = api_get_course_int_id();
 	if ($content == 'user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = 'user_id';
 	}
 
@@ -536,21 +536,21 @@ 
 	$sql = "
 		SELECT *
 		FROM
-			" . $table . " role_group_user,
-			" . $table_role . " role,
-			" . $table_role_permissions . " role_permissions
+			" . $table." role_group_user,
+			" . $table_role." role,
+			" . $table_role_permissions." role_permissions
 		WHERE
 		    role_group_user.c_id = $course_id AND
 		    $role_condition
-			role_group_user.scope = '" . $scope . "' AND
-			role_group_user." . $id_field . " = '" . $id . "' AND
+			role_group_user.scope = '".$scope."' AND
+			role_group_user." . $id_field." = '".$id."' AND
 			role_group_user.role_id = role.role_id AND
 			role.role_id = role_permissions.role_id";
 
 	$result = Database::query($sql);
     $current_role_permissions = array();
-	while ($row=Database::fetch_array($result)) {
-		$current_role_permissions[$row['tool']][]=$row['action'];
+	while ($row = Database::fetch_array($result)) {
+		$current_role_permissions[$row['tool']][] = $row['action'];
     }
 	return $current_role_permissions;
 }
@@ -564,33 +564,33 @@ 
 * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University
 */
 
-function assign_role($content, $action, $id, $role_id, $scope='course') {
+function assign_role($content, $action, $id, $role_id, $scope = 'course') {
     $course_id = api_get_course_int_id();
 	// Which database are we using (depending on the $content parameter)
-	if ($content=='user') {
-		$table=Database::get_course_table(TABLE_ROLE_USER);
+	if ($content == 'user') {
+		$table = Database::get_course_table(TABLE_ROLE_USER);
 		$id_field = 'user_id';
-	} elseif($content=='group') {
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
+	} elseif ($content == 'group') {
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
 		$id_field = 'group_id';
 	} else {
 		return  get_lang('Error');
 	}
 
 	// grating a right
-	if ($action=='grant') {
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
-		$result=Database::query($sql);
+	if ($action == 'grant') {
+		$sql = "INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
+		$result = Database::query($sql);
 		if ($result) {
-			$result_message=get_lang('RoleGranted');
+			$result_message = get_lang('RoleGranted');
 		}
 	}
     
-	if ($action=='revoke') {
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
-		$result=Database::query($sql);
+	if ($action == 'revoke') {
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
+		$result = Database::query($sql);
 		if ($result) {
-			$result_message=get_lang('RoleRevoked');
+			$result_message = get_lang('RoleRevoked');
 		}
 	}
 	return $result_message;
@@ -607,7 +607,7 @@ 
 	{
 		foreach ($permissions as $permissionkey=>$permissionvalue)
 		{
-			$array1[$tool][]=$permissionvalue;
+			$array1[$tool][] = $permissionvalue;
 		}
 	}
 	return $array1;

main/user/user.php

Doc Comments -1 removed lines

@@ -735,7 +735,6 @@
  * lock = the user can no longer use this account
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @param int $active the current state of the account
- * @param int $user_id The user id
  * @param string $urlParams
  *
  * @return string Some HTML-code with the lock/unlock button

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
  */
 $use_anonymous = true;
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_USER;
+$current_course_tool = TOOL_USER;
 $this_section = SECTION_COURSES;
 
 // notice for unauthorized people.
@@ -41,7 +41,7 @@ 
 
 //Can't auto unregister from a session
 if (!empty($sessionId)) {
-    $course_info['unsubscribe']  = 0;
+    $course_info['unsubscribe'] = 0;
 }
 
 /* Unregistering a user section	*/
@@ -173,7 +173,7 @@ 
                             '#',
                             get_lang('UserPicture'),
                             get_lang('OfficialCode'),
-                            get_lang('FirstName') . ', ' . get_lang('LastName'),
+                            get_lang('FirstName').', '.get_lang('LastName'),
                             get_lang('Email'),
                             get_lang('Phone')
                         );
@@ -182,7 +182,7 @@ 
                             '#',
                             get_lang('UserPicture'),
                             get_lang('OfficialCode'),
-                            get_lang('LastName') . ', ' . get_lang('FirstName'),
+                            get_lang('LastName').', '.get_lang('FirstName'),
                             get_lang('Email'),
                             get_lang('Phone')
                         );
@@ -207,7 +207,7 @@ 
                     if (api_is_multiple_url_enabled()) {
                         $sql .= ' , '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au ';
                     }
-                    $sql .=" WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id ";
+                    $sql .= " WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id ";
                     $sql .= ' AND session_id = '.$sessionId;
 
                     if (api_is_multiple_url_enabled()) {
@@ -255,7 +255,7 @@ 
                                     $counter,
                                     $user_image,
                                     $user['official_code'],
-                                    $user['firstname'] . ', ' . $user['lastname'],
+                                    $user['firstname'].', '.$user['lastname'],
                                     $user['email'],
                                     $user['phone']
                                 );
@@ -264,7 +264,7 @@ 
                                     $counter,
                                     $user_image,
                                     $user['official_code'],
-                                    $user['lastname'] . ', ' . $user['firstname'],
+                                    $user['lastname'].', '.$user['firstname'],
                                     $user['email'],
                                     $user['phone']
                                 );
@@ -343,7 +343,7 @@ 
                                     $counter,
                                     $user_image,
                                     $user['official_code'],
-                                    $user['firstname'] . ', ' . $user['lastname'],
+                                    $user['firstname'].', '.$user['lastname'],
                                     $user['email'],
                                     $user['phone']
                                 );
@@ -352,7 +352,7 @@ 
                                     $counter,
                                     $user_image,
                                     $user['official_code'],
-                                    $user['lastname'] . ', ' . $user['firstname'],
+                                    $user['lastname'].', '.$user['firstname'],
                                     $user['email'],
                                     $user['phone']
                                 );
@@ -701,7 +701,7 @@ 
                 $userInfo = api_get_user_info($user_id);
                 $userPicture = $userInfo['avatar'];
 
-                $photo= '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />';
+                $photo = '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />';
 
                 $temp[] = $user_id;
                 $temp[] = $photo;
@@ -824,7 +824,7 @@ 
         if (api_get_setting('allow_user_course_subscription_by_course_admin') === 'true' or api_is_platform_admin()) {
             // unregister
             if ($user_id != $current_user_id || api_is_platform_admin()) {
-                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.
+                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'.
                     get_lang('Unreg').'</a>&nbsp;';
             } else {
                 //$result .= Display::return_icon('unsubscribe_course_na.png', get_lang('Unreg'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
@@ -834,7 +834,7 @@ 
         // Show buttons for unsubscribe
         if ($course_info['unsubscribe'] == 1) {
             if ($user_id == $current_user_id) {
-                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.
+                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'.
                     get_lang('Unreg').'</a>&nbsp;';
             }
         }
@@ -914,7 +914,7 @@ 
 
     // Actions column
     $table->set_header($header_nr++, get_lang('Action'), false);
-    $table->set_column_filter($header_nr-1, 'modify_filter');
+    $table->set_column_filter($header_nr - 1, 'modify_filter');
 
     if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') {
         $table->set_form_actions(array('unsubscribe' => get_lang('Unreg')), 'user');
@@ -922,7 +922,7 @@ 
 } else {
     if ($course_info['unsubscribe'] == 1) {
         $table->set_header($header_nr++, get_lang('Action'), false);
-        $table->set_column_filter($header_nr-1, 'modify_filter');
+        $table->set_column_filter($header_nr - 1, 'modify_filter');
     }
 }
 
@@ -978,19 +978,19 @@ 
     echo '<div class="col-md-6">';
     echo $icon;
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=csv&type='.$type.'">'.
-        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
+        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a> ';
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=xls&type='.$type.'">'.
-        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> ';
+        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a> ';
 
     if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' ||
         api_is_platform_admin()
     ) {
         $actions .= '<a href="user_import.php?'.api_get_cidreq().'&action=import">'.
-            Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+            Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'), '', ICON_SIZE_MEDIUM).'</a> ';
     }
 
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=pdf&type='.$type.'">'.
-        Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a> ';
+        Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a> ';
     echo $actions;
 
     echo '</div>';

main/webservices/additional_webservices.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 }
 
 /**
- * @param $directoryPath
+ * @param string $directoryPath
  * @return bool
  */
 function deleteDirectory($directoryPath)

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
 {
     $fileData = $pptData['file_data'];
     $dataInfo = pathinfo($pptData['file_name']);
-    $fileName =  basename($pptData['file_name'], '.' . $dataInfo['extension']);
+    $fileName = basename($pptData['file_name'], '.'.$dataInfo['extension']);
     $fullFileName = $pptData['file_name'];
     $size = $pptData['service_ppt2lp_size'];
     $w = '800';
@@ -29,20 +29,20 @@ 
     }
 
     $tempArchivePath = api_get_path(SYS_ARCHIVE_PATH);
-    $tempPath = $tempArchivePath . 'wsConvert/' . $fileName . '/';
-    $tempPathNewFiles = $tempArchivePath . 'wsConvert/' . $fileName . '-n/';
+    $tempPath = $tempArchivePath.'wsConvert/'.$fileName.'/';
+    $tempPathNewFiles = $tempArchivePath.'wsConvert/'.$fileName.'-n/';
 
     $oldumask = umask(0);
     $perms = api_get_permissions_for_new_directories();
     pptConverterDirectoriesCreate($tempPath, $tempPathNewFiles, $fileName, $perms);
 
     $file = base64_decode($fileData);
-    file_put_contents($tempPath . $fullFileName, $file);
+    file_put_contents($tempPath.$fullFileName, $file);
 
     $cmd = pptConverterGetCommandBaseParams();
-    $cmd .= ' -w ' . $w . ' -h ' . $h . ' -d oogie "' . $tempPath . $fullFileName.'"  "' . $tempPathNewFiles . $fileName . '.html"';
+    $cmd .= ' -w '.$w.' -h '.$h.' -d oogie "'.$tempPath.$fullFileName.'"  "'.$tempPathNewFiles.$fileName.'.html"';
 
-    chmod($tempPathNewFiles . $fileName, $perms);
+    chmod($tempPathNewFiles.$fileName, $perms);
 
     $files = array();
     $return = 0;
@@ -54,7 +54,7 @@ 
         if (is_array($files) && !empty($files)) {
             foreach ($files as $file) {
                 $imageData = explode('||', $file);
-                $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles . $fileName . '/' . $imageData[1]));
+                $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles.$fileName.'/'.$imageData[1]));
             }
         }
         $data = array(
@@ -80,7 +80,7 @@ 
  */
 function deleteDirectory($directoryPath)
 {
-    $files = array_diff(scandir($directoryPath), array('.','..'));
+    $files = array_diff(scandir($directoryPath), array('.', '..'));
     foreach ($files as $file) {
         if (is_dir("$directoryPath/$file")) {
             deleteDirectory("$directoryPath/$file");
@@ -108,8 +108,8 @@ 
     if (!is_dir($tempPathNewFiles)) {
         mkdir($tempPathNewFiles, $perms, true);
     }
-    if (!is_dir($tempPathNewFiles . $fileName)) {
-        mkdir($tempPathNewFiles . $fileName, $perms, true);
+    if (!is_dir($tempPathNewFiles.$fileName)) {
+        mkdir($tempPathNewFiles.$fileName, $perms, true);
     }
 }
 
@@ -120,16 +120,16 @@ 
 function pptConverterGetCommandBaseParams()
 {
     if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
-        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
-        $classPath = $converterPath . ';' . $converterPath . '/jodconverter-2.2.2.jar;' . $converterPath . '/jodconverter-cli-2.2.2.jar';
-        $cmd = 'java -Dfile.encoding=UTF-8 -cp "' . $classPath . '" DokeosConverter';
+        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
+        $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar';
+        $cmd = 'java -Dfile.encoding=UTF-8 -cp "'.$classPath.'" DokeosConverter';
     } else {
-        $converterPath = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
+        $converterPath = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
         $classPath = ' -Dfile.encoding=UTF-8 -cp .:jodconverter-2.2.2.jar:jodconverter-cli-2.2.2.jar';
-        $cmd = 'cd ' . $converterPath . ' && java ' . $classPath . ' DokeosConverter';
+        $cmd = 'cd '.$converterPath.' && java '.$classPath.' DokeosConverter';
     }
 
-    $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
+    $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
     return $cmd;
 }
 
@@ -138,7 +138,7 @@ 
 $webCodePath = api_get_path(WEB_CODE_PATH);
 $options = array(
     'uri' => $webPath,
-    'location' => $webCodePath . 'webservices/additional_webservices.php'
+    'location' => $webCodePath.'webservices/additional_webservices.php'
 );
 
 $soapServer = new SoapServer(NULL, $options);

main/webservices/cm_webservice_inbox.php

Doc Comments +3 added lines

@@ -204,6 +204,9 @@
 
     }
 
+    /**
+     * @param integer $user_id
+     */
     protected function set_message_as_read($user_id, $message_id){
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".$user_id." AND id='".$message_id."';";

Indentation +8 added lines, -8 removed lines

@@ -37,8 +37,8 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $sql_query = "SELECT id FROM $table_message " .
-                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
-                                     " ORDER BY send_date LIMIT $from,$number_of_items";
+                                        " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
+                                        " ORDER BY send_date LIMIT $from,$number_of_items";
 
             $sql_result = Database::query($sql_query);
             $message = "#";
@@ -86,7 +86,7 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $sql_query = "SELECT ".$field_table." FROM $table_message " .
-                                     " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
+                                        " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
 
             $sql_result = Database::query($sql_query);
             $result = Database::fetch_row($sql_result);
@@ -107,8 +107,8 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $sql_query = "SELECT id FROM $table_message " .
-					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
-					 "ORDER BY send_date LIMIT $from,$number_of_items";
+                        "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
+                        "ORDER BY send_date LIMIT $from,$number_of_items";
 
             $sql_result = Database::query($sql_query);
             $message = "#";
@@ -157,7 +157,7 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $sql_query = "SELECT ".$field_table." FROM $table_message " .
-                                     " WHERE user_sender_id=".$user_id." AND id=".$id;
+                                        " WHERE user_sender_id=".$user_id." AND id=".$id;
 
             $sql_result = Database::query($sql_query);
             $result = Database::fetch_row($sql_result);
@@ -188,11 +188,11 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
-                           " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
+                            " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
             $result = Database::query($query);
 
             $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
-                           " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
+                            " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
             $result = Database::query($query);
 
             $inbox_last_id = Database::insert_id();

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 {
     public function unreadMessage($username, $password)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $table_message = Database::get_main_table(TABLE_MESSAGE);
             $user_id = UserManager::get_user_id_from_username($username);
@@ -30,14 +30,14 @@ 
 
     public function get_message_id($username, $password, $from, $number_of_items)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $user_id = UserManager::get_user_id_from_username($username);
 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
-            $sql_query = "SELECT id FROM $table_message " .
-                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
+            $sql_query = "SELECT id FROM $table_message ".
+                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)".
                                      " ORDER BY send_date LIMIT $from,$number_of_items";
 
             $sql_result = Database::query($sql_query);
@@ -55,7 +55,7 @@ 
 
     public function get_message_data($username, $password, $message_id, $field)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $htmlcode = false;
             $user_id = UserManager::get_user_id_from_username($username);
@@ -85,14 +85,14 @@ 
 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
-            $sql_query = "SELECT ".$field_table." FROM $table_message " .
+            $sql_query = "SELECT ".$field_table." FROM $table_message ".
                                      " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
 
             $sql_result = Database::query($sql_query);
             $result = Database::fetch_row($sql_result);
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
 
-        }else
+        } else
             return get_lang('InvalidId');
 
 
@@ -100,14 +100,14 @@ 
 
     public function get_message_id_sent($username, $password, $from, $number_of_items)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $user_id = UserManager::get_user_id_from_username($username);
 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
-            $sql_query = "SELECT id FROM $table_message " .
-					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
+            $sql_query = "SELECT id FROM $table_message ".
+					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." ".
 					 "ORDER BY send_date LIMIT $from,$number_of_items";
 
             $sql_result = Database::query($sql_query);
@@ -126,7 +126,7 @@ 
 
     public function get_message_data_sent($username, $password, $id, $field)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $htmlcode = false;
             switch ($field)
@@ -156,7 +156,7 @@ 
 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
-            $sql_query = "SELECT ".$field_table." FROM $table_message " .
+            $sql_query = "SELECT ".$field_table." FROM $table_message ".
                                      " WHERE user_sender_id=".$user_id." AND id=".$id;
 
             $sql_result = Database::query($sql_query);
@@ -164,7 +164,7 @@ 
 
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
 
-        }else
+        } else
             return get_lang('InvalidId');
 
 
@@ -173,7 +173,7 @@ 
     public function message_send($username, $password, $receiver_user_id, $subject, $content)
     {
         //TODO: verificar data de envio. Esta divergindo de data!
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $group_id = intval(0);
             $parent_id = intval(0);
@@ -204,7 +204,7 @@ 
 
     }
 
-    protected function set_message_as_read($user_id, $message_id){
+    protected function set_message_as_read($user_id, $message_id) {
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".$user_id." AND id='".$message_id."';";
         $result = Database::query($query);

Braces +15 added lines, -10 removed lines

@@ -48,8 +48,9 @@ 
 
             return $message;
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
     }
 
@@ -92,8 +93,9 @@ 
             $result = Database::fetch_row($sql_result);
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
 
-        }else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
 
     }
@@ -118,8 +120,9 @@ 
 
             return $message;
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
     }
 
@@ -164,8 +167,9 @@ 
 
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
 
-        }else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
 
     }
@@ -199,8 +203,9 @@ 
 
             return $inbox_last_id;
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
     }
 

main/webservices/cm_webservice_user.php

Doc Comments +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
     /**
     * Get a list of users of which the given conditions match with a LIKE '%cond%'
     * @param array $conditions a list of condition (exemple : status=>STUDENT)
-    * @param array $order_by a list of fields on which sort
+    * @param string[] $order_by a list of fields on which sort
     * @return array An array with all users of the platform.
     * @todo optional course code parameter, optional sorting parameters...
      *@todo Use the UserManager class

Indentation +14 added lines, -14 removed lines

@@ -13,21 +13,21 @@ 
 
     public function find_id_user($username, $password, $name)
     {
-         if ($this->verifyUserPass($username, $password) == "valid") {
+            if ($this->verifyUserPass($username, $password) == "valid") {
             $listResult = "#";
 
             $listArrayResult = Array();
             $listArray = Array();
 
             $list = $this->get_user_list_like_start(array('firstname'=>$name), array('firstname'));
-             foreach ($list as $userData) {
-                 $listArray[] = $userData['user_id'];
-             }
+                foreach ($list as $userData) {
+                    $listArray[] = $userData['user_id'];
+                }
 
             $list = $this->get_user_list_like_start(array('lastname'=>$name), array('firstname'));
-             foreach ($list as $userData) {
-                 $listArray[] = $userData['user_id'];
-             }
+                foreach ($list as $userData) {
+                    $listArray[] = $userData['user_id'];
+                }
 
             $list = $this->get_user_list_like_start(array('email'=>$name), array('firstname'));
             foreach ($list as $userData) {
@@ -89,7 +89,7 @@ 
     {
         global $charset;
         if ($this->verifyUserPass($username, $password) == "valid") {
-		    $user_id = UserManager::get_user_id_from_username($username);
+            $user_id = UserManager::get_user_id_from_username($username);
             $message_title = get_lang('Invitation');
             $count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
 
@@ -129,14 +129,14 @@ 
 
 
     /**
-    * Get a list of users of which the given conditions match with a LIKE '%cond%'
-    * @param array $conditions a list of condition (exemple : status=>STUDENT)
-    * @param array $order_by a list of fields on which sort
-    * @return array An array with all users of the platform.
-    * @todo optional course code parameter, optional sorting parameters...
+     * Get a list of users of which the given conditions match with a LIKE '%cond%'
+     * @param array $conditions a list of condition (exemple : status=>STUDENT)
+     * @param array $order_by a list of fields on which sort
+     * @return array An array with all users of the platform.
+     * @todo optional course code parameter, optional sorting parameters...
      *@todo Use the UserManager class
      * @todo security filter order by
-    */
+     */
     private static function get_user_list_like_start($conditions = array(), $order_by = array())
     {
         $user_table = Database :: get_main_table(TABLE_MAIN_USER);

Spacing +3 added lines, -3 removed lines

@@ -91,12 +91,12 @@
         if ($this->verifyUserPass($username, $password) == "valid") {
 		    $user_id = UserManager::get_user_id_from_username($username);
             $message_title = get_lang('Invitation');
-            $count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
+            $count_is_true = SocialManager::send_invitation_friend($user_id, $userfriend_id, $message_title, $content_message);
 
             if ($count_is_true) {
-                return Display::display_normal_message(api_htmlentities(get_lang('InvitationHasBeenSent'), ENT_QUOTES,$charset),false);
+                return Display::display_normal_message(api_htmlentities(get_lang('InvitationHasBeenSent'), ENT_QUOTES, $charset), false);
             } else {
-                return Display::display_error_message(api_htmlentities(get_lang('YouAlreadySentAnInvitation'), ENT_QUOTES,$charset),false);
+                return Display::display_error_message(api_htmlentities(get_lang('YouAlreadySentAnInvitation'), ENT_QUOTES, $charset), false);
             }
         }
         return get_lang('InvalidId');

main/webservices/lp.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 
 define('WS_ERROR_SECRET_KEY', 1);
 
+/**
+ * @param integer $code
+ */
 function return_error($code) {
     $fault = null;
     switch ($code) {

Indentation +1 added lines, -1 removed lines

@@ -581,7 +581,7 @@
     /*$sessionIdName = isset($params['session_id_name']) ? $params['session_id_name'] : null;
     $sessionIdValue = isset($params['session_id_value']) ? $params['session_id_value'] : null;*/
 
-     $courseInfo = CourseManager::getCourseInfoFromOriginalId(
+        $courseInfo = CourseManager::getCourseInfoFromOriginalId(
         $courseIdValue,
         $courseIdName
     );

Braces +48 added lines, -20 removed lines

@@ -48,19 +48,22 @@ 
         list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -76,8 +79,9 @@ 
     }
     $result = api_is_valid_secret_key($secret_key, $security_key);
     //error_log($secret_key.'-'.$security_key);
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 
@@ -140,7 +144,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return return_error(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSImportLP');
+    if ($debug) {
+        error_log('WSImportLP');
+    }
 
     $courseIdName = $params['course_id_name'];
     $courseIdValue = $params['course_id_value'];
@@ -156,7 +162,9 @@ 
     $courseId = $courseInfo['real_id'];
 
     if (empty($courseInfo)) {
-        if ($debug) error_log('Course not found');
+        if ($debug) {
+            error_log('Course not found');
+        }
         return 'Course not found';
     }
 
@@ -169,7 +177,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -196,7 +206,9 @@ 
     $manifest = $oScorm->import_package($fileInfo, '', $courseInfo);
 
     if (!$manifest) {
-        if ($debug) error_log('manifest.xml file not found');
+        if ($debug) {
+            error_log('manifest.xml file not found');
+        }
         //if api_set_failure
         return 'manifest.xml file not found';
     }
@@ -215,10 +227,14 @@ 
         $oScorm->set_maker($maker, $courseId);
         //$oScorm->set_jslib('scorm_api.php');
 
-        if ($debug) error_log('scorm was added');
+        if ($debug) {
+            error_log('scorm was added');
+        }
         return 1;
     } else {
-        if ($debug) error_log('manifest data empty');
+        if ($debug) {
+            error_log('manifest data empty');
+        }
         return 'manifest data empty';
     }
 }
@@ -311,7 +327,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
 
@@ -326,7 +344,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -407,7 +427,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
     $courseId = $courseInfo['real_id'];
@@ -432,7 +454,9 @@ 
 
     $lp = new learnpath($courseCode, $lpId, null);
     if ($lp) {
-        if ($debug) error_log("LP deleted $lpId");
+        if ($debug) {
+            error_log("LP deleted $lpId");
+        }
 
         $course_dir = $courseInfo['directory'] . '/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
@@ -448,7 +472,9 @@ 
                 if ($item) {
                     $documentId = $item->get_path();
 
-                    if ($debug) error_log("lp item id found #$itemId");
+                    if ($debug) {
+                        error_log("lp item id found #$itemId");
+                    }
 
                     $documentInfo = DocumentManager::get_document_data_by_id(
                         $documentId,
@@ -474,7 +500,9 @@ 
                         }
                     }
                 } else {
-                    if ($debug) error_log("Document not found #$itemId");
+                    if ($debug) {
+                        error_log("Document not found #$itemId");
+                    }
                 }
             }
         }

Spacing +43 added lines, -43 removed lines

@@ -65,7 +65,7 @@ 
     }
 
     if ($debug) {
-        error_log("checkip " . intval($check_ip));
+        error_log("checkip ".intval($check_ip));
     }
 
     if ($check_ip) {
@@ -120,13 +120,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSImportLP',                            // method name
-    array('params' => 'tns:params'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSImportLP',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSImportLP', // method name
+    array('params' => 'tns:params'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSImportLP', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -183,7 +183,7 @@ 
 
     $uniqueFile = uniqid();
     $userId = 1; // admin
-    $filePath = api_get_path(SYS_ARCHIVE_PATH) . $uniqueFile;
+    $filePath = api_get_path(SYS_ARCHIVE_PATH).$uniqueFile;
     file_put_contents($filePath, $fileData);
 
     $fileName = $params['filename'];
@@ -257,8 +257,8 @@ 
     'all',
     '',
     array(
-        'id'    => array('name' => 'id',    'type' => 'xsd:string'),
-        'name'  => array('name' => 'name',  'type' => 'xsd:string'),
+        'id'    => array('name' => 'id', 'type' => 'xsd:string'),
+        'name'  => array('name' => 'name', 'type' => 'xsd:string'),
     )
 );
 
@@ -274,13 +274,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSGetLpList',                            // method name
-    array('params' => 'tns:paramsGetLpList'),  // input parameters
-    array('return' => 'tns:lpList'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSGetLpList',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSGetLpList', // method name
+    array('params' => 'tns:paramsGetLpList'), // input parameters
+    array('return' => 'tns:lpList'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSGetLpList', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -295,9 +295,9 @@ 
         return return_error(WS_ERROR_SECRET_KEY);
     }
 
-    require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpathList.class.php';
-    require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpath.class.php';
-    require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpathItem.class.php';
+    require_once api_get_path(SYS_CODE_PATH).'lp/learnpathList.class.php';
+    require_once api_get_path(SYS_CODE_PATH).'lp/learnpath.class.php';
+    require_once api_get_path(SYS_CODE_PATH).'lp/learnpathItem.class.php';
 
     $courseIdName = $params['course_id_name'];
     $courseIdValue = $params['course_id_value'];
@@ -369,13 +369,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteLp',                            // method name
-    array('params' => 'tns:paramsDeleteLp'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSDeleteLp',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSDeleteLp', // method name
+    array('params' => 'tns:paramsDeleteLp'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSDeleteLp', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a LP'                                               // documentation
 );
 
@@ -390,9 +390,9 @@ 
         return return_error(WS_ERROR_SECRET_KEY);
     }
 
-    require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpathList.class.php';
-    require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpath.class.php';
-    require_once api_get_path(SYS_CODE_PATH) . 'lp/learnpathItem.class.php';
+    require_once api_get_path(SYS_CODE_PATH).'lp/learnpathList.class.php';
+    require_once api_get_path(SYS_CODE_PATH).'lp/learnpath.class.php';
+    require_once api_get_path(SYS_CODE_PATH).'lp/learnpathItem.class.php';
 
     $courseIdName = $params['course_id_name'];
     $courseIdValue = $params['course_id_value'];
@@ -434,9 +434,9 @@ 
     if ($lp) {
         if ($debug) error_log("LP deleted $lpId");
 
-        $course_dir = $courseInfo['directory'] . '/document';
+        $course_dir = $courseInfo['directory'].'/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $base_work_dir = $sys_course_path . $course_dir;
+        $base_work_dir = $sys_course_path.$course_dir;
 
         $items = $lp->get_flat_ordered_items_list($lpId, 0, $courseId);
 
@@ -495,9 +495,9 @@ 
     'all',
     '',
     array(
-        'data'  => array('name' => 'data',  'type' => 'xsd:string'),
-        'title'  => array('name' => 'title',  'type' => 'xsd:string'),
-        'filename'  => array('name' => 'filename',  'type' => 'xsd:string'),
+        'data'  => array('name' => 'data', 'type' => 'xsd:string'),
+        'title'  => array('name' => 'title', 'type' => 'xsd:string'),
+        'filename'  => array('name' => 'filename', 'type' => 'xsd:string'),
     )
 );
 
@@ -548,13 +548,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateLp',                            // method name
-    array('params' => 'tns:paramsCreateLp'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSCreateLp',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSCreateLp', // method name
+    array('params' => 'tns:paramsCreateLp'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSCreateLp', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service creates a LP'                                               // documentation
 );
 

main/webservices/registration.soap.php

Doc Comments +3 added lines

@@ -2617,6 +2617,9 @@
     )
 );
 
+/**
+ * @param string $type
+ */
 function WSHelperActionOnUsers($params, $type) {
     if(!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);

Spacing +460 added lines, -460 removed lines

@@ -81,7 +81,7 @@ 
     }
 
     if ($debug) {
-        error_log("checkip " . intval($check_ip));
+        error_log("checkip ".intval($check_ip));
     }
 
     if ($check_ip) {
@@ -140,7 +140,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:extras[]')),
     'tns:extras'
 );
 
@@ -173,7 +173,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:usersParams[]')),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:usersParams[]')),
     'tns:usersParams'
 );
 
@@ -219,13 +219,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateUsers',                 // method name
-    array('createUsers' => 'tns:createUsers'),     // input parameters
-    array('return' => 'tns:results_createUsers'),  // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSCreateUsers',            // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+$server->register('WSCreateUsers', // method name
+    array('createUsers' => 'tns:createUsers'), // input parameters
+    array('return' => 'tns:results_createUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user'                     // documentation
 );
 
@@ -406,7 +406,7 @@ 
             continue;
         }
 
-        $results[] =  $userId;
+        $results[] = $userId;
 
     } // end principal foreach
 
@@ -452,13 +452,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCreateUser',                // method name
-    array('createUser' => 'tns:createUser'),     // input parameters
-    array('return' => 'xsd:string'),             // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSCreateUser',           // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+$server->register('WSCreateUser', // method name
+    array('createUser' => 'tns:createUser'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user'                   // documentation
 );
 
@@ -561,7 +561,7 @@ 
     }
 
     if (isset($original_user_id_name) && isset($original_user_id_value)) {
-        $_SESSION['ws_' . $original_user_id_name] = $original_user_id_value;
+        $_SESSION['ws_'.$original_user_id_name] = $original_user_id_value;
     }
 
     /** @var User $user */
@@ -609,7 +609,7 @@ 
         );
 
         if (isset($original_user_id_name) && isset($original_user_id_value)) {
-            unset($_SESSION['ws_' . $original_user_id_name]);
+            unset($_SESSION['ws_'.$original_user_id_name]);
         }
 
         if (is_array($extra_list) && count($extra_list) > 0) {
@@ -661,7 +661,7 @@ 
         'language'              => array('name' => 'language', 'type' => 'xsd:string'),
         'phone'                 => array('name' => 'phone', 'type' => 'xsd:string'),
         'expiration_date'       => array('name' => 'expiration_date', 'type' => 'xsd:string'),
-        'official_code'         => array('name' => 'official_code',    'type' => 'xsd:string'),
+        'official_code'         => array('name' => 'official_code', 'type' => 'xsd:string'),
         'original_user_id_name' => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
         'original_user_id_value'=> array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
         'extra'                 => array('name' => 'extra', 'type' => 'tns:extrasList')
@@ -689,7 +689,7 @@ 
     'all',
     '',
     array(
-        'users'         => array('name' => 'users',      'type' => 'tns:createUsersPassEncryptParamsList'),
+        'users'         => array('name' => 'users', 'type' => 'tns:createUsersPassEncryptParamsList'),
         'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
@@ -719,13 +719,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateUsersPasswordCrypted',                            // method name
+$server->register('WSCreateUsersPasswordCrypted', // method name
     array('createUsersPasswordCrypted' => 'tns:createUsersPasswordCrypted'), // input parameters
-    array('return' => 'tns:results_createUsersPassEncrypt'),                 // output parameters
-    'urn:WSRegistration',                                                    // namespace
-    'urn:WSRegistration#WSCreateUsersPasswordCrypted',                       // soapaction
-    'rpc',                                                                   // style
-    'encoded',                                                               // use
+    array('return' => 'tns:results_createUsersPassEncrypt'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUsersPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users to the system'                                  // documentation
 );
 
@@ -795,7 +795,7 @@ 
 
         if (is_array($extra_list) && count($extra_list) > 0) {
             foreach ($extra_list as $extra) {
-                if($extra['field_name'] == 'salt') {
+                if ($extra['field_name'] == 'salt') {
                     $salt = $extra['field_value'];
                     break;
                 }
@@ -850,7 +850,7 @@ 
                         active='1',
                         hr_dept_id=".intval($hr_dept_id);
 
-                $sql .=  " WHERE user_id='".$r_check_user[0]."'";
+                $sql .= " WHERE user_id='".$r_check_user[0]."'";
                 Database::query($sql);
 
                 if (is_array($extra_list) && count($extra_list) > 0) {
@@ -989,9 +989,9 @@ 
     'all',
     '',
     array(
-        'user_id' => array('name' => 'course',     'type' => 'xsd:string'), // Chamilo user Id
-        'session_id' => array('name' => 'user_id',    'type' => 'xsd:string'), // Current Session course ID
-        'course_id' =>array('name' => 'courseId',      'type' => 'xsd:string'), // Course Real Id
+        'user_id' => array('name' => 'course', 'type' => 'xsd:string'), // Chamilo user Id
+        'session_id' => array('name' => 'user_id', 'type' => 'xsd:string'), // Current Session course ID
+        'course_id' =>array('name' => 'courseId', 'type' => 'xsd:string'), // Course Real Id
         'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string'),
 
         // optional
@@ -1049,9 +1049,9 @@ 
         );
     }
 
-    if ($debug) error_log('$userId found: '. $userId);
-    if ($debug) error_log('$courseId found: '. $courseId);
-    if ($debug) error_log('$sessionId found: '. $sessionId);
+    if ($debug) error_log('$userId found: '.$userId);
+    if ($debug) error_log('$courseId found: '.$courseId);
+    if ($debug) error_log('$sessionId found: '.$sessionId);
 
     return [
         'user_id' => $userId,
@@ -1087,7 +1087,7 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1100,13 +1100,13 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  '. print_r($coaches, 1));
+        if ($debug) error_log('Coaches:  '.print_r($coaches, 1));
         if (in_array($userId, $coaches)) {
             $result = 1;
         }
     }
 
-    if ($debug) error_log('Result:  '. $result);
+    if ($debug) error_log('Result:  '.$result);
 
     return $result;
 }
@@ -1138,7 +1138,7 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1152,7 +1152,7 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  ' . print_r($coaches, 1));
+        if ($debug) error_log('Coaches:  '.print_r($coaches, 1));
         if (!in_array($userId, $coaches)) {
             $result = 1;
         }
@@ -1160,7 +1160,7 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) error_log('Final Result: '.$result);
 
     return $result;
 }
@@ -1178,32 +1178,32 @@ 
     'all',
     '',
     array(
-        'firstname'                 => array('name' => 'firstname',                 'type' => 'xsd:string'),
-        'lastname'                  => array('name' => 'lastname',                  'type' => 'xsd:string'),
-        'status'                    => array('name' => 'status',                    'type' => 'xsd:string'),
-        'email'                     => array('name' => 'email',                     'type' => 'xsd:string'),
-        'loginname'                 => array('name' => 'loginname',                 'type' => 'xsd:string'),
-        'password'                  => array('name' => 'password',                  'type' => 'xsd:string'), //encripted password using the encrypt_method
-        'encrypt_method'            => array('name' => 'encrypt_method',            'type' => 'xsd:string'),
-        'language'                  => array('name' => 'language',                  'type' => 'xsd:string'),
-        'phone'                     => array('name' => 'phone',                     'type' => 'xsd:string'),
-        'expiration_date'           => array('name' => 'expiration_date',           'type' => 'xsd:string'),
-        'official_code'             => array('name' => 'official_code',             'type' => 'xsd:string'),
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'extra'                     => array('name' => 'extra',                     'type' => 'tns:extrasList'),
-        'secret_key'                => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'firstname'                 => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname'                  => array('name' => 'lastname', 'type' => 'xsd:string'),
+        'status'                    => array('name' => 'status', 'type' => 'xsd:string'),
+        'email'                     => array('name' => 'email', 'type' => 'xsd:string'),
+        'loginname'                 => array('name' => 'loginname', 'type' => 'xsd:string'),
+        'password'                  => array('name' => 'password', 'type' => 'xsd:string'), //encripted password using the encrypt_method
+        'encrypt_method'            => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
+        'language'                  => array('name' => 'language', 'type' => 'xsd:string'),
+        'phone'                     => array('name' => 'phone', 'type' => 'xsd:string'),
+        'expiration_date'           => array('name' => 'expiration_date', 'type' => 'xsd:string'),
+        'official_code'             => array('name' => 'official_code', 'type' => 'xsd:string'),
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'extra'                     => array('name' => 'extra', 'type' => 'tns:extrasList'),
+        'secret_key'                => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSCreateUserPasswordCrypted',                            // method name
-    array('createUserPasswordCrypted' => 'tns:createUserPasswordCrypted'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSRegistration',                                                   // namespace
-    'urn:WSRegistration#WSCreateUserPasswordCrypted',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSCreateUserPasswordCrypted', // method name
+    array('createUserPasswordCrypted' => 'tns:createUserPasswordCrypted'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUserPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -1213,7 +1213,7 @@ 
     global $_user, $_configuration, $debug;
     $debug = 1;
     if ($debug) error_log('WSCreateUserPasswordCrypted');
-    if ($debug) error_log(print_r($params,1));
+    if ($debug) error_log(print_r($params, 1));
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -1242,7 +1242,7 @@ 
     $extra_list = isset($params['extra']) ? $params['extra'] : '';
 
     if (!empty($_configuration['password_encryption'])) {
-        if ($_configuration['password_encryption'] === $encrypt_method ) {
+        if ($_configuration['password_encryption'] === $encrypt_method) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
                 if ($debug) error_log($msg);
@@ -1304,7 +1304,7 @@ 
             if (!is_null($auth_source)) {
                 $sql .= " auth_source='".Database::escape_string($auth_source)."',";
             }
-            $sql .=    "
+            $sql .= "
                     password='".Database::escape_string($password)."',
                     email='".Database::escape_string($email)."',
                     status='".Database::escape_string($status)."',
@@ -1495,13 +1495,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserCredentials',                      // method name
-    array('editUserCredentials' => 'tns:editUserCredentials'),  // input parameters
-    array('return' => 'xsd:string'),                            // output parameters
-    'urn:WSRegistration',                                       // namespace
-    'urn:WSRegistration#WSEditUserCredentials',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSEditUserCredentials', // method name
+    array('editUserCredentials' => 'tns:editUserCredentials'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserCredentials', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits the username and password of a user'    // documentation
 );
 
@@ -1600,13 +1600,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUsers',                // method name
-    array('editUsers' => 'tns:editUsers'),      // input parameters
+$server->register('WSEditUsers', // method name
+    array('editUsers' => 'tns:editUsers'), // input parameters
     array('return' => 'tns:results_editUsers'), // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSEditUsers',           // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'     // documentation
 );
 
@@ -1791,13 +1791,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUser',              // method name
-    array('editUser' => 'tns:editUser'),     // input parameters
-    array('return' => 'xsd:string'),         // output parameters
-    'urn:WSRegistration',                    // namespace
-    'urn:WSRegistration#WSEditUser',         // soapaction
-    'rpc',                                   // style
-    'encoded',                               // use
+$server->register('WSEditUser', // method name
+    array('editUser' => 'tns:editUser'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'  // documentation
 );
 
@@ -1964,13 +1964,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserWithPicture',              // method name
-    array('editUserWithPicture' => 'tns:editUserWithPicture'),     // input parameters
-    array('return' => 'xsd:string'),                    // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSEditUserWithPicture',         // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSEditUserWithPicture', // method name
+    array('editUserWithPicture' => 'tns:editUserWithPicture'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserWithPicture', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'             // documentation
 );
 
@@ -2024,8 +2024,8 @@ 
     $tempDir = api_get_path(SYS_ARCHIVE_PATH);
     // Make sure the file download was OK by checking the HTTP headers for OK
     if (strpos(get_headers($picture_url)[0], "OK")) {
-        file_put_contents($tempDir . $filename, file_get_contents($picture_url));
-        $pictureUri = UserManager::update_user_picture($user_id, $filename, $tempDir . $filename);
+        file_put_contents($tempDir.$filename, file_get_contents($picture_url));
+        $pictureUri = UserManager::update_user_picture($user_id, $filename, $tempDir.$filename);
     }
 
     if ($user_id == 0) {
@@ -2187,13 +2187,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUsersPasswordCrypted',                           // method name
-    array('editUsersPasswordCrypted' => 'tns:editUsersPasswordCrypted'),  // input parameters
-    array('return' => 'tns:results_editUsersPasswordCrypted'),            // output parameters
-    'urn:WSRegistration',                                                 // namespace
-    'urn:WSRegistration#WSEditUsersPasswordCrypted',                      // soapaction
-    'rpc',                                                                // style
-    'encoded',                                                            // use
+$server->register('WSEditUsersPasswordCrypted', // method name
+    array('editUsersPasswordCrypted' => 'tns:editUsersPasswordCrypted'), // input parameters
+    array('return' => 'tns:results_editUsersPasswordCrypted'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUsersPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user'                                           // documentation
 );
 
@@ -2237,7 +2237,7 @@ 
 
             $password = $user_param['password'];
             $encrypt_method = $user_param['encrypt_method'];
-            if ($_configuration['password_encryption'] === $encrypt_method ) {
+            if ($_configuration['password_encryption'] === $encrypt_method) {
                 if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                     $msg = "Encryption $encrypt_method is invalid";
                     $results[] = $msg;
@@ -2252,11 +2252,11 @@ 
                 $results[] = $msg;
                 continue;
             }
-        } elseif (!empty($user_param['password']) && empty($user_param['encrypt_method'])){
+        } elseif (!empty($user_param['password']) && empty($user_param['encrypt_method'])) {
             $msg = "If password is not empty the encrypt_method param is required ";
             $results[] = $msg;
             continue;
-        } elseif (empty($user_param['password']) && !empty($user_param['encrypt_method'])){
+        } elseif (empty($user_param['password']) && !empty($user_param['encrypt_method'])) {
             $msg = "If encrypt_method is not empty the password param is required ";
             $results[] = $msg;
             continue;
@@ -2392,13 +2392,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserPasswordCrypted',                         // method name
+$server->register('WSEditUserPasswordCrypted', // method name
     array('editUserPasswordCrypted' => 'tns:editUserPasswordCrypted'), // input parameters
-    array('return' => 'xsd:string'),                                   // output parameters
-    'urn:WSRegistration',                                              // namespace
-    'urn:WSRegistration#WSEditUserPasswordCrypted',                    // soapaction
-    'rpc',                                                             // style
-    'encoded',                                                         // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user'                                        // documentation
 );
 
@@ -2442,7 +2442,7 @@ 
     if (!empty($params['password']) && !empty($params['encrypt_method'])) {
         $password = $params['password'];
         $encrypt_method = $params['encrypt_method'];
-        if ($_configuration['password_encryption'] === $encrypt_method ) {
+        if ($_configuration['password_encryption'] === $encrypt_method) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
                 return $msg;
@@ -2612,7 +2612,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:user_id[]')),'tns:user_id'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_id[]')), 'tns:user_id'
 );
 
 $server->wsdl->addComplexType(
@@ -2636,7 +2636,7 @@ 
     $orig_user_id_value = array();
 
     $original_user_ids = $params['ids'];
-    foreach($original_user_ids as $original_user_id) {
+    foreach ($original_user_ids as $original_user_id) {
         $result = false;
         $orig_user_id_value[] = $original_user_id['original_user_id_value'];
         $user_id = UserManager::get_user_id_from_original_id(
@@ -2646,13 +2646,13 @@ 
         if ($user_id > 0) {
             if ($type == "delete") {
                 $result = UserManager::delete_user($user_id);
-            } else if($type == "disable") {
+            } else if ($type == "disable") {
                 $result = UserManager::disable($user_id);
-            } else if($type == "enable") {
+            } else if ($type == "enable") {
                 $result = UserManager::enable($user_id);
             }
         }
-        $results[] = $result?1:0;
+        $results[] = $result ? 1 : 0;
     }
 
 
@@ -2668,13 +2668,13 @@ 
     return $output;
 }
 
-$server->register('WSDeleteUsers',                         // method name
-    array('user_ids' => 'tns:user_ids'),                   // input parameters
-    array('return' => 'tns:results_actionUsers'),          // output parameters
-    'urn:WSRegistration',                                  // namespace
-    'urn:WSRegistration#WSDeleteUsers',                    // soapaction
-    'rpc',                                                 // style
-    'encoded',                                             // use
+$server->register('WSDeleteUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array('return' => 'tns:results_actionUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Deletes users provided as parameters from the system' // documentation
 );
 
@@ -2683,13 +2683,13 @@ 
 }
 
 /** WSDisableUsers **/
-$server->register('WSDisableUsers',                         // method name
-    array('user_ids' => 'tns:user_ids'),                    // input parameters
-    array('return' => 'tns:results_actionUsers'),           // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#WSDisableUsers',                    // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('WSDisableUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array('return' => 'tns:results_actionUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDisableUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Disables users provided as parameters from the system' // documentation
 );
 
@@ -2698,13 +2698,13 @@ 
 }
 
 /** WSEnableUsers **/
-$server->register('WSEnableUsers',            // method name
-    array('user_ids' => 'tns:user_ids'),      // input parameters
-    array('return' => 'tns:results_actionUsers'),      // output parameters
-    'urn:WSRegistration',                     // namespace
-    'urn:WSRegistration#WSEnableUsers',       // soapaction
-    'rpc',                                    // style
-    'encoded',                                // use
+$server->register('WSEnableUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array('return' => 'tns:results_actionUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEnableUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Enables users provided as parameters'    // documentation
 );
 
@@ -2757,7 +2757,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:createCourseParams[]')),'tns:createCourseParams'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:createCourseParams[]')), 'tns:createCourseParams'
 );
 
 // Register the data structures used by the service
@@ -2798,13 +2798,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateCourse',                // method name
-    array('createCourse' => 'tns:createCourse'),   // input parameters
+$server->register('WSCreateCourse', // method name
+    array('createCourse' => 'tns:createCourse'), // input parameters
     array('return' => 'tns:results_createCourse'), // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSCreateCourse',           // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a course'                   // documentation
 );
 
@@ -2862,7 +2862,7 @@ 
                             category_code='".Database::escape_string($category_code)."',
                             tutor_name='".Database::escape_string($tutor_name)."',
                             visual_code='".Database::escape_string($wanted_code)."'";
-                if($visibility !== null) {
+                if ($visibility !== null) {
                     $sql .= ", visibility = '$visibility' ";
                 }
                 $sql .= " WHERE id='".$courseInfo['real_id']."'";
@@ -2895,7 +2895,7 @@ 
         $params['title'] = $title;
         $params['wanted_code'] = $wanted_code;
         $params['category_code'] = $category_code;
-        $params['course_category']    = $category_code;
+        $params['course_category'] = $category_code;
         $params['tutor_name'] = $tutor_name;
         $params['course_language'] = $course_language;
         $params['user_id'] = api_get_user_id();
@@ -3033,13 +3033,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCreateCourseByTitle',                     // method name
+$server->register('WSCreateCourseByTitle', // method name
     array('createCourseByTitle' => 'tns:createCourseByTitle'), // input parameters
-    array('return' => 'tns:results_createCourseByTitle'),      // output parameters
-    'urn:WSRegistration',                                      // namespace
-    'urn:WSRegistration#WSCreateCourseByTitle',                // soapaction
-    'rpc',                                                     // style
-    'encoded',                                                 // use
+    array('return' => 'tns:results_createCourseByTitle'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateCourseByTitle', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a course by title'                      // documentation
 );
 
@@ -3270,18 +3270,18 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditCourse',                // method name
-    array('editCourse' => 'tns:editCourse'),     // input parameters
+$server->register('WSEditCourse', // method name
+    array('editCourse' => 'tns:editCourse'), // input parameters
     array('return' => 'tns:results_editCourse'), // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSEditCourse',           // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course'                // documentation
 );
 
 // Define the method WSEditCourse
-function WSEditCourse($params){
+function WSEditCourse($params) {
 
     global $_configuration;
     if (!WSHelperVerifyKey($params)) {
@@ -3436,13 +3436,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCourseDescription',                    // method name
-    array('courseDescription' => 'tns:courseDescription'),  // input parameters
-    array('return' => 'tns:fields_course_desc_list'),       // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#WSCourseDescription',               // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('WSCourseDescription', // method name
+    array('courseDescription' => 'tns:courseDescription'), // input parameters
+    array('return' => 'tns:fields_course_desc_list'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCourseDescription', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course description'               // documentation
 );
 
@@ -3492,7 +3492,7 @@ 
     }
 
     while ($row = Database::fetch_array($result)) {
-        $ind = (int)$row['id'];
+        $ind = (int) $row['id'];
         $array_course_desc_title[$ind] = $row['title'];
         $array_course_desc_content[$ind] = $row['content'];
     }
@@ -3579,13 +3579,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSEditCourseDescription',                       // method name
+$server->register('WSEditCourseDescription', // method name
     array('editCourseDescription' => 'tns:editCourseDescription'), // input parameters
-    array('return' => 'tns:results_editCourseDescription'),        // output parameters
-    'urn:WSRegistration',                                          // namespace
-    'urn:WSRegistration#WSEditCourseDescription',                  // soapaction
-    'rpc',                                                         // style
-    'encoded',                                                     // use
+    array('return' => 'tns:results_editCourseDescription'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditCourseDescription', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course description'                      // documentation
 );
 
@@ -3627,7 +3627,7 @@ 
         $course_desc_title = Database::escape_string($course_desc_title);
         $course_desc_content = Database::escape_string($course_desc_content);
 
-        $course_desc_id = (int)$course_desc_id;
+        $course_desc_id = (int) $course_desc_id;
         if ($course_desc_id > 8 && $course_desc_id < 1) {
             $results[] = 0; // course_desc_id invalid.
             continue;
@@ -3656,7 +3656,7 @@ 
             $result = $courseDescription->insert();
         }
 
-        $results[] = $result?1:0;
+        $results[] = $result ? 1 : 0;
     } // end principal foreach
 
     $count_results = count($results);
@@ -3734,13 +3734,13 @@ 
     'tns:result_deleteCourse'
 );
 
-$server->register('WSDeleteCourse',                // method name
-    array('deleteCourse' => 'tns:deleteCourse'),   // input parameters
+$server->register('WSDeleteCourse', // method name
+    array('deleteCourse' => 'tns:deleteCourse'), // input parameters
     array('return' => 'tns:results_deleteCourse'), // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSDeleteCourse',           // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a course '               // documentation
 );
 
@@ -3867,13 +3867,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateSession',                // method name
-    array('createSession' => 'tns:createSession'),  // input parameters
+$server->register('WSCreateSession', // method name
+    array('createSession' => 'tns:createSession'), // input parameters
     array('return' => 'tns:results_createSession'), // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSCreateSession',           // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a session'                  // documentation
 );
 
@@ -3927,8 +3927,8 @@ 
         }
 
         if (empty($nolimit)) {
-            $date_start = "$year_start-".(($month_start < 10)?"0$month_start":$month_start)."-".(($day_start < 10)?"0$day_start":$day_start) . ' 00:00:00';
-            $date_end = "$year_end-".(($month_end < 10)?"0$month_end":$month_end)."-".(($day_end < 10)?"0$day_end":$day_end) . ' 23:59:59';
+            $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start).' 00:00:00';
+            $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end).' 23:59:59';
         } else {
             $date_start = "";
             $date_end = "";
@@ -3952,7 +3952,7 @@ 
             }
             $results[] = 0;
             continue;
-        } elseif (empty($nolimit) && (!$month_end || !$day_end || !$year_end || !checkdate($month_end,  $day_end, $year_end))) {
+        } elseif (empty($nolimit) && (!$month_end || !$day_end || !$year_end || !checkdate($month_end, $day_end, $year_end))) {
             $results[] = 0;
             if ($debug) {
                 error_log("There's an error with the end date: $month_end - $day_end - $year_end");
@@ -4141,13 +4141,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSEditSession',                // method name
-    array('editSession' => 'tns:editSession'),    // input parameters
+$server->register('WSEditSession', // method name
+    array('editSession' => 'tns:editSession'), // input parameters
     array('return' => 'tns:results_editSession'), // output parameters
-    'urn:WSRegistration',                         // namespace
-    'urn:WSRegistration#WSEditSession',           // soapaction
-    'rpc',                                        // style
-    'encoded',                                    // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a session'                // documentation
 );
 
@@ -4267,7 +4267,7 @@ 
                 }
             }
 
-            $results[] = $editResult?1:0;
+            $results[] = $editResult ? 1 : 0;
             continue;
         }
 
@@ -4346,13 +4346,13 @@ 
     'tns:result_deleteSession'
 );
 
-$server->register('WSDeleteSession',                // method name
-    array('deleteSession' => 'tns:deleteSession'),  // input parameters
+$server->register('WSDeleteSession', // method name
+    array('deleteSession' => 'tns:deleteSession'), // input parameters
     array('return' => 'tns:results_deleteSession'), // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSDeleteSession',           // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a session '               // documentation
 );
 
@@ -4433,10 +4433,10 @@ 
     'struct',
     'all',
     '',
-    array (
+    array(
         'course_id' => array('name' => 'course_id', 'type' => 'tns:course_id'),
-        'user_id'   => array('name' => 'user_id',   'type' => 'tns:user_id'),
-        'status'    => array('name' => 'status',    'type' => 'xsd:int')
+        'user_id'   => array('name' => 'user_id', 'type' => 'tns:user_id'),
+        'status'    => array('name' => 'status', 'type' => 'xsd:int')
     )
 );
 
@@ -4446,9 +4446,9 @@ 
     'struct',
     'all',
     '',
-    array (
-        'userscourses'  => array('name' => 'userscourses',  'type' => 'tns:user_course_status_array'), //removed []
-        'secret_key'    => array('name' => 'secret_key',    'type' => 'xsd:string')
+    array(
+        'userscourses'  => array('name' => 'userscourses', 'type' => 'tns:user_course_status_array'), //removed []
+        'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -4473,9 +4473,9 @@ 
     'all',
     '',
     array(
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'original_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'result'                    => array('name' => 'result',                    'type' => 'xsd:int')
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'original_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'result'                    => array('name' => 'result', 'type' => 'xsd:int')
     )
 );
 
@@ -4491,13 +4491,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSSubscribeUserToCourse',                            // method name
-    array('subscribeUserToCourse' => 'tns:subscribeUserToCourse_arg'),  // input parameters
+$server->register('WSSubscribeUserToCourse', // method name
+    array('subscribeUserToCourse' => 'tns:subscribeUserToCourse_arg'), // input parameters
     array('return' => 'tns:subscribeUserToCourse_return_global'),
-    'urn:WSRegistration',                                               // namespace
-    'urn:WSRegistration#WSSubscribeUserToCourse',                       // soapaction
-    'rpc',                                                              // style
-    'encoded',                                                          // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a course'                        // documentation
 );
 
@@ -4507,7 +4507,7 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params, 1));
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -4575,9 +4575,9 @@ 
     'all',
     '',
     array(
-        'course'       => array('name' => 'course',     'type' => 'xsd:string'), //Course string code
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'), //Chamilo user_id
-        'status'       => array('name' => 'status',     'type' => 'xsd:int'),
+        'course'       => array('name' => 'course', 'type' => 'xsd:string'), //Course string code
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'), //Chamilo user_id
+        'status'       => array('name' => 'status', 'type' => 'xsd:int'),
         'secret_key'   => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
@@ -4590,18 +4590,18 @@ 
     'struct',
     'all',
     '',
-    array('message' => array('name' => 'message',    'type' => 'xsd:string'))
+    array('message' => array('name' => 'message', 'type' => 'xsd:string'))
 );
 
 
 // Register the method to expose
-$server->register('WSSubscribeUserToCourseSimple',                                 // method name
+$server->register('WSSubscribeUserToCourseSimple', // method name
     array('subscribeUserToCourseSimple' => 'tns:subscribeUserToCourseSimple_arg'), // input parameters
-    array('return' => 'xsd:string'),                                               // output parameters
-    'urn:WSRegistration',                                                          // namespace
-    'urn:WSRegistration#WSSubscribeUserToCourseSimple',                            // soapaction
-    'rpc',                                                                         // style
-    'encoded',                                                                     // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToCourseSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a course in a simple way'                   // documentation
 );
 
@@ -4610,7 +4610,7 @@ 
     global $debug;
 
     if ($debug) error_log('WSSubscribeUserToCourseSimple');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
@@ -4661,9 +4661,9 @@ 
     'all',
     '',
     array(
-        'original_user_id_value'      => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'original_user_id_name'       => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'secret_key'                  => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'original_user_id_value'      => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'original_user_id_name'       => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'secret_key'                  => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -4674,21 +4674,21 @@ 
     'struct',
     'all',
     '',
-    array (
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'),
-        'firstname'    => array('name' => 'firstname',  'type' => 'xsd:string'),
-        'lastname'     => array('name' => 'lastname',   'type' => 'xsd:string'),
+    array(
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'),
+        'firstname'    => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname'     => array('name' => 'lastname', 'type' => 'xsd:string'),
     )
 );
 
 // Register the method to expose
-$server->register('WSGetUser',                   // method name
-    array('GetUser' => 'tns:GetUserArg'),        // input parameters
-    array('return' => 'tns:User'),               // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSGetUser',              // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+$server->register('WSGetUser', // method name
+    array('GetUser' => 'tns:GetUserArg'), // input parameters
+    array('return' => 'tns:User'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSGetUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get user information by id'    // documentation
 );
 
@@ -4733,17 +4733,17 @@ 
     '',
     array(
         'username'      => array('name' => 'username', 'type' => 'xsd:string'),
-        'secret_key'    => array('name' => 'secret_key','type' => 'xsd:string')
+        'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 // Register the method to expose
-$server->register('WSGetUserFromUsername',                     // method name
-    array('GetUserFromUsername' => 'tns:GetUserArgUsername'),  // input params
-    array('return' => 'tns:User'),                             // output parameters
-    'urn:WSRegistration',                                      // namespace
-    'urn:WSRegistration#WSGetUserFromUsername',                // soapaction
-    'rpc',                                                     // style
-    'encoded',                                                 // use
+$server->register('WSGetUserFromUsername', // method name
+    array('GetUserFromUsername' => 'tns:GetUserArgUsername'), // input params
+    array('return' => 'tns:User'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSGetUserFromUsername', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get user information by username'            // documentation
 );
 
@@ -4785,10 +4785,10 @@ 
     'all',
     '',
     array(
-        'original_user_id_values'   => array('name' => 'original_user_id_values',   'type' => 'tns:originalUsersList'),
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'original_course_id_name'   => array('name' => 'original_course_id_name',   'type' => 'xsd:string'),
+        'original_user_id_values'   => array('name' => 'original_user_id_values', 'type' => 'tns:originalUsersList'),
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_name', 'type' => 'xsd:string'),
     )
 );
 
@@ -4841,13 +4841,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUnsubscribeUserFromCourse',                         // method name
+$server->register('WSUnsubscribeUserFromCourse', // method name
     array('unsuscribeUserFromCourse' => 'tns:unsuscribeUserFromCourse'), // input parameters
-    array('return' => 'tns:results_unsuscribeUserFromCourse'),           // output parameters
-    'urn:WSRegistration',                                                // namespace
-    'urn:WSRegistration#WSUnsubscribeUserFromCourse',                    // soapaction
-    'rpc',                                                               // style
-    'encoded',                                                           // use
+    array('return' => 'tns:results_unsuscribeUserFromCourse'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsubscribeUserFromCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribes a user from a course'                     // documentation
 );
 
@@ -4893,7 +4893,7 @@ 
             $usersList[] = $user_id;
         }
 
-        $orig_user_id_value[] = implode(',',$usersList);
+        $orig_user_id_value[] = implode(',', $usersList);
 
         $courseInfo = CourseManager::getCourseInfoFromOriginalId(
             $original_course_id_value,
@@ -4960,20 +4960,20 @@ 
     'all',
     '',
     array(
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'original_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'result'                    => array('name' => 'result',                    'type' => 'xsd:int')
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'original_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'result'                    => array('name' => 'result', 'type' => 'xsd:int')
     )
 );
 
 // Register the method to expose
-$server->register('WSUnSubscribeUserFromCourseSimple',                         // method name
+$server->register('WSUnSubscribeUserFromCourseSimple', // method name
     array('unSubscribeUserFromCourseSimple' => 'tns:unSubscribeUserFromCourseSimple'), // input parameters
-    array('return' => 'tns:unSubscribeUserToCourseSimple_return'),           // output parameters
-    'urn:WSRegistration',                                                // namespace
-    'urn:WSRegistration#WSUnSubscribeUserFromCourseSimple',                    // soapaction
-    'rpc',                                                               // style
-    'encoded',                                                           // use
+    array('return' => 'tns:unSubscribeUserToCourseSimple_return'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnSubscribeUserFromCourseSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribe a user from a course'                     // documentation
 );
 /**
@@ -5044,10 +5044,10 @@ 
     'all',
     '',
     array(
-        'original_user_id_values'   => array('name' => 'original_user_id_values',   'type' => 'tns:originalUsersList'),
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'original_course_id_name'   => array('name' => 'original_course_id_value',  'type' => 'xsd:string')
+        'original_user_id_values'   => array('name' => 'original_user_id_values', 'type' => 'tns:originalUsersList'),
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_value', 'type' => 'xsd:string')
     )
 );
 
@@ -5140,13 +5140,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSSuscribeUsersToSession',                          // method name
+$server->register('WSSuscribeUsersToSession', // method name
     array('subscribeUsersToSession' => 'tns:subscribeUsersToSession'), // input parameters
-    array('return' => 'tns:results_subscribeUsersToSession'),          // output parameters
-    'urn:WSRegistration',                                              // namespace
-    'urn:WSRegistration#WSSuscribeUsersToSession',                     // soapaction
-    'rpc',                                                             // style
-    'encoded',                                                         // use
+    array('return' => 'tns:results_subscribeUsersToSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSuscribeUsersToSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a session'                      // documentation
 );
 
@@ -5246,25 +5246,25 @@ 
     'all',
     '',
     array(
-        'session'    => array('name' => 'session',    'type' => 'xsd:string'), // Session ID
-        'user_id'    => array('name' => 'user_id',    'type' => 'xsd:string'), // Chamilo user_id
+        'session'    => array('name' => 'session', 'type' => 'xsd:string'), // Session ID
+        'user_id'    => array('name' => 'user_id', 'type' => 'xsd:string'), // Chamilo user_id
         'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
-$server->register('WSSubscribeUserToSessionSimple',                                   // method name
-    array('subscribeUserToSessionSimple' => 'tns:subscribeUserToSessionSimple_arg'),  // input parameters
-    array('return' => 'xsd:string'),                                                  // output parameters
-    'urn:WSRegistration',                                                             // namespace
-    'urn:WSRegistration#WSSubscribeUserToSessionSimple',                              // soapaction
-    'rpc',                                                                            // style
-    'encoded',                                                                        // use
+$server->register('WSSubscribeUserToSessionSimple', // method name
+    array('subscribeUserToSessionSimple' => 'tns:subscribeUserToSessionSimple_arg'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToSessionSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a session in a simple way'                     // documentation
 );
 function WSSubscribeUserToSessionSimple($params) {
     global $debug;
 
     if ($debug) {
-        error_log('WSSubscribeUserToSessionSimple with params=[' . serialize($params). ']');
+        error_log('WSSubscribeUserToSessionSimple with params=['.serialize($params).']');
     }
 
     // Check security key
@@ -5273,8 +5273,8 @@ 
     }
 
     // Get input parameters
-    $session_id = intval($params['session']);  // Session ID
-    $user_id    = intval($params['user_id']);  // Chamilo user id
+    $session_id = intval($params['session']); // Session ID
+    $user_id    = intval($params['user_id']); // Chamilo user id
 
     // Get user id
     $user_data = api_get_user_info($user_id);
@@ -5375,13 +5375,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUnsuscribeUsersFromSession',                              // method name
+$server->register('WSUnsuscribeUsersFromSession', // method name
     array('unsubscribeUsersFromSession' => 'tns:unsubscribeUsersFromSession'), // input parameters
-    array('return' => 'tns:results_unsubscribeUsersFromSession'),              // output parameters
-    'urn:WSRegistration',                                                      // namespace
-    'urn:WSRegistration#WSUnsuscribeUsersFromSession',                         // soapaction
-    'rpc',                                                                     // style
-    'encoded',                                                                 // use
+    array('return' => 'tns:results_unsubscribeUsersFromSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsuscribeUsersFromSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribes a user to a session'                            // documentation
 );
 
@@ -5395,7 +5395,7 @@ 
     global $debug;
 
     if ($debug) {
-        error_log('WSUnsuscribeUsersFromSession with params=[' . serialize($params). ']');
+        error_log('WSUnsuscribeUsersFromSession with params=['.serialize($params).']');
     }
 
     $user_table = Database::get_main_table(TABLE_MAIN_USER);
@@ -5489,7 +5489,7 @@ 
     'all',
     '',
     array(
-        'course_code'   => array('name' => 'course_code',   'type' => 'xsd:string'),
+        'course_code'   => array('name' => 'course_code', 'type' => 'xsd:string'),
     )
 );
 
@@ -5524,9 +5524,9 @@ 
     '',
     array(
         'original_course_id_values' => array('name' => 'original_course_id_values', 'type' => 'tns:originalCoursesList'),
-        'original_course_id_name'   => array('name' => 'original_course_id_name',   'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_name', 'type' => 'xsd:string'),
         'original_session_id_value' => array('name' => 'original_session_id_value', 'type' => 'xsd:string'),
-        'original_session_id_name'  => array('name' => 'original_session_id_name',  'type' => 'xsd:string')
+        'original_session_id_name'  => array('name' => 'original_session_id_name', 'type' => 'xsd:string')
     )
 );
 
@@ -5579,13 +5579,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSSuscribeCoursesToSession',                            // method name
+$server->register('WSSuscribeCoursesToSession', // method name
     array('subscribeCoursesToSession' => 'tns:subscribeCoursesToSession'), // input parameters
-    array('return' => 'tns:results_subscribeCoursesToSession'),            // output parameters
-    'urn:WSRegistration',                                                  // namespace
-    'urn:WSRegistration#WSSuscribeCoursesToSession',                       // soapaction
-    'rpc',                                                                 // style
-    'encoded',                                                             // use
+    array('return' => 'tns:results_subscribeCoursesToSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSuscribeCoursesToSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a course to a session'                        // documentation
 );
 
@@ -5730,13 +5730,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSUnsuscribeCoursesFromSession',                                // method name
+$server->register('WSUnsuscribeCoursesFromSession', // method name
     array('unsubscribeCoursesFromSession' => 'tns:unsubscribeCoursesFromSession'), // input parameters
-    array('return' => 'tns:results_unsubscribeCoursesFromSession'),                // output parameters
-    'urn:WSRegistration',                                                          // namespace
-    'urn:WSRegistration#WSUnsuscribeCoursesFromSession',                           // soapaction
-    'rpc',                                                                         // style
-    'encoded',                                                                     // use
+    array('return' => 'tns:results_unsubscribeCoursesFromSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsuscribeCoursesFromSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a course to a session'                                // documentation
 );
 
@@ -5900,13 +5900,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSListCourses',                                                  // method name
+$server->register('WSListCourses', // method name
     array('listCourseInput' => 'tns:listCourseInput'), // input parameters
-    array('return' => 'tns:courses'),                                               // output parameters
-    'urn:WSRegistration',                                                           // namespace
-    'urn:WSRegistration#WSListCourses',                                             // soapaction
-    'rpc',                                                                          // style
-    'encoded',                                                                      // use
+    array('return' => 'tns:courses'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListCourses', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service list courses available on the system'                             // documentation
 );
 
@@ -5986,21 +5986,21 @@ 
     'all',
     '',
     array(
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'chamilo_username'          => array('name' => 'chamilo_username',          'type' => 'xsd:string'),
-        'secret_key'                => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'chamilo_username'          => array('name' => 'chamilo_username', 'type' => 'xsd:string'),
+        'secret_key'                => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSUpdateUserApiKey',      // method name
+$server->register('WSUpdateUserApiKey', // method name
     array('userApiKey' => 'tns:userApiKey'), // input parameters
-    array('return' => 'xsd:string'),         // output parameters
-    'urn:WSRegistration',                    // namespace
-    'urn:WSRegistration#WSListCourses',      // soapaction
-    'rpc',                                   // style
-    'encoded',                               // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListCourses', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service return user api key'       // documentation
 );
 
@@ -6056,11 +6056,11 @@ 
     'all',
     '',
     array(
-        'from'  => array('name' => 'from',  'type' => 'xsd:int'),
-        'to'    => array('name' => 'to',    'type' => 'xsd:int'),
-        'date_start'  => array('name' => 'date_start',  'type' => 'xsd:string'),
-        'date_end'    => array('name' => 'date_end',    'type' => 'xsd:string'),
-        'secret_key'  => array('name' => 'secret_key',  'type' => 'xsd:string')
+        'from'  => array('name' => 'from', 'type' => 'xsd:int'),
+        'to'    => array('name' => 'to', 'type' => 'xsd:int'),
+        'date_start'  => array('name' => 'date_start', 'type' => 'xsd:string'),
+        'date_end'    => array('name' => 'date_end', 'type' => 'xsd:string'),
+        'secret_key'  => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -6071,11 +6071,11 @@ 
     'all',
     '',
     array(
-        'id' => array ('name' => 'id'  , 'type' => 'xsd:int'),
-        'title' => array ('name' => 'title', 'type' => 'xsd:string'),
-        'url' => array ('name' => 'url', 'type' => 'xsd:string'),
-        'date_start' => array ('name' => 'date_start', 'type' => 'xsd:string'),
-        'date_end' => array ('name' => 'date_end', 'type' => 'xsd:string'),
+        'id' => array('name' => 'id', 'type' => 'xsd:int'),
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
+        'url' => array('name' => 'url', 'type' => 'xsd:string'),
+        'date_start' => array('name' => 'date_start', 'type' => 'xsd:string'),
+        'date_end' => array('name' => 'date_end', 'type' => 'xsd:string'),
     )
 );
 
@@ -6094,13 +6094,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSListSessions',           // method name
-    array('input'  => 'tns:session_arg'),     // input parameters
-    array('return' => 'tns:sessions'),        // output parameters
-    'urn:WSRegistration',                     // namespace
-    'urn:WSRegistration#WSListSessions',      // soapaction
-    'rpc',                                    // style
-    'encoded',                                // use
+$server->register('WSListSessions', // method name
+    array('input'  => 'tns:session_arg'), // input parameters
+    array('return' => 'tns:sessions'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListSessions', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service returns a list of sessions' // documentation
 );
 
@@ -6158,20 +6158,20 @@ 
     'all',
     '',
     array(
-        'course'       => array('name' => 'course',     'type' => 'xsd:string'), //Course string code
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'), //Chamilo user_id
+        'course'       => array('name' => 'course', 'type' => 'xsd:string'), //Course string code
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'), //Chamilo user_id
         'secret_key'   => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSUserSubscribedInCourse',                            // method name
-    array('UserSubscribedInCourse' => 'tns:UserSubscribedInCourse'),    // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSRegistration',                                                    // namespace
-    'urn:WSRegistration#WSUserSubscribedInCourse',                       // soapaction
-    'rpc',                                                                    // style
-    'encoded',                                                                // use
+$server->register('WSUserSubscribedInCourse', // method name
+    array('UserSubscribedInCourse' => 'tns:UserSubscribedInCourse'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUserSubscribedInCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service checks if user assigned to course'    // documentation
 );
 
@@ -6197,7 +6197,7 @@ 
     $courseCode = $params['course']; //Course code
     $userId = $params['user_id']; //chamilo user id
 
-    return CourseManager::is_user_subscribed_in_course($userId,$courseCode);
+    return CourseManager::is_user_subscribed_in_course($userId, $courseCode);
 }
 
 
@@ -6225,8 +6225,8 @@ 
     'all',
     '',
     array(
-        'variable' => array('name'=>'variable','type'=>'xsd:string'),
-        'value' => array('name'=>'value','type'=>'xsd:string')
+        'variable' => array('name'=>'variable', 'type'=>'xsd:string'),
+        'value' => array('name'=>'value', 'type'=>'xsd:string')
     )
 );
 
@@ -6288,12 +6288,12 @@ 
 //Reister WSSearchSession
 $server->register(
     'WSSearchSession',
-    array('SearchSession' => 'tns:SearchSession'),      // input parameters
-    array('return' => 'tns:searchedSessionList'),       // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSSearchSession',               // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+    array('SearchSession' => 'tns:SearchSession'), // input parameters
+    array('return' => 'tns:searchedSessionList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSearchSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service to get a session list filtered by name, description or short description extra field'    // documentation
 );
 
@@ -6348,12 +6348,12 @@ 
 //Reister WSFetchSession
 $server->register(
     'WSFetchSession',
-    array('SearchSession' => 'tns:FetchSession'),                    // input parameters
-    array('return' => 'tns:searchedSessionList'),       // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSFetchSession',                // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+    array('SearchSession' => 'tns:FetchSession'), // input parameters
+    array('return' => 'tns:searchedSessionList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSFetchSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get a session by its id. Optionally can get its extra fields values'    // documentation
 );
 
@@ -6430,16 +6430,16 @@ 
 );
 // Register the method to expose
 $server->register(
-    'WSCertificatesList',                           // method name
+    'WSCertificatesList', // method name
     array(
-        'startingDate' => 'xsd:string',             // input parameters
+        'startingDate' => 'xsd:string', // input parameters
         'endingDate' => 'xsd:string'
     ),
-    array('return' => 'tns:certificatesList'),      // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSCertificatesList',        // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    array('return' => 'tns:certificatesList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCertificatesList', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service returns a list of certificates'   // documentation
 );
 
@@ -6505,13 +6505,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateGroup',              // method name
-    array('createGroup' => 'tns:createGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSCreateGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSCreateGroup', // method name
+    array('createGroup' => 'tns:createGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a group'                 // documentation
 );
 
@@ -6553,13 +6553,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUpdateGroup',              // method name
-    array('updateGroup' => 'tns:updateGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSUpdateGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSUpdateGroup', // method name
+    array('updateGroup' => 'tns:updateGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUpdateGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service updates a group'              // documentation
 );
 
@@ -6594,13 +6594,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteGroup',              // method name
-    array('deleteGroup' => 'tns:deleteGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSDeleteGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSDeleteGroup', // method name
+    array('deleteGroup' => 'tns:deleteGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a group'              // documentation
 );
 
@@ -6635,13 +6635,13 @@ 
 );
 
 // Register the method to expose
-$server->register('GroupBindToParent',                      // method name
-    array('groupBindToParent' => 'tns:groupBindToParent'),  // input parameters
-    array('return' => 'xsd:string'),                        // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#GroupBindToParent',                 // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('GroupBindToParent', // method name
+    array('groupBindToParent' => 'tns:groupBindToParent'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#GroupBindToParent', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service binds a group to a parent'                // documentation
 );
 
@@ -6675,13 +6675,13 @@ 
 );
 
 // Register the method to expose
-$server->register('GroupUnbindFromParent',                          // method name
-    array('groupUnbindFromParent' => 'tns:groupUnbindFromParent'),  // input parameters
-    array('return' => 'xsd:string'),                                // output parameters
-    'urn:WSRegistration',                                           // namespace
-    'urn:WSRegistration#GroupUnbindFromParent',                     // soapaction
-    'rpc',                                                          // style
-    'encoded',                                                      // use
+$server->register('GroupUnbindFromParent', // method name
+    array('groupUnbindFromParent' => 'tns:groupUnbindFromParent'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#GroupUnbindFromParent', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unbinds a group from its parent'                  // documentation
 );
 
@@ -6715,13 +6715,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSAddUserToGroup',                   // method name
-    array('addUserToGroup' => 'tns:addUserToGroup'),    // input parameters
-    array('return' => 'xsd:string'),                    // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSAddUserToGroup',              // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSAddUserToGroup', // method name
+    array('addUserToGroup' => 'tns:addUserToGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSAddUserToGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user to a group'               // documentation
 );
 
@@ -6758,13 +6758,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUpdateUserRoleInGroup',                        // method name
-    array('updateUserRoleInGroup' => 'tns:updateUserRoleInGroup'),  // input parameters
-    array('return' => 'xsd:string'),                                // output parameters
-    'urn:WSRegistration',                                           // namespace
-    'urn:WSRegistration#WSUpdateUserRoleInGroup',                   // soapaction
-    'rpc',                                                          // style
-    'encoded',                                                      // use
+$server->register('WSUpdateUserRoleInGroup', // method name
+    array('updateUserRoleInGroup' => 'tns:updateUserRoleInGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUpdateUserRoleInGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service updates a user role in group'                     // documentation
 );
 
@@ -6803,13 +6803,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteUserFromGroup',                      // method name
-    array('deleteUserFromGroup' => 'tns:deleteUserFromGroup'),  // input parameters
-    array('return' => 'xsd:string'),                            // output parameters
-    'urn:WSRegistration',                                       // namespace
-    'urn:WSRegistration#WSDeleteUserFromGroup',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSDeleteUserFromGroup', // method name
+    array('deleteUserFromGroup' => 'tns:deleteUserFromGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteUserFromGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a user from a group'                  // documentation
 );
 
@@ -6842,10 +6842,10 @@ 
     'struct',
     'all',
     '',
-    array (
+    array(
         'course_id' => array('name' => 'course_id', 'type' => 'tns:course_id'),
-        'user_id'   => array('name' => 'user_id',   'type' => 'tns:user_id'),
-        'visible'   => array('name' => 'status',    'type' => 'xsd:int')
+        'user_id'   => array('name' => 'user_id', 'type' => 'tns:user_id'),
+        'visible'   => array('name' => 'status', 'type' => 'xsd:int')
     )
 );
 
@@ -6868,9 +6868,9 @@ 
     'struct',
     'all',
     '',
-    array (
-        'userscourses'  => array('name' => 'userscourses',  'type' => 'tns:user_course_visibility_array'),
-        'secret_key'    => array('name' => 'secret_key',    'type' => 'xsd:string')
+    array(
+        'userscourses'  => array('name' => 'userscourses', 'type' => 'tns:user_course_visibility_array'),
+        'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -6882,10 +6882,10 @@ 
     'all',
     '',
     array(
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'original_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'visible'                   => array('name' => 'visible',                   'type' => 'xsd:int'),
-        'result'                    => array('name' => 'result',                    'type' => 'xsd:int')
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'original_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'visible'                   => array('name' => 'visible', 'type' => 'xsd:int'),
+        'result'                    => array('name' => 'result', 'type' => 'xsd:int')
     )
 );
 
@@ -6901,13 +6901,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSAddUserVisibilityToCourseInCatalogue',          // method name
-    array('registerUserToCourseCatalogue' => 'tns:registerUserToCourseCatalogue_arg'),  // input parameters
+$server->register('WSAddUserVisibilityToCourseInCatalogue', // method name
+    array('registerUserToCourseCatalogue' => 'tns:registerUserToCourseCatalogue_arg'), // input parameters
     array('return' => 'tns:registerUserToCourseCatalogue_return_global'),
-    'urn:WSRegistration',                                               // namespace
-    'urn:WSRegistration#WSRegisterUserVisibilityToCourseCatalogue',     // soapaction
-    'rpc',                                                              // style
-    'encoded',                                                          // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSRegisterUserVisibilityToCourseCatalogue', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service registers the visibility of users to course in catalogue' // documentation
 );
 
@@ -6973,13 +6973,13 @@ 
 }
 
 // Register the method to expose
-$server->register('WSRemoveUserVisibilityToCourseInCatalogue',          // method name
-    array('registerUserToCourseCatalogue' => 'tns:registerUserToCourseCatalogue_arg'),  // input parameters
+$server->register('WSRemoveUserVisibilityToCourseInCatalogue', // method name
+    array('registerUserToCourseCatalogue' => 'tns:registerUserToCourseCatalogue_arg'), // input parameters
     array('return' => 'tns:registerUserToCourseCatalogue_return_global'),
-    'urn:WSRegistration',                                               // namespace
-    'urn:WSRegistration#WSRegisterUserVisibilityToCourseCatalogue',     // soapaction
-    'rpc',                                                              // style
-    'encoded',                                                          // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSRegisterUserVisibilityToCourseCatalogue', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service removes the visibility of users to course in catalogue' // documentation
 );
 

Braces +186 added lines, -64 removed lines

@@ -63,14 +63,16 @@ 
         list($ip1) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
@@ -554,7 +556,9 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
@@ -1045,9 +1049,15 @@ 
         );
     }
 
-    if ($debug) error_log('$userId found: '. $userId);
-    if ($debug) error_log('$courseId found: '. $courseId);
-    if ($debug) error_log('$sessionId found: '. $sessionId);
+    if ($debug) {
+        error_log('$userId found: '. $userId);
+    }
+    if ($debug) {
+        error_log('$courseId found: '. $courseId);
+    }
+    if ($debug) {
+        error_log('$sessionId found: '. $sessionId);
+    }
 
     return [
         'user_id' => $userId,
@@ -1077,13 +1087,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1096,13 +1110,17 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  '. print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  '. print_r($coaches, 1));
+        }
         if (in_array($userId, $coaches)) {
             $result = 1;
         }
     }
 
-    if ($debug) error_log('Result:  '. $result);
+    if ($debug) {
+        error_log('Result:  '. $result);
+    }
 
     return $result;
 }
@@ -1128,13 +1146,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1148,7 +1170,9 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  ' . print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  ' . print_r($coaches, 1));
+        }
         if (!in_array($userId, $coaches)) {
             $result = 1;
         }
@@ -1156,7 +1180,9 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) {
+        error_log('Final Result: '. $result);
+    }
 
     return $result;
 }
@@ -1208,8 +1234,12 @@ 
 {
     global $_user, $_configuration, $debug;
     $debug = 1;
-    if ($debug) error_log('WSCreateUserPasswordCrypted');
-    if ($debug) error_log(print_r($params,1));
+    if ($debug) {
+        error_log('WSCreateUserPasswordCrypted');
+    }
+    if ($debug) {
+        error_log(print_r($params,1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -1241,22 +1271,30 @@ 
         if ($_configuration['password_encryption'] === $encrypt_method ) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
 
             } else if ($encrypt_method == 'sha1' && !preg_match('/^[A-Fa-f0-9]{40}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
             }
         } else {
             $msg = "This encryption $encrypt_method is not configured";
-            if ($debug) error_log($msg);
+            if ($debug) {
+                error_log($msg);
+            }
             return $msg;
         }
     } else {
         $msg = 'The chamilo setting $_configuration["password_encryption"] is not configured';
-        if ($debug) error_log($msg);
+        if ($debug) {
+            error_log($msg);
+        }
         return $msg;
     }
 
@@ -1276,10 +1314,14 @@ 
         $original_user_id_name
     );
 
-    if ($debug) error_log('Ready to create user');
+    if ($debug) {
+        error_log('Ready to create user');
+    }
 
     if ($user_id > 0) {
-        if ($debug) error_log('User found with id: '.$user_id);
+        if ($debug) {
+            error_log('User found with id: '.$user_id);
+        }
 
         // Check whether user is not active
         //@todo why this condition exists??
@@ -1290,7 +1332,9 @@ 
         $count_check_user = Database::num_rows($resu);
         if ($count_check_user > 0) {
 
-            if ($debug) error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            if ($debug) {
+                error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            }
 
             $sql = "UPDATE $table_user SET
                     lastname='".Database::escape_string($lastName)."',
@@ -1311,7 +1355,9 @@ 
                     hr_dept_id=".intval($hr_dept_id)." 
                 WHERE user_id='".$r_check_user[0]."'";
 
-            if ($debug) error_log($sql);
+            if ($debug) {
+                error_log($sql);
+            }
             Database::query($sql);
 
             if (is_array($extra_list) && count($extra_list) > 0) {
@@ -1328,11 +1374,15 @@ 
             }
             return $r_check_user[0];
         } else {
-            if ($debug) error_log('User exists but is active. Cant be updated');
+            if ($debug) {
+                error_log('User exists but is active. Cant be updated');
+            }
             return 0;
         }
     } else {
-        if ($debug) error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        if ($debug) {
+            error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        }
     }
 
     // Default language.
@@ -1348,12 +1398,16 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
     $queryExpirationDate = '';
-    if (!empty($params['expiration_date'])) $queryExpirationDate = "expiration_date     = '".Database::escape_string($expiration_date)."', ";
+    if (!empty($params['expiration_date'])) {
+        $queryExpirationDate = "expiration_date     = '".Database::escape_string($expiration_date)."', ";
+    }
 
     $sql = "INSERT INTO $table_user SET
             lastname            = '".Database::escape_string(trim($lastName))."',
@@ -1373,7 +1427,9 @@ 
             ".$queryExpirationDate."
             hr_dept_id          = '".Database::escape_string($hr_dept_id)."',
             active              = '".Database::escape_string($active)."'";
-    if ($debug) error_log($sql);
+    if ($debug) {
+        error_log($sql);
+    }
 
     Database::query($sql);
     $return = Database::insert_id();
@@ -1385,7 +1441,9 @@ 
 
         $url_id = api_get_current_access_url_id();
         UrlManager::add_user_to_url($return, $url_id);
-        if ($debug) error_log("Adding user_id = $return to URL id $url_id ");
+        if ($debug) {
+            error_log("Adding user_id = $return to URL id $url_id ");
+        }
 
         // Create extra field for the original_user_id_name
         UserManager::create_extra_field(
@@ -1422,7 +1480,9 @@ 
             }
         }
     } else {
-        if ($debug) error_log('Error while inserting a user');
+        if ($debug) {
+            error_log('Error while inserting a user');
+        }
 
         return 0;
     }
@@ -4504,7 +4564,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -4523,7 +4585,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        if ($debug) {
+            error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        }
 
         if ($user_id == 0) {
             // If user was not found, there was a problem
@@ -4541,13 +4605,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                }
                 $result = CourseManager::add_user_to_course($user_id, $courseCode, $status, false);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSSubscribeUserToCourse subscribed');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse subscribed');
+                    }
                 } else {
-                    if ($debug) error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    }
                 }
             }
         }
@@ -4606,8 +4676,12 @@ 
 function WSSubscribeUserToCourseSimple($params) {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeUserToCourseSimple');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourseSimple');
+    }
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
@@ -4625,7 +4699,9 @@ 
     if (empty($user_data)) {
         // If user was not found, there was a problem
         $result = "User $user_id does not exist";
-        if ($debug) error_log($result);
+        if ($debug) {
+            error_log($result);
+        }
         return $result;
     }
     if (!empty($course_code)) {
@@ -4633,14 +4709,22 @@ 
         if (empty($course_data)) {
             // Course was not found
             $result = "Course $course_code does not exist in the platform ";
-            if ($debug) error_log($result);
+            if ($debug) {
+                error_log($result);
+            }
         } else {
-            if ($debug) error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            if ($debug) {
+                error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            }
             if (!CourseManager::add_user_to_course($user_id, $course_data['code'], $status)) {
                 $result = 'User was not registered possible reasons: User already registered to the course, Course visibility doesnt allow user subscriptions ';
-                if ($debug) error_log($result);
+                if ($debug) {
+                    error_log($result);
+                }
             } else {
-                if ($debug) error_log('User registered to the course: '.$course_data['code']);
+                if ($debug) {
+                    error_log('User registered to the course: '.$course_data['code']);
+                }
                 $result = 1;
             }
         }
@@ -4693,8 +4777,12 @@ 
 function WSGetUser($params)
 {
     global $debug;
-    if ($debug) error_log('WSGetUser');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUser');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -4748,8 +4836,12 @@ 
 function WSGetUserFromUsername($params)
 {
     global $debug;
-    if ($debug) error_log('WSGetUserFromUsername');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUserFromUsername');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -5216,7 +5308,9 @@ 
                 SessionManager::suscribe_users_to_session($sessionId, array($user_id), SESSION_VISIBLE_READ_ONLY, false);
                 $results[] = 1;
 
-                if ($debug) error_log("subscribe user:$user_id to session $sessionId");
+                if ($debug) {
+                    error_log("subscribe user:$user_id to session $sessionId");
+                }
             }
         }
     } // end principal foreach
@@ -5300,7 +5394,9 @@ 
                 SESSION_VISIBLE_READ_ONLY,
                 false
             );
-            if ($debug) error_log('User registered to the course: '.$session_id);
+            if ($debug) {
+                error_log('User registered to the course: '.$session_id);
+            }
             $result = 1;
         }
     }
@@ -5448,7 +5544,9 @@ 
 
                 $results[] = 1;
 
-                if ($debug) error_log("Unsubscribe user:$user_id to session:$id_session");
+                if ($debug) {
+                    error_log("Unsubscribe user:$user_id to session:$id_session");
+                }
             }
         }
     } // end principal foreach
@@ -5595,7 +5693,9 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    }
 
     $coursessessions_params = $params['coursessessions'];
     $results = array();
@@ -5641,7 +5741,9 @@ 
                     array($courseInfo['real_id']),
                     false
                 );
-                if ($debug) error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                if ($debug) {
+                    error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                }
 
                 $results[] = 1;
             }
@@ -6914,7 +7016,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSAddUserVisibilityToCourseCatalogue params: '.print_r($params, 1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -6930,7 +7034,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue userId: '.$userId);
+        if ($debug) {
+            error_log('WSAddUserVisibilityToCourseCatalogue userId: '.$userId);
+        }
 
         if ($userId == 0) {
             // If user was not found, there was a problem
@@ -6947,13 +7053,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSAddUserVisibilityToCourseCatalogue courseCode: '.$courseCode);
+                }
                 $result = CourseManager::addUserVisibilityToCourseInCatalogue($userId, $courseCode, $visible);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue registered');
+                    if ($debug) {
+                        error_log('WSAddUserVisibilityToCourseCatalogue registered');
+                    }
                 } else {
-                    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue NOT registered: ');
+                    if ($debug) {
+                        error_log('WSAddUserVisibilityToCourseCatalogue NOT registered: ');
+                    }
                 }
             }
         }
@@ -6986,7 +7098,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSRemoveUserVisibilityToCourseInCatalogue params: '.print_r($params, 1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -7002,7 +7116,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue user_id: '.$userId);
+        if ($debug) {
+            error_log('WSRemoveUserVisibilityToCourseInCatalogue user_id: '.$userId);
+        }
 
         if ($userId == 0) {
             // If user was not found, there was a problem
@@ -7020,13 +7136,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSRemoveUserVisibilityToCourseInCatalogue courseCode: '.$courseCode);
+                }
                 $result = CourseManager::removeUserVisibilityToCourseInCatalogue($userId, $courseCode, $visible);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue removed');
+                    if ($debug) {
+                        error_log('WSRemoveUserVisibilityToCourseInCatalogue removed');
+                    }
                 } else {
-                    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue NOT removed: ');
+                    if ($debug) {
+                        error_log('WSRemoveUserVisibilityToCourseInCatalogue NOT removed: ');
+                    }
                 }
             }
         }