From e5ef86153a88317faaa15441b6aabde24b35a78b Mon Sep 17 00:00:00 2001
From: Vincent Zanotti <vincent.zanotti@m4x.org>
Date: Wed, 23 Jun 2010 18:31:29 +0200
Subject: [PATCH] Replaces the remaining Content-Type headers with calls to
 pl_content_header*.

---
 modules/carnet/outlook.inc.php |  2 +-
 modules/profile.php            | 15 +++++++--------
 modules/xnetgrp.php            |  3 ---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/carnet/outlook.inc.php b/modules/carnet/outlook.inc.php
index 791b15c..7907eb8 100644
--- a/modules/carnet/outlook.inc.php
+++ b/modules/carnet/outlook.inc.php
@@ -114,7 +114,7 @@ class Outlook {
     }
 
     public static function output_profiles(&$profiles, $lang) {
-        header("Content-Type: text/plain;charset=iso8859-15");
+        pl_content_headers("text/plain", "iso8859-15");
         $fields =& Outlook::$contact_fields[$lang];
         foreach ($fields as $i => $k) {
             if ($i != 0) {
diff --git a/modules/profile.php b/modules/profile.php
index beb6c5d..e1bc64b 100644
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -119,7 +119,7 @@ class ProfileModule extends PLModule
 
     function handler_name_info(&$page)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $page->changeTpl('profile/name_info.tpl', SIMPLE);
         $res = XDB::iterator("SELECT  name, explanations,
                                       FIND_IN_SET('public', flags) AS public,
@@ -137,8 +137,7 @@ class ProfileModule extends PLModule
                             WHERE  nwid = {?}",
                           $mid);
         $img  = dirname(__FILE__) . '/../htdocs/images/networking/' . $res->fetchOneCell();
-        $type = mime_content_type($img);
-        header("Content-Type: $type");
+        pl_cached_content_headers(mime_content_type($img));
         echo file_get_contents($img);
         exit;
     }
@@ -372,7 +371,7 @@ class ProfileModule extends PLModule
 
     function handler_ajax_edu(&$page, $eduid, $class)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $page->changeTpl('profile/general.edu.tpl', NO_SKIN);
         $res = XDB::iterator("SELECT  id, field
                                 FROM  profile_education_field_enum
@@ -424,7 +423,7 @@ class ProfileModule extends PLModule
 
     function handler_ajax_sub_sector(&$page, $id, $ssect, $sssect = -1)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $res = XDB::iterator("SELECT  id, name
                                 FROM  profile_job_subsubsector_enum
                                WHERE  subsectorid = {?}", $ssect);
@@ -436,7 +435,7 @@ class ProfileModule extends PLModule
 
     function handler_ajax_alternates(&$page, $id, $sssect)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $res = XDB::iterator('SELECT  name
                                 FROM  profile_job_alternates
                                WHERE  subsubsectorid = {?}
@@ -476,7 +475,7 @@ class ProfileModule extends PLModule
 
     function handler_ajax_searchname(&$page, $id, $isFemale)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $page->changeTpl('profile/general.searchname.tpl', NO_SKIN);
         $res = XDB::query("SELECT  id, name, FIND_IN_SET('public', flags) AS pub
                              FROM  profile_name_enum
@@ -489,7 +488,7 @@ class ProfileModule extends PLModule
 
     function handler_ajax_buildnames(&$page, $data, $isFemale)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $page->changeTpl('profile/general.buildnames.tpl', NO_SKIN);
         require_once 'name.func.inc.php';
         $page->assign('names', build_javascript_names($data, $isFemale));
diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 2dabdc9..a3accb6 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -358,9 +358,6 @@ class XnetGrpModule extends PLModule
             $filename = $globals->asso('diminutif') . '.csv';
         }
         $users = $globals->asso()->getMembersFilter(null, new UFO_Name('directory_name'))->getUsers();
-        header('Content-Type: text/x-csv; charset=utf-8;');
-        header('Pragma: ');
-        header('Cache-Control: ');
         pl_content_headers("text/x-csv");
         $page->changeTpl('xnetgrp/annuaire-csv.tpl', NO_SKIN);
         $page->assign('users', $users);
-- 
2.1.4