Remove deprecated .gif images and update some scripts correspondingly to move from .gif to .png

main/admin/configure_extensions.php

@@ -203,73 +203,6 @@ Display::display_header($nameTool);
     </div>
 	<?php
     /*
-    <!-- EPHORUS -->
-    <div id="main_ephorus">
-        <div id="extension_header_ephorus" class="accordion_header">
-            <a href="#"><?php echo get_lang('EphorusPlagiarismPrevention') ?></a>
-        </div>
-        <div id="extension_content_ephorus" style="display:none;padding:0;width:780px;" class="accordion_content">
-            <table width="100%" cellpadding="0" cellspacing="0">
-                <tr>
-                    <td align="center">
-                        <TABLE style="WIDTH: 750px" cellSpacing="0" cellPadding="0" align="middle" border="0">
-                        <TBODY>
-                            <TR>
-                                <TD>
-                                    <TABLE style="WIDTH: 475px" cellSpacing="0" cellPadding="0" border="0">
-                                    <TBODY>
-                                        <TR>
-                                            <TD>
-                                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                                <a title="http://www.ephorus.com/dokeos_activate.html" href="http://www.ephorus.com/dokeos_activate.html" target="_blank">
-                                                <?php Display::display_icon('ephorus.gif','Ephorus'); ?>
-                                                </a>
-                                            </TD>
-                                            <TD>
-                                                <P align=center>
-                                                    <FONT color="#669966" size="3"><?php echo get_lang('EphorusLeadersInAntiPlagiarism') ?></FONT>
-                                                </P>
-                                            </TD>
-                                        </TR>
-                                    </TBODY>
-                                    </TABLE>
-                                </TD>
-                            </TR>
-                            <TR>
-                                <TD>
-                                    <P>
-                                        <TABLE style="WIDTH: 85%" cellSpacing="0" cellPadding="0" border="0">
-                                        <TBODY>
-                                            <TR>
-                                                <TD width="50">&nbsp;
-
-                                                </TD>
-                                                <TD>
-                                                    <P>
-                                                        <?php echo get_lang('EphorusDescription') ?>
-                                                    </P>
-                                                    <P>
-                                                        <A title="http://www.ephorus.nl/demo_account_en.html" href="http://www.ephorus.nl/demo_account_en.html" target="_blank"><?php echo get_lang('EphorusClickHereForADemoAccount') ?></A>
-                                                    </P>
-                                                    <P>
-                                                        <A title="http://www.ephorus.nl:80/dokeos_activate.html" href="http://www.ephorus.nl/dokeos_activate.html" target="_blank"><?php echo get_lang('EphorusClickHereForInformationsAndPrices') ?></A>.
-                                                    </P>
-                                                </TD>
-                                            </TR>
-                                        </TBODY>
-                                        </TABLE>
-                                    </P>
-                                </TD>
-                            </TR>
-                        </TBODY>
-                        </TABLE>
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </div>
-    */
-    /*
 
     <!-- SEARCH -->
     <div id="main_search">
@@ -294,52 +227,6 @@ Display::display_header($nameTool);
         </div>
     </div>
 
-    <!-- SERVER STATS -->
-    <div id="main_serverstats">
-        <div id="extension_header_serverstats" class="accordion_header">
-            <a href="#"><?php echo get_lang('ServerStatistics') ?></a>
-        </div>
-        <div id="extension_content_serverstats" style="display:none" class="accordion_content">
-            <?php echo get_lang('ServerStatisticsDescription') ?><br /><br />
-            <table width="100%">
-                <tr>
-                    <td width="50%">
-                        <?php Display::display_icon('screenshot_serverstats.jpg', get_lang('ServerStatistics')); ?>
-                    </td>
-                    <td align="center" width="50%">
-                        <form method="POST" action="<?php echo api_get_self(); ?>">
-                        <input type="hidden" name="extension_code" value="serverstats" />
-                        <button type="submit" class="save" name="activeExtension" value="<?php echo get_lang('ActivateExtension') ?>" ><?php echo get_lang('ActivateExtension') ?></button>
-                        </form>
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </div>
-
-    <!-- BANDWIDTH STATS -->
-    <div id="main_bandwidthstats">
-        <div id="extension_header_bandwidthstats" class="accordion_header">
-            <a href="#"><?php echo get_lang('BandWidthStatistics') ?></a>
-        </div>
-        <div id="extension_content_bandwidthstats" style="display:none" class="accordion_content">
-            <?php echo get_lang('BandWidthStatisticsDescription') ?><br /><br />
-            <table width="100%">
-                <tr>
-                    <td width="50%">
-                        <?php Display::display_icon('screenshot_bandwidth.jpg', get_lang('BandWidthStatistics')); ?>
-                    </td>
-                    <td align="center" width="50%">
-                        <form method="POST" action="<?php echo api_get_self(); ?>">
-                        <input type="hidden" name="extension_code" value="bandwidthstats" />
-                        <button type="submit" class="save" name="activeExtension" value="<?php echo get_lang('ActivateExtension') ?>" ><?php echo get_lang('ActivateExtension') ?></button>
-                        </form>
-
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </div>
      */ ?>
 </div><!-- /content -->
 

main/course_home/course_home.php

@@ -48,8 +48,8 @@ $(document).ready(function(){
     
 	$(".make_visible_and_invisible").attr("href", "javascript:void(0);");
 	$(".make_visible_and_invisible > img").click(function () {
-		make_visible = "visible.gif";
-		make_invisible = "invisible.gif";
+		make_visible = "visible.png";
+		make_invisible = "invisible.png";
 		path_name = $(this).attr("src");
 		list_path_name = path_name.split("/");
 		image_link = list_path_name[list_path_name.length - 1];
@@ -79,7 +79,7 @@ $(document).ready(function(){
 				$("#tooldesc_" + my_tool_id).attr("class", info.tclass);
 				$("#istooldesc_" + my_tool_id).attr("class", info.tclass);
 
-				if (image_link == "visible.gif") {
+				if (image_link == "visible.png") {
 					$("#" + tool_id).attr("alt", "'.get_lang('Activate', '').'");
 					$("#" + tool_id).attr("title", "'.get_lang('Activate', '').'");
 				} else {

main/extra/userInfo.php

@@ -359,7 +359,7 @@ if ($displayMode == "viewDefEdit") {
         // is the user online?
         $online = '';
         if (user_is_online($userIdViewed)) {
-            $online = Display::return_icon('online.gif', get_lang('OnLine'), ['style' => 'with="8"; height="8"']);
+            $online = Display::return_icon('online.png', get_lang('OnLine'), ['style' => 'with="8"; height="8"']);
         }
 
         // DISPLAY TABLE HEADING

main/inc/lib/TicketManager.php

@@ -986,7 +986,7 @@ class TicketManager
             }
             if ($isAdmin) {
                 $ticket['0'] .= '&nbsp;&nbsp;<a  href="javascript:void(0)" onclick="load_history_ticket(\'div_'.$row['ticket_id'].'\','.$row['ticket_id'].')">
-					<img onclick="load_course_list(\'div_'.$row['ticket_id'].'\','.$row['ticket_id'].')" onmouseover="clear_course_list (\'div_'.$row['ticket_id'].'\')" src="'.Display::returnIconPath('history.gif').'" title="'.get_lang('Historial').'" alt="'.get_lang('Historial').'"/>
+					<img onclick="load_course_list(\'div_'.$row['ticket_id'].'\','.$row['ticket_id'].')" onmouseover="clear_course_list (\'div_'.$row['ticket_id'].'\')" src="'.Display::returnIconPath('history.png').'" title="'.get_lang('Historial').'" alt="'.get_lang('Historial').'"/>
 					<div class="blackboard_hide" id="div_'.$row['ticket_id'].'">&nbsp;&nbsp;</div>
 					</a>&nbsp;&nbsp;';
             }

main/inc/lib/course_description.lib.php

@@ -436,7 +436,6 @@ class CourseDescription
         $default_description_icon[5] = 'laptop.png';
         $default_description_icon[6] = 'teacher.png';
         $default_description_icon[7] = 'assessment.png';
-        //$default_description_icon[8]= 'porcent.png';
         $default_description_icon[8] = 'wizard.png';
 
         return $default_description_icon;

main/inc/lib/course_home.lib.php

@@ -1258,7 +1258,7 @@ class CourseHome
         if (!empty($course_id)) {
             $course_tools_table = Database::get_course_table(TABLE_TOOL_LIST);
             /* 	Link to the Course homepage */
-            $navigation_items['home']['image'] = 'home.gif';
+            $navigation_items['home']['image'] = 'home.png';
             $navigation_items['home']['link'] = $courseInfo['course_public_url'];
             $navigation_items['home']['name'] = get_lang('CourseHomepageLink');
 

main/inc/lib/template.lib.php

@@ -202,7 +202,7 @@ class Template
                 $help = Security::remove_XSS($help);
                 $content = '<div class="help">';
                 $content .= Display::url(
-                    Display::return_icon('help.large.png', get_lang('Help')),
+                    Display::return_icon('help.png', get_lang('Help'), null, ICON_SIZE_LARGE),
                     api_get_path(WEB_CODE_PATH).'help/help.php?open='.$help,
                     [
                         'class' => 'ajax',

main/inc/lib/tracking.lib.php

@@ -352,7 +352,7 @@ class Tracking
                     if (!empty($inter_num)) {
                         $extend_link = Display::url(
                             Display::return_icon(
-                                'visible.gif',
+                                'visible.png',
                                 get_lang('HideAttemptView')
                             ),
                             api_get_self().'?action=stats&fold_id='.$my_item_id.$url_suffix
@@ -415,13 +415,13 @@ class Tracking
                                 // The extend button for this attempt has been clicked.
                                 $extend_this_attempt = 1;
                                 $extend_attempt_link = Display::url(
-                                    Display::return_icon('visible.gif', get_lang('HideAttemptView')),
+                                    Display::return_icon('visible.png', get_lang('HideAttemptView')),
                                     api_get_self().'?action=stats&extend_id='.$my_item_id.'&fold_attempt_id='.$row['iv_id'].$url_suffix
                                 );
                             } else { // Same case if fold_attempt_id is set, so not implemented explicitly.
                                 // The extend button for this attempt has not been clicked.
                                 $extend_attempt_link = Display::url(
-                                    Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')),
+                                    Display::return_icon('invisible.png', get_lang('ExtendAttemptView')),
                                     api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix
                                 );
                             }
@@ -459,7 +459,7 @@ class Tracking
                         if ($row['item_type'] != 'dir') {
                             if (!$is_allowed_to_edit && $result_disabled_ext_all) {
                                 $view_score = Display::return_icon(
-                                    'invisible.gif',
+                                    'invisible.png',
                                     get_lang('ResultsHiddenByExerciseSetting')
                                 );
                             } else {
@@ -631,14 +631,14 @@ class Tracking
                             // The extend button for this attempt has been clicked.
                             $extend_this_attempt = 1;
                             $extend_attempt_link = Display::url(
-                                Display::return_icon('visible.gif', get_lang('HideAttemptView')),
+                                Display::return_icon('visible.png', get_lang('HideAttemptView')),
                                 api_get_self().'?action=stats&extend_id='.$my_item_id.'&fold_attempt_id='.$row['iv_id'].$url_suffix
                             );
                         } else {
                             // Same case if fold_attempt_id is set, so not implemented explicitly.
                             // The extend button for this attempt has not been clicked.
                             $extend_attempt_link = Display::url(
-                                Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')),
+                                Display::return_icon('invisible.png', get_lang('ExtendAttemptView')),
                                 api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix
                             );
                         }
@@ -652,7 +652,7 @@ class Tracking
                     $extend_link = '';
                     if ($inter_num > 1) {
                         $extend_link = Display::url(
-                            Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')),
+                            Display::return_icon('invisible.png', get_lang('ExtendAttemptView')),
                             api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix
                         );
                     }
@@ -879,7 +879,7 @@ class Tracking
                             if ($row['item_type'] == 'quiz') {
                                 if (!$is_allowed_to_edit && $result_disabled_ext_all) {
                                     $scoreItem .= Display::return_icon(
-                                        'invisible.gif',
+                                        'invisible.png',
                                         get_lang('ResultsHiddenByExerciseSetting')
                                     );
                                 } else {
@@ -1027,7 +1027,7 @@ class Tracking
                                         }
                                         if (!$is_allowed_to_edit && $result_disabled_ext_all) {
                                             $view_score = Display::return_icon(
-                                                'invisible.gif',
+                                                'invisible.png',
                                                 get_lang(
                                                     'ResultsHiddenByExerciseSetting'
                                                 )
@@ -1152,7 +1152,7 @@ class Tracking
         $total_time = str_replace('NaN', '00'.$h.'00\'00"', $total_time);
 
         if (!$is_allowed_to_edit && $result_disabled_ext_all) {
-            $final_score = Display::return_icon('invisible.gif', get_lang('ResultsHiddenByExerciseSetting'));
+            $final_score = Display::return_icon('invisible.png', get_lang('ResultsHiddenByExerciseSetting'));
             $finalScoreToCsv = get_lang('ResultsHiddenByExerciseSetting');
         } else {
             if (is_numeric($total_score)) {
@@ -1866,7 +1866,7 @@ class Tracking
                         $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(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').'
+                              '.Display::return_icon('warning.png').'
                              </a>'
                             : null;
 

main/lp/learnpath.class.php

@@ -4616,7 +4616,7 @@ class learnpath
                 WHERE
                     t.course = :course AND
                     t.link = :link1 AND
-                    t.image = 'lp_category.gif' AND
+                    t.image LIKE 'lp_category.%' AND
                     t.link LIKE :link2
                     $sessionCondition
             ")
@@ -4641,7 +4641,7 @@ class learnpath
                 ->setCourse(api_get_course_entity($courseId))
                 ->setName(strip_tags($category->getName()))
                 ->setLink($link)
-                ->setImage('lp_category.gif')
+                ->setImage('lp_category.png')
                 ->setVisibility(1)
                 ->setAdmin(0)
                 ->setAddress('pastillegris.gif')
@@ -4772,7 +4772,7 @@ class learnpath
                 SELECT t FROM ChamiloCourseBundle:CTool t
                 WHERE t.course = :course AND 
                     t.name = :name AND
-                    t.image = 'lp_category.gif' AND
+                    t.image LIKE 'lp_category.%' AND
                     t.link LIKE :link
             ")
             ->setParameters([
@@ -6259,14 +6259,10 @@ class learnpath
             if (file_exists($iconPath.'lp_'.$icon_name.'.png')) {
                 $icon = Display::return_icon('lp_'.$icon_name.'.png');
             } else {
-                if (file_exists($iconPath.'lp_'.$icon_name.'.gif')) {
-                    $icon = Display::return_icon('lp_'.$icon_name.'.gif');
+                if ($arrLP[$i]['item_type'] === TOOL_LP_FINAL_ITEM) {
+                    $icon = Display::return_icon('certificate.png');
                 } else {
-                    if ($arrLP[$i]['item_type'] === TOOL_LP_FINAL_ITEM) {
-                        $icon = Display::return_icon('certificate.png');
-                    } else {
-                        $icon = Display::return_icon('folder_document.gif');
-                    }
+                    $icon = Display::return_icon('folder_document.png');
                 }
             }
 
@@ -12517,7 +12513,7 @@ EOD;
             $link = 'lp/lp_controller.php?cidReq='.$courseInfo['code'].'&id_session='.$sessionId.'&gidReq=0&gradebook=0&origin=&action=view_category&id='.$id;
             // Delete tools
             $sql = "DELETE FROM $tbl_tool
-                    WHERE c_id = ".$courseId." AND (link LIKE '$link%' AND image='lp_category.gif')";
+                    WHERE c_id = ".$courseId." AND (link LIKE '$link%' AND image LIKE 'lp_category.%')";
             Database::query($sql);
         }
     }

main/session/resume_session.php

@@ -213,7 +213,7 @@ if ($session->getNbrCourses() === 0) {
         $courseItem .= '<td>'.($namesOfCoaches ? implode('<br>', $namesOfCoaches) : get_lang('None')).'</td>';
         $courseItem .= '<td>'.$numberOfUsers.'</td>';
         $courseItem .= '<td>';
-        $courseItem .= Display::url(Display::return_icon('course_home.gif', get_lang('Course')), $courseUrl);
+        $courseItem .= Display::url(Display::return_icon('course_home.png', get_lang('Course')), $courseUrl);
 
         if ($allowSkills) {
             $courseItem .= Display::url(
@@ -232,7 +232,7 @@ if ($session->getNbrCourses() === 0) {
                 <a href="'.api_get_path(WEB_CODE_PATH).'user/user_export.php?file_type=csv&course_session='.$course->getCode().':'.$sessionId.'&addcsvheader=1">'.
                 Display::return_icon('export_csv.png', get_lang('ExportUsersOfACourse'), null, ICON_SIZE_SMALL).'</a>
 				<a href="../tracking/courseLog.php?id_session='.$sessionId.'&cidReq='.$course->getCode().$orig_param.'&hide_course_breadcrumb=1">'.
-                Display::return_icon('statistics.gif', get_lang('Tracking')).'</a>&nbsp;
+                Display::return_icon('statistics.png', get_lang('Tracking'), null, ICON_SIZE_SMALL).'</a>&nbsp;
 				<a href="session_course_edit.php?id_session='.$sessionId.'&page=resume_session.php&course_code='.$course->getCode().''.$orig_param.'">'.
                 Display::return_icon('teacher.png', get_lang('ModifyCoach'), '', ICON_SIZE_SMALL).'</a>
 				<a href="'.api_get_self().'?id_session='.$sessionId.'&action=delete&idChecked[]='.$course->getCode().'" onclick="javascript:if(!confirm(\''.get_lang('ConfirmYourChoice').'\')) return false;">'.

main/session/session_course_list.php

@@ -86,7 +86,7 @@ foreach ($Courses as $key => $enreg) {
     $course[] = api_htmlentities($enreg['title'], ENT_QUOTES, $charset);
     $course[] = '<a href="session_course_user_list.php?id_session='.$id_session.'&course_code='.$enreg['code'].'">'.$enreg['nbr_users'].' '.get_lang('Users').'</a>';
     $course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$enreg['code'].'/?id_session='.$id_session.'">'.
-        Display::return_icon('course_home.gif', get_lang('Course')).'</a>
+        Display::return_icon('course_home.png', get_lang('Course')).'</a>
 			<a href="session_course_edit.php?id_session='.$id_session.'&page=session_course_list.php&course_code='.$enreg['code'].'">'.
         Display::return_icon('edit.png', get_lang('Edit')).'</a>
 			<a href="'.api_get_self().'?id_session='.$id_session.'&sort='.$sort.'&action=delete&idChecked[]='.$enreg['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;">'.

main/upload/upload_word.php

@@ -116,12 +116,12 @@ $s_style_error = "border-width: 1px;
          color: #000;";
 
 echo '<div style="'.$s_style.'"><div style="float:left; margin-right:10px;">
-<img src="'.Display::returnIconPath('message_normal.gif').'" alt="'.$alt_text.'" '.$attribute_list.'  /></div>
+<img src="'.Display::returnIconPath('message_normal.png').'" alt="'.$alt_text.'" '.$attribute_list.'  /></div>
 <div style="margin-left: 43px">'.$message.'</div></div>';
 
 if (!empty($errorMessage)) {
     echo '<div style="'.$s_style_error.'"><div style="float:left; margin-right:10px;">
-    <img src="'.Display::returnIconPath('message_error.gif').'" alt="'.$alt_text.'" '.$attribute_list.'  /></div>
+    <img src="'.Display::returnIconPath('message_error.png').'" alt="'.$alt_text.'" '.$attribute_list.'  /></div>
     <div style="margin-left: 43px">'.$errorMessage.'</div></div>';
 }
 

main/user/user.php

@@ -1007,7 +1007,7 @@ function modify_filter($user_id, $row, $data)
     // time taken by support to test things out)
     if (api_is_platform_admin()) {
         $result .= ' <a href="'.api_get_path(WEB_CODE_PATH).'admin/user_list.php?action=login_as&user_id='.$user_id.'&sec_token='.Security::getTokenFromSession().'">'.
-            Display::return_icon('login_as.gif', get_lang('LoginAs')).'</a>&nbsp;&nbsp;';
+            Display::return_icon('login_as.png', get_lang('LoginAs')).'</a>&nbsp;&nbsp;';
     }
 
     if (api_is_allowed_to_edit(null, true)) {