Implement xml functions

implement functions moved to xml class

diff --git a/blogger/blogger.php b/blogger/blogger.php
index bf4c7eac5a146554f559253114dbe8e56e737b3d..ee79032f2d084ac926032a1a1117935740c33150 100644 (file)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function blogger_install()
 {
@@ -178,14 +179,14 @@ function blogger_send(App $a, array &$b)
                return;
        }
 
-       $bl_username = xmlify(PConfig::get($b['uid'], 'blogger', 'bl_username'));
-       $bl_password = xmlify(PConfig::get($b['uid'], 'blogger', 'bl_password'));
+       $bl_username = XML::xmlify(PConfig::get($b['uid'], 'blogger', 'bl_username'));
+       $bl_password = XML::xmlify(PConfig::get($b['uid'], 'blogger', 'bl_password'));
        $bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog');
 
        if ($bl_username && $bl_password && $bl_blog) {
                $title = '<title>' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . '</title>';
                $post = $title . BBCode::convert($b['body']);
-               $post = xmlify($post);
+               $post = XML::xmlify($post);
 
                $xml = <<< EOT
 <?xml version=\"1.0\" encoding=\"utf-8\"?>

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index a75fb878168e6ffbab9b09a88c9ea58ba7e002a0..eec1ea78f12f66a7a8a1580a20ff6e8ae2d4e4d3 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -17,6 +17,7 @@ use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function dwpost_install()
 {
@@ -189,7 +190,7 @@ function dwpost_send(App $a, array &$b)
        if ($dw_username && $dw_password && $dw_blog) {
                $title = $b['title'];
                $post = BBCode::convert($b['body']);
-               $post = xmlify($post);
+               $post = XML::xmlify($post);
                $tags = dwpost_get_tags($b['tag']);
 
                $date = DateTimeFormat::convert($b['created'], $tz);

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index a5f98f451d0884ca594e24286c7c589eb9803d21..f9242a18811e71bf698f46b60f7bb8967454dfea 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -15,6 +15,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function ijpost_install()
 {
@@ -185,7 +186,7 @@ function ijpost_send(&$a, &$b)
        if ($ij_username && $ij_password && $ij_blog) {
                $title = $b['title'];
                $post = BBCode::convert($b['body']);
-               $post = xmlify($post);
+               $post = XML::xmlify($post);
                $tags = ijpost_get_tags($b['tag']);
 
                $date = DateTimeFormat::convert($b['created'], $tz);

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index c785700011eeada9fb13c9910378dfad33f1285b..47eab5dcad425c1108ca559c60304fce3102b75a 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -15,6 +15,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function ljpost_install() {
     Addon::registerHook('post_local',           'addon/ljpost/ljpost.php', 'ljpost_post_local');
@@ -169,20 +170,20 @@ function ljpost_send(&$a,&$b) {
        if($x && strlen($x[0]['timezone']))
                $tz = $x[0]['timezone'];
 
-       $lj_username = xmlify(PConfig::get($b['uid'],'ljpost','lj_username'));
-       $lj_password = xmlify(PConfig::get($b['uid'],'ljpost','lj_password'));
-       $lj_journal = xmlify(PConfig::get($b['uid'],'ljpost','lj_journal'));
+       $lj_username = XML::xmlify(PConfig::get($b['uid'],'ljpost','lj_username'));
+       $lj_password = XML::xmlify(PConfig::get($b['uid'],'ljpost','lj_password'));
+       $lj_journal = XML::xmlify(PConfig::get($b['uid'],'ljpost','lj_journal'));
 //     if(! $lj_journal)
 //             $lj_journal = $lj_username;
 
-       $lj_blog = xmlify(PConfig::get($b['uid'],'ljpost','lj_blog'));
+       $lj_blog = XML::xmlify(PConfig::get($b['uid'],'ljpost','lj_blog'));
        if(! strlen($lj_blog))
-               $lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
+               $lj_blog = XML::xmlify('http://www.livejournal.com/interface/xmlrpc');
 
        if($lj_username && $lj_password && $lj_blog) {
-               $title = xmlify($b['title']);
+               $title = XML::xmlify($b['title']);
                $post = BBCode::convert($b['body']);
-               $post = xmlify($post);
+               $post = XML::xmlify($post);
                $tags = ljpost_get_tags($b['tag']);
 
                $date = DateTimeFormat::convert($b['created'], $tz);

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 0b7b7facee8bb6d4a86cba3ae777c940e37416d4..383ed0b6e15ffca2b9669156b09020f5710eef43 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -25,6 +25,7 @@ use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
@@ -981,7 +982,7 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
        $likedata['body'] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
 
        $likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' .
-               '<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
+               '<id>' . $orig_post['uri'] . '</id><link>' . XML::xmlify('<link rel="alternate" type="text/html" href="' . XML::xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
 
        $ret = Item::insert($likedata);
 

diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index 2ce81d991c419bd7bd429410cb61fa4dec1d60a5..f1a23266252ea7b7505075082d73a4db210bd651 100644 (file)
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -20,6 +20,7 @@
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\XML;
 
 function qcomment_install() {
        Addon::registerHook('addon_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings');
@@ -50,7 +51,7 @@ function qcomment_addon_settings(&$a, &$s)
        $s .= '<div id="qcomment-wrapper">';
        $s .= '<div id="qcomment-desc">' . L10n::t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '</div>';
        $s .= '<label id="qcomment-label" for="qcomment-words">' . L10n::t('Enter quick comments, one per line') . ' </label>';
-       $s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(unxmlify($words)) . '</textarea>';
+       $s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(XML::unxmlify($words)) . '</textarea>';
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="qcomment-submit" name="qcomment-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
@@ -59,13 +60,14 @@ function qcomment_addon_settings(&$a, &$s)
        return;
 }
 
-function qcomment_addon_settings_post(&$a,&$b) {
-
-       if(! local_user())
+function qcomment_addon_settings_post(&$a, &$b)
+{
+       if (! local_user()) {
                return;
+       }
 
-       if($_POST['qcomment-submit']) {
-               PConfig::set(local_user(),'qcomment','words',xmlify($_POST['qcomment-words']));
+       if ($_POST['qcomment-submit']) {
+               PConfig::set(local_user(), 'qcomment', 'words', XML::xmlify($_POST['qcomment-words']));
                info(L10n::t('Quick Comment settings saved.') . EOL);
        }
 }

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 107d8c0c036a30133cc97663c7d06d5d48f47129..27061978c2b1352fca8c0154a22da37725ac3917 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -14,6 +14,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function wppost_install() {
     Addon::registerHook('post_local',           'addon/wppost/wppost.php', 'wppost_post_local');
@@ -216,8 +217,8 @@ function wppost_send(&$a,&$b) {
                return;
        }
 
-       $wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username'));
-       $wp_password = xmlify(PConfig::get($b['uid'],'wppost','wp_password'));
+       $wp_username = XML::(PConfig::get($b['uid'], 'wppost', 'wp_username'));
+       $wp_password = XML::xmlify(PConfig::get($b['uid'], 'wppost',' wp_password'));
        $wp_blog = PConfig::get($b['uid'],'wppost','wp_blog');
        $wp_backlink_text = PConfig::get($b['uid'],'wppost','wp_backlink_text');
        if ($wp_backlink_text == '') {
@@ -294,7 +295,7 @@ function wppost_send(&$a,&$b) {
                                . $wp_backlink_text . '</a>' . EOL . EOL;
                }
 
-               $post = xmlify($post);
+               $post = XML::xmlify($post);
 
 
                $xml = <<< EOT