Browse Source

merge from 1.10.x

jmontoya 9 years ago
parent
commit
b9768a98da

+ 9 - 9
main/admin/languages.php

@@ -57,9 +57,9 @@ $htmlHeadXtra[] = '<script>
     var disabledLang = "'.$disabledLang.'"
 
     if (msgLang == 1) {
-        $("#id_content_message").html("<div class=\"warning-message alert alert-warning\">' . get_lang('ThereAreUsersUsingThisLanguagesDisableItManually') . ' </br> " + disabledLang + "</div");
+        $("#id_content_message").html("<div class=\"warning-message alert alert-warning\">' . get_lang('ThereAreUsersUsingThisLanguagesDisableItManually') . ' <br /> " + disabledLang + "</div");
     }
-    
+
     $("#disable_all_except_default").click(function () {
         if(confirm("'. get_lang('ConfirmYourChoice') .'")) {
             $.ajax({
@@ -75,8 +75,8 @@ $htmlHeadXtra[] = '<script>
                 }
             });
         }
-        
-        return false;  
+
+        return false;
     });
 
  	//$(window).load(function () {
@@ -137,7 +137,7 @@ $htmlHeadXtra[] = '<script>
                 var action = datos.split(":")[0];
                 if (action && action == "confirm") {
                     var id = datos.split(":")[1];
-                    var sure = "<div class=\"warning-message alert alert-warning\">'.get_lang('ThereAreUsersUsingThisLanguageYouWantToDisableThisLanguageAndSetUsersWithTheDefaultPortalLanguage').'</br></br><a href=\"languages.php?action=make_unavailable_confirmed&id="+id+"\" class=\"btn btn-default\"><em class=\"fa fa-eye\"></em> ' . get_lang('MakeUnavailable') . '</a></div>";
+                    var sure = "<div class=\"warning-message alert alert-warning\">'.get_lang('ThereAreUsersUsingThisLanguageYouWantToDisableThisLanguageAndSetUsersWithTheDefaultPortalLanguage').'<br /><br /><a href=\"languages.php?action=make_unavailable_confirmed&id="+id+"\" class=\"btn btn-default\"><em class=\"fa fa-eye\"></em> ' . get_lang('MakeUnavailable') . '</a></div>";
                     $("#id_content_message").html(sure);
                     $("html, body").animate({ scrollTop: 0 }, 200);
 				}
@@ -182,16 +182,16 @@ if ($action == 'disable_all_except_default') {
             SubLanguageManager::make_unavailable_language($language['id']);
         } else {
             if (intval(SubLanguageManager::get_platform_language_id()) !== intval($language['id'])) {
-                $failedDisabledLanguages .= ' - ' .$language['english_name'] . '</br>';
+                $failedDisabledLanguages .= ' - ' .$language['english_name'] . '<br />';
                 $checkFailed = true;
             }
         }
     }
-    
+
     if ($checkFailed) {
         $_SESSION['disabled_languages'] = $failedDisabledLanguages;
     }
-    
+
 }
 
 if (isset($_POST['Submit']) && $_POST['Submit']) {
@@ -252,7 +252,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'make_unavailable_confirmed') {
 // displaying the explanation for this tool
 Display::display_normal_message(get_lang('PlatformLanguagesExplanation'));
 
-echo '<a id="disable_all_except_default" href="javascript:void(0)" class="btn btn-primary"><em class="fa fa-eye"></em> ' . get_lang('LanguagesDisableAllExceptDefault') . '</a></br></br>';
+echo '<a id="disable_all_except_default" href="javascript:void(0)" class="btn btn-primary"><em class="fa fa-eye"></em> ' . get_lang('LanguagesDisableAllExceptDefault') . '</a><br /><br />';
 
 // selecting all the languages
 $sql_select = "SELECT * FROM $tbl_admin_languages";

+ 2 - 2
main/announcements/announcements.php

@@ -451,11 +451,11 @@ switch ($action) {
 
         $form->addElement('text', 'title', get_lang('EmailTitle'));
         $form->addElement('hidden', 'id');
-        $htmlTags = "<b>".get_lang('Tags')."</b></br></br>";
+        $htmlTags = "<b>".get_lang('Tags')."</b><br /><br />";
         $tags = AnnouncementManager::get_tags();
 
         foreach ($tags as $tag) {
-            $htmlTags .= "<b>".$tag."</b></br>";
+            $htmlTags .= "<b>".$tag."</b><br />";
         }
 
         $form->addHtml(

+ 2 - 2
main/attendance/index.php

@@ -106,7 +106,7 @@ $(function() {
             $(".row_odd  td.checkboxes_col_"+calendar_id).css({"opacity":"1","background-color":"#F9F9F9",   "border-left":"none","border-right":"none"});
             $(".row_even td.checkboxes_col_"+calendar_id).css({"opacity":"1","background-color":"#FFF",      "border-left":"none","border-right":"none"});
             $(".checkboxes_col_"+calendar_id+" input:checkbox").attr("disabled",true);
-            $(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/icons/22/lock-closed.png");
+            $(this).attr("src","'.Display::returnIconPath('lock-closed.png').'");
             $(this).attr("title","'.get_lang('DateUnLock').'");
             $(this).attr("alt","'.get_lang('DateUnLock').'");
             $(this).attr("class","img_lock");
@@ -134,7 +134,7 @@ $(function() {
             });
 
             $(".checkboxes_col_"+calendar_id+" input:checkbox").attr("disabled",false);
-            $(this).attr("src","'.api_get_path(WEB_CODE_PATH).'img/icons/22/lock-open.png");
+            $(this).attr("src","'.Display::returnIconPath('lock-open.png').'");
             $(this).attr("title","'.get_lang('DateLock').'");
             $(this).attr("alt","'.get_lang('DateLock').'");
             $(this).attr("class","img_unlock");

+ 0 - 45
main/document/create_audio.php

@@ -291,55 +291,10 @@ if (Security::remove_XSS($_GET['dt2a']) == 'pediaphon') {
 <?php
 }//end pediaphon
 
-//vozMe services
-	//disabled for a time
-/*
-echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checktext2voice" onclick="javascript: if(this.checked){document.getElementById(\'option3\').style.display=\'block\';}else{document.getElementById(\'option3\').style.display=\'none\';}"/>&nbsp;<img src="../img/file_sound.gif" title="'.get_lang('HelpvozMe').'" alt="'.get_lang('vozMe').'"/>&nbsp;'.get_lang('vozMe').'';
-echo '&nbsp;&nbsp;&nbsp;<span id="msg_error3" style="display:none;color:red"></span>';
-echo '<div id="option3" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
-
-echo '<form id="form3" name="form3" method="post" action="http://vozme.com/text2voice.php" target="mymp3" class="formw">';
-	echo '<br/>';
-	echo '<label>'.get_lang('Language').': ';
-	$tbl_admin_languages 	= Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-	$sql_select = "SELECT * FROM $tbl_admin_languages";
-	$result_select = Database::query($sql_select);
-	echo '<select name="lang" id="select">';
-	while ($row = Database::fetch_array($result_select)) {
-		if (in_array($row['isocode'], array('ca', 'en', 'es', 'hi', 'it', 'pt'))) {
-			if (api_get_setting('platformLanguage')==$row['english_name']){
-				echo '<option value="'.$row['isocode'].'" selected="selected">'.$row['original_name'].' ('.$row['english_name'].')</option>';
-			} else {
-				echo '<option value="'.$row['isocode'].'">'.$row['original_name'].' ('.$row['english_name'].')</option>';
-			}
-		}
-	}
-	echo '</select>';
-	echo '</label>';
-	echo '<label>&nbsp;&nbsp;'.get_lang('Voice').': ';
-	echo '<select name="gn" id="select1">';
-	echo '<option value="ml">'.get_lang('Male').'</option>';
-	echo '<option value="fm">'.get_lang('Female').'</option>';
-	echo '</select>';
-	echo '</label>';
-	echo '<br/><br/>';
-	echo '<div>'.get_lang('InsertText2Audio').'</div>';
-	echo '<br/>';
-	echo '<label>';
-	echo '<textarea name="text" id="textarea" cols="70" rows="10"></textarea>';
-	echo '</label>';
-	echo '<br/><br/>';
-	echo '<button class="save" type="submit" name="SendText2Audio">'.get_lang('BuildMP3').'</button>';
-	echo '<br/>';
-echo '</form>';
-echo '</div>';
-*/
 echo '</div>';
 
 Display :: display_footer();
 
-//Functions. TODO:all at one
-
 /**
  * This function save a post into a file mp3 from google services
  *

+ 16 - 6
main/gradebook/lib/fe/displaygradebook.php

@@ -148,11 +148,18 @@ class DisplayGradebook
             $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?selectcat=' . $catobj->get_parent_id() . '"><img src="../img/gradebook.gif" border="0" alt="' . get_lang('Up') . '" /></a></td>';
         }
         $header .= '<td style="vertical-align: top;">' . $simple_search_form->toHtml() . '</td>';
-        $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?exportpdf=&offset=' . Security::remove_XSS($_GET['offset']) . '&search=' . Security::remove_XSS($_GET['search']) . '&selectcat=' . $catobj->get_id() . '"><img src=../img/icons/32/pdf.png alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
-        $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?print=&selectcat=' . $catobj->get_id() . '" target="_blank"><img src="../img/icons/32/printer.png" alt=' . get_lang('Print') . '/> ' . get_lang('Print') . '</a>';
+        $header .= '<td style="vertical-align: top;">
+                    <a href="' . api_get_self() . '?exportpdf=&offset=' . Security::remove_XSS($_GET['offset']) . '&search=' . Security::remove_XSS($_GET['search']) . '&selectcat=' . $catobj->get_id() . '">
+                     '.Display::return_icon('pdf.png', get_lang('ExportPDF'), [], ICON_SIZE_MEDIUM).'
+                    ' . get_lang('ExportPDF') . '</a>';
+        $header .= '<td style="vertical-align: top;">
+                    <a href="' . api_get_self() . '?print=&selectcat=' . $catobj->get_id() . '" target="_blank">
+                     '.Display::return_icon('printer.png', get_lang('Print'), [], ICON_SIZE_MEDIUM).'
+                    ' . get_lang('Print') . '</a>';
         $header .= '</td></tr></table>';
         if (!$catobj->get_id() == '0') {
-            $header .= '<table border="0" cellpadding="5"><tr><td><form name="itemfilter" method="post" action="' . api_get_self() . '?selectcat=' . $catobj->get_id() . '"><input type="checkbox" name="showeval" onclick="document.itemfilter.submit()" ' . (($showeval == '1') ? 'checked' : '') . '>Show Evaluations &nbsp;';
+            $header .= '<table border="0" cellpadding="5"><tr><td><form name="itemfilter" method="post" action="' . api_get_self() . '?selectcat=' . $catobj->get_id() . '">
+            <input type="checkbox" name="showeval" onclick="document.itemfilter.submit()" ' . (($showeval == '1') ? 'checked' : '') . '>Show Evaluations &nbsp;';
             $header .= '<input type="checkbox" name="showlink" onclick="document.itemfilter.submit()" ' . (($showlink == '1') ? 'checked' : '') . '>' . get_lang('ShowLinks') . '</form></td></tr></table>';
         }
         if (isset($_GET['search'])) {
@@ -293,7 +300,9 @@ class DisplayGradebook
                     //$header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '"><img src="../img/view_list.gif" alt="' . get_lang('FlatView') . '" /> ' . get_lang('FlatView') . '</a>';
                 }
             } else {
-                $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank"><img src="../img/icons/32/pdf.png" alt="' . get_lang('ExportPDF') . '" /> ' . get_lang('ExportPDF') . '</a>';
+                $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">
+                '.Display::return_icon('pdf.png', get_lang('ExportPDF'), [], ICON_SIZE_MEDIUM).'
+                ' . get_lang('ExportPDF') . '</a>';
             }
             $header .= '</td></tr>';
         }
@@ -532,10 +541,11 @@ class DisplayGradebook
                 }
             } else {
                 $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">
-							<img src="../img/icons/32/pdf.png" alt="' . get_lang('ExportPDF') . '" /> ' . get_lang('ExportPDF') . '</a>';
+							 '.Display::return_icon('pdf.png', get_lang('ExportPDF'), [], ICON_SIZE_MEDIUM).'
+							' . get_lang('ExportPDF') . '</a>';
             }
             $header .= '</td></tr>';
-            $header.='</table></div>';
+            $header .= '</table></div>';
         }
 
         // for course admin & platform admin add item buttons are added to the header

+ 4 - 2
main/gradebook/lib/fe/scoredisplayform.class.php

@@ -112,8 +112,10 @@ class ScoreDisplayForm extends FormValidator
 					{element}
 				</div>
 				<div class="col-sm-1">
-                    <a href="javascript:plusItem(' . ($counter+1) . ')"><img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="../img/icons/22/add.png" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></img></a>
-        			<a href="javascript:minItem(' . ($counter) . ')"><img style="display: '.(($counter>=$nr_items && $counter!=1)?'inline':'none').';" id="min-' . $counter . '" src="../img/delete.png" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></img></a>
+                    <a href="javascript:plusItem(' . ($counter+1) . ')">
+                    <img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="'.Display::returnIconPath('add.png').'" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></a>
+        			<a href="javascript:minItem(' . ($counter) . ')">
+        			<img style="display: '.(($counter>=$nr_items && $counter!=1)?'inline':'none').';" id="min-' . $counter . '" src="'.Display::returnIconPath('delete.png').'" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></a>
 				</div>
 				</div>
 				</div>';

+ 7 - 6
main/inc/lib/AnnouncementManager.php

@@ -1524,9 +1524,9 @@ class AnnouncementManager
             }
         } else {
             // STUDENT
-            if (is_array($group_memberships) && count($group_memberships)>0) {
+            if (is_array($group_memberships) && count($group_memberships) > 0) {
                 if ($allowUserEditSetting && !api_is_anonymous()) {
-                    if (api_get_group_id() == 0) {
+                    if ($group_id == 0) {
                         // No group
                         $cond_user_id = " AND (
                             ip.lastedit_user_id = '".$user_id."' OR (
@@ -1540,13 +1540,13 @@ class AnnouncementManager
                         )";
                     }
                 } else {
-                    if (api_get_group_id() == 0) {
+                    if ($group_id == 0) {
                         $cond_user_id = " AND (
-                            ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
+                            ip.to_user_id = $user_id AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
                         ) ";
                     } else {
                        $cond_user_id = " AND (
-                            ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".api_get_group_id()."))
+                            ip.to_user_id = $user_id AND (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".$group_id."))
                         )";
                     }
                 }
@@ -1565,6 +1565,7 @@ class AnnouncementManager
                             AND ip.visibility='1'
                         ORDER BY display_order DESC";
             } else {
+
                 if ($user_id) {
                     if ($allowUserEditSetting && !api_is_anonymous()) {
                         $cond_user_id = " AND (
@@ -1586,7 +1587,7 @@ class AnnouncementManager
     						$condition_session
     						$searchCondition
     						AND ip.visibility='1'
-    						AND announcement.session_id IN(0, ".api_get_session_id().")
+    						AND announcement.session_id IN(0, ".$session_id.")
 						ORDER BY display_order DESC";
 
                 } else {

+ 1 - 3
main/inc/lib/course.lib.php

@@ -5390,9 +5390,7 @@ class CourseManager
     }
 
     /**
-     * this function shows the form for sending a message to a specific group or user.
-     */
-    /**
+     * Shows the form for sending a message to a specific group or user.
      * @param FormValidator $form
      * @param int $group_id
      * @param array $to

+ 3 - 3
main/inc/lib/course_home.lib.php

@@ -1096,7 +1096,7 @@ class CourseHome
             /* 	Link to the Course homepage */
 
             $navigation_items['home']['image'] = 'home.gif';
-            $navigation_items['home']['link'] = api_get_path(REL_COURSE_PATH).Security::remove_XSS($_SESSION['_course']['path']).'/index.php';
+            $navigation_items['home']['link'] = api_get_path(WEB_CODE_PATH).Security::remove_XSS($_SESSION['_course']['path']).'/index.php';
             $navigation_items['home']['name'] = get_lang('CourseHomepageLink');
 
             $sql_menu_query = "SELECT * FROM $course_tools_table
@@ -1106,7 +1106,7 @@ class CourseHome
             while ($row = Database::fetch_array($sql_result)) {
                 $navigation_items[$row['id']] = $row;
                 if (stripos($row['link'], 'http://') === false && stripos($row['link'], 'https://') === false) {
-                    $navigation_items[$row['id']]['link'] = api_get_path(REL_CODE_PATH).$row['link'];
+                    $navigation_items[$row['id']]['link'] = api_get_path(WEB_CODE_PATH).$row['link'];
                     $navigation_items[$row['id']]['name'] = CourseHome::translate_tool_name($row);
                 }
             }
@@ -1124,7 +1124,7 @@ class CourseHome
                 if (api_get_session_id() == 0) {
                     // course settings item
                     $navigation_items['course_settings']['image'] = $course_setting_info['image'];
-                    $navigation_items['course_settings']['link'] = api_get_path(REL_CODE_PATH).'course_info/infocours.php';
+                    $navigation_items['course_settings']['link'] = api_get_path(WEB_CODE_PATH).'course_info/infocours.php';
                     $navigation_items['course_settings']['name'] = $course_setting_visual_name;
                 }
             }

+ 4 - 2
main/inc/lib/display.lib.php

@@ -700,11 +700,13 @@ class Display
      * Gets the path of an icon
      *
      * @param string $icon
+     * @param string $size
+     *
      * @return string
      */
-    public static function returnIconPath($icon)
+    public static function returnIconPath($icon, $size = ICON_SIZE_SMALL)
     {
-        return Display::return_icon($icon, null, null, null, null, true, false);
+        return Display::return_icon($icon, null, null, $size, null, true, false);
     }
 
     /**

+ 10 - 13
main/inc/lib/exercise.lib.php

@@ -1940,14 +1940,11 @@ HOTSPOT;
                                     date('Y-m-d h:i:s'),
                                     false
                                 );
-                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip=' . $ip . '" target="_blank"><img src="' . api_get_path(
-                                        WEB_CODE_PATH
-                                    ) . 'img/icons/22/info.png" title="' . $ip . '" /></a>';
-
-                                $delete_link = '<a href="exercise_report.php?' . api_get_cidreq(
-                                    ) . '&filter_by_user=' . intval(
-                                        $_GET['filter_by_user']
-                                    ) . '&filter=' . $filter . '&exerciseId=' . $exercise_id . '&delete=delete&did=' . $id . '"
+                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip=' . $ip . '" target="_blank">
+                                '.Display::return_icon('info.png', $ip).'
+                                </a>';
+
+                                $delete_link = '<a href="exercise_report.php?' . api_get_cidreq() . '&filter_by_user=' . intval($_GET['filter_by_user']) . '&filter=' . $filter . '&exerciseId=' . $exercise_id . '&delete=delete&did=' . $id . '"
                                 onclick="javascript:if(!confirm(\'' . sprintf(
                                         get_lang('DeleteAttempt'),
                                         $results[$i]['username'],
@@ -2867,10 +2864,10 @@ HOTSPOT;
 
         return $return;
     }
-    
+
     /**
      * Get the correct answer count for a fill blanks question
-     * 
+     *
      * @param int $question_id
      * @param int $exercise_id
      * @return int
@@ -2911,7 +2908,7 @@ HOTSPOT;
                     $arrayCount[$index] += $count;
                 }
             }
-            
+
             return $arrayCount;
     }
 
@@ -3276,11 +3273,11 @@ HOTSPOT;
                 }
             }
             $tmp = api_strrpos($choice[$j], ' / ');
-            
+
             if ($tmp !== false) {
                 $choice[$j] = api_substr($choice[$j], 0, $tmp);
             }
-            
+
             $choice[$j] = trim($choice[$j]);
 
             //Needed to let characters ' and " to work as part of an answer

+ 4 - 4
main/inc/lib/grade_model.lib.php

@@ -142,16 +142,16 @@ class GradeModel extends Model
             $template_title =
             '&nbsp{element} <!-- BEGIN error --> <span class="form_error">{error}</span><!-- END error -->
              <a href="javascript:plusItem(' . ($counter+1) . ')">
-                <img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="../img/icons/22/add.png" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></img>
+                <img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="'.Display::return_icon('add.png').'" alt="'.get_lang('Add').'" title="'.get_lang('Add').'">
             </a>
             <a href="javascript:minItem(' . ($counter) . ')">
-                <img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="min-' . $counter . '" src="../img/delete.png" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></img>
+                <img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="min-' . $counter . '" src="'.Display::return_icon('delete.png').'" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'">
             </a>
             </div></p></div>';
 
             $renderer->setElementTemplate($template_title, 'components['.$i.'][title]');
-            $renderer->setElementTemplate($template_percentage ,  'components['.$i.'][percentage]');
-            $renderer->setElementTemplate($template_acronym , 'components['.$i.'][acronym]');
+            $renderer->setElementTemplate($template_percentage, 'components['.$i.'][percentage]');
+            $renderer->setElementTemplate($template_acronym, 'components['.$i.'][acronym]');
 
             if ($i == 0) {
                 $form->addRule('components['.$i.'][percentage]', get_lang('ThisFieldIsRequired'), 'required');

+ 1 - 1
main/inc/lib/tracking.lib.php

@@ -1578,7 +1578,7 @@ class Tracking
     				if ($convert_date) {
                         $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
                         $icon = api_is_allowed_to_edit() ?
-                            '<a href="'.api_get_path(REL_CODE_PATH).'announcements/announcements.php?action=add&remind_inactive='.$student_id.'&cidReq='.$courseInfo['code'].'" title="'.get_lang('RemindInactiveUser').'">
+                            '<a href="'.api_get_path(WEB_CODE_PATH).'announcements/announcements.php?action=add&remind_inactive='.$student_id.'&cidReq='.$courseInfo['code'].'" title="'.get_lang('RemindInactiveUser').'">
                               '.Display::return_icon('messagebox_warning.gif').'
                              </a>'
                             : null;

+ 10 - 2
main/mySpace/myStudents.php

@@ -713,7 +713,15 @@ if (!empty($student_id)) {
 
                         $scoretotal_display = '0/0 (0%)';
                         if (!empty($scoretotal)) {
-                            $scoretotal_display =  round($scoretotal[0],1).'/'.round($scoretotal[1],1).' ('.round(($scoretotal[0] / $scoretotal[1]) * 100,2) . ' %)';
+                            $scoretotal_display = round(
+                                    $scoretotal[0],
+                                    1
+                                ).'/'.
+                                round(
+                                    $scoretotal[1],
+                                    1
+                                ).' ('.
+                                round(($scoretotal[0] / $scoretotal[1]) * 100, 2).' %)';
                         }
 
                         $progress = Tracking::get_avg_student_progress($user_info['user_id'], $course_code, null, $sessionId);
@@ -943,7 +951,7 @@ if (!empty($student_id)) {
                             $from ='&from=myspace';
                         }
                         $link = Display::url(
-                            '<img src="../img/icons/22/2rightarrow.png" border="0" />',
+                            Display::return_icon('2rightarrow.png'),
                             'lp_tracking.php?cidReq='.Security::remove_XSS($_GET['course']).'&course='.Security::remove_XSS($_GET['course']).$from.'&origin='.$origin.'&lp_id='.$learnpath->getId().'&student_id='.$user_info['user_id'].'&id_session='.$sessionId
                         );
                         echo Display::tag('td', $link);

+ 27 - 30
main/newscorm/learnpath.class.php

@@ -8575,14 +8575,15 @@ class learnpath
             $icon_name = str_replace(' ', '', $item['item_type']);
 
             if (file_exists('../img/lp_' . $icon_name . '.png')) {
-                $return .= '<img alt="" src="../img/lp_' . $icon_name . '.png" style="margin-right:5px;" title="" />';
+                $return .= Display::return_icon('lp_' . $icon_name . '.png');
             } else {
                 if (file_exists('../img/lp_' . $icon_name . '.gif')) {
-                    $return .= '<img alt="" src="../img/lp_' . $icon_name . '.gif" style="margin-right:5px;" title="" />';
+                    $return .= Display::return_icon('lp_' . $icon_name . '.gif');
                 } else {
                     $return .= Display::return_icon('folder_document.gif','',array('style'=>'margin-right:5px;'));
                 }
             }
+
             $return .=  $item['title'] . '</label>';
             $return .= '</td>';
 
@@ -8785,7 +8786,7 @@ class learnpath
             $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
             $return .= '</a> ';
 
-            $return .= '<img src="../img/hotpotatoes_s.png" style="margin-right:5px;" title="" width="16px" />';
+            $return .= Display::return_icon('hotpotatoes_s.png');
             $return .= '<a href="' . api_get_self() . '?' . api_get_cidreq().'&action=add_item&type=' . TOOL_HOTPOTATOES . '&file=' . $row_hot['id'] . '&lp_id=' . $this->lp_id . '">'.
                 ((!empty ($row_hot['comment'])) ? $row_hot['comment'] : Security :: remove_XSS($row_hot['title'])) . '</a>';
             $return .= '</li>';
@@ -8795,16 +8796,10 @@ class learnpath
             $return .= '<li class="lp_resource_element" data_id="'.$row_quiz['id'].'" data_type="quiz" title="'.$row_quiz['title'].'" >';
             $return .= '<a class="moved" href="#">';
             $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
-
-            $return .= Display::return_icon('quizz_small.gif');
-            $return .= ' '.Security :: remove_XSS(cut($row_quiz['title'], 80));
             $return .= '</a> ';
-
-            /*$return .= ' <a href="' . api_get_self() . '?'.api_get_cidreq().'&action=add_item&type=' . TOOL_QUIZ . '&file=' . $row_quiz['id'] . '&lp_id=' . $this->lp_id . '">' .
-                Display::return_icon('add.png', get_lang('Add')).
-                '</a>';*/
-            $return .= ' <a href="' . api_get_path(WEB_CODE_PATH) . 'exercice/overview.php?'.api_get_cidreq().'&exerciseId=' . $row_quiz['id'].'">' .
-                Display::return_icon('preview_view.png', get_lang('Preview')).
+            $return .= Display::return_icon('quizz_small.gif', '', array(), ICON_SIZE_TINY);
+            $return .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&action=add_item&type=' . TOOL_QUIZ . '&file=' . $row_quiz['id'] . '&lp_id=' . $this->lp_id . '">' .
+                Security :: remove_XSS(cut($row_quiz['title'], 80)).
                 '</a>';
 
             $return .= '</li>';
@@ -8858,18 +8853,20 @@ class learnpath
             function toggle_tool(tool, id){
                 if(document.getElementById(tool+"_"+id+"_content").style.display == "none"){
                     document.getElementById(tool+"_"+id+"_content").style.display = "block";
-                    document.getElementById(tool+"_"+id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'remove.gif";
+                    document.getElementById(tool+"_"+id+"_opener").src = "' . Display::returnIconPath('remove.gif').'";
                 } else {
                     document.getElementById(tool+"_"+id+"_content").style.display = "none";
-                    document.getElementById(tool+"_"+id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'add.gif";
+                    document.getElementById(tool+"_"+id+"_opener").src = "'.Display::returnIconPath('add.gif').'";
                 }
             }
         </script>
+
         <ul class="lp_resource">
             <li class="lp_resource_element">
-                <img alt="" src="../img/linksnew.gif" style="margin-right:5px;width:16px"/>
-                <a href="'.api_get_path(WEB_CODE_PATH).'link/link.php?'.$courseIdReq.
-            '&action=addlink&lp_id='.$this->lp_id.'" title="'.get_lang('LinkAdd').'">'.get_lang('LinkAdd').'</a>
+                '.Display::return_icon('linksnew.gif').'
+                <a href="'.api_get_path(WEB_CODE_PATH).'link/link.php?'.$courseIdReq.'&action=addlink&lp_id='.$this->lp_id.'" title="'.get_lang('LinkAdd').'">'.
+                get_lang('LinkAdd').'
+                </a>
             </li>';
 
         foreach ($categorizedLinks as $categoryId => $links) {
@@ -8888,18 +8885,18 @@ class learnpath
                         <a class="moved" href="#">'.
                             $moveEverywhereIcon.
                         '</a>
-                        <img alt="" src="../img/lp_link.gif" style="margin-right:5px;width:16px"/>
-                        <a class="moved" href="'.$selfUrl.'?'.$courseIdReq.'&action=add_item&type='.TOOL_LINK.'&file='.$key.'&lp_id='.$this->lp_id.'">'.
-                        Security::remove_XSS($title).' '.$link.'
-                        </a>
+                        '.Display::return_icon('lp_link.png').'
+                        <a href="'.$selfUrl.'?'.$courseIdReq.'&action=add_item&type='.
+                        TOOL_LINK.'&file='.$key.'&lp_id='.$this->lp_id.'">'.
+                        Security::remove_XSS($title).
+                        '</a>
                     </li>';
                 }
             }
             $linksHtmlCode .=
                 '<li>
-                <a style="cursor:hand" onclick="javascript: toggle_tool(\''.TOOL_LINK.'\','.$categoryId.')"
-                style="vertical-align:middle">
-                    <img src="'.api_get_path(WEB_IMG_PATH).'add.gif" id="'.TOOL_LINK.'_'.$categoryId.'_opener"
+                <a style="cursor:hand" onclick="javascript: toggle_tool(\''.TOOL_LINK.'\','.$categoryId.')" style="vertical-align:middle">
+                    <img src="'.Display::returnIconPath('add.gif').'" id="'.TOOL_LINK.'_'.$categoryId.'_opener"
                     align="absbottom" />
                 </a>
                 <span style="vertical-align:middle">'.Security::remove_XSS($categories[$categoryId]).'</span>
@@ -8980,10 +8977,10 @@ class learnpath
             function toggle_forum(forum_id){
                 if(document.getElementById("forum_"+forum_id+"_content").style.display == "none"){
                     document.getElementById("forum_"+forum_id+"_content").style.display = "block";
-                    document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'remove.gif";
+                            document.getElementById("forum_"+forum_id+"_opener").src = "' . Display::returnIconPath('remove.gif').'";
                 } else {
                     document.getElementById("forum_"+forum_id+"_content").style.display = "none";
-                    document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'add.gif";
+                            document.getElementById("forum_"+forum_id+"_opener").src = "' . Display::returnIconPath('add.gif').'";
                 }
             }
         </script>';
@@ -9002,12 +8999,12 @@ class learnpath
                 $return .= '<a class="moved" href="#">';
                 $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
                 $return .= ' </a>';
-                $return .= '<img alt="" src="../img/lp_forum.gif" style="margin-right:5px;" title="" />';
+                $return .= Display::return_icon('lp_forum.png', '', array(), ICON_SIZE_TINY);
                 $return .= '<a style="cursor:hand" onclick="javascript: toggle_forum(' . $forum['forum_id'] . ')" style="vertical-align:middle">
-                                <img src="' . api_get_path(WEB_IMG_PATH) . 'add.gif" id="forum_' . $forum['forum_id'] . '_opener" align="absbottom" />
+                                <img src="' . Display::returnIconPath('add.gif').'" id="forum_' . $forum['forum_id'] . '_opener" align="absbottom" />
                             </a>
-                            <a class="moved" href="' . api_get_self() . '?'.api_get_cidreq().'&action=add_item&type=' . TOOL_FORUM . '&forum_id=' . $forum['forum_id'] . '&lp_id=' . $this->lp_id . '" style="vertical-align:middle">' .
-                    Security :: remove_XSS($forum['forum_title']) .' '.$link. '</a>';
+                            <a href="' . api_get_self() . '?'.api_get_cidreq().'&action=add_item&type=' . TOOL_FORUM . '&forum_id=' . $forum['forum_id'] . '&lp_id=' . $this->lp_id . '" style="vertical-align:middle">' .
+                    Security :: remove_XSS($forum['forum_title']) . '</a>';
 
                 $return .= '</li>';
 

+ 1 - 0
main/newscorm/lp_ajax_switch_item.php

@@ -85,6 +85,7 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
     if ($mylp->force_commit) {
         $mylp->save_current();
     }
+
     if (is_object($mylp->items[$new_item_id])) {
         $mylpi = $mylp->items[$new_item_id];
     } else {

+ 1 - 1
main/newscorm/lp_view.php

@@ -445,7 +445,7 @@ if (api_get_course_setting('lp_return_link') == 1) {
     $buttonHomeText = get_lang('LearningPathList');
 }
 
-$lpPreviewImagePath = api_get_path(WEB_CODE_PATH).'img/icons/64/unknown.png';
+$lpPreviewImagePath = Display::returnIconPath('unknown.png', ICON_SIZE_BIG);
 if ($_SESSION['oLP']->get_preview_image()) {
     $lpPreviewImagePath = $_SESSION['oLP']->get_preview_image_path();
 }

+ 2 - 2
main/newscorm/scorm.class.php

@@ -529,9 +529,9 @@ class scorm extends learnpath
             error_log('New LP - import_package() - zip file path = ' . $zip_file_path . ', zip file name = ' . $zip_file_name, 0);
         }
 
-        $course_rel_dir     = api_get_course_path($courseInfo['code']).'/scorm'; // scorm dir web path starting from /courses
+        $course_rel_dir = api_get_course_path($courseInfo['code']).'/scorm'; // scorm dir web path starting from /courses
         $course_sys_dir = api_get_path(SYS_COURSE_PATH).$course_rel_dir; // Absolute system path for this course.
-        $current_dir        = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
+        $current_dir = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
 
         if ($this->debug > 1) {
             error_log( 'New LP - import_package() - current_dir = ' . $current_dir, 0);

+ 3 - 3
main/reports/templates/exercicesMultiCourses.reports.php

@@ -3,7 +3,7 @@
 $reports_template['exercicesMultiCourses'] = array(
 	'description' => 'Result of each test per student',
 	'getSQL' => 'reports_template_exercicesMultiCourses_getSQL',
-	'wizard' => 
+	'wizard' =>
 '
 <span id="exercicesMultiCourses" class="step">
 	<span class="font_normal_07em_black">Result of each test per student</span><br />
@@ -26,7 +26,7 @@ $reports_template['exercicesMultiCourses'] = array(
 		<option value="average">group and take the average value</option>
 		<option value="min">group and take the minimum value</option>
 		<option value="max">group and take the maximum value</option>
-	</select></br>
+	</select><br />
 -->	<input type="hidden" class="link" value="format" />
 </span>
 ');
@@ -52,7 +52,7 @@ function reports_template_exercicesMultiCourses_getSQL() {
 	foreach ($columns as $key => $column)
 		$query .= ', '.$function.'(k'.$key.'.score) as `'.
 				$column['course'].' - '.
-				$column['test'].'` '; 
+				$column['test'].'` ';
 	$query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
 	foreach ($columns as $key => $column) // fixme sessions
 		$query .= 'left outer join '.

+ 9 - 10
main/survey/ch_personality.php

@@ -58,27 +58,26 @@ class ch_personality extends survey_question
         $count = 0;
         if (is_array($form_content['answers'])) {
             foreach ($form_content['answers'] as $key => & $value) {
-                $this->html .= '	<tr>';
-                $this->html .= '		<td align="right"><label for="answers['.$key.']">'.($key+1).'</label></td>';
-                //$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.$form_content['answers'][$key].'" /></td>';
-                $this->html .= '		<td width="550">'.api_return_html_area('answers['.$key.']', api_html_entity_decode(stripslashes($form_content['answers'][$key])), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
-                $this->html .= '		<td>';
+                $this->html .= '<tr>';
+                $this->html .= '<td align="right"><label for="answers['.$key.']">'.($key + 1).'</label></td>';
+                $this->html .= '<td width="550">'.api_return_html_area('answers['.$key.']', api_html_entity_decode(stripslashes($form_content['answers'][$key])), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
+                $this->html .= '<td>';
 
                 if ($total_number_of_answers > 2) {
                     $this->html .= $question_values[$count];
                 }
 
                 if ($key < $total_number_of_answers - 1) {
-                    $this->html .= '		<input type="image" style="width:22px"   src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+                    $this->html .= '<input type="image" style="width:22px"   src="'.Display::returnIconPath('down.png').'"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
                 }
                 if ($key > 0) {
-                    $this->html .= '		<input type="image" style="width:22px"   src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+                    $this->html .= '<input type="image" style="width:22px"   src="'.Display::returnIconPath('up.png').'"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
                 }
                 if ($total_number_of_answers > 2) {
-                    $this->html .= '			<input type="image" style="width:22px"   src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+                    $this->html .= '<input type="image" style="width:22px"   src="'.Display::returnIconPath('delete.png').'"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
                 }
-                $this->html .= ' 		</td>';
-                $this->html .= '	</tr>';
+                $this->html .= '</td>';
+                $this->html .= '</tr>';
                 $count++;
             }
         }

+ 1 - 1
main/webservices/lp.php

@@ -162,7 +162,7 @@ function WSImportLP($params)
 
     $sessionId = 0;
     if (!empty($sessionIdName) && !empty($sessionIdValue)) {
-        $sessionId = SessionManager::get_session_id_from_original_id(
+        $sessionId = SessionManager::getSessionIdFromOriginalId(
             $sessionIdValue,
             $sessionIdName
         );

+ 6 - 2
main/webservices/registration.soap.php

@@ -60,7 +60,7 @@ function WSHelperVerifyKey($params)
     // if we are behind a reverse proxy, assume it will send the
     // HTTP_X_FORWARDED_FOR header and use this IP instead
     if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-        list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+        list($ip1) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
     if ($debug)
@@ -2579,7 +2579,11 @@ function WSEditUserPasswordCrypted($params)
         }
     }
 
-    return $return;
+    if ($return) {
+        return 1;
+    }
+
+    return 0;
 }
 
 /** WSDeleteUsers **/

+ 53 - 53
plugin/buycourses/src/buycourses.ajax.php

@@ -24,23 +24,23 @@ switch ($action) {
         if (api_is_anonymous()) {
             break;
         }
-        
+
         $userId = isset($_POST['id']) ? intval($_POST['id']) : '';
         $isUserHavePaypalAccount = $plugin->verifyPaypalAccountByBeneficiary($userId);
-        
+
         if ($isUserHavePaypalAccount) {
             echo '';
         } else {
             echo '<b style="color: red; font-size: 70%;">* '.$plugin->get_lang('NoPayPalAccountDetected').'</b>';
         }
-        
+
         break;
-        
+
     case 'saleInfo':
         if (api_is_anonymous()) {
             break;
         }
-        
+
         $saleId = isset($_POST['id']) ? intval($_POST['id']) : '';
         $sale = $plugin->getSale($saleId);
         $productType = ($sale['product_type'] == 1) ? get_lang('Course') : get_lang('Session');
@@ -52,9 +52,9 @@ switch ($action) {
         } else {
             $productImage = ($productInfo['image']) ? $productInfo['image'] : Template::get_icon_path('session_default.png');
         }
-        
+
         $userInfo = api_get_user_info($sale['user_id']);
-        
+
         $html = '<h2>' . $sale['product_name'] .'</h2>';
         $html .= '<div class="row">';
         $html .= '<div class="col-sm-6 col-md-6">';
@@ -73,14 +73,14 @@ switch ($action) {
         $html .= '</div>';
 
         echo $html;
-        
+
         break;
-    
+
     case 'stats':
         if (api_is_anonymous()) {
             break;
         }
-        
+
         $stats = [];
         $stats['completed_count'] = 0;
         $stats['completed_total_amount'] = 0;
@@ -88,31 +88,31 @@ switch ($action) {
         $stats['pending_total_amount'] = 0;
         $stats['canceled_count'] = 0;
         $stats['canceled_total_amount'] = 0;
-        
+
         $completedPayouts = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_COMPLETED);
         $pendingPayouts = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_PENDING);
         $canceledPayouts = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_CANCELED);
         $currency = $plugin->getSelectedCurrency();
-        
+
         foreach ($completedPayouts as $completed) {
             $stats['completed_count'] = count($completedPayouts);
             $stats['completed_total_amount'] += $completed['commission'];
             $stats['completed_total_amount'] = number_format($stats['completed_total_amount'], 2);
         }
-        
+
         foreach ($pendingPayouts as $pending) {
             $stats['pending_count'] = count($pendingPayouts);
             $stats['pending_total_amount'] += $pending['commission'];
             $stats['pending_total_amount'] = number_format($stats['pending_total_amount'], 2);
         }
-        
+
         foreach ($canceledPayouts as $canceled) {
             $stats['canceled_count'] = count($canceledPayouts);
             $stats['canceled_total_amount'] += $canceled['commission'];
             $stats['canceled_total_amount'] = number_format($stats['canceled_total_amount'], 2);
         }
-        
-        
+
+
         $html = '<div class="row">'
         . '<p>'
             . '<ul>'
@@ -123,41 +123,41 @@ switch ($action) {
         . '</p>';
         $html .= '</div>';
         echo $html;
-        
+
         break;
-    
+
     case 'processPayout':
         if (api_is_anonymous()) {
             break;
         }
-        
+
         $html = '';
         $allPays = [];
         $totalAccounts = 0;
         $totalPayout = 0;
-        
+
         $payouts = isset($_POST['payouts']) ? $_POST['payouts'] : '';
-        
+
         if (!$payouts) {
-            
+
             echo Display::return_message(get_plugin_lang("SelectOptionToProceed", "BuyCoursesPlugin"), 'error', false);
-            
+
             break;
         }
-        
+
         foreach ($payouts as $index => $id) {
             $allPays[] = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_PENDING, $id);
         }
-        
+
         foreach ($allPays as $payout) {
             $totalPayout += number_format($payout['commission'], 2);
             $totalAccounts++;
         }
-        
+
         $currentCurrency = $plugin->getSelectedCurrency();
-        
+
         $isoCode = $currentCurrency['iso_code'];
-        
+
         $html .= '<p>'. get_plugin_lang("VerifyTotalAmountToProceedPayout", "BuyCoursesPlugin") .'</p>';
         $html .= ''
         . '<p>'
@@ -167,65 +167,65 @@ switch ($action) {
             . '</ul>'
         . '</p>';
         $html .= '<p>'. get_plugin_lang("CautionThisProcessCantBeCanceled", "BuyCoursesPlugin") .'</p>';
-        $html .= '</br></br>';
+        $html .= '<br /><br />';
         $html .= '<div id="spinner" class="text-center"></div>';
-                
+
         echo $html;
         break;
-    
+
     case 'proceedPayout':
         if (api_is_anonymous()) {
             break;
         }
-        
+
         $paypalParams = $plugin->getPaypalParams();
-        
+
         $pruebas = $paypalParams['sandbox'] == 1;
         $paypalUsername = $paypalParams['username'];
         $paypalPassword = $paypalParams['password'];
         $paypalSignature = $paypalParams['signature'];
-        
+
         require_once("paypalfunctions.php");
-        
+
         $allPayouts = [];
         $totalAccounts = 0;
         $totalPayout = 0;
-        
+
         $payouts = isset($_POST['payouts']) ? $_POST['payouts'] : '';
-        
+
         if (!$payouts) {
-            
+
             echo Display::return_message(get_plugin_lang("SelectOptionToProceed", "BuyCoursesPlugin"), 'error', false);
-            
+
             break;
         }
-        
+
         foreach ($payouts as $index => $id) {
             $allPayouts[] = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_PENDING, $id);
         }
-        
+
         $currentCurrency = $plugin->getSelectedCurrency();
-        
+
         $isoCode = $currentCurrency['iso_code'];
-        
-        
+
+
         $result = MassPayment($allPayouts, $isoCode);
-        
+
         if ($result['ACK'] === 'Success') {
             foreach ($allPayouts as $payout) {
                 $plugin->setStatusPayouts($payout['id'], BuyCoursesPlugin::PAYOUT_STATUS_COMPLETED);
             }
-            
+
             echo Display::return_message(get_plugin_lang("PayoutSuccess", "BuyCoursesPlugin"), 'success', false);
-            
+
         } else {
 
-            echo Display::return_message('<b>'.$result['L_SEVERITYCODE0'].' '.$result['L_ERRORCODE0'].'</b> - '.$result['L_SHORTMESSAGE0'].'</br><ul><li>'. $result['L_LONGMESSAGE0'].'</li></ul>', 'error', false);
-            
+            echo Display::return_message('<b>'.$result['L_SEVERITYCODE0'].' '.$result['L_ERRORCODE0'].'</b> - '.$result['L_SHORTMESSAGE0'].'<br /><ul><li>'. $result['L_LONGMESSAGE0'].'</li></ul>', 'error', false);
+
         }
-        
+
         break;
-        
+
         case 'cancelPayout':
         if (api_is_anonymous()) {
             break;
@@ -234,9 +234,9 @@ switch ($action) {
         // $payoutId only gets used in setStatusPayout(), where it is filtered
         $payoutId = isset($_POST['id']) ? $_POST['id'] : '';
         $plugin->setStatusPayouts($payoutId, BuyCoursesPlugin::PAYOUT_STATUS_CANCELED);
-        
+
         echo '';
-        
+
         break;
 }
 exit;

+ 50 - 50
plugin/buycourses/src/panel.ajax.php

@@ -34,9 +34,9 @@ switch ($action) {
         } else {
             $productImage = ($productInfo['image']) ? $productInfo['image'] : Template::get_icon_path('session_default.png');
         }
-        
+
         $userInfo = api_get_user_info($sale['user_id']);
-        
+
         $html = '<h2>' . $sale['product_name'] .'</h2>';
         $html .= '<div class="row">';
         $html .= '<div class="col-sm-6 col-md-6">';
@@ -55,11 +55,11 @@ switch ($action) {
         $html .= '</div>';
 
         echo $html;
-        
+
         break;
-    
+
     case 'stats':
-        
+
         $stats = [];
         $stats['completed_count'] = 0;
         $stats['completed_total_amount'] = 0;
@@ -67,31 +67,31 @@ switch ($action) {
         $stats['pending_total_amount'] = 0;
         $stats['canceled_count'] = 0;
         $stats['canceled_total_amount'] = 0;
-        
+
         $completedPayouts = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_COMPLETED);
         $pendingPayouts = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_PENDING);
         $canceledPayouts = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_CANCELED);
         $currency = $plugin->getSelectedCurrency();
-        
+
         foreach ($completedPayouts as $completed) {
             $stats['completed_count'] = count($completedPayouts);
             $stats['completed_total_amount'] += $completed['commission'];
             $stats['completed_total_amount'] = number_format($stats['completed_total_amount'], 2);
         }
-        
+
         foreach ($pendingPayouts as $pending) {
             $stats['pending_count'] = count($pendingPayouts);
             $stats['pending_total_amount'] += $pending['commission'];
             $stats['pending_total_amount'] = number_format($stats['pending_total_amount'], 2);
         }
-        
+
         foreach ($canceledPayouts as $canceled) {
             $stats['canceled_count'] = count($canceledPayouts);
             $stats['canceled_total_amount'] += $canceled['commission'];
             $stats['canceled_total_amount'] = number_format($stats['canceled_total_amount'], 2);
         }
-        
-        
+
+
         $html = '<div class="row">'
         . '<p>'
             . '<ul>'
@@ -102,41 +102,41 @@ switch ($action) {
         . '</p>';
         $html .= '</div>';
         echo $html;
-        
+
         break;
-    
+
     case 'processPayout':
         if (api_is_anonymous()) {
             break;
         }
-        
+
         $html = '';
         $allPays = [];
         $totalAccounts = 0;
         $totalPayout = 0;
-        
+
         $payouts = isset($_POST['payouts']) ? $_POST['payouts'] : '';
-        
+
         if (!$payouts) {
-            
+
             echo Display::return_message(get_plugin_lang("SelectOptionToProceed", "BuyCoursesPlugin"), 'error', false);
-            
+
             break;
         }
-        
+
         foreach ($payouts as $index => $id) {
             $allPays[] = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_PENDING, $id);
         }
-        
+
         foreach ($allPays as $payout) {
             $totalPayout += number_format($payout['commission'], 2);
             $totalAccounts++;
         }
-        
+
         $currentCurrency = $plugin->getSelectedCurrency();
-        
+
         $isoCode = $currentCurrency['iso_code'];
-        
+
         $html .= '<p>'. get_plugin_lang("VerifyTotalAmountToProceedPayout", "BuyCoursesPlugin") .'</p>';
         $html .= ''
         . '<p>'
@@ -146,76 +146,76 @@ switch ($action) {
             . '</ul>'
         . '</p>';
         $html .= '<p>'. get_plugin_lang("CautionThisProcessCantBeCanceled", "BuyCoursesPlugin") .'</p>';
-        $html .= '</br></br>';
+        $html .= '<br /><br />';
         $html .= '<div id="spinner" class="text-center"></div>';
-                
+
         echo $html;
         break;
-    
+
     case 'proceedPayout':
         if (api_is_anonymous()) {
             break;
         }
-        
+
         $paypalParams = $plugin->getPaypalParams();
-        
+
         $pruebas = $paypalParams['sandbox'] == 1;
         $paypalUsername = $paypalParams['username'];
         $paypalPassword = $paypalParams['password'];
         $paypalSignature = $paypalParams['signature'];
-        
+
         require_once("paypalfunctions.php");
-        
+
         $allPayouts = [];
         $totalAccounts = 0;
         $totalPayout = 0;
-        
+
         $payouts = isset($_POST['payouts']) ? $_POST['payouts'] : '';
-        
+
         if (!$payouts) {
-            
+
             echo Display::return_message(get_plugin_lang("SelectOptionToProceed", "BuyCoursesPlugin"), 'error', false);
-            
+
             break;
         }
-        
+
         foreach ($payouts as $index => $id) {
             $allPayouts[] = $plugin->getPayouts(BuyCoursesPlugin::PAYOUT_STATUS_PENDING, $id);
         }
-        
+
         $currentCurrency = $plugin->getSelectedCurrency();
-        
+
         $isoCode = $currentCurrency['iso_code'];
-        
-        
+
+
         $result = MassPayment($allPayouts, $isoCode);
-        
+
         if ($result['ACK'] === 'Success') {
             foreach ($allPayouts as $payout) {
                 $plugin->setStatusPayouts($payout['id'], BuyCoursesPlugin::PAYOUT_STATUS_COMPLETED);
             }
-            
+
             echo Display::return_message(get_plugin_lang("PayoutSuccess", "BuyCoursesPlugin"), 'success', false);
-            
+
         } else {
 
-            echo Display::return_message('<b>'.$result['L_SEVERITYCODE0'].' '.$result['L_ERRORCODE0'].'</b> - '.$result['L_SHORTMESSAGE0'].'</br><ul><li>'. $result['L_LONGMESSAGE0'].'</li></ul>', 'error', false);
-            
+            echo Display::return_message('<b>'.$result['L_SEVERITYCODE0'].' '.$result['L_ERRORCODE0'].'</b> - '.$result['L_SHORTMESSAGE0'].'<br /><ul><li>'. $result['L_LONGMESSAGE0'].'</li></ul>', 'error', false);
+
         }
-        
+
         break;
-        
+
         case 'cancelPayout':
         if (api_is_anonymous()) {
             break;
         }
-        
+
         $payoutId = isset($_POST['id']) ? $_POST['id'] : '';
-        
+
         $plugin->setStatusPayouts($payoutId, BuyCoursesPlugin::PAYOUT_STATUS_CANCELED);
-        
+
         echo '';
-        
+
         break;
 }
 exit;

+ 15 - 15
plugin/buycourses/view/paypal_payout.tpl

@@ -27,7 +27,7 @@
             {% endfor %}
         </tbody>
     </table>
-        
+
     <div id="startPayout" class="modal fade" role="dialog">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
@@ -35,7 +35,7 @@
                     <h4 class="modal-title">{{ 'PaypalPayoutCommissions'|get_plugin_lang('BuyCoursesPlugin') }}</h4>
                 </div>
                 <div class="modal-body" id="content">
-                    
+
                 </div>
                 <div class="modal-footer">
                     <button id="proceedPayout" type="button" class="btn btn-success fa fa-paypal"> {{ 'ProceedPayout' | get_plugin_lang('BuyCoursesPlugin') }}</button>
@@ -52,21 +52,21 @@
 
 <script>
     $(document).ready(function() {
-        
+
         $("#responseButton").hide();
-        
+
         $("#checkAll").click(function() {
             $(':checkbox').prop('checked', this.checked);
         });
-        
+
         $('#continuePayout').click(function() {
-            
+
             var val = [];
-            
+
             $(':checkbox:checked').not('#checkAll').each(function(i) {
                 val[i] = $(this).attr("id");
             });
-            
+
             $.ajax({
                 data: { payouts : val },
                 url: '{{ _p.web_plugin ~ 'buycourses/src/buycourses.ajax.php?' ~  { 'a': 'processPayout' } | url_encode() }}',
@@ -77,15 +77,15 @@
                 }
             });
         });
-        
+
         $('#proceedPayout').click(function() {
-            
+
             var val = [];
-            
+
             $(':checkbox:checked').not('#checkAll').each(function(i) {
                 val[i] = $(this).attr("id");
             });
-            
+
             $.ajax({
                 data: { payouts : val },
                 url: '{{ _p.web_plugin ~ 'buycourses/src/buycourses.ajax.php?' ~  { 'a': 'proceedPayout' } | url_encode() }}',
@@ -93,7 +93,7 @@
                 beforeSend: function() {
                     $("#proceedPayout").hide();
                     $("#cancelPayout").hide();
-                    $("#spinner").html('</br></br><div class="wobblebar-loader"></div><p> {{ 'ProcessingPayoutsDontCloseThisWindow' | get_plugin_lang('BuyCoursesPlugin') }} </p>');
+                    $("#spinner").html('<br /><br /><div class="wobblebar-loader"></div><p> {{ 'ProcessingPayoutsDontCloseThisWindow' | get_plugin_lang('BuyCoursesPlugin') }} </p>');
                 },
                 success: function(response) {
                     $("#content").html(response);
@@ -101,7 +101,7 @@
                 }
             });
         });
-        
+
         $(".cancelPayout").click(function() {
             var id = this.id;
             $.ajax({
@@ -113,7 +113,7 @@
                 }
             });
         });
-        
+
         $('#responseButton').click(function() {
             window.location.reload();
         });