ソースを参照

[AtomFormat] Change xml_encode($) to private scope

logmanoriginal 7 年 前
コミット
e3c578510b
1 ファイル変更12 行追加13 行削除
  1. 12 13
      formats/AtomFormat.php

+ 12 - 13
formats/AtomFormat.php

@@ -1,9 +1,4 @@
 <?php
-
-function xml_encode($text) {
-	return htmlspecialchars($text, ENT_XML1);
-}
-
 /**
 * Atom
 * Documentation Source http://en.wikipedia.org/wiki/Atom_%28standard%29 and http://tools.ietf.org/html/rfc4287
@@ -18,20 +13,20 @@ class AtomFormat extends FormatAbstract{
         $httpHost = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
         $httpInfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '';
 
-        $serverRequestUri = xml_encode($_SERVER['REQUEST_URI']);
+        $serverRequestUri = $this->xml_encode($_SERVER['REQUEST_URI']);
 
         $extraInfos = $this->getExtraInfos();
-        $title = xml_encode($extraInfos['name']);
+        $title = $this->xml_encode($extraInfos['name']);
         $uri = $extraInfos['uri'];
-        $icon = xml_encode('http://icons.better-idea.org/icon?url='. $uri .'&size=64');
-        $uri = xml_encode($uri);
+        $icon = $this->xml_encode('http://icons.better-idea.org/icon?url='. $uri .'&size=64');
+        $uri = $this->xml_encode($uri);
 
         $entries = '';
         foreach($this->getDatas() as $data){
-            $entryAuthor = is_null($data->author) ? $title : xml_encode($data->author);
-            $entryTitle = is_null($data->title) ? '' : xml_encode($data->title);
-            $entryUri = is_null($data->uri) ? '' : xml_encode($data->uri);
-            $entryTimestamp = is_null($data->timestamp) ? '' : xml_encode(date(DATE_ATOM, $data->timestamp));
+            $entryAuthor = is_null($data->author) ? $title : $this->xml_encode($data->author);
+            $entryTitle = is_null($data->title) ? '' : $this->xml_encode($data->title);
+            $entryUri = is_null($data->uri) ? '' : $this->xml_encode($data->uri);
+            $entryTimestamp = is_null($data->timestamp) ? '' : $this->xml_encode(date(DATE_ATOM, $data->timestamp));
             // We prevent content from closing the CDATA too early.
             $entryContent = is_null($data->content) ? '' : '<![CDATA[' . $this->sanitizeHtml(str_replace(']]>','',$data->content)) . ']]>';
 
@@ -96,4 +91,8 @@ EOD;
 
         return parent::display();
     }
+
+    private function xml_encode($text) {
+        return htmlspecialchars($text, ENT_XML1);
+    }
 }