]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch '2018.12-rc' into task/move-config-to-php-array
authorHypolite Petovan <hypolite@mrpetovan.com>
Thu, 27 Dec 2018 06:47:53 +0000 (01:47 -0500)
committerGitHub <noreply@github.com>
Thu, 27 Dec 2018 06:47:53 +0000 (01:47 -0500)
420 files changed:
VERSION
boot.php
config/dbstructure.config.php
doc/Install.md
doc/themes.md
include/api.php
include/conversation.php
mod/admin.php
mod/allfriends.php
mod/api.php
mod/babel.php
mod/cal.php
mod/common.php
mod/contactgroup.php
mod/credits.php
mod/crepair.php
mod/delegate.php
mod/dfrn_confirm.php
mod/dfrn_notify.php
mod/dfrn_poll.php
mod/dfrn_request.php
mod/directory.php
mod/dirfind.php
mod/display.php
mod/editpost.php
mod/events.php
mod/fbrowser.php
mod/fetch.php
mod/follow.php
mod/friendica.php
mod/hcard.php
mod/home.php
mod/hovercard.php
mod/item.php
mod/like.php
mod/localtime.php
mod/manage.php
mod/message.php
mod/modexp.php
mod/network.php
mod/newmember.php
mod/noscrape.php
mod/notes.php
mod/notifications.php
mod/oexchange.php
mod/openid.php
mod/ostatus_subscribe.php
mod/parse_url.php
mod/photos.php
mod/ping.php
mod/poco.php
mod/poke.php
mod/probe.php
mod/profile.php
mod/profiles.php
mod/pubsub.php
mod/pubsubhubbub.php
mod/redir.php
mod/register.php
mod/removeme.php
mod/search.php
mod/settings.php
mod/starred.php
mod/subthread.php
mod/suggest.php
mod/tagger.php
mod/tagrm.php
mod/uimport.php
mod/unfollow.php
mod/viewcontacts.php
mod/wall_attach.php
mod/wall_upload.php
mod/wallmessage.php
mod/webfinger.php
mods/sample-nginx.config
spec/dfrn2_contact_request.svg
src/App.php
src/Content/Nav.php
src/Content/OEmbed.php
src/Content/Text/BBCode.php
src/Content/Text/HTML.php
src/Core/Authentication.php
src/Core/Console/AutomaticInstallation.php
src/Core/Installer.php
src/Core/NotificationsManager.php
src/Core/Renderer.php
src/Core/Session/DatabaseSessionHandler.php
src/Core/System.php
src/Core/Update.php
src/Core/UserImport.php
src/Database/DBA.php
src/Database/DBStructure.php
src/Model/Contact.php
src/Model/Event.php
src/Model/FileTag.php
src/Model/GContact.php
src/Model/Group.php
src/Model/Item.php
src/Model/ItemURI.php
src/Model/Photo.php
src/Model/Profile.php
src/Model/Term.php
src/Model/User.php
src/Module/Contact.php
src/Module/Feed.php
src/Module/Inbox.php
src/Module/Itemsource.php
src/Module/Login.php
src/Module/Magic.php
src/Network/CurlResult.php
src/Network/Probe.php
src/Object/OEmbed.php
src/Object/Post.php
src/Protocol/ActivityPub/Processor.php
src/Protocol/ActivityPub/Receiver.php
src/Protocol/ActivityPub/Transmitter.php
src/Protocol/DFRN.php
src/Protocol/Diaspora.php
src/Protocol/Email.php
src/Protocol/OStatus.php
src/Protocol/PortableContact.php
src/Render/FriendicaSmarty.php
src/Render/FriendicaSmartyEngine.php
src/Util/Emailer.php
src/Util/HTTPSignature.php
src/Util/JsonLD.php
src/Util/LDSignature.php
src/Util/Network.php
src/Util/Strings.php
src/Util/Temporal.php
src/Worker/CronJobs.php
src/Worker/GProbe.php
src/Worker/Notifier.php
src/Worker/OnePoll.php
tests/src/Core/Console/AutomaticInstallationConsoleTest.php
tests/src/Core/InstallerTest.php
view/php/default.php
view/php/minimal.php
view/php/none.php
view/templates/acl_selector.tpl
view/templates/admin/addon_details.tpl
view/templates/admin/addons.tpl
view/templates/admin/contactblock.tpl
view/templates/admin/logs.tpl
view/templates/admin/settings_features.tpl
view/templates/admin/site.tpl
view/templates/admin/tos.tpl
view/templates/admin/users.tpl
view/templates/album_edit.tpl
view/templates/apps.tpl
view/templates/auto_request.tpl
view/templates/babel.tpl
view/templates/birthdays_reminder.tpl
view/templates/categories_widget.tpl
view/templates/comment_item.tpl
view/templates/community.tpl
view/templates/confirm.tpl
view/templates/contact_block.tpl
view/templates/contact_edit.tpl
view/templates/contact_template.tpl
view/templates/contacts-template.tpl
view/templates/contacts-widget-sidebar.tpl
view/templates/content_wrapper.tpl
view/templates/conversation.tpl
view/templates/crepair.tpl
view/templates/cropbody.tpl
view/templates/delegate.tpl
view/templates/dfrn_req_confirm.tpl
view/templates/dfrn_request.tpl
view/templates/directory_header.tpl
view/templates/email_notify_html.tpl
view/templates/event.tpl
view/templates/event_form.tpl
view/templates/event_stream_item.tpl
view/templates/events.tpl
view/templates/events_js.tpl
view/templates/events_reminder.tpl
view/templates/failed_updates.tpl
view/templates/field_checkbox.tpl
view/templates/field_combobox.tpl
view/templates/field_custom.tpl
view/templates/field_input.tpl
view/templates/field_intcheckbox.tpl
view/templates/field_openid.tpl
view/templates/field_password.tpl
view/templates/field_radio.tpl
view/templates/field_richtext.tpl
view/templates/field_select.tpl
view/templates/field_select_raw.tpl
view/templates/field_textarea.tpl
view/templates/field_themeselect.tpl
view/templates/field_yesno.tpl
view/templates/fileas_widget.tpl
view/templates/filebrowser.tpl
view/templates/filer_dialog.tpl
view/templates/files.tpl
view/templates/follow.tpl
view/templates/generic_links_widget.tpl
view/templates/group_edit.tpl
view/templates/head.tpl
view/templates/home.tpl
view/templates/hovercard.tpl
view/templates/http_status.tpl
view/templates/install_checks.tpl
view/templates/install_db.tpl
view/templates/install_finished.tpl
view/templates/install_settings.tpl
view/templates/intros.tpl
view/templates/invite.tpl
view/templates/jot.tpl
view/templates/login.tpl
view/templates/logout.tpl
view/templates/lostpass.tpl
view/templates/mail_conv.tpl
view/templates/mail_head.tpl
view/templates/manage.tpl
view/templates/message_side.tpl
view/templates/moderated_comment.tpl
view/templates/nav.tpl
view/templates/nets.tpl
view/templates/nogroup-template.tpl
view/templates/notifications.tpl
view/templates/notifications_attend_item.tpl
view/templates/notifications_comments_item.tpl
view/templates/notifications_dislikes_item.tpl
view/templates/notifications_friends_item.tpl
view/templates/notifications_likes_item.tpl
view/templates/notifications_network_item.tpl
view/templates/notifications_posts_item.tpl
view/templates/notify.tpl
view/templates/oauth_authorize.tpl
view/templates/peoplefind.tpl
view/templates/photo_album.tpl
view/templates/photo_edit.tpl
view/templates/photo_top.tpl
view/templates/photo_view.tpl
view/templates/photos_default_uploader_submit.tpl
view/templates/photos_recent.tpl
view/templates/photos_upload.tpl
view/templates/poke_content.tpl
view/templates/profile-hide-wall.tpl
view/templates/profile-in-directory.tpl
view/templates/profile-in-netdir.tpl
view/templates/profile_advanced.tpl
view/templates/profile_edit.tpl
view/templates/profile_entry.tpl
view/templates/profile_listing_header.tpl
view/templates/profile_photo.tpl
view/templates/profile_vcard.tpl
view/templates/prv_message.tpl
view/templates/register.tpl
view/templates/remote_friends_common.tpl
view/templates/removeme.tpl
view/templates/saved_searches_aside.tpl
view/templates/search_item.tpl
view/templates/settings/addons.tpl
view/templates/settings/connectors.tpl
view/templates/settings/display.tpl
view/templates/settings/features.tpl
view/templates/settings/nick_set.tpl
view/templates/settings/oauth.tpl
view/templates/settings/oauth_edit.tpl
view/templates/settings/settings.tpl
view/templates/shared_content.tpl
view/templates/suggestions.tpl
view/templates/tag_slap.tpl
view/templates/threaded_conversation.tpl
view/templates/tos.tpl
view/templates/uimport.tpl
view/templates/vcard-widget.tpl
view/templates/viewcontact_template.tpl
view/templates/voting_fakelink.tpl
view/templates/wall/content_filter.tpl
view/templates/wall_thread.tpl
view/templates/wallmessage.tpl
view/templates/widget_forumlist.tpl
view/theme/duepuntozero/style.php
view/theme/duepuntozero/templates/nav.tpl
view/theme/duepuntozero/templates/profile_vcard.tpl
view/theme/duepuntozero/templates/prv_message.tpl
view/theme/frio/php/PHPColors/Color.php
view/theme/frio/php/default.php
view/theme/frio/php/frio_boot.php
view/theme/frio/php/standard.php
view/theme/frio/style.php
view/theme/frio/templates/acl_selector.tpl
view/theme/frio/templates/admin/addons.tpl
view/theme/frio/templates/admin/contactblock.tpl
view/theme/frio/templates/admin/queue.tpl
view/theme/frio/templates/admin/site.tpl
view/theme/frio/templates/admin/summary.tpl
view/theme/frio/templates/admin/users.tpl
view/theme/frio/templates/album_edit.tpl
view/theme/frio/templates/auto_request.tpl [new file with mode: 0644]
view/theme/frio/templates/comment_item.tpl
view/theme/frio/templates/common_tabs.tpl
view/theme/frio/templates/confirm.tpl
view/theme/frio/templates/contact_block.tpl
view/theme/frio/templates/contact_edit.tpl
view/theme/frio/templates/contact_template.tpl
view/theme/frio/templates/contacts-template.tpl
view/theme/frio/templates/credits.tpl
view/theme/frio/templates/crepair.tpl
view/theme/frio/templates/dfrn_request.tpl [new file with mode: 0644]
view/theme/frio/templates/directory_header.tpl
view/theme/frio/templates/event.tpl
view/theme/frio/templates/event_form.tpl
view/theme/frio/templates/event_stream_item.tpl
view/theme/frio/templates/events_js.tpl
view/theme/frio/templates/field_checkbox.tpl
view/theme/frio/templates/field_colorinput.tpl
view/theme/frio/templates/field_custom.tpl
view/theme/frio/templates/field_fileinput.tpl
view/theme/frio/templates/field_input.tpl
view/theme/frio/templates/field_intcheckbox.tpl
view/theme/frio/templates/field_openid.tpl
view/theme/frio/templates/field_password.tpl
view/theme/frio/templates/field_radio.tpl
view/theme/frio/templates/field_select.tpl
view/theme/frio/templates/field_select_raw.tpl
view/theme/frio/templates/field_textarea.tpl
view/theme/frio/templates/field_themeselect.tpl
view/theme/frio/templates/field_yesno.tpl
view/theme/frio/templates/fileas_widget.tpl
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/follow.tpl
view/theme/frio/templates/generic_links_widget.tpl
view/theme/frio/templates/group_edit.tpl
view/theme/frio/templates/head.tpl
view/theme/frio/templates/home.tpl
view/theme/frio/templates/intros.tpl
view/theme/frio/templates/invite.tpl
view/theme/frio/templates/jot.tpl
view/theme/frio/templates/like_noshare.tpl
view/theme/frio/templates/login.tpl
view/theme/frio/templates/mail_conv.tpl
view/theme/frio/templates/mail_head.tpl
view/theme/frio/templates/mail_list.tpl
view/theme/frio/templates/message_side.tpl
view/theme/frio/templates/nav.tpl
view/theme/frio/templates/nets.tpl
view/theme/frio/templates/notifications.tpl
view/theme/frio/templates/notify.tpl
view/theme/frio/templates/peoplefind.tpl
view/theme/frio/templates/photo_album.tpl
view/theme/frio/templates/photo_item.tpl
view/theme/frio/templates/photo_top.tpl
view/theme/frio/templates/photo_view.tpl
view/theme/frio/templates/photos_default_uploader_submit.tpl
view/theme/frio/templates/photos_upload.tpl
view/theme/frio/templates/poke_content.tpl
view/theme/frio/templates/profile_advanced.tpl
view/theme/frio/templates/profile_edit.tpl
view/theme/frio/templates/profile_entry.tpl
view/theme/frio/templates/profile_listing_header.tpl
view/theme/frio/templates/profile_vcard.tpl
view/theme/frio/templates/prv_message.tpl
view/theme/frio/templates/register.tpl
view/theme/frio/templates/removeme.tpl
view/theme/frio/templates/search_item.tpl
view/theme/frio/templates/settings/addons.tpl
view/theme/frio/templates/settings/connectors.tpl
view/theme/frio/templates/settings/display.tpl
view/theme/frio/templates/settings/features.tpl
view/theme/frio/templates/settings/oauth.tpl
view/theme/frio/templates/settings/oauth_edit.tpl
view/theme/frio/templates/settings/settings.tpl
view/theme/frio/templates/theme_settings.tpl
view/theme/frio/templates/threaded_conversation.tpl
view/theme/frio/templates/vcard-widget.tpl
view/theme/frio/templates/viewcontact_template.tpl
view/theme/frio/templates/wall_thread.tpl
view/theme/frio/theme.php
view/theme/quattro/templates/contact_template.tpl
view/theme/quattro/templates/conversation.tpl
view/theme/quattro/templates/event_form.tpl
view/theme/quattro/templates/events-js.tpl
view/theme/quattro/templates/events.tpl
view/theme/quattro/templates/fileas_widget.tpl
view/theme/quattro/templates/generic_links_widget.tpl
view/theme/quattro/templates/jot.tpl
view/theme/quattro/templates/mail_conv.tpl
view/theme/quattro/templates/message_side.tpl
view/theme/quattro/templates/nav.tpl
view/theme/quattro/templates/nets.tpl
view/theme/quattro/templates/photo_item.tpl
view/theme/quattro/templates/photo_view.tpl
view/theme/quattro/templates/profile_vcard.tpl
view/theme/quattro/templates/prv_message.tpl
view/theme/quattro/templates/saved_searches_aside.tpl
view/theme/quattro/templates/search_item.tpl
view/theme/quattro/templates/threaded_conversation.tpl
view/theme/quattro/templates/wall_item_tag.tpl
view/theme/quattro/templates/wall_thread.tpl
view/theme/quattro/templates/widget_forumlist.tpl
view/theme/smoothly/php/default.php
view/theme/smoothly/style.css
view/theme/smoothly/templates/follow.tpl
view/theme/smoothly/templates/jot.tpl
view/theme/smoothly/templates/search_item.tpl
view/theme/smoothly/templates/wall_thread.tpl
view/theme/vier/templates/ch_connectors.tpl
view/theme/vier/templates/ch_directory_item.tpl
view/theme/vier/templates/comment_item.tpl
view/theme/vier/templates/communityhome.tpl
view/theme/vier/templates/contact_edit.tpl
view/theme/vier/templates/contact_template.tpl
view/theme/vier/templates/event_form.tpl
view/theme/vier/templates/nav.tpl
view/theme/vier/templates/photo_item.tpl
view/theme/vier/templates/photo_view.tpl
view/theme/vier/templates/profile_advanced.tpl
view/theme/vier/templates/profile_edit.tpl
view/theme/vier/templates/profile_vcard.tpl
view/theme/vier/templates/search_item.tpl
view/theme/vier/templates/threaded_conversation.tpl
view/theme/vier/templates/wall_item_tag.tpl
view/theme/vier/templates/wall_thread.tpl
view/theme/vier/templates/widget_forumlist_right.tpl
view/theme/vier/theme.php

diff --git a/VERSION b/VERSION
index 8033ba2083d3c09995be63b1288dc3aadcc25310..d04d731e2fb2078b13552b79ed22c14801cc4997 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2018.12-dev
+2018.12-rc
index f3d1f6f649eb511050002de2bab0d4eeb1dd6526..222011f6b76d7dc0ad2bb440c328437daf61bb5e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -39,7 +39,7 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018.12-dev');
+define('FRIENDICA_VERSION',      '2018.12-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
@@ -338,41 +338,6 @@ function get_app()
        return BaseObject::getApp();
 }
 
-/**
- * @brief Multi-purpose function to check variable state.
- *
- * Usage: x($var) or $x($array, 'key')
- *
- * returns false if variable/key is not set
- * if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0.
- * e.g. x('') or x(0) returns 0;
- *
- * @param string|array $s variable to check
- * @param string       $k key inside the array to check
- *
- * @return bool|int
- */
-function x($s, $k = null)
-{
-       if ($k != null) {
-               if ((is_array($s)) && (array_key_exists($k, $s))) {
-                       if ($s[$k]) {
-                               return (int) 1;
-                       }
-                       return (int) 0;
-               }
-               return false;
-       } else {
-               if (isset($s)) {
-                       if ($s) {
-                               return (int) 1;
-                       }
-                       return (int) 0;
-               }
-               return false;
-       }
-}
-
 /**
  * Return the provided variable value if it exists and is truthy or the provided
  * default value instead.
@@ -383,13 +348,12 @@ function x($s, $k = null)
  * - defaults($var, $default)
  * - defaults($array, 'key', $default)
  *
+ * @param array $args
  * @brief Returns a defaut value if the provided variable or array key is falsy
- * @see x()
  * @return mixed
  */
-function defaults() {
-       $args = func_get_args();
-
+function defaults(...$args)
+{
        if (count($args) < 2) {
                throw new BadFunctionCallException('defaults() requires at least 2 parameters');
        }
@@ -400,16 +364,15 @@ function defaults() {
                throw new BadFunctionCallException('defaults($arr, $key, $def) $key is null');
        }
 
-       $default = array_pop($args);
+       // The default value always is the last argument
+       $return = array_pop($args);
 
-       if (call_user_func_array('x', $args)) {
-               if (count($args) === 1) {
-                       $return = $args[0];
-               } else {
-                       $return = $args[0][$args[1]];
-               }
-       } else {
-               $return = $default;
+       if (count($args) == 2 && is_array($args[0]) && !empty($args[0][$args[1]])) {
+               $return = $args[0][$args[1]];
+       }
+
+       if (count($args) == 1 && !empty($args[0])) {
+               $return = $args[0];
        }
 
        return $return;
@@ -446,15 +409,15 @@ function public_contact()
 {
        static $public_contact_id = false;
 
-       if (!$public_contact_id && x($_SESSION, 'authenticated')) {
-               if (x($_SESSION, 'my_address')) {
+       if (!$public_contact_id && !empty($_SESSION['authenticated'])) {
+               if (!empty($_SESSION['my_address'])) {
                        // Local user
                        $public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true));
-               } elseif (x($_SESSION, 'visitor_home')) {
+               } elseif (!empty($_SESSION['visitor_home'])) {
                        // Remote user
                        $public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true));
                }
-       } elseif (!x($_SESSION, 'authenticated')) {
+       } elseif (empty($_SESSION['authenticated'])) {
                $public_contact_id = false;
        }
 
@@ -479,7 +442,7 @@ function remote_user()
                return false;
        }
 
-       if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
+       if (!empty($_SESSION['authenticated']) && !empty($_SESSION['visitor_id'])) {
                return intval($_SESSION['visitor_id']);
        }
        return false;
@@ -499,7 +462,7 @@ function notice($s)
        }
 
        $a = get_app();
-       if (!x($_SESSION, 'sysmsg')) {
+       if (empty($_SESSION['sysmsg'])) {
                $_SESSION['sysmsg'] = [];
        }
        if ($a->interactive) {
@@ -522,7 +485,7 @@ function info($s)
                return;
        }
 
-       if (!x($_SESSION, 'sysmsg_info')) {
+       if (empty($_SESSION['sysmsg_info'])) {
                $_SESSION['sysmsg_info'] = [];
        }
        if ($a->interactive) {
@@ -891,3 +854,22 @@ function validate_include(&$file)
        // Simply return flag
        return $valid;
 }
+
+/**
+ * PHP 5 compatible dirname() with count parameter
+ *
+ * @see http://php.net/manual/en/function.dirname.php#113193
+ *
+ * @deprecated with PHP 7
+ * @param string $path
+ * @param int    $levels
+ * @return string
+ */
+function rdirname($path, $levels = 1)
+{
+       if ($levels > 1) {
+               return dirname(rdirname($path, --$levels));
+       } else {
+               return dirname($path);
+       }
+}
\ No newline at end of file
index 99e3de9d067071779b19131f4b64618411399dac..ca34936065c30097f53bd253e1290e0d85603812 100644 (file)
@@ -34,7 +34,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1290);
+       define('DB_UPDATE_VERSION', 1291);
 }
 
 return [
@@ -643,6 +643,7 @@ return [
                        "uid_contactid_created" => ["uid", "contact-id", "created"],
                        "authorid_created" => ["author-id", "created"],
                        "ownerid" => ["owner-id"],
+                       "contact-id" => ["contact-id"],
                        "uid_uri" => ["uid", "uri(190)"],
                        "resource-id" => ["resource-id"],
                        "deleted_changed" => ["deleted", "changed"],
@@ -894,7 +895,9 @@ return [
                        "fid" => ["type" => "int unsigned", "not null" => "1", "relation" => ["fcontact" => "id"], "comment" => ""],
                ],
                "indexes" => [
-                       "PRIMARY" => ["iid", "server"]
+                       "PRIMARY" => ["iid", "server"],
+                       "cid" => ["cid"],
+                       "fid" => ["fid"]
                ]
        ],
        "pconfig" => [
index 275d21b768b03ec43f1eb26da6e05c81103832e4..dd483095c488416d49003774fa679af39c036cc1 100644 (file)
@@ -248,7 +248,10 @@ Friendica will not work correctly if you cannot perform this step.
 
 If it is not possible to set up a cron job then please activate the "frontend worker" in the administration interface.
 
-Once you have installed Friendica and created an admin account as part of the process, you can access the admin panel of your installation and do most of the server wide configuration from there
+Once you have installed Friendica and created an admin account as part of the process, you can access the admin panel of your installation and do most of the server wide configuration from there.
+
+At this point it is recommended that you set up logging and logrotation.
+To do so please visit [Settings](help/Settings) and search the 'Logs' section for more information.
 
 ### Set up a backup plan
 
index d0d74a92c6b6e2c4b32a37952ecf18c7e75ed989..d2e4c59be3edee9fbcaf1f3454815eecefe02868 100644 (file)
@@ -181,13 +181,13 @@ Next take the default.php file found in the /view direcotry and exchange the asi
 So the central part of the file now looks like this:
 
     <body>
-        <?php if(x($page,'nav')) echo $page['nav']; ?>
-        <aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
-        <section><?php if(x($page,'content')) echo $page['content']; ?>
+        <?php if(!empty($page['nav'])) echo $page['nav']; ?>
+        <aside><?php if(!empty($page['right_aside'])) echo $page['right_aside']; ?></aside>
+        <section><?php if(!empty($page['content'])) echo $page['content']; ?>
                 <div id="page-footer"></div>
         </section>
-        <right_aside><?php if(x($page,'aside')) echo $page['aside']; ?></right_aside>
-        <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+        <right_aside><?php if(!empty($page['aside'])) echo $page['aside']; ?></right_aside>
+        <footer><?php if(!empty($page['footer'])) echo $page['footer']; ?></footer>
     </body>
 
 Finally we need a style.css file, inheriting the definitions from the parent theme and containing out changes for the new theme.
index f4d7c5f5a6c549b80f894bf3396821678455fb84..20b3844cd5cc93d7a96cf03f1b1f96a34a5920e7 100644 (file)
@@ -68,7 +68,7 @@ $called_api = [];
  */
 function api_user()
 {
-       if (x($_SESSION, 'allow_api')) {
+       if (!empty($_SESSION['allow_api'])) {
                return local_user();
        }
 
@@ -186,8 +186,8 @@ function api_login(App $a)
        }
 
        // workaround for HTTP-auth in CGI mode
-       if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
-               $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
+       if (!empty($_SERVER['REDIRECT_REMOTE_USER'])) {
+               $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6));
                if (strlen($userpass)) {
                        list($name, $password) = explode(':', $userpass);
                        $_SERVER['PHP_AUTH_USER'] = $name;
@@ -195,7 +195,7 @@ function api_login(App $a)
                }
        }
 
-       if (!x($_SERVER, 'PHP_AUTH_USER')) {
+       if (empty($_SERVER['PHP_AUTH_USER'])) {
                Logger::log('API_login: ' . print_r($_SERVER, true), Logger::DEBUG);
                header('WWW-Authenticate: Basic realm="Friendica"');
                throw new UnauthorizedException("This API requires login");
@@ -396,7 +396,7 @@ function api_call(App $a)
                                        case "json":
                                                header("Content-Type: application/json");
                                                $json = json_encode(end($return));
-                                               if (x($_GET, 'callback')) {
+                                               if (!empty($_GET['callback'])) {
                                                        $json = $_GET['callback'] . "(" . $json . ")";
                                                }
                                                $return = $json;
@@ -550,7 +550,7 @@ function api_get_user(App $a, $contact_id = null)
                }
        }
 
-       if (is_null($user) && x($_GET, 'user_id')) {
+       if (is_null($user) && !empty($_GET['user_id'])) {
                $user = DBA::escape(api_unique_id_to_nurl($_GET['user_id']));
 
                if ($user == "") {
@@ -563,7 +563,7 @@ function api_get_user(App $a, $contact_id = null)
                        $extra_query .= "AND `contact`.`uid`=" . intval(api_user());
                }
        }
-       if (is_null($user) && x($_GET, 'screen_name')) {
+       if (is_null($user) && !empty($_GET['screen_name'])) {
                $user = DBA::escape($_GET['screen_name']);
                $extra_query = "AND `contact`.`nick` = '%s' ";
                if (api_user() !== false) {
@@ -571,7 +571,7 @@ function api_get_user(App $a, $contact_id = null)
                }
        }
 
-       if (is_null($user) && x($_GET, 'profileurl')) {
+       if (is_null($user) && !empty($_GET['profileurl'])) {
                $user = DBA::escape(Strings::normaliseLink($_GET['profileurl']));
                $extra_query = "AND `contact`.`nurl` = '%s' ";
                if (api_user() !== false) {
@@ -643,8 +643,6 @@ function api_get_user(App $a, $contact_id = null)
                $contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
 
                if (DBA::isResult($contact)) {
-                       $network_name = ContactSelector::networkToName($contact['network'], $contact['url']);
-
                        // If no nick where given, extract it from the address
                        if (($contact['nick'] == "") || ($contact['name'] == $contact['nick'])) {
                                $contact['nick'] = api_get_nick($contact["url"]);
@@ -655,7 +653,7 @@ function api_get_user(App $a, $contact_id = null)
                                'id_str' => (string) $contact["id"],
                                'name' => $contact["name"],
                                'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']),
-                               'location' => ($contact["location"] != "") ? $contact["location"] : $network_name,
+                               'location' => ($contact["location"] != "") ? $contact["location"] : ContactSelector::networkToName($contact['network'], $contact['url']),
                                'description' => $contact["about"],
                                'profile_image_url' => $contact["micro"],
                                'profile_image_url_https' => $contact["micro"],
@@ -713,8 +711,6 @@ function api_get_user(App $a, $contact_id = null)
                $uinfo[0]['nick'] = api_get_nick($uinfo[0]["url"]);
        }
 
-       $network_name = ContactSelector::networkToName($uinfo[0]['network'], $uinfo[0]['url']);
-
        $pcontact_id  = Contact::getIdForURL($uinfo[0]['url'], 0, true);
 
        if (!empty($profile['about'])) {
@@ -728,7 +724,7 @@ function api_get_user(App $a, $contact_id = null)
        } elseif (!empty($uinfo[0]["location"])) {
                $location = $uinfo[0]["location"];
        } else {
-               $location = $network_name;
+               $location = ContactSelector::networkToName($uinfo[0]['network'], $uinfo[0]['url']);
        }
 
        $ret = [
@@ -980,7 +976,7 @@ function api_account_verify_credentials($type)
        unset($_REQUEST["screen_name"]);
        unset($_GET["screen_name"]);
 
-       $skip_status = (x($_REQUEST, 'skip_status')?$_REQUEST['skip_status'] : false);
+       $skip_status = defaults($_REQUEST, 'skip_status', false);
 
        $user_info = api_get_user($a);
 
@@ -1014,10 +1010,10 @@ api_register_func('api/account/verify_credentials', 'api_account_verify_credenti
  */
 function requestdata($k)
 {
-       if (x($_POST, $k)) {
+       if (!empty($_POST[$k])) {
                return $_POST[$k];
        }
-       if (x($_GET, $k)) {
+       if (!empty($_GET[$k])) {
                return $_GET[$k];
        }
        return null;
@@ -1172,7 +1168,7 @@ function api_statuses_update($type)
                }
        }
 
-       if (x($_FILES, 'media')) {
+       if (!empty($_FILES['media'])) {
                // upload the image if we have one
                $picture = wall_upload_post($a, false);
                if (is_array($picture)) {
@@ -1199,7 +1195,7 @@ function api_statuses_update($type)
 
        $_REQUEST['api_source'] = true;
 
-       if (!x($_REQUEST, "source")) {
+       if (empty($_REQUEST['source'])) {
                $_REQUEST["source"] = api_source();
        }
 
@@ -1231,7 +1227,7 @@ function api_media_upload()
 
        api_get_user($a);
 
-       if (!x($_FILES, 'media')) {
+       if (empty($_FILES['media'])) {
                // Output error
                throw new BadRequestException("No media.");
        }
@@ -1445,7 +1441,7 @@ function api_users_search($type)
 
        $userlist = [];
 
-       if (x($_GET, 'q')) {
+       if (!empty($_GET['q'])) {
                $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", DBA::escape($_GET["q"]));
 
                if (!DBA::isResult($r)) {
@@ -1530,21 +1526,21 @@ function api_search($type)
 
        $data = [];
 
-       if (!x($_REQUEST, 'q')) {
+       if (empty($_REQUEST['q'])) {
                throw new BadRequestException("q parameter is required.");
        }
 
-       if (x($_REQUEST, 'rpp')) {
+       if (!empty($_REQUEST['rpp'])) {
                $count = $_REQUEST['rpp'];
-       } elseif (x($_REQUEST, 'count')) {
+       } elseif (!empty($_REQUEST['count'])) {
                $count = $_REQUEST['count'];
        } else {
                $count = 15;
        }
 
-       $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-       $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
-       $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+       $since_id = defaults($_REQUEST, 'since_id', 0);
+       $max_id = defaults($_REQUEST, 'max_id', 0);
+       $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
 
        $start = $page * $count;
 
@@ -1598,16 +1594,15 @@ function api_statuses_home_timeline($type)
        // get last network messages
 
        // params
-       $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
-       $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+       $count = defaults($_REQUEST, 'count', 20);
+       $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
        if ($page < 0) {
                $page = 0;
        }
-       $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-       $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
-       //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0);
-       $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0);
-       $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0);
+       $since_id = defaults($_REQUEST, 'since_id', 0);
+       $max_id = defaults($_REQUEST, 'max_id', 0);
+       $exclude_replies = !empty($_REQUEST['exclude_replies']);
+       $conversation_id = defaults($_REQUEST, 'conversation_id', 0);
 
        $start = $page * $count;
 
@@ -1618,7 +1613,7 @@ function api_statuses_home_timeline($type)
                $condition[0] .= " AND `item`.`id` <= ?";
                $condition[] = $max_id;
        }
-       if ($exclude_replies > 0) {
+       if ($exclude_replies) {
                $condition[0] .= ' AND `item`.`parent` = `item`.`id`';
        }
        if ($conversation_id > 0) {
@@ -1681,19 +1676,17 @@ function api_statuses_public_timeline($type)
        // get last network messages
 
        // params
-       $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
-       $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
+       $count = defaults($_REQUEST, 'count', 20);
+       $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] -1 : 0);
        if ($page < 0) {
                $page = 0;
        }
-       $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-       $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
-       //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0);
-       $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0);
-       $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0);
+       $since_id = defaults($_REQUEST, 'since_id', 0);
+       $max_id = defaults($_REQUEST, 'max_id', 0);
+       $exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0);
+       $conversation_id = defaults($_REQUEST, 'conversation_id', 0);
 
        $start = $page * $count;
-       $sql_extra = '';
 
        if ($exclude_replies && !$conversation_id) {
                $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`",
@@ -1762,12 +1755,12 @@ function api_statuses_networkpublic_timeline($type)
                throw new ForbiddenException();
        }
 
-       $since_id        = x($_REQUEST, 'since_id')        ? $_REQUEST['since_id']        : 0;
-       $max_id          = x($_REQUEST, 'max_id')          ? $_REQUEST['max_id']          : 0;
+       $since_id        = defaults($_REQUEST, 'since_id', 0);
+       $max_id          = defaults($_REQUEST, 'max_id', 0);
 
        // pagination
-       $count = x($_REQUEST, 'count') ? $_REQUEST['count']   : 20;
-       $page  = x($_REQUEST, 'page')  ? $_REQUEST['page']    : 1;
+       $count = defaults($_REQUEST, 'count', 20);
+       $page  = defaults($_REQUEST, 'page', 1);
        if ($page < 1) {
                $page = 1;
        }
@@ -2001,7 +1994,7 @@ function api_statuses_repeat($type)
                $_REQUEST['profile_uid'] = api_user();
                $_REQUEST['api_source'] = true;
 
-               if (!x($_REQUEST, "source")) {
+               if (empty($_REQUEST['source'])) {
                        $_REQUEST["source"] = api_source();
                }
 
@@ -2150,14 +2143,14 @@ function api_statuses_user_timeline($type)
                Logger::DEBUG
        );
 
-       $since_id        = x($_REQUEST, 'since_id')        ? $_REQUEST['since_id']        : 0;
-       $max_id          = x($_REQUEST, 'max_id')          ? $_REQUEST['max_id']          : 0;
-       $exclude_replies = x($_REQUEST, 'exclude_replies') ? 1                            : 0;
-       $conversation_id = x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0;
+       $since_id        = defaults($_REQUEST, 'since_id', 0);
+       $max_id          = defaults($_REQUEST, 'max_id', 0);
+       $exclude_replies = !empty($_REQUEST['exclude_replies']);
+       $conversation_id = defaults($_REQUEST, 'conversation_id', 0);
 
        // pagination
-       $count = x($_REQUEST, 'count') ? $_REQUEST['count'] : 20;
-       $page  = x($_REQUEST, 'page')  ? $_REQUEST['page']  : 1;
+       $count = defaults($_REQUEST, 'count', 20);
+       $page  = defaults($_REQUEST, 'page', 1);
        if ($page < 1) {
                $page = 1;
        }
@@ -2170,7 +2163,7 @@ function api_statuses_user_timeline($type)
                $condition[0] .= ' AND `item`.`wall` ';
        }
 
-       if ($exclude_replies > 0) {
+       if ($exclude_replies) {
                $condition[0] .= ' AND `item`.`parent` = `item`.`id`';
        }
 
@@ -2309,10 +2302,10 @@ function api_favorites($type)
                $ret = [];
        } else {
                // params
-               $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-               $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
-               $count = (x($_GET, 'count') ? $_GET['count'] : 20);
-               $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
+               $since_id = defaults($_REQUEST, 'since_id', 0);
+               $max_id = defaults($_REQUEST, 'max_id', 0);
+               $count = defaults($_GET, 'count', 20);
+               $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] -1 : 0);
                if ($page < 0) {
                        $page = 0;
                }
@@ -2390,7 +2383,7 @@ function api_format_messages($item, $recipient, $sender)
        }
 
        //don't send title to regular StatusNET requests to avoid confusing these apps
-       if (x($_GET, 'getText')) {
+       if (!empty($_GET['getText'])) {
                $ret['title'] = $item['title'];
                if ($_GET['getText'] == 'html') {
                        $ret['text'] = BBCode::convert($item['body'], false);
@@ -2400,7 +2393,7 @@ function api_format_messages($item, $recipient, $sender)
        } else {
                $ret['text'] = $item['title'] . "\n" . HTML::toPlaintext(BBCode::convert(api_clean_plain_items($item['body']), false, 2, true), 0);
        }
-       if (x($_GET, 'getUserObjects') && $_GET['getUserObjects'] == 'false') {
+       if (!empty($_GET['getUserObjects']) && $_GET['getUserObjects'] == 'false') {
                unset($ret['sender']);
                unset($ret['recipient']);
        }
@@ -2530,7 +2523,7 @@ function api_get_attachments(&$body)
  */
 function api_get_entitities(&$text, $bbcode)
 {
-       $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false");
+       $include_entities = strtolower(defaults($_REQUEST, 'include_entities', "false"));
 
        if ($include_entities != "true") {
                preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
@@ -3119,15 +3112,15 @@ function api_lists_statuses($type)
        }
 
        // params
-       $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
-       $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+       $count = defaults($_REQUEST, 'count', 20);
+       $page = (!empty($_REQUEST['page']) ? $_REQUEST['page'] - 1 : 0);
        if ($page < 0) {
                $page = 0;
        }
-       $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-       $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
-       $exclude_replies = (x($_REQUEST, 'exclude_replies') ? 1 : 0);
-       $conversation_id = (x($_REQUEST, 'conversation_id') ? $_REQUEST['conversation_id'] : 0);
+       $since_id = defaults($_REQUEST, 'since_id', 0);
+       $max_id = defaults($_REQUEST, 'max_id', 0);
+       $exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0);
+       $conversation_id = defaults($_REQUEST, 'conversation_id', 0);
 
        $start = $page * $count;
 
@@ -3185,8 +3178,8 @@ function api_statuses_f($qtype)
        }
 
        // pagination
-       $count = x($_GET, 'count') ? $_GET['count'] : 20;
-       $page = x($_GET, 'page') ? $_GET['page'] : 1;
+       $count = defaults($_GET, 'count', 20);
+       $page = defaults($_GET, 'page', 1);
        if ($page < 1) {
                $page = 1;
        }
@@ -3194,7 +3187,7 @@ function api_statuses_f($qtype)
 
        $user_info = api_get_user($a);
 
-       if (x($_GET, 'cursor') && $_GET['cursor'] == 'undefined') {
+       if (!empty($_GET['cursor']) && $_GET['cursor'] == 'undefined') {
                /* this is to stop Hotot to load friends multiple times
                *  I'm not sure if I'm missing return something or
                *  is a bug in hotot. Workaround, meantime
@@ -3522,7 +3515,7 @@ function api_direct_messages_new($type)
 
        $replyto = '';
        $sub     = '';
-       if (x($_REQUEST, 'replyto')) {
+       if (!empty($_REQUEST['replyto'])) {
                $r = q(
                        'SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d',
                        intval(api_user()),
@@ -3531,7 +3524,7 @@ function api_direct_messages_new($type)
                $replyto = $r[0]['parent-uri'];
                $sub     = $r[0]['title'];
        } else {
-               if (x($_REQUEST, 'title')) {
+               if (!empty($_REQUEST['title'])) {
                        $sub = $_REQUEST['title'];
                } else {
                        $sub = ((strlen($_POST['text'])>10) ? substr($_POST['text'], 0, 10)."...":$_POST['text']);
@@ -3583,10 +3576,10 @@ function api_direct_messages_destroy($type)
        // params
        $user_info = api_get_user($a);
        //required
-       $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
+       $id = defaults($_REQUEST, 'id', 0);
        // optional
-       $parenturi = (x($_REQUEST, 'friendica_parenturi') ? $_REQUEST['friendica_parenturi'] : "");
-       $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+       $parenturi = defaults($_REQUEST, 'friendica_parenturi', "");
+       $verbose = (!empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false");
        /// @todo optional parameter 'include_entities' from Twitter API not yet implemented
 
        $uid = $user_info['uid'];
@@ -3647,7 +3640,7 @@ api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy',
 /**
  * Unfollow Contact
  *
- * @brief unfollow contact 
+ * @brief unfollow contact
  *
  * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
  * @return string|array
@@ -3838,7 +3831,7 @@ function api_direct_messages_box($type, $box, $verbose)
  */
 function api_direct_messages_sentbox($type)
 {
-       $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+       $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false";
        return api_direct_messages_box($type, "sentbox", $verbose);
 }
 
@@ -3852,7 +3845,7 @@ function api_direct_messages_sentbox($type)
  */
 function api_direct_messages_inbox($type)
 {
-       $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+       $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false";
        return api_direct_messages_box($type, "inbox", $verbose);
 }
 
@@ -3864,7 +3857,7 @@ function api_direct_messages_inbox($type)
  */
 function api_direct_messages_all($type)
 {
-       $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+       $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false";
        return api_direct_messages_box($type, "all", $verbose);
 }
 
@@ -3876,7 +3869,7 @@ function api_direct_messages_all($type)
  */
 function api_direct_messages_conversation($type)
 {
-       $verbose = (x($_GET, 'friendica_verbose') ? strtolower($_GET['friendica_verbose']) : "false");
+       $verbose = !empty($_GET['friendica_verbose']) ? strtolower($_GET['friendica_verbose']) : "false";
        return api_direct_messages_box($type, "conversation", $verbose);
 }
 
@@ -3940,7 +3933,7 @@ function api_fr_photoalbum_delete($type)
                throw new ForbiddenException();
        }
        // input params
-       $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : "");
+       $album = defaults($_REQUEST, 'album', "");
 
        // we do not allow calls without album string
        if ($album == "") {
@@ -3992,8 +3985,8 @@ function api_fr_photoalbum_update($type)
                throw new ForbiddenException();
        }
        // input params
-       $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : "");
-       $album_new = (x($_REQUEST, 'album_new') ? $_REQUEST['album_new'] : "");
+       $album = defaults($_REQUEST, 'album', "");
+       $album_new = defaults($_REQUEST, 'album_new', "");
 
        // we do not allow calls without album string
        if ($album == "") {
@@ -4077,15 +4070,15 @@ function api_fr_photo_create_update($type)
                throw new ForbiddenException();
        }
        // input params
-       $photo_id = (x($_REQUEST, 'photo_id') ? $_REQUEST['photo_id'] : null);
-       $desc = (x($_REQUEST, 'desc') ? $_REQUEST['desc'] : (array_key_exists('desc', $_REQUEST) ? "" : null)); // extra check necessary to distinguish between 'not provided' and 'empty string'
-       $album = (x($_REQUEST, 'album') ? $_REQUEST['album'] : null);
-       $album_new = (x($_REQUEST, 'album_new') ? $_REQUEST['album_new'] : null);
-       $allow_cid = (x($_REQUEST, 'allow_cid') ? $_REQUEST['allow_cid'] : (array_key_exists('allow_cid', $_REQUEST) ? " " : null));
-       $deny_cid = (x($_REQUEST, 'deny_cid') ? $_REQUEST['deny_cid'] : (array_key_exists('deny_cid', $_REQUEST) ? " " : null));
-       $allow_gid = (x($_REQUEST, 'allow_gid') ? $_REQUEST['allow_gid'] : (array_key_exists('allow_gid', $_REQUEST) ? " " : null));
-       $deny_gid = (x($_REQUEST, 'deny_gid') ? $_REQUEST['deny_gid'] : (array_key_exists('deny_gid', $_REQUEST) ? " " : null));
-       $visibility = (x($_REQUEST, 'visibility') ? (($_REQUEST['visibility'] == "true" || $_REQUEST['visibility'] == 1) ? true : false) : false);
+       $photo_id = defaults($_REQUEST, 'photo_id', null);
+       $desc = defaults($_REQUEST, 'desc', (array_key_exists('desc', $_REQUEST) ? "" : null)) ; // extra check necessary to distinguish between 'not provided' and 'empty string'
+       $album = defaults($_REQUEST, 'album', null);
+       $album_new = defaults($_REQUEST, 'album_new', null);
+       $allow_cid = defaults($_REQUEST, 'allow_cid', (array_key_exists('allow_cid', $_REQUEST) ? " " : null));
+       $deny_cid  = defaults($_REQUEST, 'deny_cid' , (array_key_exists('deny_cid' , $_REQUEST) ? " " : null));
+       $allow_gid = defaults($_REQUEST, 'allow_gid', (array_key_exists('allow_gid', $_REQUEST) ? " " : null));
+       $deny_gid  = defaults($_REQUEST, 'deny_gid' , (array_key_exists('deny_gid' , $_REQUEST) ? " " : null));
+       $visibility = !empty($_REQUEST['visibility']) && $_REQUEST['visibility'] !== "false";
 
        // do several checks on input parameters
        // we do not allow calls without album string
@@ -4097,7 +4090,7 @@ function api_fr_photo_create_update($type)
                $mode = "create";
 
                // error if no media posted in create-mode
-               if (!x($_FILES, 'media')) {
+               if (empty($_FILES['media'])) {
                        // Output error
                        throw new BadRequestException("no media data submitted");
                }
@@ -4188,7 +4181,7 @@ function api_fr_photo_create_update($type)
                        $nothingtodo = true;
                }
 
-               if (x($_FILES, 'media')) {
+               if (!empty($_FILES['media'])) {
                        $nothingtodo = false;
                        $media = $_FILES['media'];
                        $data = save_media_to_database("photo", $media, $type, $album, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $desc, 0, $visibility, $photo_id);
@@ -4224,7 +4217,7 @@ function api_fr_photo_delete($type)
                throw new ForbiddenException();
        }
        // input params
-       $photo_id = (x($_REQUEST, 'photo_id') ? $_REQUEST['photo_id'] : null);
+       $photo_id = defaults($_REQUEST, 'photo_id', null);
 
        // do several checks on input parameters
        // we do not allow calls without photo id
@@ -4275,11 +4268,11 @@ function api_fr_photo_detail($type)
        if (api_user() === false) {
                throw new ForbiddenException();
        }
-       if (!x($_REQUEST, 'photo_id')) {
+       if (empty($_REQUEST['photo_id'])) {
                throw new BadRequestException("No photo id.");
        }
 
-       $scale = (x($_REQUEST, 'scale') ? intval($_REQUEST['scale']) : false);
+       $scale = (!empty($_REQUEST['scale']) ? intval($_REQUEST['scale']) : false);
        $photo_id = $_REQUEST['photo_id'];
 
        // prepare json/xml output with data from database for the requested photo
@@ -4308,7 +4301,7 @@ function api_account_update_profile_image($type)
        $profile_id = defaults($_REQUEST, 'profile_id', 0);
 
        // error if image data is missing
-       if (!x($_FILES, 'image')) {
+       if (empty($_FILES['image'])) {
                throw new BadRequestException("no media data submitted");
        }
 
@@ -4326,9 +4319,9 @@ function api_account_update_profile_image($type)
 
        // get mediadata from image or media (Twitter call api/account/update_profile_image provides image)
        $media = null;
-       if (x($_FILES, 'image')) {
+       if (!empty($_FILES['image'])) {
                $media = $_FILES['image'];
-       } elseif (x($_FILES, 'media')) {
+       } elseif (!empty($_FILES['media'])) {
                $media = $_FILES['media'];
        }
        // save new profile image
@@ -4788,8 +4781,8 @@ function prepare_photo_data($type, $scale, $photo_id)
  */
 function api_friendica_remoteauth()
 {
-       $url = (x($_GET, 'url') ? $_GET['url'] : '');
-       $c_url = (x($_GET, 'c_url') ? $_GET['c_url'] : '');
+       $url = defaults($_GET, 'url', '');
+       $c_url = defaults($_GET, 'c_url', '');
 
        if ($url === '' || $c_url === '') {
                throw new BadRequestException("Wrong parameters.");
@@ -4935,6 +4928,7 @@ function api_share_as_retweet(&$item)
        }
 
        $reshared_item["body"] = $shared_body;
+       $reshared_item["author-id"] = Contact::getIdForURL($profile, 0, true);
        $reshared_item["author-name"] = $author;
        $reshared_item["author-link"] = $profile;
        $reshared_item["author-avatar"] = $avatar;
@@ -5092,7 +5086,7 @@ function api_in_reply_to($item)
  */
 function api_clean_plain_items($text)
 {
-       $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false");
+       $include_entities = strtolower(defaults($_REQUEST, 'include_entities', "false"));
 
        $text = BBCode::cleanPictureLinks($text);
        $URLSearchString = "^\[\]";
@@ -5224,7 +5218,7 @@ function api_friendica_group_show($type)
 
        // params
        $user_info = api_get_user($a);
-       $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
+       $gid = defaults($_REQUEST, 'gid', 0);
        $uid = $user_info['uid'];
 
        // get data of the specified group id or all groups if not specified
@@ -5289,8 +5283,8 @@ function api_friendica_group_delete($type)
 
        // params
        $user_info = api_get_user($a);
-       $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
-       $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+       $gid = defaults($_REQUEST, 'gid', 0);
+       $name = defaults($_REQUEST, 'name', "");
        $uid = $user_info['uid'];
 
        // error if no gid specified
@@ -5351,7 +5345,7 @@ function api_lists_destroy($type)
 
        // params
        $user_info = api_get_user($a);
-       $gid = (x($_REQUEST, 'list_id') ? $_REQUEST['list_id'] : 0);
+       $gid = defaults($_REQUEST, 'list_id', 0);
        $uid = $user_info['uid'];
 
        // error if no gid specified
@@ -5467,7 +5461,7 @@ function api_friendica_group_create($type)
 
        // params
        $user_info = api_get_user($a);
-       $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+       $name = defaults($_REQUEST, 'name', "");
        $uid = $user_info['uid'];
        $json = json_decode($_POST['json'], true);
        $users = $json['user'];
@@ -5496,7 +5490,7 @@ function api_lists_create($type)
 
        // params
        $user_info = api_get_user($a);
-       $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+       $name = defaults($_REQUEST, 'name', "");
        $uid = $user_info['uid'];
 
        $success = group_create($name, $uid);
@@ -5531,8 +5525,8 @@ function api_friendica_group_update($type)
        // params
        $user_info = api_get_user($a);
        $uid = $user_info['uid'];
-       $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
-       $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+       $gid = defaults($_REQUEST, 'gid', 0);
+       $name = defaults($_REQUEST, 'name', "");
        $json = json_decode($_POST['json'], true);
        $users = $json['user'];
 
@@ -5604,8 +5598,8 @@ function api_lists_update($type)
 
        // params
        $user_info = api_get_user($a);
-       $gid = (x($_REQUEST, 'list_id') ? $_REQUEST['list_id'] : 0);
-       $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+       $gid = defaults($_REQUEST, 'list_id', 0);
+       $name = defaults($_REQUEST, 'name', "");
        $uid = $user_info['uid'];
 
        // error if no gid specified
@@ -5650,7 +5644,7 @@ function api_friendica_activity($type)
        $verb = strtolower($a->argv[3]);
        $verb = preg_replace("|\..*$|", "", $verb);
 
-       $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
+       $id = defaults($_REQUEST, 'id', 0);
 
        $res = Item::performLike($id, $verb);
 
@@ -5732,7 +5726,7 @@ function api_friendica_notification_seen($type)
                throw new BadRequestException("Invalid argument count");
        }
 
-       $id = (x($_REQUEST, 'id') ? intval($_REQUEST['id']) : 0);
+       $id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0);
 
        $nm = new NotificationsManager();
        $note = $nm->getByID($id);
@@ -5775,7 +5769,7 @@ function api_friendica_direct_messages_setseen($type)
        // params
        $user_info = api_get_user($a);
        $uid = $user_info['uid'];
-       $id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
+       $id = defaults($_REQUEST, 'id', 0);
 
        // return error if id is zero
        if ($id == "") {
@@ -5824,7 +5818,7 @@ function api_friendica_direct_messages_search($type, $box = "")
 
        // params
        $user_info = api_get_user($a);
-       $searchstring = (x($_REQUEST, 'searchstring') ? $_REQUEST['searchstring'] : "");
+       $searchstring = defaults($_REQUEST, 'searchstring', "");
        $uid = $user_info['uid'];
 
        // error if no searchstring specified
@@ -5886,7 +5880,7 @@ function api_friendica_profile_show($type)
        }
 
        // input params
-       $profile_id = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0);
+       $profile_id = defaults($_REQUEST, 'profile_id', 0);
 
        // retrieve general information about profiles for user
        $multi_profiles = Feature::isEnabled(api_user(), 'multi_profiles');
index 023b6c875e54cb9c582d1719367151bd1d320c95..1059941b9e0bcb274b12f678ff37d4f7b6895601 100644 (file)
@@ -389,7 +389,7 @@ function visible_activity($item) {
         * likes (etc.) can apply to other things besides posts. Check if they are post children,
         * in which case we handle them specially
         */
-       $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+       $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_FOLLOW];
        foreach ($hidden_activities as $act) {
                if (activity_match($item['verb'], $act)) {
                        return false;
@@ -462,17 +462,17 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                                . "<script> var profile_uid = " . $_SESSION['uid']
                                . "; var netargs = '" . substr($a->cmd, 8)
                                . '?f='
-                               . ((x($_GET, 'cid'))    ? '&cid='    . rawurlencode($_GET['cid'])    : '')
-                               . ((x($_GET, 'search')) ? '&search=' . rawurlencode($_GET['search']) : '')
-                               . ((x($_GET, 'star'))   ? '&star='   . rawurlencode($_GET['star'])   : '')
-                               . ((x($_GET, 'order'))  ? '&order='  . rawurlencode($_GET['order'])  : '')
-                               . ((x($_GET, 'bmark'))  ? '&bmark='  . rawurlencode($_GET['bmark'])  : '')
-                               . ((x($_GET, 'liked'))  ? '&liked='  . rawurlencode($_GET['liked'])  : '')
-                               . ((x($_GET, 'conv'))   ? '&conv='   . rawurlencode($_GET['conv'])   : '')
-                               . ((x($_GET, 'nets'))   ? '&nets='   . rawurlencode($_GET['nets'])   : '')
-                               . ((x($_GET, 'cmin'))   ? '&cmin='   . rawurlencode($_GET['cmin'])   : '')
-                               . ((x($_GET, 'cmax'))   ? '&cmax='   . rawurlencode($_GET['cmax'])   : '')
-                               . ((x($_GET, 'file'))   ? '&file='   . rawurlencode($_GET['file'])   : '')
+                               . (!empty($_GET['cid'])    ? '&cid='    . rawurlencode($_GET['cid'])    : '')
+                               . (!empty($_GET['search']) ? '&search=' . rawurlencode($_GET['search']) : '')
+                               . (!empty($_GET['star'])   ? '&star='   . rawurlencode($_GET['star'])   : '')
+                               . (!empty($_GET['order'])  ? '&order='  . rawurlencode($_GET['order'])  : '')
+                               . (!empty($_GET['bmark'])  ? '&bmark='  . rawurlencode($_GET['bmark'])  : '')
+                               . (!empty($_GET['liked'])  ? '&liked='  . rawurlencode($_GET['liked'])  : '')
+                               . (!empty($_GET['conv'])   ? '&conv='   . rawurlencode($_GET['conv'])   : '')
+                               . (!empty($_GET['nets'])   ? '&nets='   . rawurlencode($_GET['nets'])   : '')
+                               . (!empty($_GET['cmin'])   ? '&cmin='   . rawurlencode($_GET['cmin'])   : '')
+                               . (!empty($_GET['cmax'])   ? '&cmax='   . rawurlencode($_GET['cmax'])   : '')
+                               . (!empty($_GET['file'])   ? '&file='   . rawurlencode($_GET['file'])   : '')
 
                                . "'; var profile_page = " . $pager->getPage() . "; </script>\r\n";
                }
@@ -482,7 +482,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 
                if (!$update) {
                        $tab = 'posts';
-                       if (x($_GET, 'tab')) {
+                       if (!empty($_GET['tab'])) {
                                $tab = Strings::escapeTags(trim($_GET['tab']));
                        }
                        if ($tab === 'posts') {
@@ -497,7 +497,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                        }
                }
        } elseif ($mode === 'notes') {
-               $items = conversation_add_children($items, false, $order, $uid);
+               $items = conversation_add_children($items, false, $order, local_user());
                $profile_owner = local_user();
 
                if (!$update) {
@@ -798,7 +798,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
        foreach ($parents AS $parent) {
                $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) ",
-                       $parent['uri'], local_user()];
+                       $parent['uri'], $uid];
                if ($block_authors) {
                        $condition[0] .= "AND NOT `author`.`hidden`";
                }
@@ -951,7 +951,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 
                        $url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
 
-                       if (!x($item, 'thr-parent')) {
+                       if (empty($item['thr-parent'])) {
                                $item['thr-parent'] = $item['parent-uri'];
                        }
 
@@ -994,6 +994,7 @@ function builtin_activity_puller($item, &$conv_responses) {
 function format_like($cnt, array $arr, $type, $id) {
        $o = '';
        $expanded = '';
+       $phrase = '';
 
        if ($cnt == 1) {
                $likers = $arr[0];
@@ -1064,7 +1065,7 @@ function format_like($cnt, array $arr, $type, $id) {
                $expanded .= "\t" . '<div class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</div>';
        }
 
-       $phrase .= EOL ;
+       $phrase .= EOL;
        $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
                '$phrase' => $phrase,
                '$type' => $type,
@@ -1079,7 +1080,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 {
        $o = '';
 
-       $geotag = x($x, 'allow_location') ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
+       $geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
 
        $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
        $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
@@ -1100,7 +1101,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 
        // Private/public post links for the non-JS ACL form
        $private_post = 1;
-       if (x($_REQUEST, 'public')) {
+       if (!empty($_REQUEST['public'])) {
                $private_post = 0;
        }
 
@@ -1432,11 +1433,11 @@ function sort_thr_commented(array $a, array $b)
 }
 
 function render_location_dummy(array $item) {
-       if (x($item, 'location') && !empty($item['location'])) {
+       if (!empty($item['location']) && !empty($item['location'])) {
                return $item['location'];
        }
 
-       if (x($item, 'coord') && !empty($item['coord'])) {
+       if (!empty($item['coord']) && !empty($item['coord'])) {
                return $item['coord'];
        }
 }
index cedd6748ec7fac0a97211a3255b0f63db4d6bd58..eab2e722674439eba8822d2dc0016a30531a7d16 100644 (file)
@@ -58,7 +58,7 @@ function admin_post(App $a)
 
        // do not allow a page manager to access the admin panel at all.
 
-       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+       if (!empty($_SESSION['submanage'])) {
                return;
        }
 
@@ -167,14 +167,14 @@ function admin_content(App $a)
                return Login::form();
        }
 
-       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+       if (!empty($_SESSION['submanage'])) {
                return "";
        }
 
        // APC deactivated, since there are problems with PHP 5.5
        //if (function_exists("apc_delete")) {
-       //      $toDelete = new APCIterator('user', APC_ITER_VALUE);
-       //      apc_delete($toDelete);
+       // $toDelete = new APCIterator('user', APC_ITER_VALUE);
+       // apc_delete($toDelete);
        //}
        // Header stuff
        $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []);
@@ -321,7 +321,7 @@ function admin_page_tos(App $a)
                '$title' => L10n::t('Administration'),
                '$page' => L10n::t('Terms of Service'),
                '$displaytos' => ['displaytos', L10n::t('Display Terms of Service'), Config::get('system', 'tosdisplay'), L10n::t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')],
-               '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system','tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to <a href="%s" target="_blank">EU-GDPR</a>.','https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')],
+               '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system', 'tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to <a href="%s" target="_blank">EU-GDPR</a>.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')],
                '$preview' => L10n::t('Privacy Statement Preview'),
                '$privtext' => $tos->privacy_complete,
                '$tostext' => ['tostext', L10n::t('The Terms of Service'), Config::get('system', 'tostext'), L10n::t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')],
@@ -329,6 +329,7 @@ function admin_page_tos(App $a)
                '$submit' => L10n::t('Save Settings'),
        ]);
 }
+
 /**
  * @brief Process send data from Admin TOS Page
  *
@@ -338,13 +339,13 @@ function admin_page_tos_post(App $a)
 {
        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/tos', 'admin_tos');
 
-       if (!x($_POST, "page_tos")) {
+       if (empty($_POST['page_tos'])) {
                return;
        }
 
-       $displaytos = ((x($_POST, 'displaytos')) ? True : False);
-       $displayprivstatement = ((x($_POST, 'displayprivstatement')) ? True : False);
-       $tostext = ((x($_POST, 'tostext')) ? strip_tags(trim($_POST['tostext'])) : '');
+       $displaytos = !empty($_POST['displaytos']);
+       $displayprivstatement = !empty($_POST['displayprivstatement']);
+       $tostext = (!empty($_POST['tostext']) ? strip_tags(trim($_POST['tostext'])) : '');
 
        Config::set('system', 'tosdisplay', $displaytos);
        Config::set('system', 'tosprivstatement', $displayprivstatement);
@@ -354,6 +355,7 @@ function admin_page_tos_post(App $a)
 
        return; // NOTREACHED
 }
+
 /**
  * @brief Subpage to modify the server wide block list via the admin panel.
  *
@@ -407,13 +409,13 @@ function admin_page_blocklist(App $a)
  */
 function admin_page_blocklist_post(App $a)
 {
-       if (!x($_POST, "page_blocklist_save") && (!x($_POST['page_blocklist_edit']))) {
+       if (empty($_POST['page_blocklist_save']) && empty($_POST['page_blocklist_edit'])) {
                return;
        }
 
        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/blocklist', 'admin_blocklist');
 
-       if (x($_POST['page_blocklist_save'])) {
+       if (!empty($_POST['page_blocklist_save'])) {
                //  Add new item to blocklist
                $blocklist = Config::get('system', 'blocklist');
                $blocklist[] = [
@@ -429,7 +431,7 @@ function admin_page_blocklist_post(App $a)
                        // Trimming whitespaces as well as any lingering slashes
                        $domain = Strings::escapeTags(trim($domain, "\x00..\x1F/"));
                        $reason = Strings::escapeTags(trim($_POST['reason'][$id]));
-                       if (!x($_POST['delete'][$id])) {
+                       if (empty($_POST['delete'][$id])) {
                                $blocklist[] = [
                                        'domain' => $domain,
                                        'reason' => $reason
@@ -451,12 +453,12 @@ function admin_page_blocklist_post(App $a)
  */
 function admin_page_contactblock_post(App $a)
 {
-       $contact_url = x($_POST, 'contact_url') ? $_POST['contact_url'] : '';
-       $contacts    = x($_POST, 'contacts')    ? $_POST['contacts']    : [];
+       $contact_url = defaults($_POST, 'contact_url', '');
+       $contacts    = defaults($_POST, 'contacts', []);
 
        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/contactblock', 'admin_contactblock');
 
-       if (x($_POST, 'page_contactblock_block')) {
+       if (!empty($_POST['page_contactblock_block'])) {
                $contact_id = Contact::getIdForURL($contact_url);
                if ($contact_id) {
                        Contact::block($contact_id);
@@ -465,7 +467,7 @@ function admin_page_contactblock_post(App $a)
                        notice(L10n::t("Could not find any contact entry for this URL \x28%s\x29", $contact_url));
                }
        }
-       if (x($_POST, 'page_contactblock_unblock')) {
+       if (!empty($_POST['page_contactblock_unblock'])) {
                foreach ($contacts as $uid) {
                        Contact::unblock($uid);
                }
@@ -559,13 +561,13 @@ function admin_page_deleteitem(App $a)
  */
 function admin_page_deleteitem_post(App $a)
 {
-       if (!x($_POST['page_deleteitem_submit'])) {
+       if (empty($_POST['page_deleteitem_submit'])) {
                return;
        }
 
        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/deleteitem/', 'admin_deleteitem');
 
-       if (x($_POST['page_deleteitem_submit'])) {
+       if (!empty($_POST['page_deleteitem_submit'])) {
                $guid = trim(Strings::escapeTags($_POST['deleteitemguid']));
                // The GUID should not include a "/", so if there is one, we got an URL
                // and the last part of it is most likely the GUID.
@@ -838,7 +840,7 @@ function admin_page_workerqueue(App $a, $deferred)
                $info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.');
        }
 
-       $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order'=> ['priority']]);
+       $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]);
 
        $r = [];
        while ($entry = DBA::fetch($entries)) {
@@ -938,7 +940,7 @@ function admin_page_summary(App $a)
        $users = 0;
        foreach ($r as $u) {
                $accounts[$u['page-flags']][1] = $u['count'];
-               $users+= $u['count'];
+               $users += $u['count'];
        }
 
        Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA);
@@ -962,10 +964,10 @@ function admin_page_summary(App $a)
        $max_allowed_packet = (($r) ? $r[0]['Value'] : 0);
 
        $server_settings = ['label' => L10n::t('Server Settings'),
-                               'php' => ['upload_max_filesize' => ini_get('upload_max_filesize'),
-                                                 'post_max_size' => ini_get('post_max_size'),
-                                                 'memory_limit' => ini_get('memory_limit')],
-                               'mysql' => ['max_allowed_packet' => $max_allowed_packet]];
+               'php' => ['upload_max_filesize' => ini_get('upload_max_filesize'),
+                       'post_max_size' => ini_get('post_max_size'),
+                       'memory_limit' => ini_get('memory_limit')],
+               'mysql' => ['max_allowed_packet' => $max_allowed_packet]];
 
        $t = Renderer::getMarkupTemplate('admin/summary.tpl');
        return Renderer::replaceMacros($t, [
@@ -1001,17 +1003,17 @@ function admin_page_site_post(App $a)
                return;
        }
 
-       if (!x($_POST, "page_site")) {
+       if (empty($_POST['page_site'])) {
                return;
        }
 
        // relocate
-       if (x($_POST, 'relocate') && x($_POST, 'relocate_url') && $_POST['relocate_url'] != "") {
+       if (!empty($_POST['relocate']) && !empty($_POST['relocate_url']) && $_POST['relocate_url'] != "") {
                $new_url = $_POST['relocate_url'];
                $new_url = rtrim($new_url, "/");
 
                $parsed = @parse_url($new_url);
-               if (!is_array($parsed) || !x($parsed, 'host') || !x($parsed, 'scheme')) {
+               if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) {
                        notice(L10n::t("Can not parse base url. Must have at least <scheme>://<domain>"));
                        $a->internalRedirect('admin/site');
                }
@@ -1046,6 +1048,7 @@ function admin_page_site_post(App $a)
                                $a->internalRedirect('admin/site');
                        }
                }
+
                // update tables
                // update profile links in the format "http://server.tld"
                update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url);
@@ -1059,7 +1062,7 @@ function admin_page_site_post(App $a)
                update_table($a, "gcontact", ['connect', 'addr'], $old_host, $new_host);
 
                // update config
-               Config::set('system', 'hostname', parse_url($new_url,  PHP_URL_HOST));
+               Config::set('system', 'hostname', parse_url($new_url, PHP_URL_HOST));
                Config::set('system', 'url', $new_url);
                $a->setBaseURL($new_url);
 
@@ -1076,98 +1079,97 @@ function admin_page_site_post(App $a)
        }
        // end relocate
 
-       $sitename               =       ((x($_POST,'sitename'))                 ? Strings::escapeTags(trim($_POST['sitename']))         : '');
-       $hostname               =       ((x($_POST,'hostname'))                 ? Strings::escapeTags(trim($_POST['hostname']))         : '');
-       $sender_email           =       ((x($_POST,'sender_email'))             ? Strings::escapeTags(trim($_POST['sender_email']))             : '');
-       $banner                 =       ((x($_POST,'banner'))                   ? trim($_POST['banner'])                        : false);
-       $shortcut_icon          =       ((x($_POST,'shortcut_icon'))            ? Strings::escapeTags(trim($_POST['shortcut_icon']))            : '');
-       $touch_icon             =       ((x($_POST,'touch_icon'))               ? Strings::escapeTags(trim($_POST['touch_icon']))               : '');
-       $info                   =       ((x($_POST,'info'))                     ? trim($_POST['info'])                          : false);
-       $language               =       ((x($_POST,'language'))                 ? Strings::escapeTags(trim($_POST['language']))         : '');
-       $theme                  =       ((x($_POST,'theme'))                    ? Strings::escapeTags(trim($_POST['theme']))                    : '');
-       $theme_mobile           =       ((x($_POST,'theme_mobile'))             ? Strings::escapeTags(trim($_POST['theme_mobile']))             : '');
-       $maximagesize           =       ((x($_POST,'maximagesize'))             ? intval(trim($_POST['maximagesize']))          :  0);
-       $maximagelength         =       ((x($_POST,'maximagelength'))           ? intval(trim($_POST['maximagelength']))        :  MAX_IMAGE_LENGTH);
-       $jpegimagequality       =       ((x($_POST,'jpegimagequality'))         ? intval(trim($_POST['jpegimagequality']))      :  JPEG_QUALITY);
-
-
-       $register_policy        =       ((x($_POST,'register_policy'))          ? intval(trim($_POST['register_policy']))       :  0);
-       $daily_registrations    =       ((x($_POST,'max_daily_registrations'))  ? intval(trim($_POST['max_daily_registrations']))       :0);
-       $abandon_days           =       ((x($_POST,'abandon_days'))             ? intval(trim($_POST['abandon_days']))          :  0);
-
-       $register_text          =       ((x($_POST,'register_text'))            ? strip_tags(trim($_POST['register_text']))             : '');
-
-       $allowed_sites          =       ((x($_POST,'allowed_sites'))            ? Strings::escapeTags(trim($_POST['allowed_sites']))            : '');
-       $allowed_email          =       ((x($_POST,'allowed_email'))            ? Strings::escapeTags(trim($_POST['allowed_email']))            : '');
-       $forbidden_nicknames    =       ((x($_POST,'forbidden_nicknames'))      ? strtolower(Strings::escapeTags(trim($_POST['forbidden_nicknames'])))          : '');
-       $no_oembed_rich_content = x($_POST,'no_oembed_rich_content');
-       $allowed_oembed         =       ((x($_POST,'allowed_oembed'))           ? Strings::escapeTags(trim($_POST['allowed_oembed']))           : '');
-       $block_public           =       ((x($_POST,'block_public'))             ? True                                          : False);
-       $force_publish          =       ((x($_POST,'publish_all'))              ? True                                          : False);
-       $global_directory       =       ((x($_POST,'directory'))                ? Strings::escapeTags(trim($_POST['directory']))                : '');
-       $newuser_private                =       ((x($_POST,'newuser_private'))          ? True                                  : False);
-       $enotify_no_content             =       ((x($_POST,'enotify_no_content'))       ? True                                  : False);
-       $private_addons                 =       ((x($_POST,'private_addons'))           ? True                                  : False);
-       $disable_embedded               =       ((x($_POST,'disable_embedded'))         ? True                                  : False);
-       $allow_users_remote_self        =       ((x($_POST,'allow_users_remote_self'))  ? True                                  : False);
-       $explicit_content       =       ((x($_POST,'explicit_content')) ? True                                  : False);
-
-       $no_multi_reg           =       ((x($_POST,'no_multi_reg'))             ? True                                          : False);
-       $no_openid              =       !((x($_POST,'no_openid'))               ? True                                          : False);
-       $no_regfullname         =       !((x($_POST,'no_regfullname'))          ? True                                          : False);
-       $community_page_style   =       ((x($_POST,'community_page_style'))     ? intval(trim($_POST['community_page_style']))  : 0);
-       $max_author_posts_community_page        =       ((x($_POST,'max_author_posts_community_page'))  ? intval(trim($_POST['max_author_posts_community_page']))       : 0);
-
-       $verifyssl              =       ((x($_POST,'verifyssl'))                ? True                                          : False);
-       $proxyuser              =       ((x($_POST,'proxyuser'))                ? Strings::escapeTags(trim($_POST['proxyuser']))                : '');
-       $proxy                  =       ((x($_POST,'proxy'))                    ? Strings::escapeTags(trim($_POST['proxy']))                    : '');
-       $timeout                =       ((x($_POST,'timeout'))                  ? intval(trim($_POST['timeout']))               : 60);
-       $maxloadavg             =       ((x($_POST,'maxloadavg'))               ? intval(trim($_POST['maxloadavg']))            : 50);
-       $maxloadavg_frontend    =       ((x($_POST,'maxloadavg_frontend'))      ? intval(trim($_POST['maxloadavg_frontend']))   : 50);
-       $min_memory             =       ((x($_POST,'min_memory'))               ? intval(trim($_POST['min_memory']))            : 0);
-       $optimize_max_tablesize =       ((x($_POST,'optimize_max_tablesize'))   ? intval(trim($_POST['optimize_max_tablesize'])): 100);
-       $optimize_fragmentation =       ((x($_POST,'optimize_fragmentation'))   ? intval(trim($_POST['optimize_fragmentation'])): 30);
-       $poco_completion        =       ((x($_POST,'poco_completion'))          ? intval(trim($_POST['poco_completion']))       : false);
-       $poco_requery_days      =       ((x($_POST,'poco_requery_days'))        ? intval(trim($_POST['poco_requery_days']))     : 7);
-       $poco_discovery         =       ((x($_POST,'poco_discovery'))           ? intval(trim($_POST['poco_discovery']))        : 0);
-       $poco_discovery_since   =       ((x($_POST,'poco_discovery_since'))     ? intval(trim($_POST['poco_discovery_since']))  : 30);
-       $poco_local_search      =       ((x($_POST,'poco_local_search'))        ? intval(trim($_POST['poco_local_search']))     : false);
-       $nodeinfo               =       ((x($_POST,'nodeinfo'))                 ? intval(trim($_POST['nodeinfo']))              : false);
-       $dfrn_only              =       ((x($_POST,'dfrn_only'))                ? True                                          : False);
-       $ostatus_disabled       =       !((x($_POST,'ostatus_disabled'))        ? True                                          : False);
-       $ostatus_full_threads   =       ((x($_POST,'ostatus_full_threads'))     ? True                                          : False);
-       $diaspora_enabled       =       ((x($_POST,'diaspora_enabled'))         ? True                                          : False);
-       $ssl_policy             =       ((x($_POST,'ssl_policy'))               ? intval($_POST['ssl_policy'])                  : 0);
-       $force_ssl              =       ((x($_POST,'force_ssl'))                ? True                                          : False);
-       $hide_help              =       ((x($_POST,'hide_help'))                ? True                                          : False);
-       $dbclean                =       ((x($_POST,'dbclean'))                  ? True                                          : False);
-       $dbclean_expire_days    =       ((x($_POST,'dbclean_expire_days'))      ? intval($_POST['dbclean_expire_days'])         : 0);
-       $dbclean_unclaimed      =       ((x($_POST,'dbclean_unclaimed'))        ? intval($_POST['dbclean_unclaimed'])           : 0);
-       $dbclean_expire_conv    =       ((x($_POST,'dbclean_expire_conv'))      ? intval($_POST['dbclean_expire_conv'])         : 0);
-       $suppress_tags          =       ((x($_POST,'suppress_tags'))            ? True                                          : False);
-       $itemcache              =       ((x($_POST,'itemcache'))                ? Strings::escapeTags(trim($_POST['itemcache']))                : '');
-       $itemcache_duration     =       ((x($_POST,'itemcache_duration'))       ? intval($_POST['itemcache_duration'])          : 0);
-       $max_comments           =       ((x($_POST,'max_comments'))             ? intval($_POST['max_comments'])                : 0);
-       $temppath               =       ((x($_POST,'temppath'))                 ? Strings::escapeTags(trim($_POST['temppath']))         : '');
-       $basepath               =       ((x($_POST,'basepath'))                 ? Strings::escapeTags(trim($_POST['basepath']))         : '');
-       $singleuser             =       ((x($_POST,'singleuser'))               ? Strings::escapeTags(trim($_POST['singleuser']))               : '');
-       $proxy_disabled         =       ((x($_POST,'proxy_disabled'))           ? True                                          : False);
-       $only_tag_search        =       ((x($_POST,'only_tag_search'))          ? True                                          : False);
-       $rino                   =       ((x($_POST,'rino'))                     ? intval($_POST['rino'])                        : 0);
-       $check_new_version_url  =       ((x($_POST, 'check_new_version_url'))   ?       Strings::escapeTags(trim($_POST['check_new_version_url']))      : 'none');
-
-       $worker_queues          =       ((x($_POST,'worker_queues'))            ? intval($_POST['worker_queues'])               : 10);
-       $worker_dont_fork       =       ((x($_POST,'worker_dont_fork'))         ? True                                          : False);
-       $worker_fastlane        =       ((x($_POST,'worker_fastlane'))          ? True                                          : False);
-       $worker_frontend        =       ((x($_POST,'worker_frontend'))          ? True                                          : False);
-
-       $relay_directly         =       ((x($_POST,'relay_directly'))           ? True                                          : False);
-       $relay_server           =       ((x($_POST,'relay_server'))             ? Strings::escapeTags(trim($_POST['relay_server']))             : '');
-       $relay_subscribe        =       ((x($_POST,'relay_subscribe'))          ? True                                          : False);
-       $relay_scope            =       ((x($_POST,'relay_scope'))              ? Strings::escapeTags(trim($_POST['relay_scope']))              : '');
-       $relay_server_tags      =       ((x($_POST,'relay_server_tags'))        ? Strings::escapeTags(trim($_POST['relay_server_tags']))        : '');
-       $relay_user_tags        =       ((x($_POST,'relay_user_tags'))          ? True                                          : False);
-       $active_panel           =       (defaults($_POST, 'active_panel', '')   ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : '');
+       $sitename         = (!empty($_POST['sitename'])         ? Strings::escapeTags(trim($_POST['sitename']))      : '');
+       $hostname         = (!empty($_POST['hostname'])         ? Strings::escapeTags(trim($_POST['hostname']))      : '');
+       $sender_email     = (!empty($_POST['sender_email'])     ? Strings::escapeTags(trim($_POST['sender_email']))  : '');
+       $banner           = (!empty($_POST['banner'])           ? trim($_POST['banner'])                             : false);
+       $shortcut_icon    = (!empty($_POST['shortcut_icon'])    ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : '');
+       $touch_icon       = (!empty($_POST['touch_icon'])       ? Strings::escapeTags(trim($_POST['touch_icon']))    : '');
+       $info             = (!empty($_POST['info'])             ? trim($_POST['info'])                               : false);
+       $language         = (!empty($_POST['language'])         ? Strings::escapeTags(trim($_POST['language']))      : '');
+       $theme            = (!empty($_POST['theme'])            ? Strings::escapeTags(trim($_POST['theme']))         : '');
+       $theme_mobile     = (!empty($_POST['theme_mobile'])     ? Strings::escapeTags(trim($_POST['theme_mobile']))  : '');
+       $maximagesize     = (!empty($_POST['maximagesize'])     ? intval(trim($_POST['maximagesize']))               : 0);
+       $maximagelength   = (!empty($_POST['maximagelength'])   ? intval(trim($_POST['maximagelength']))             : MAX_IMAGE_LENGTH);
+       $jpegimagequality = (!empty($_POST['jpegimagequality']) ? intval(trim($_POST['jpegimagequality']))           : JPEG_QUALITY);
+
+       $register_policy        = (!empty($_POST['register_policy'])         ? intval(trim($_POST['register_policy']))             : 0);
+       $daily_registrations    = (!empty($_POST['max_daily_registrations']) ? intval(trim($_POST['max_daily_registrations']))     : 0);
+       $abandon_days           = (!empty($_POST['abandon_days'])            ? intval(trim($_POST['abandon_days']))                : 0);
+
+       $register_text          = (!empty($_POST['register_text'])           ? strip_tags(trim($_POST['register_text']))           : '');
+
+       $allowed_sites          = (!empty($_POST['allowed_sites'])           ? Strings::escapeTags(trim($_POST['allowed_sites']))  : '');
+       $allowed_email          = (!empty($_POST['allowed_email'])           ? Strings::escapeTags(trim($_POST['allowed_email']))  : '');
+       $forbidden_nicknames    = (!empty($_POST['forbidden_nicknames'])     ? strtolower(Strings::escapeTags(trim($_POST['forbidden_nicknames']))) : '');
+       $no_oembed_rich_content = !empty($_POST['no_oembed_rich_content']);
+       $allowed_oembed         = (!empty($_POST['allowed_oembed'])          ? Strings::escapeTags(trim($_POST['allowed_oembed'])) : '');
+       $block_public           = !empty($_POST['block_public']);
+       $force_publish          = !empty($_POST['publish_all']);
+       $global_directory       = (!empty($_POST['directory'])               ? Strings::escapeTags(trim($_POST['directory']))      : '');
+       $newuser_private        = !empty($_POST['newuser_private']);
+       $enotify_no_content     = !empty($_POST['enotify_no_content']);
+       $private_addons         = !empty($_POST['private_addons']);
+       $disable_embedded       = !empty($_POST['disable_embedded']);
+       $allow_users_remote_self = !empty($_POST['allow_users_remote_self']);
+       $explicit_content       = !empty($_POST['explicit_content']);
+
+       $no_multi_reg           = !empty($_POST['no_multi_reg']);
+       $no_openid              = !empty($_POST['no_openid']);
+       $no_regfullname         = !empty($_POST['no_regfullname']);
+       $community_page_style   = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0);
+       $max_author_posts_community_page = (!empty($_POST['max_author_posts_community_page']) ? intval(trim($_POST['max_author_posts_community_page'])) : 0);
+
+       $verifyssl              = !empty($_POST['verifyssl']);
+       $proxyuser              = (!empty($_POST['proxyuser'])              ? Strings::escapeTags(trim($_POST['proxyuser'])) : '');
+       $proxy                  = (!empty($_POST['proxy'])                  ? Strings::escapeTags(trim($_POST['proxy']))     : '');
+       $timeout                = (!empty($_POST['timeout'])                ? intval(trim($_POST['timeout']))                : 60);
+       $maxloadavg             = (!empty($_POST['maxloadavg'])             ? intval(trim($_POST['maxloadavg']))             : 50);
+       $maxloadavg_frontend    = (!empty($_POST['maxloadavg_frontend'])    ? intval(trim($_POST['maxloadavg_frontend']))    : 50);
+       $min_memory             = (!empty($_POST['min_memory'])             ? intval(trim($_POST['min_memory']))             : 0);
+       $optimize_max_tablesize = (!empty($_POST['optimize_max_tablesize']) ? intval(trim($_POST['optimize_max_tablesize'])) : 100);
+       $optimize_fragmentation = (!empty($_POST['optimize_fragmentation']) ? intval(trim($_POST['optimize_fragmentation'])) : 30);
+       $poco_completion        = (!empty($_POST['poco_completion'])        ? intval(trim($_POST['poco_completion']))        : false);
+       $poco_requery_days      = (!empty($_POST['poco_requery_days'])      ? intval(trim($_POST['poco_requery_days']))      : 7);
+       $poco_discovery         = (!empty($_POST['poco_discovery'])         ? intval(trim($_POST['poco_discovery']))         : 0);
+       $poco_discovery_since   = (!empty($_POST['poco_discovery_since'])   ? intval(trim($_POST['poco_discovery_since']))   : 30);
+       $poco_local_search      = !empty($_POST['poco_local_search']);
+       $nodeinfo               = !empty($_POST['nodeinfo']);
+       $dfrn_only              = !empty($_POST['dfrn_only']);
+       $ostatus_disabled       = !empty($_POST['ostatus_disabled']);
+       $ostatus_full_threads   = !empty($_POST['ostatus_full_threads']);
+       $diaspora_enabled       = !empty($_POST['diaspora_enabled']);
+       $ssl_policy             = (!empty($_POST['ssl_policy'])             ? intval($_POST['ssl_policy'])                    : 0);
+       $force_ssl              = !empty($_POST['force_ssl']);
+       $hide_help              = !empty($_POST['hide_help']);
+       $dbclean                = !empty($_POST['dbclean']);
+       $dbclean_expire_days    = (!empty($_POST['dbclean_expire_days'])    ? intval($_POST['dbclean_expire_days'])           : 0);
+       $dbclean_unclaimed      = (!empty($_POST['dbclean_unclaimed'])      ? intval($_POST['dbclean_unclaimed'])             : 0);
+       $dbclean_expire_conv    = (!empty($_POST['dbclean_expire_conv'])    ? intval($_POST['dbclean_expire_conv'])           : 0);
+       $suppress_tags          = !empty($_POST['suppress_tags']);
+       $itemcache              = (!empty($_POST['itemcache'])              ? Strings::escapeTags(trim($_POST['itemcache']))  : '');
+       $itemcache_duration     = (!empty($_POST['itemcache_duration'])     ? intval($_POST['itemcache_duration'])            : 0);
+       $max_comments           = (!empty($_POST['max_comments'])           ? intval($_POST['max_comments'])                  : 0);
+       $temppath               = (!empty($_POST['temppath'])               ? Strings::escapeTags(trim($_POST['temppath']))   : '');
+       $basepath               = (!empty($_POST['basepath'])               ? Strings::escapeTags(trim($_POST['basepath']))   : '');
+       $singleuser             = (!empty($_POST['singleuser'])             ? Strings::escapeTags(trim($_POST['singleuser'])) : '');
+       $proxy_disabled         = !empty($_POST['proxy_disabled']);
+       $only_tag_search        = !empty($_POST['only_tag_search']);
+       $rino                   = (!empty($_POST['rino'])                   ? intval($_POST['rino'])                          : 0);
+       $check_new_version_url  = (!empty($_POST['check_new_version_url'])  ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none');
+
+       $worker_queues    = (!empty($_POST['worker_queues'])                ? intval($_POST['worker_queues'])                 : 10);
+       $worker_dont_fork = !empty($_POST['worker_dont_fork']);
+       $worker_fastlane  = !empty($_POST['worker_fastlane']);
+       $worker_frontend  = !empty($_POST['worker_frontend']);
+
+       $relay_directly    = !empty($_POST['relay_directly']);
+       $relay_server      = (!empty($_POST['relay_server'])      ? Strings::escapeTags(trim($_POST['relay_server']))       : '');
+       $relay_subscribe   = !empty($_POST['relay_subscribe']);
+       $relay_scope       = (!empty($_POST['relay_scope'])       ? Strings::escapeTags(trim($_POST['relay_scope']))        : '');
+       $relay_server_tags = (!empty($_POST['relay_server_tags']) ? Strings::escapeTags(trim($_POST['relay_server_tags']))  : '');
+       $relay_user_tags   = !empty($_POST['relay_user_tags']);
+       $active_panel      = (!empty($_POST['active_panel'])      ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : '');
 
        // Has the directory url changed? If yes, then resubmit the existing profiles there
        if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) {
@@ -1217,24 +1219,24 @@ function admin_page_site_post(App $a)
                        );
                }
        }
-       Config::set('system', 'ssl_policy', $ssl_policy);
-       Config::set('system', 'maxloadavg', $maxloadavg);
-       Config::set('system', 'maxloadavg_frontend', $maxloadavg_frontend);
-       Config::set('system', 'min_memory', $min_memory);
+       Config::set('system', 'ssl_policy'            , $ssl_policy);
+       Config::set('system', 'maxloadavg'            , $maxloadavg);
+       Config::set('system', 'maxloadavg_frontend'   , $maxloadavg_frontend);
+       Config::set('system', 'min_memory'            , $min_memory);
        Config::set('system', 'optimize_max_tablesize', $optimize_max_tablesize);
        Config::set('system', 'optimize_fragmentation', $optimize_fragmentation);
-       Config::set('system', 'poco_completion', $poco_completion);
-       Config::set('system', 'poco_requery_days', $poco_requery_days);
-       Config::set('system', 'poco_discovery', $poco_discovery);
-       Config::set('system', 'poco_discovery_since', $poco_discovery_since);
-       Config::set('system', 'poco_local_search', $poco_local_search);
-       Config::set('system', 'nodeinfo', $nodeinfo);
-       Config::set('config', 'sitename', $sitename);
-       Config::set('config', 'hostname', $hostname);
-       Config::set('config', 'sender_email', $sender_email);
-       Config::set('system', 'suppress_tags', $suppress_tags);
-       Config::set('system', 'shortcut_icon', $shortcut_icon);
-       Config::set('system', 'touch_icon', $touch_icon);
+       Config::set('system', 'poco_completion'       , $poco_completion);
+       Config::set('system', 'poco_requery_days'     , $poco_requery_days);
+       Config::set('system', 'poco_discovery'        , $poco_discovery);
+       Config::set('system', 'poco_discovery_since'  , $poco_discovery_since);
+       Config::set('system', 'poco_local_search'     , $poco_local_search);
+       Config::set('system', 'nodeinfo'              , $nodeinfo);
+       Config::set('config', 'sitename'              , $sitename);
+       Config::set('config', 'hostname'              , $hostname);
+       Config::set('config', 'sender_email'          , $sender_email);
+       Config::set('system', 'suppress_tags'         , $suppress_tags);
+       Config::set('system', 'shortcut_icon'         , $shortcut_icon);
+       Config::set('system', 'touch_icon'            , $touch_icon);
 
        if ($banner == "") {
                Config::delete('system', 'banner');
@@ -1261,49 +1263,49 @@ function admin_page_site_post(App $a)
        } else {
                Config::set('system', 'singleuser', $singleuser);
        }
-       Config::set('system', 'maximagesize', $maximagesize);
-       Config::set('system', 'max_image_length', $maximagelength);
-       Config::set('system', 'jpeg_quality', $jpegimagequality);
+       Config::set('system', 'maximagesize'           , $maximagesize);
+       Config::set('system', 'max_image_length'       , $maximagelength);
+       Config::set('system', 'jpeg_quality'           , $jpegimagequality);
 
-       Config::set('config', 'register_policy', $register_policy);
+       Config::set('config', 'register_policy'        , $register_policy);
        Config::set('system', 'max_daily_registrations', $daily_registrations);
-       Config::set('system', 'account_abandon_days', $abandon_days);
-       Config::set('config', 'register_text', $register_text);
-       Config::set('system', 'allowed_sites', $allowed_sites);
-       Config::set('system', 'allowed_email', $allowed_email);
-       Config::set('system', 'forbidden_nicknames', $forbidden_nicknames);
-       Config::set('system', 'no_oembed_rich_content', $no_oembed_rich_content);
-       Config::set('system', 'allowed_oembed', $allowed_oembed);
-       Config::set('system', 'block_public', $block_public);
-       Config::set('system', 'publish_all', $force_publish);
-       Config::set('system', 'newuser_private', $newuser_private);
-       Config::set('system', 'enotify_no_content', $enotify_no_content);
-       Config::set('system', 'disable_embedded', $disable_embedded);
+       Config::set('system', 'account_abandon_days'   , $abandon_days);
+       Config::set('config', 'register_text'          , $register_text);
+       Config::set('system', 'allowed_sites'          , $allowed_sites);
+       Config::set('system', 'allowed_email'          , $allowed_email);
+       Config::set('system', 'forbidden_nicknames'    , $forbidden_nicknames);
+       Config::set('system', 'no_oembed_rich_content' , $no_oembed_rich_content);
+       Config::set('system', 'allowed_oembed'         , $allowed_oembed);
+       Config::set('system', 'block_public'           , $block_public);
+       Config::set('system', 'publish_all'            , $force_publish);
+       Config::set('system', 'newuser_private'        , $newuser_private);
+       Config::set('system', 'enotify_no_content'     , $enotify_no_content);
+       Config::set('system', 'disable_embedded'       , $disable_embedded);
        Config::set('system', 'allow_users_remote_self', $allow_users_remote_self);
-       Config::set('system', 'explicit_content', $explicit_content);
-       Config::set('system', 'check_new_version_url', $check_new_version_url);
+       Config::set('system', 'explicit_content'       , $explicit_content);
+       Config::set('system', 'check_new_version_url'  , $check_new_version_url);
 
        Config::set('system', 'block_extended_register', $no_multi_reg);
-       Config::set('system', 'no_openid', $no_openid);
-       Config::set('system', 'no_regfullname', $no_regfullname);
-       Config::set('system', 'community_page_style', $community_page_style);
+       Config::set('system', 'no_openid'              , $no_openid);
+       Config::set('system', 'no_regfullname'         , $no_regfullname);
+       Config::set('system', 'community_page_style'   , $community_page_style);
        Config::set('system', 'max_author_posts_community_page', $max_author_posts_community_page);
-       Config::set('system', 'verifyssl', $verifyssl);
-       Config::set('system', 'proxyuser', $proxyuser);
-       Config::set('system', 'proxy', $proxy);
-       Config::set('system', 'curl_timeout', $timeout);
-       Config::set('system', 'dfrn_only', $dfrn_only);
-       Config::set('system', 'ostatus_disabled', $ostatus_disabled);
-       Config::set('system', 'ostatus_full_threads', $ostatus_full_threads);
-       Config::set('system', 'diaspora_enabled', $diaspora_enabled);
-
-       Config::set('config', 'private_addons', $private_addons);
-
-       Config::set('system', 'force_ssl', $force_ssl);
-       Config::set('system', 'hide_help', $hide_help);
-
-       Config::set('system', 'dbclean', $dbclean);
-       Config::set('system', 'dbclean-expire-days', $dbclean_expire_days);
+       Config::set('system', 'verifyssl'              , $verifyssl);
+       Config::set('system', 'proxyuser'              , $proxyuser);
+       Config::set('system', 'proxy'                  , $proxy);
+       Config::set('system', 'curl_timeout'           , $timeout);
+       Config::set('system', 'dfrn_only'              , $dfrn_only);
+       Config::set('system', 'ostatus_disabled'       , $ostatus_disabled);
+       Config::set('system', 'ostatus_full_threads'   , $ostatus_full_threads);
+       Config::set('system', 'diaspora_enabled'       , $diaspora_enabled);
+
+       Config::set('config', 'private_addons'         , $private_addons);
+
+       Config::set('system', 'force_ssl'              , $force_ssl);
+       Config::set('system', 'hide_help'              , $hide_help);
+
+       Config::set('system', 'dbclean'                , $dbclean);
+       Config::set('system', 'dbclean-expire-days'    , $dbclean_expire_days);
        Config::set('system', 'dbclean_expire_conversation', $dbclean_expire_conv);
 
        if ($dbclean_unclaimed == 0) {
@@ -1330,23 +1332,23 @@ function admin_page_site_post(App $a)
                $basepath = App::getRealPath($basepath);
        }
 
-       Config::set('system', 'basepath', $basepath);
-       Config::set('system', 'proxy_disabled', $proxy_disabled);
-       Config::set('system', 'only_tag_search', $only_tag_search);
+       Config::set('system', 'basepath'         , $basepath);
+       Config::set('system', 'proxy_disabled'   , $proxy_disabled);
+       Config::set('system', 'only_tag_search'  , $only_tag_search);
 
-       Config::set('system', 'worker_queues', $worker_queues);
-       Config::set('system', 'worker_dont_fork', $worker_dont_fork);
-       Config::set('system', 'worker_fastlane', $worker_fastlane);
-       Config::set('system', 'frontend_worker', $worker_frontend);
+       Config::set('system', 'worker_queues'    , $worker_queues);
+       Config::set('system', 'worker_dont_fork' , $worker_dont_fork);
+       Config::set('system', 'worker_fastlane'  , $worker_fastlane);
+       Config::set('system', 'frontend_worker'  , $worker_frontend);
 
-       Config::set('system', 'relay_directly', $relay_directly);
-       Config::set('system', 'relay_server', $relay_server);
-       Config::set('system', 'relay_subscribe', $relay_subscribe);
-       Config::set('system', 'relay_scope', $relay_scope);
+       Config::set('system', 'relay_directly'   , $relay_directly);
+       Config::set('system', 'relay_server'     , $relay_server);
+       Config::set('system', 'relay_subscribe'  , $relay_subscribe);
+       Config::set('system', 'relay_scope'      , $relay_scope);
        Config::set('system', 'relay_server_tags', $relay_server_tags);
-       Config::set('system', 'relay_user_tags', $relay_user_tags);
+       Config::set('system', 'relay_user_tags'  , $relay_user_tags);
 
-       Config::set('system', 'rino_encrypt', $rino);
+       Config::set('system', 'rino_encrypt'     , $rino);
 
        info(L10n::t('Site settings updated.') . EOL);
 
@@ -1442,9 +1444,7 @@ function admin_page_site(App $a)
                $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
        }
 
-       $banner = htmlspecialchars($banner);
        $info = Config::get('config', 'info');
-       $info = htmlspecialchars($info);
 
        // Automatically create temporary paths
        get_temppath();
@@ -1484,120 +1484,121 @@ function admin_page_site(App $a)
 
        $t = Renderer::getMarkupTemplate('admin/site.tpl');
        return Renderer::replaceMacros($t, [
-               '$title' => L10n::t('Administration'),
-               '$page' => L10n::t('Site'),
-               '$submit' => L10n::t('Save Settings'),
-               '$republish' => L10n::t('Republish users to directory'),
-               '$registration' => L10n::t('Registration'),
-               '$upload' => L10n::t('File upload'),
-               '$corporate' => L10n::t('Policies'),
-               '$advanced' => L10n::t('Advanced'),
+               '$title'             => L10n::t('Administration'),
+               '$page'              => L10n::t('Site'),
+               '$submit'            => L10n::t('Save Settings'),
+               '$republish'         => L10n::t('Republish users to directory'),
+               '$registration'      => L10n::t('Registration'),
+               '$upload'            => L10n::t('File upload'),
+               '$corporate'         => L10n::t('Policies'),
+               '$advanced'          => L10n::t('Advanced'),
                '$portable_contacts' => L10n::t('Auto Discovered Contact Directory'),
-               '$performance' => L10n::t('Performance'),
-               '$worker_title' => L10n::t('Worker'),
-               '$relay_title' => L10n::t('Message Relay'),
-               '$relocate' => L10n::t('Relocate Instance'),
-               '$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'),
-               '$baseurl' => System::baseUrl(true),
+               '$performance'       => L10n::t('Performance'),
+               '$worker_title'      => L10n::t('Worker'),
+               '$relay_title'       => L10n::t('Message Relay'),
+               '$relocate'          => L10n::t('Relocate Instance'),
+               '$relocate_warning'  => L10n::t('Warning! Advanced function. Could make this server unreachable.'),
+               '$baseurl'           => System::baseUrl(true),
+
                // name, label, value, help string, extra data...
-               '$sitename'             => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''],
-               '$hostname'             => ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""],
-               '$sender_email'         => ['sender_email', L10n::t("Sender Email"), Config::get('config', 'sender_email'), L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"],
-               '$banner'               => ['banner', L10n::t("Banner/Logo"), $banner, ""],
-               '$shortcut_icon'        => ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system','shortcut_icon'),  L10n::t("Link to an icon that will be used for browsers.")],
-               '$touch_icon'           => ['touch_icon', L10n::t("Touch icon"), Config::get('system','touch_icon'),  L10n::t("Link to an icon that will be used for tablets and mobiles.")],
-               '$info'                 => ['info', L10n::t('Additional Info'), $info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())],
-               '$language'             => ['language', L10n::t("System language"), Config::get('system','language'), "", $lang_choices],
-               '$theme'                => ['theme', L10n::t("System theme"), Config::get('system','theme'), L10n::t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices],
-               '$theme_mobile'         => ['theme_mobile', L10n::t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), L10n::t("Theme for mobile devices"), $theme_choices_mobile],
-               '$ssl_policy'           => ['ssl_policy', L10n::t("SSL link policy"), (string) intval(Config::get('system','ssl_policy')), L10n::t("Determines whether generated links should be forced to use SSL"), $ssl_choices],
-               '$force_ssl'            => ['force_ssl', L10n::t("Force SSL"), Config::get('system','force_ssl'), L10n::t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")],
-               '$hide_help'            => ['hide_help', L10n::t("Hide help entry from navigation menu"), Config::get('system','hide_help'), L10n::t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")],
-               '$singleuser'           => ['singleuser', L10n::t("Single user instance"), Config::get('system', 'singleuser', '---'), L10n::t("Make this instance multi-user or single-user for the named user"), $user_names],
-               '$maximagesize'         => ['maximagesize', L10n::t("Maximum image size"), Config::get('system','maximagesize'), L10n::t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")],
-               '$maximagelength'       => ['maximagelength', L10n::t("Maximum image length"), Config::get('system','max_image_length'), L10n::t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")],
-               '$jpegimagequality'     => ['jpegimagequality', L10n::t("JPEG image quality"), Config::get('system','jpeg_quality'), L10n::t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")],
-
-               '$register_policy'      => ['register_policy', L10n::t("Register policy"), Config::get('config', 'register_policy'), "", $register_choices],
-               '$daily_registrations'  => ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect.")],
-               '$register_text'        => ['register_text', L10n::t("Register text"), Config::get('config', 'register_text'), L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
-               '$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames'), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')],
-               '$abandon_days'         => ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
-               '$allowed_sites'        => ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system','allowed_sites'), L10n::t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")],
-               '$allowed_email'        => ['allowed_email', L10n::t("Allowed email domains"), Config::get('system','allowed_email'), L10n::t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")],
-               '$no_oembed_rich_content' => ['no_oembed_rich_content', L10n::t("No OEmbed rich content"), Config::get('system','no_oembed_rich_content'), L10n::t("Don't show the rich content \x28e.g. embedded PDF\x29, except from the domains listed below.")],
-               '$allowed_oembed'       => ['allowed_oembed', L10n::t("Allowed OEmbed domains"), Config::get('system','allowed_oembed'), L10n::t("Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted.")],
-               '$block_public'         => ['block_public', L10n::t("Block public"), Config::get('system','block_public'), L10n::t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")],
-               '$force_publish'        => ['publish_all', L10n::t("Force publish"), Config::get('system','publish_all'), L10n::t("Check to force all profiles on this site to be listed in the site directory.") . '<strong>' . L10n::t('Enabling this may violate privacy laws like the GDPR') . '</strong>'],
-               '$global_directory'     => ['directory', L10n::t("Global directory URL"), Config::get('system', 'directory', 'https://dir.friendica.social'), L10n::t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")],
-               '$newuser_private'      => ['newuser_private', L10n::t("Private posts by default for new users"), Config::get('system','newuser_private'), L10n::t("Set default post permissions for all new members to the default privacy group rather than public.")],
-               '$enotify_no_content'   => ['enotify_no_content', L10n::t("Don't include post content in email notifications"), Config::get('system','enotify_no_content'), L10n::t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")],
-               '$private_addons'       => ['private_addons', L10n::t("Disallow public access to addons listed in the apps menu."), Config::get('config','private_addons'), L10n::t("Checking this box will restrict addons listed in the apps menu to members only.")],
-               '$disable_embedded'     => ['disable_embedded', L10n::t("Don't embed private images in posts"), Config::get('system','disable_embedded'), L10n::t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")],
-               '$explicit_content' => ['explicit_content', L10n::t('Explicit Content'), Config::get('system', 'explicit_content', False), L10n::t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')],
-               '$allow_users_remote_self' => ['allow_users_remote_self', L10n::t('Allow Users to set remote_self'), Config::get('system','allow_users_remote_self'), L10n::t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')],
-               '$no_multi_reg'         => ['no_multi_reg', L10n::t("Block multiple registrations"),  Config::get('system','block_extended_register'), L10n::t("Disallow users to register additional accounts for use as pages.")],
-               '$no_openid'            => ['no_openid', L10n::t("OpenID support"), !Config::get('system','no_openid'), L10n::t("OpenID support for registration and logins.")],
-               '$no_regfullname'       => ['no_regfullname', L10n::t("Fullname check"), !Config::get('system','no_regfullname'), L10n::t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")],
-               '$community_page_style' => ['community_page_style', L10n::t("Community pages for visitors"), Config::get('system','community_page_style'), L10n::t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices],
-               '$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), L10n::t("The maximum number of posts per user on the community page. \x28Not valid for 'Global Community'\x29")],
-               '$ostatus_disabled'     => ['ostatus_disabled', L10n::t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), L10n::t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")],
-               '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus/ActivityPub threads from our contacts"), Config::get('system','ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.")],
-               '$ostatus_not_able'     => L10n::t("OStatus support can only be enabled if threading is enabled."),
-               '$diaspora_able'        => $diaspora_able,
-               '$diaspora_not_able'    => L10n::t("Diaspora support can't be enabled because Friendica was installed into a sub directory."),
-               '$diaspora_enabled'     => ['diaspora_enabled', L10n::t("Enable Diaspora support"), Config::get('system', 'diaspora_enabled', $diaspora_able), L10n::t("Provide built-in Diaspora network compatibility.")],
-               '$dfrn_only'            => ['dfrn_only', L10n::t('Only allow Friendica contacts'), Config::get('system','dfrn_only'), L10n::t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")],
-               '$verifyssl'            => ['verifyssl', L10n::t("Verify SSL"), Config::get('system','verifyssl'), L10n::t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect \x28at all\x29 to self-signed SSL sites.")],
-               '$proxyuser'            => ['proxyuser', L10n::t("Proxy user"), Config::get('system','proxyuser'), ""],
-               '$proxy'                => ['proxy', L10n::t("Proxy URL"), Config::get('system','proxy'), ""],
-               '$timeout'              => ['timeout', L10n::t("Network timeout"), Config::get('system', 'curl_timeout', 60), L10n::t("Value is in seconds. Set to 0 for unlimited \x28not recommended\x29.")],
-               '$maxloadavg'           => ['maxloadavg', L10n::t("Maximum Load Average"), Config::get('system', 'maxloadavg', 50), L10n::t("Maximum system load before delivery and poll processes are deferred - default 50.")],
-               '$maxloadavg_frontend'  => ['maxloadavg_frontend', L10n::t("Maximum Load Average \x28Frontend\x29"), Config::get('system', 'maxloadavg_frontend', 50), L10n::t("Maximum system load before the frontend quits service - default 50.")],
-               '$min_memory'           => ['min_memory', L10n::t("Minimal Memory"), Config::get('system', 'min_memory', 0), L10n::t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 \x28deactivated\x29.")],
-               '$optimize_max_tablesize'=> ['optimize_max_tablesize', L10n::t("Maximum table size for optimization"), $optimize_max_tablesize, L10n::t("Maximum table size \x28in MB\x29 for the automatic optimization. Enter -1 to disable it.")],
-               '$optimize_fragmentation'=> ['optimize_fragmentation', L10n::t("Minimum level of fragmentation"), Config::get('system', 'optimize_fragmentation', 30), L10n::t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")],
-
-               '$poco_completion'      => ['poco_completion', L10n::t("Periodical check of global contacts"), Config::get('system','poco_completion'), L10n::t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")],
-               '$poco_requery_days'    => ['poco_requery_days', L10n::t("Days between requery"), Config::get('system','poco_requery_days'), L10n::t("Number of days after which a server is requeried for his contacts.")],
-               '$poco_discovery'       => ['poco_discovery', L10n::t("Discover contacts from other servers"), (string) intval(Config::get('system','poco_discovery')), L10n::t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices],
-               '$poco_discovery_since' => ['poco_discovery_since', L10n::t("Timeframe for fetching global contacts"), (string) intval(Config::get('system','poco_discovery_since')), L10n::t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices],
-               '$poco_local_search'    => ['poco_local_search', L10n::t("Search the local directory"), Config::get('system','poco_local_search'), L10n::t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")],
-
-               '$nodeinfo'             => ['nodeinfo', L10n::t("Publish server information"), Config::get('system','nodeinfo'), L10n::t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details.")],
-
-               '$check_new_version_url' => ['check_new_version_url', L10n::t("Check upstream version"), Config::get('system', 'check_new_version_url'), L10n::t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices],
-               '$suppress_tags'        => ['suppress_tags', L10n::t("Suppress Tags"), Config::get('system','suppress_tags'), L10n::t("Suppress showing a list of hashtags at the end of the posting.")],
-               '$dbclean'              => ['dbclean', L10n::t("Clean database"), Config::get('system','dbclean', false), L10n::t("Remove old remote items, orphaned database records and old content from some other helper tables.")],
-               '$dbclean_expire_days'  => ['dbclean_expire_days', L10n::t("Lifespan of remote items"), Config::get('system','dbclean-expire-days', 0), L10n::t("When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.")],
-               '$dbclean_unclaimed'    => ['dbclean_unclaimed', L10n::t("Lifespan of unclaimed items"), Config::get('system','dbclean-expire-unclaimed', 90), L10n::t("When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.")],
-               '$dbclean_expire_conv'  => ['dbclean_expire_conv', L10n::t("Lifespan of raw conversation data"), Config::get('system','dbclean_expire_conversation', 90), L10n::t("The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days.")],
-               '$itemcache'            => ['itemcache', L10n::t("Path to item cache"), Config::get('system','itemcache'), L10n::t("The item caches buffers generated bbcode and external images.")],
-               '$itemcache_duration'   => ['itemcache_duration', L10n::t("Cache duration in seconds"), Config::get('system','itemcache_duration'), L10n::t("How long should the cache files be hold? Default value is 86400 seconds \x28One day\x29. To disable the item cache, set the value to -1.")],
-               '$max_comments'         => ['max_comments', L10n::t("Maximum numbers of comments per post"), Config::get('system','max_comments'), L10n::t("How much comments should be shown for each post? Default value is 100.")],
-               '$temppath'             => ['temppath', L10n::t("Temp path"), Config::get('system','temppath'), L10n::t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")],
-               '$basepath'             => ['basepath', L10n::t("Base path to installation"), Config::get('system','basepath'), L10n::t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")],
-               '$proxy_disabled'       => ['proxy_disabled', L10n::t("Disable picture proxy"), Config::get('system','proxy_disabled'), L10n::t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth.")],
-               '$only_tag_search'      => ['only_tag_search', L10n::t("Only search in tags"), Config::get('system','only_tag_search'), L10n::t("On large systems the text search can slow down the system extremely.")],
-
-               '$relocate_url'         => ['relocate_url', L10n::t("New base url"), System::baseUrl(), L10n::t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")],
-
-               '$rino'                 => ['rino', L10n::t("RINO Encryption"), intval(Config::get('system','rino_encrypt')), L10n::t("Encryption layer between nodes."), [0 => L10n::t("Disabled"), 1 => L10n::t("Enabled")]],
-
-               '$worker_queues'        => ['worker_queues', L10n::t("Maximum number of parallel workers"), Config::get('system','worker_queues'), L10n::t("On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.", 5, 20, 10)],
-               '$worker_dont_fork'     => ['worker_dont_fork', L10n::t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), L10n::t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")],
-               '$worker_fastlane'      => ['worker_fastlane', L10n::t("Enable fastlane"), Config::get('system','worker_fastlane'), L10n::t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")],
-               '$worker_frontend'      => ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system','frontend_worker'), L10n::t('When enabled the Worker process is triggered when backend access is performed \x28e.g. messages being delivered\x29. On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.', System::baseUrl())],
-
-               '$relay_subscribe'      => ['relay_subscribe', L10n::t("Subscribe to relay"), Config::get('system','relay_subscribe'), L10n::t("Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page.")],
-               '$relay_server'         => ['relay_server', L10n::t("Relay server"), Config::get('system', 'relay_server', 'https://relay.diasp.org'), L10n::t("Address of the relay server where public posts should be send to. For example https://relay.diasp.org")],
-               '$relay_directly'       => ['relay_directly', L10n::t("Direct relay transfer"), Config::get('system','relay_directly'), L10n::t("Enables the direct transfer to other servers without using the relay servers")],
-               '$relay_scope'          => ['relay_scope', L10n::t("Relay scope"), Config::get('system','relay_scope'), L10n::t("Can be 'all' or 'tags'. 'all' means that every public post should be received. 'tags' means that only posts with selected tags should be received."), ['' => L10n::t('Disabled'), 'all' => L10n::t('all'), 'tags' => L10n::t('tags')]],
-               '$relay_server_tags'    => ['relay_server_tags', L10n::t("Server tags"), Config::get('system','relay_server_tags'), L10n::t("Comma separated list of tags for the 'tags' subscription.")],
-               '$relay_user_tags'      => ['relay_user_tags', L10n::t("Allow user tags"), Config::get('system', 'relay_user_tags', true), L10n::t("If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'.")],
-
-               '$form_security_token'  => BaseModule::getFormSecurityToken("admin_site"),
-               '$relocate_button'      => L10n::t('Start Relocation'),
+               '$sitename'         => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'), ''],
+               '$hostname'         => ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""],
+               '$sender_email'     => ['sender_email', L10n::t("Sender Email"), Config::get('config', 'sender_email'), L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"],
+               '$banner'           => ['banner', L10n::t("Banner/Logo"), $banner, ""],
+               '$shortcut_icon'    => ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system', 'shortcut_icon'), L10n::t("Link to an icon that will be used for browsers.")],
+               '$touch_icon'       => ['touch_icon', L10n::t("Touch icon"), Config::get('system', 'touch_icon'), L10n::t("Link to an icon that will be used for tablets and mobiles.")],
+               '$info'             => ['info', L10n::t('Additional Info'), $info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())],
+               '$language'         => ['language', L10n::t("System language"), Config::get('system', 'language'), "", $lang_choices],
+               '$theme'            => ['theme', L10n::t("System theme"), Config::get('system', 'theme'), L10n::t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices],
+               '$theme_mobile'     => ['theme_mobile', L10n::t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), L10n::t("Theme for mobile devices"), $theme_choices_mobile],
+               '$ssl_policy'       => ['ssl_policy', L10n::t("SSL link policy"), (string)intval(Config::get('system', 'ssl_policy')), L10n::t("Determines whether generated links should be forced to use SSL"), $ssl_choices],
+               '$force_ssl'        => ['force_ssl', L10n::t("Force SSL"), Config::get('system', 'force_ssl'), L10n::t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")],
+               '$hide_help'        => ['hide_help', L10n::t("Hide help entry from navigation menu"), Config::get('system', 'hide_help'), L10n::t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")],
+               '$singleuser'       => ['singleuser', L10n::t("Single user instance"), Config::get('system', 'singleuser', '---'), L10n::t("Make this instance multi-user or single-user for the named user"), $user_names],
+               '$maximagesize'     => ['maximagesize', L10n::t("Maximum image size"), Config::get('system', 'maximagesize'), L10n::t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")],
+               '$maximagelength'   => ['maximagelength', L10n::t("Maximum image length"), Config::get('system', 'max_image_length'), L10n::t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")],
+               '$jpegimagequality' => ['jpegimagequality', L10n::t("JPEG image quality"), Config::get('system', 'jpeg_quality'), L10n::t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")],
+
+               '$register_policy'        => ['register_policy', L10n::t("Register policy"), Config::get('config', 'register_policy'), "", $register_choices],
+               '$daily_registrations'    => ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect.")],
+               '$register_text'          => ['register_text', L10n::t("Register text"), Config::get('config', 'register_text'), L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
+               '$forbidden_nicknames'    => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames'), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')],
+               '$abandon_days'           => ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system', 'account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
+               '$allowed_sites'          => ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system', 'allowed_sites'), L10n::t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")],
+               '$allowed_email'          => ['allowed_email', L10n::t("Allowed email domains"), Config::get('system', 'allowed_email'), L10n::t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")],
+               '$no_oembed_rich_content' => ['no_oembed_rich_content', L10n::t("No OEmbed rich content"), Config::get('system', 'no_oembed_rich_content'), L10n::t("Don't show the rich content \x28e.g. embedded PDF\x29, except from the domains listed below.")],
+               '$allowed_oembed'         => ['allowed_oembed', L10n::t("Allowed OEmbed domains"), Config::get('system', 'allowed_oembed'), L10n::t("Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted.")],
+               '$block_public'           => ['block_public', L10n::t("Block public"), Config::get('system', 'block_public'), L10n::t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")],
+               '$force_publish'          => ['publish_all', L10n::t("Force publish"), Config::get('system', 'publish_all'), L10n::t("Check to force all profiles on this site to be listed in the site directory.") . '<strong>' . L10n::t('Enabling this may violate privacy laws like the GDPR') . '</strong>'],
+               '$global_directory'       => ['directory', L10n::t("Global directory URL"), Config::get('system', 'directory', 'https://dir.friendica.social'), L10n::t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")],
+               '$newuser_private'        => ['newuser_private', L10n::t("Private posts by default for new users"), Config::get('system', 'newuser_private'), L10n::t("Set default post permissions for all new members to the default privacy group rather than public.")],
+               '$enotify_no_content'     => ['enotify_no_content', L10n::t("Don't include post content in email notifications"), Config::get('system', 'enotify_no_content'), L10n::t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")],
+               '$private_addons'         => ['private_addons', L10n::t("Disallow public access to addons listed in the apps menu."), Config::get('config', 'private_addons'), L10n::t("Checking this box will restrict addons listed in the apps menu to members only.")],
+               '$disable_embedded'       => ['disable_embedded', L10n::t("Don't embed private images in posts"), Config::get('system', 'disable_embedded'), L10n::t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")],
+               '$explicit_content'       => ['explicit_content', L10n::t('Explicit Content'), Config::get('system', 'explicit_content', false), L10n::t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')],
+               '$allow_users_remote_self'=> ['allow_users_remote_self', L10n::t('Allow Users to set remote_self'), Config::get('system', 'allow_users_remote_self'), L10n::t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')],
+               '$no_multi_reg'           => ['no_multi_reg', L10n::t("Block multiple registrations"), Config::get('system', 'block_extended_register'), L10n::t("Disallow users to register additional accounts for use as pages.")],
+               '$no_openid'              => ['no_openid', L10n::t("Disable OpenID"), Config::get('system', 'no_openid'), L10n::t("Disable OpenID support for registration and logins.")],
+               '$no_regfullname'         => ['no_regfullname', L10n::t("No Fullname check"), Config::get('system', 'no_regfullname'), L10n::t("Allow users to register without a space between the first name and the last name in their full name.")],
+               '$community_page_style'   => ['community_page_style', L10n::t("Community pages for visitors"), Config::get('system', 'community_page_style'), L10n::t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices],
+               '$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t("Posts per user on community page"), Config::get('system', 'max_author_posts_community_page'), L10n::t("The maximum number of posts per user on the community page. \x28Not valid for 'Global Community'\x29")],
+               '$ostatus_disabled'       => ['ostatus_disabled', L10n::t("Disable OStatus support"), Config::get('system', 'ostatus_disabled'), L10n::t("Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")],
+               '$ostatus_full_threads'   => ['ostatus_full_threads', L10n::t("Only import OStatus/ActivityPub threads from our contacts"), Config::get('system', 'ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.")],
+               '$ostatus_not_able'       => L10n::t("OStatus support can only be enabled if threading is enabled."),
+               '$diaspora_able'          => $diaspora_able,
+               '$diaspora_not_able'      => L10n::t("Diaspora support can't be enabled because Friendica was installed into a sub directory."),
+               '$diaspora_enabled'       => ['diaspora_enabled', L10n::t("Enable Diaspora support"), Config::get('system', 'diaspora_enabled', $diaspora_able), L10n::t("Provide built-in Diaspora network compatibility.")],
+               '$dfrn_only'              => ['dfrn_only', L10n::t('Only allow Friendica contacts'), Config::get('system', 'dfrn_only'), L10n::t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")],
+               '$verifyssl'              => ['verifyssl', L10n::t("Verify SSL"), Config::get('system', 'verifyssl'), L10n::t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect \x28at all\x29 to self-signed SSL sites.")],
+               '$proxyuser'              => ['proxyuser', L10n::t("Proxy user"), Config::get('system', 'proxyuser'), ""],
+               '$proxy'                  => ['proxy', L10n::t("Proxy URL"), Config::get('system', 'proxy'), ""],
+               '$timeout'                => ['timeout', L10n::t("Network timeout"), Config::get('system', 'curl_timeout', 60), L10n::t("Value is in seconds. Set to 0 for unlimited \x28not recommended\x29.")],
+               '$maxloadavg'             => ['maxloadavg', L10n::t("Maximum Load Average"), Config::get('system', 'maxloadavg', 50), L10n::t("Maximum system load before delivery and poll processes are deferred - default 50.")],
+               '$maxloadavg_frontend'    => ['maxloadavg_frontend', L10n::t("Maximum Load Average \x28Frontend\x29"), Config::get('system', 'maxloadavg_frontend', 50), L10n::t("Maximum system load before the frontend quits service - default 50.")],
+               '$min_memory'             => ['min_memory', L10n::t("Minimal Memory"), Config::get('system', 'min_memory', 0), L10n::t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 \x28deactivated\x29.")],
+               '$optimize_max_tablesize' => ['optimize_max_tablesize', L10n::t("Maximum table size for optimization"), $optimize_max_tablesize, L10n::t("Maximum table size \x28in MB\x29 for the automatic optimization. Enter -1 to disable it.")],
+               '$optimize_fragmentation' => ['optimize_fragmentation', L10n::t("Minimum level of fragmentation"), Config::get('system', 'optimize_fragmentation', 30), L10n::t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")],
+
+               '$poco_completion'        => ['poco_completion', L10n::t("Periodical check of global contacts"), Config::get('system', 'poco_completion'), L10n::t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")],
+               '$poco_requery_days'      => ['poco_requery_days', L10n::t("Days between requery"), Config::get('system', 'poco_requery_days'), L10n::t("Number of days after which a server is requeried for his contacts.")],
+               '$poco_discovery'         => ['poco_discovery', L10n::t("Discover contacts from other servers"), (string)intval(Config::get('system', 'poco_discovery')), L10n::t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices],
+               '$poco_discovery_since'   => ['poco_discovery_since', L10n::t("Timeframe for fetching global contacts"), (string)intval(Config::get('system', 'poco_discovery_since')), L10n::t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices],
+               '$poco_local_search'      => ['poco_local_search', L10n::t("Search the local directory"), Config::get('system', 'poco_local_search'), L10n::t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")],
+
+               '$nodeinfo'               => ['nodeinfo', L10n::t("Publish server information"), Config::get('system', 'nodeinfo'), L10n::t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details.")],
+
+               '$check_new_version_url'  => ['check_new_version_url', L10n::t("Check upstream version"), Config::get('system', 'check_new_version_url'), L10n::t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices],
+               '$suppress_tags'          => ['suppress_tags', L10n::t("Suppress Tags"), Config::get('system', 'suppress_tags'), L10n::t("Suppress showing a list of hashtags at the end of the posting.")],
+               '$dbclean'                => ['dbclean', L10n::t("Clean database"), Config::get('system', 'dbclean', false), L10n::t("Remove old remote items, orphaned database records and old content from some other helper tables.")],
+               '$dbclean_expire_days'    => ['dbclean_expire_days', L10n::t("Lifespan of remote items"), Config::get('system', 'dbclean-expire-days', 0), L10n::t("When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.")],
+               '$dbclean_unclaimed'      => ['dbclean_unclaimed', L10n::t("Lifespan of unclaimed items"), Config::get('system', 'dbclean-expire-unclaimed', 90), L10n::t("When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.")],
+               '$dbclean_expire_conv'    => ['dbclean_expire_conv', L10n::t("Lifespan of raw conversation data"), Config::get('system', 'dbclean_expire_conversation', 90), L10n::t("The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days.")],
+               '$itemcache'              => ['itemcache', L10n::t("Path to item cache"), Config::get('system', 'itemcache'), L10n::t("The item caches buffers generated bbcode and external images.")],
+               '$itemcache_duration'     => ['itemcache_duration', L10n::t("Cache duration in seconds"), Config::get('system', 'itemcache_duration'), L10n::t("How long should the cache files be hold? Default value is 86400 seconds \x28One day\x29. To disable the item cache, set the value to -1.")],
+               '$max_comments'           => ['max_comments', L10n::t("Maximum numbers of comments per post"), Config::get('system', 'max_comments'), L10n::t("How much comments should be shown for each post? Default value is 100.")],
+               '$temppath'               => ['temppath', L10n::t("Temp path"), Config::get('system', 'temppath'), L10n::t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")],
+               '$basepath'               => ['basepath', L10n::t("Base path to installation"), Config::get('system', 'basepath'), L10n::t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")],
+               '$proxy_disabled'         => ['proxy_disabled', L10n::t("Disable picture proxy"), Config::get('system', 'proxy_disabled'), L10n::t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth.")],
+               '$only_tag_search'        => ['only_tag_search', L10n::t("Only search in tags"), Config::get('system', 'only_tag_search'), L10n::t("On large systems the text search can slow down the system extremely.")],
+
+               '$relocate_url'           => ['relocate_url', L10n::t("New base url"), System::baseUrl(), L10n::t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")],
+
+               '$rino'                   => ['rino', L10n::t("RINO Encryption"), intval(Config::get('system', 'rino_encrypt')), L10n::t("Encryption layer between nodes."), [0 => L10n::t("Disabled"), 1 => L10n::t("Enabled")]],
+
+               '$worker_queues'          => ['worker_queues', L10n::t("Maximum number of parallel workers"), Config::get('system', 'worker_queues'), L10n::t("On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.", 5, 20, 10)],
+               '$worker_dont_fork'       => ['worker_dont_fork', L10n::t("Don't use 'proc_open' with the worker"), Config::get('system', 'worker_dont_fork'), L10n::t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")],
+               '$worker_fastlane'        => ['worker_fastlane', L10n::t("Enable fastlane"), Config::get('system', 'worker_fastlane'), L10n::t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")],
+               '$worker_frontend'        => ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system', 'frontend_worker'), L10n::t('When enabled the Worker process is triggered when backend access is performed \x28e.g. messages being delivered\x29. On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.', System::baseUrl())],
+
+               '$relay_subscribe'        => ['relay_subscribe', L10n::t("Subscribe to relay"), Config::get('system', 'relay_subscribe'), L10n::t("Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page.")],
+               '$relay_server'           => ['relay_server', L10n::t("Relay server"), Config::get('system', 'relay_server', 'https://relay.diasp.org'), L10n::t("Address of the relay server where public posts should be send to. For example https://relay.diasp.org")],
+               '$relay_directly'         => ['relay_directly', L10n::t("Direct relay transfer"), Config::get('system', 'relay_directly'), L10n::t("Enables the direct transfer to other servers without using the relay servers")],
+               '$relay_scope'            => ['relay_scope', L10n::t("Relay scope"), Config::get('system', 'relay_scope'), L10n::t("Can be 'all' or 'tags'. 'all' means that every public post should be received. 'tags' means that only posts with selected tags should be received."), ['' => L10n::t('Disabled'), 'all' => L10n::t('all'), 'tags' => L10n::t('tags')]],
+               '$relay_server_tags'      => ['relay_server_tags', L10n::t("Server tags"), Config::get('system', 'relay_server_tags'), L10n::t("Comma separated list of tags for the 'tags' subscription.")],
+               '$relay_user_tags'        => ['relay_user_tags', L10n::t("Allow user tags"), Config::get('system', 'relay_user_tags', true), L10n::t("If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'.")],
+
+               '$form_security_token'    => BaseModule::getFormSecurityToken("admin_site"),
+               '$relocate_button'        => L10n::t('Start Relocation'),
        ]);
 }
 
@@ -1774,14 +1775,14 @@ function admin_page_users_post(App $a)
                        'body'     => $body]);
        }
 
-       if (x($_POST, 'page_users_block')) {
+       if (!empty($_POST['page_users_block'])) {
                foreach ($users as $uid) {
                        q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s", intval($uid)
                        );
                }
                notice(L10n::tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)));
        }
-       if (x($_POST, 'page_users_delete')) {
+       if (!empty($_POST['page_users_delete'])) {
                foreach ($users as $uid) {
                        if (local_user() != $uid) {
                                User::remove($uid);
@@ -1792,13 +1793,13 @@ function admin_page_users_post(App $a)
                notice(L10n::tt("%s user deleted", "%s users deleted", count($users)));
        }
 
-       if (x($_POST, 'page_users_approve')) {
+       if (!empty($_POST['page_users_approve'])) {
                require_once "mod/regmod.php";
                foreach ($pending as $hash) {
                        user_allow($hash);
                }
        }
-       if (x($_POST, 'page_users_deny')) {
+       if (!empty($_POST['page_users_deny'])) {
                require_once "mod/regmod.php";
                foreach ($pending as $hash) {
                        user_deny($hash);
@@ -1872,7 +1873,7 @@ function admin_page_users(App $a)
 
        $order = "contact.name";
        $order_direction = "+";
-       if (x($_GET, 'o')) {
+       if (!empty($_GET['o'])) {
                $new_order = $_GET['o'];
                if ($new_order[0] === "-") {
                        $order_direction = "-";
@@ -1977,7 +1978,7 @@ function admin_page_users(App $a)
 
                '$h_users' => L10n::t('Users'),
                '$h_newuser' => L10n::t('New User'),
-               '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Delete in')],
+               '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanent deletion')],
                '$th_users' => $th_users,
                '$order_users' => $order,
                '$order_direction_users' => $order_direction,
@@ -2098,7 +2099,7 @@ function admin_page_addons(App $a, array $addons_admin)
        /*
         * List addons
         */
-       if (x($_GET, "a") && $_GET['a'] == "r") {
+       if (!empty($_GET['a']) && $_GET['a'] == "r") {
                BaseModule::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/addons', 'admin_themes', 't');
                Addon::reload();
                info("Addons reloaded");
@@ -2147,14 +2148,14 @@ function admin_page_addons(App $a, array $addons_admin)
 }
 
 /**
- * @param array $themes
+ * @param array  $themes
  * @param string $th
- * @param int $result
+ * @param int    $result
  */
 function toggle_theme(&$themes, $th, &$result)
 {
        $count = count($themes);
-       for ($x = 0; $x < $count; $x ++) {
+       for ($x = 0; $x < $count; $x++) {
                if ($themes[$x]['name'] === $th) {
                        if ($themes[$x]['allowed']) {
                                $themes[$x]['allowed'] = 0;
@@ -2168,14 +2169,14 @@ function toggle_theme(&$themes, $th, &$result)
 }
 
 /**
- * @param array $themes
+ * @param array  $themes
  * @param string $th
  * @return int
  */
 function theme_status($themes, $th)
 {
        $count = count($themes);
-       for ($x = 0; $x < $count; $x ++) {
+       for ($x = 0; $x < $count; $x++) {
                if ($themes[$x]['name'] === $th) {
                        if ($themes[$x]['allowed']) {
                                return 1;
@@ -2276,7 +2277,7 @@ function admin_page_themes(App $a)
                        return '';
                }
 
-               if (x($_GET, "a") && $_GET['a'] == "t") {
+               if (!empty($_GET['a']) && $_GET['a'] == "t") {
                        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't');
 
                        // Toggle theme status
@@ -2364,7 +2365,7 @@ function admin_page_themes(App $a)
        }
 
        // reload active themes
-       if (x($_GET, "a") && $_GET['a'] == "r") {
+       if (!empty($_GET['a']) && $_GET['a'] == "r") {
                BaseModule::checkFormSecurityTokenRedirectOnError(System::baseUrl() . '/admin/themes', 'admin_themes', 't');
                foreach ($themes as $th) {
                        if ($th['allowed']) {
@@ -2409,12 +2410,12 @@ function admin_page_themes(App $a)
  */
 function admin_page_logs_post(App $a)
 {
-       if (x($_POST, "page_logs")) {
+       if (!empty($_POST['page_logs'])) {
                BaseModule::checkFormSecurityTokenRedirectOnError('/admin/logs', 'admin_logs');
 
-               $logfile   = ((x($_POST,'logfile'))   ? Strings::escapeTags(trim($_POST['logfile']))  : '');
-               $debugging = ((x($_POST,'debugging')) ? true                             : false);
-               $loglevel  = ((x($_POST,'loglevel'))  ? intval(trim($_POST['loglevel'])) : 0);
+               $logfile   = (!empty($_POST['logfile']) ? Strings::escapeTags(trim($_POST['logfile'])) : '');
+               $debugging = !empty($_POST['debugging']);
+               $loglevel  = (!empty($_POST['loglevel']) ? intval(trim($_POST['loglevel'])) : 0);
 
                Config::set('system', 'logfile', $logfile);
                Config::set('system', 'debugging', $debugging);
@@ -2555,14 +2556,14 @@ function admin_page_features_post(App $a)
                        $feature_state = 'feature_' . $feature;
                        $featurelock = 'featurelock_' . $feature;
 
-                       if (x($_POST, $feature_state)) {
+                       if (!empty($_POST[$feature_state])) {
                                $val = intval($_POST[$feature_state]);
                        } else {
                                $val = 0;
                        }
                        Config::set('feature', $feature, $val);
 
-                       if (x($_POST, $featurelock)) {
+                       if (!empty($_POST[$featurelock])) {
                                Config::set('feature_lock', $feature, $val);
                        } else {
                                Config::delete('feature_lock', $feature);
index b233a46182050ddc8d37b3d266950117bb300132..7a39c481db50786353d255bce8e61f1e5491d716 100644 (file)
@@ -81,9 +81,9 @@ function allfriends_content(App $a)
                $entry = [
                        'url'          => $rr['url'],
                        'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
-                       'name'         => htmlentities($contact_details['name']),
+                       'name'         => $contact_details['name'],
                        'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
-                       'img_hover'    => htmlentities($contact_details['name']),
+                       'img_hover'    => $contact_details['name'],
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
                        'about'        => $contact_details['about'],
@@ -100,9 +100,7 @@ function allfriends_content(App $a)
        $tab_str = Module\Contact::getTabsHTML($a, $contact, 4);
 
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
-
        $o .= Renderer::replaceMacros($tpl, [
-               //'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),
                '$tab_str' => $tab_str,
                '$contacts' => $entries,
                '$paginate' => $pager->renderFull($total),
index 52ddf37bead61f9c287972b5ef895a07c1e5c4ea..e7214624211ca5661b25e47f7cc773d48a928f69 100644 (file)
@@ -38,7 +38,7 @@ function api_post(App $a)
                return;
        }
 
-       if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+       if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
@@ -62,7 +62,7 @@ function api_content(App $a)
                        killme();
                }
 
-               if (x($_POST, 'oauth_yes')) {
+               if (!empty($_POST['oauth_yes'])) {
                        $app = oauth_get_client($request);
                        if (is_null($app)) {
                                return "Invalid request. Unknown token.";
index b9846e4fb433a16867f7d6afd20bedff2cbd0aac..64c9557767d278d7a6122019dbd6016f4c3087d0 100644 (file)
@@ -142,7 +142,7 @@ function babel_content()
 
        $tpl = Renderer::getMarkupTemplate('babel.tpl');
        $o = Renderer::replaceMacros($tpl, [
-               '$text'          => ['text', L10n::t('Source text'), htmlentities(defaults($_REQUEST, 'text', '')), ''],
+               '$text'          => ['text', L10n::t('Source text'), defaults($_REQUEST, 'text', ''), ''],
                '$type_bbcode'   => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'],
                '$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'],
                '$type_html'     => ['type', L10n::t('HTML'), 'html', '', defaults($_REQUEST, 'type', 'bbcode') == 'html'],
index 29095082db65f0ff4e41efd006b5350ce3e227c0..526e33c00cd796b09a29591192b33db7a317346f 100644 (file)
@@ -72,7 +72,7 @@ function cal_init(App $a)
 
        $cal_widget = Widget\CalendarExport::getHTML();
 
-       if (!x($a->page, 'aside')) {
+       if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }
 
@@ -100,7 +100,7 @@ function cal_content(App $a)
        $mode = 'view';
        $y = 0;
        $m = 0;
-       $ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0);
+       $ignored = (!empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0);
 
        $format = 'ical';
        if ($a->argc == 4 && $a->argv[2] == 'export') {
@@ -115,7 +115,7 @@ function cal_content(App $a)
        $owner_uid = $a->data['user']['uid'];
        $nick = $a->data['user']['nickname'];
 
-       if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
+       if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
                foreach ($_SESSION['remote'] as $v) {
                        if ($v['uid'] == $a->profile['profile_uid']) {
                                $contact_id = $v['cid'];
@@ -195,11 +195,11 @@ function cal_content(App $a)
 
 
                if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
-                       if (x($_GET, 'start')) {
+                       if (!empty($_GET['start'])) {
                                $start = $_GET['start'];
                        }
 
-                       if (x($_GET, 'end')) {
+                       if (!empty($_GET['end'])) {
                                $finish = $_GET['end'];
                        }
                }
@@ -233,7 +233,7 @@ function cal_content(App $a)
                        $r = Event::sortByDate($r);
                        foreach ($r as $rr) {
                                $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
-                               if (!x($links, $j)) {
+                               if (empty($links[$j])) {
                                        $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
                                }
                        }
@@ -248,7 +248,7 @@ function cal_content(App $a)
                }
 
                // links: array('href', 'text', 'extra css classes', 'title')
-               if (x($_GET, 'id')) {
+               if (!empty($_GET['id'])) {
                        $tpl = Renderer::getMarkupTemplate("event.tpl");
                } else {
 //                     if (Config::get('experimentals','new_calendar')==1){
@@ -284,7 +284,7 @@ function cal_content(App $a)
                        "list" => L10n::t("list"),
                ]);
 
-               if (x($_GET, 'id')) {
+               if (!empty($_GET['id'])) {
                        echo $o;
                        killme();
                }
index b335e296dbee1ec1d3250e16b2f159812723bd12..c93edf3b3097666b60dc4e8770f70f10dbef0809 100644 (file)
@@ -50,12 +50,12 @@ function common_content(App $a)
 
                if (DBA::isResult($contact)) {
                        $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("vcard-widget.tpl"), [
-                               '$name'  => htmlentities($contact['name']),
+                               '$name'  => $contact['name'],
                                '$photo' => $contact['photo'],
                                'url'    => 'contact/' . $cid
                        ]);
 
-                       if (!x($a->page, 'aside')) {
+                       if (empty($a->page['aside'])) {
                                $a->page['aside'] = '';
                        }
                        $a->page['aside'] .= $vcard_widget;
@@ -123,7 +123,7 @@ function common_content(App $a)
                        'itemurl'      => defaults($contact_details, 'addr', $common_friend['url']),
                        'name'         => $contact_details['name'],
                        'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
-                       'img_hover'    => htmlentities($contact_details['name']),
+                       'img_hover'    => $contact_details['name'],
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
                        'about'        => $contact_details['about'],
index bf34c59d75eceb1dd39a6d7d1cfca864e437a8a9..753d3a07332139f4690deb35d4eb8785e2a6e832 100644 (file)
@@ -40,7 +40,7 @@ function contactgroup_content(App $a)
                        }
                }
 
-               if (x($change)) {
+               if (!empty($change)) {
                        if (in_array($change, $preselected)) {
                                Group::removeMember($group['id'], $change);
                        } else {
index cfcc30b3e2e3beb7f7879b70803109ca665e9456..56b7cd6618cd90353789c2c9f5b87c3f44a8a4b7 100644 (file)
@@ -13,7 +13,7 @@ function credits_content()
 {
        /* fill the page with credits */
        $credits_string = file_get_contents('CREDITS.txt');
-       $names = explode("\n", htmlspecialchars($credits_string));
+       $names = explode("\n", $credits_string);
        $tpl = Renderer::getMarkupTemplate('credits.tpl');
        return Renderer::replaceMacros($tpl, [
                '$title'  => L10n::t('Credits'),
index f9ba281d1338aa6dbc4d7f4e58483da4558cdb17..91b22dbc92b1c9085ce4709b361d4fa67cf009a7 100644 (file)
@@ -25,7 +25,7 @@ function crepair_init(App $a)
                $contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
        }
 
-       if (!x($a->page, 'aside')) {
+       if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }
 
@@ -158,8 +158,8 @@ function crepair_content(App $a)
                        $remote_self_options
                ],
 
-               '$name'         => ['name', L10n::t('Name') , htmlentities($contact['name'])],
-               '$nick'         => ['nick', L10n::t('Account Nickname'), htmlentities($contact['nick'])],
+               '$name'         => ['name', L10n::t('Name') , $contact['name']],
+               '$nick'         => ['nick', L10n::t('Account Nickname'), $contact['nick']],
                '$attag'        => ['attag', L10n::t('@Tagname - overrides Name/Nickname'), $contact['attag']],
                '$url'          => ['url', L10n::t('Account URL'), $contact['url']],
                '$request'      => ['request', L10n::t('Friend Request URL'), $contact['request']],
index c8987ab570c95c6c2ab719a1017f712f736417df..4bfc0e31ba8b78879d5c47021f7f524ae9ea8606 100644 (file)
@@ -27,7 +27,7 @@ function delegate_post(App $a)
                return;
        }
 
-       if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+       if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
@@ -63,7 +63,7 @@ function delegate_content(App $a)
 
        if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
                // delegated admins can view but not change delegation permissions
-               if (x($_SESSION, 'submanage')) {
+               if (!empty($_SESSION['submanage'])) {
                        $a->internalRedirect('delegate');
                }
 
@@ -84,7 +84,7 @@ function delegate_content(App $a)
 
        if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
                // delegated admins can view but not change delegation permissions
-               if (x($_SESSION, 'submanage')) {
+               if (!empty($_SESSION['submanage'])) {
                        $a->internalRedirect('delegate');
                }
 
@@ -163,6 +163,8 @@ function delegate_content(App $a)
 
        if (!is_null($parent_user)) {
                $parent_password = ['parent_password', L10n::t('Parent Password:'), '', L10n::t('Please enter the password of the parent account to legitimize your request.')];
+       } else {
+               $parent_password = '';
        }
 
        $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('delegate.tpl'), [
index 48c8e32e5a431ff1a767c317f7cf1cc0f91b87f4..6f365c5315bf99aa3a35deaa08ea40fe1ca7bf7c 100644 (file)
@@ -63,7 +63,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
         * this being a page type which supports automatic friend acceptance. That is also Scenario 1
         * since we are operating on behalf of our registered user to approve a friendship.
         */
-       if (!x($_POST, 'source_url')) {
+       if (empty($_POST['source_url'])) {
                $uid = defaults($handsfree, 'uid', local_user());
                if (!$uid) {
                        notice(L10n::t('Permission denied.') . EOL);
@@ -417,7 +417,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
         * In the section above where the confirming party makes a POST and
         * retrieves xml status information, they are communicating with the following code.
         */
-       if (x($_POST, 'source_url')) {
+       if (!empty($_POST['source_url'])) {
                // We are processing an external confirmation to an introduction created by our user.
                $public_key =         defaults($_POST, 'public_key', '');
                $dfrn_id    = hex2bin(defaults($_POST, 'dfrn_id'   , ''));
@@ -435,7 +435,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
                // If $aes_key is set, both of these items require unpacking from the hex transport encoding.
 
-               if (x($aes_key)) {
+               if (!empty($aes_key)) {
                        $aes_key = hex2bin($aes_key);
                        $public_key = hex2bin($public_key);
                }
index 63f53e0606a104365412a440150d26607a13577f..51576b3b4ec7dec6be551b53d9e5b75f8cd54128 100644 (file)
@@ -39,16 +39,16 @@ function dfrn_notify_post(App $a) {
                }
        }
 
-       $dfrn_id      = ((x($_POST,'dfrn_id'))      ? Strings::escapeTags(trim($_POST['dfrn_id']))   : '');
-       $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version']    : 2.0);
-       $challenge    = ((x($_POST,'challenge'))    ? Strings::escapeTags(trim($_POST['challenge'])) : '');
-       $data         = ((x($_POST,'data'))         ? $_POST['data']                    : '');
-       $key          = ((x($_POST,'key'))          ? $_POST['key']                     : '');
-       $rino_remote  = ((x($_POST,'rino'))         ? intval($_POST['rino'])            :  0);
-       $dissolve     = ((x($_POST,'dissolve'))     ? intval($_POST['dissolve'])        :  0);
-       $perm         = ((x($_POST,'perm'))         ? Strings::escapeTags(trim($_POST['perm']))      : 'r');
-       $ssl_policy   = ((x($_POST,'ssl_policy'))   ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none');
-       $page         = ((x($_POST,'page'))         ? intval($_POST['page'])            :  0);
+       $dfrn_id      = (!empty($_POST['dfrn_id'])      ? Strings::escapeTags(trim($_POST['dfrn_id']))   : '');
+       $dfrn_version = (!empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version']    : 2.0);
+       $challenge    = (!empty($_POST['challenge'])    ? Strings::escapeTags(trim($_POST['challenge'])) : '');
+       $data         = defaults($_POST, 'data', '');
+       $key          = defaults($_POST, 'key', '');
+       $rino_remote  = (!empty($_POST['rino'])         ? intval($_POST['rino'])            :  0);
+       $dissolve     = (!empty($_POST['dissolve'])     ? intval($_POST['dissolve'])        :  0);
+       $perm         = (!empty($_POST['perm'])         ? Strings::escapeTags(trim($_POST['perm']))      : 'r');
+       $ssl_policy   = (!empty($_POST['ssl_policy'])   ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none');
+       $page         = (!empty($_POST['page'])         ? intval($_POST['page'])            :  0);
 
        $forum = (($page == 1) ? 1 : 0);
        $prv   = (($page == 2) ? 1 : 0);
@@ -247,7 +247,7 @@ function dfrn_dispatch_private($user, $postdata)
 
 function dfrn_notify_content(App $a) {
 
-       if (x($_GET,'dfrn_id')) {
+       if (!empty($_GET['dfrn_id'])) {
 
                /*
                 * initial communication from external contact, $direction is their direction.
@@ -256,7 +256,7 @@ function dfrn_notify_content(App $a) {
 
                $dfrn_id = Strings::escapeTags(trim($_GET['dfrn_id']));
                $dfrn_version = (float) $_GET['dfrn_version'];
-               $rino_remote = ((x($_GET,'rino')) ? intval($_GET['rino']) : 0);
+               $rino_remote = (!empty($_GET['rino']) ? intval($_GET['rino']) : 0);
                $type = "";
                $last_update = "";
 
@@ -370,7 +370,7 @@ function dfrn_notify_content(App $a) {
                        . "\t" . '<perm>' . $perm . '</perm>' . "\r\n"
                        . "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
                        . "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
-                       . '</dfrn_notify>' . "\r\n" ;
+                       . '</dfrn_notify>' . "\r\n";
 
                killme();
        }
index ecca0adf7c3eade53825611dea2134120e9b8a18..acc279be264d77bb4710f2a84674fc6f66f67936 100644 (file)
@@ -31,7 +31,7 @@ function dfrn_poll_init(App $a)
        $sec             = defaults($_GET, 'sec'            , '');
        $dfrn_version    = (float) defaults($_GET, 'dfrn_version'   , 2.0);
        $perm            = defaults($_GET, 'perm'           , 'r');
-       $quiet                   = x($_GET, 'quiet');
+       $quiet                   = !empty($_GET['quiet']);
 
        // Possibly it is an OStatus compatible server that requests a user feed
        $user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', '');
@@ -51,7 +51,7 @@ function dfrn_poll_init(App $a)
 
        $hidewall = false;
 
-       if (($dfrn_id === '') && (!x($_POST, 'dfrn_id'))) {
+       if (($dfrn_id === '') && empty($_POST['dfrn_id'])) {
                if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
                        System::httpExit(403);
                }
@@ -113,7 +113,7 @@ function dfrn_poll_init(App $a)
 
                                if ((int)$xml->status === 1) {
                                        $_SESSION['authenticated'] = 1;
-                                       if (!x($_SESSION, 'remote')) {
+                                       if (empty($_SESSION['remote'])) {
                                                $_SESSION['remote'] = [];
                                        }
 
@@ -230,13 +230,13 @@ function dfrn_poll_init(App $a)
 
 function dfrn_poll_post(App $a)
 {
-       $dfrn_id      = x($_POST,'dfrn_id')      ? $_POST['dfrn_id']              : '';
-       $challenge    = x($_POST,'challenge')    ? $_POST['challenge']            : '';
-       $url          = x($_POST,'url')          ? $_POST['url']                  : '';
-       $sec          = x($_POST,'sec')          ? $_POST['sec']                  : '';
-       $ptype        = x($_POST,'type')         ? $_POST['type']                 : '';
-       $dfrn_version = x($_POST,'dfrn_version') ? (float) $_POST['dfrn_version'] : 2.0;
-       $perm         = x($_POST,'perm')         ? $_POST['perm']                 : 'r';
+       $dfrn_id      = defaults($_POST, 'dfrn_id'  , '');
+       $challenge    = defaults($_POST, 'challenge', '');
+       $url          = defaults($_POST, 'url'      , '');
+       $sec          = defaults($_POST, 'sec'      , '');
+       $ptype        = defaults($_POST, 'type'     , '');
+       $perm         = defaults($_POST, 'perm'     , 'r');
+       $dfrn_version = !empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0;
 
        if ($ptype === 'profile-check') {
                if (strlen($challenge) && strlen($sec)) {
@@ -399,14 +399,13 @@ function dfrn_poll_post(App $a)
 
 function dfrn_poll_content(App $a)
 {
-       $dfrn_id         = x($_GET,'dfrn_id')         ? $_GET['dfrn_id']              : '';
-       $type            = x($_GET,'type')            ? $_GET['type']                 : 'data';
-       $last_update     = x($_GET,'last_update')     ? $_GET['last_update']          : '';
-       $destination_url = x($_GET,'destination_url') ? $_GET['destination_url']      : '';
-       $sec             = x($_GET,'sec')             ? $_GET['sec']                  : '';
-       $dfrn_version    = x($_GET,'dfrn_version')    ? (float) $_GET['dfrn_version'] : 2.0;
-       $perm            = x($_GET,'perm')            ? $_GET['perm']                 : 'r';
-       $quiet           = x($_GET,'quiet')           ? true                          : false;
+       $dfrn_id         = defaults($_GET, 'dfrn_id'        , '');
+       $type            = defaults($_GET, 'type'           , 'data');
+       $last_update     = defaults($_GET, 'last_update'    , '');
+       $destination_url = defaults($_GET, 'destination_url', '');
+       $sec             = defaults($_GET, 'sec'            , '');
+       $dfrn_version    = !empty($_GET['dfrn_version'])    ? (float) $_GET['dfrn_version'] : 2.0;
+       $quiet           = !empty($_GET['quiet']);
 
        $direction = -1;
        if (strpos($dfrn_id, ':') == 1) {
@@ -437,7 +436,7 @@ function dfrn_poll_content(App $a)
                switch ($direction) {
                        case -1:
                                if ($type === 'profile') {
-                                       $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
+                                       $sql_extra = sprintf(" AND (`dfrn-id` = '%s' OR `issued-id` = '%s') ", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
                                } else {
                                        $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
                                }
@@ -524,7 +523,7 @@ function dfrn_poll_content(App $a)
 
                                if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
                                        $_SESSION['authenticated'] = 1;
-                                       if (!x($_SESSION, 'remote')) {
+                                       if (empty($_SESSION['remote'])) {
                                                $_SESSION['remote'] = [];
                                        }
 
@@ -562,11 +561,7 @@ function dfrn_poll_content(App $a)
                                        break;
                                default:
                                        $appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
-                                       if (filter_var($url, FILTER_VALIDATE_URL)) {
-                                               System::externalRedirect($destination_url . $appendix);
-                                       } else {
-                                               $a->internalRedirect($destination_url . $appendix);
-                                       }
+                                       $a->redirect($destination_url . $appendix);
                                        break;
                        }
                        // NOTREACHED
index 26d7efda5250c027b80a1fa469b6c2feade3d7f2..0e24accc013855f307e70b8c5ddcf1249ad58aa7 100644 (file)
@@ -64,7 +64,7 @@ function dfrn_request_post(App $a)
                return;
        }
 
-       if (x($_POST, 'cancel')) {
+       if (!empty($_POST['cancel'])) {
                $a->internalRedirect();
        }
 
@@ -73,18 +73,18 @@ function dfrn_request_post(App $a)
         * to confirm the request, and then we've clicked submit (perhaps after logging in).
         * That brings us here:
         */
-       if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) {
+       if (!empty($_POST['localconfirm']) && ($_POST['localconfirm'] == 1)) {
                // Ensure this is a valid request
-               if (local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST, 'dfrn_url'))) {
-                       $dfrn_url = Strings::escapeTags(trim($_POST['dfrn_url']));
-                       $aes_allow = (((x($_POST, 'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
-                       $confirm_key = ((x($_POST, 'confirm_key')) ? $_POST['confirm_key'] : "");
-                       $hidden = ((x($_POST, 'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
+               if (local_user() && ($a->user['nickname'] == $a->argv[1]) && !empty($_POST['dfrn_url'])) {
+                       $dfrn_url    = Strings::escapeTags(trim($_POST['dfrn_url']));
+                       $aes_allow   = !empty($_POST['aes_allow']);
+                       $confirm_key = defaults($_POST, 'confirm_key', "");
+                       $hidden      = (!empty($_POST['hidden-contact']) ? intval($_POST['hidden-contact']) : 0);
                        $contact_record = null;
-                       $blocked = 1;
-                       $pending = 1;
+                       $blocked     = 1;
+                       $pending     = 1;
 
-                       if (x($dfrn_url)) {
+                       if (!empty($dfrn_url)) {
                                // Lookup the contact based on their URL (which is the only unique thing we have at the moment)
                                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
                                        intval(local_user()),
@@ -115,10 +115,10 @@ function dfrn_request_post(App $a)
                                                notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
                                                return;
                                        } else {
-                                               if (!x($parms, 'fn')) {
+                                               if (empty($parms['fn'])) {
                                                        notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
                                                }
-                                               if (!x($parms, 'photo')) {
+                                               if (empty($parms['photo'])) {
                                                        notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
                                                }
                                                $invalid = Probe::validDfrn($parms);
@@ -238,7 +238,7 @@ function dfrn_request_post(App $a)
        $blocked = 1;
        $pending = 1;
 
-       if (x($_POST, 'dfrn_url')) {
+       if (!empty($_POST['dfrn_url'])) {
                // Block friend request spam
                if ($maxreq) {
                        $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
@@ -270,7 +270,7 @@ function dfrn_request_post(App $a)
                        }
                }
 
-               $real_name = x($_POST, 'realname') ? Strings::escapeTags(trim($_POST['realname'])) : '';
+               $real_name = !empty($_POST['realname']) ? Strings::escapeTags(trim($_POST['realname'])) : '';
 
                $url = trim($_POST['dfrn_url']);
                if (!strlen($url)) {
@@ -356,10 +356,10 @@ function dfrn_request_post(App $a)
                                        notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
                                        $a->internalRedirect($a->cmd);
                                } else {
-                                       if (!x($parms, 'fn')) {
+                                       if (empty($parms['fn'])) {
                                                notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
                                        }
-                                       if (!x($parms, 'photo')) {
+                                       if (empty($parms['photo'])) {
                                                notice(L10n::t('Warning: profile location has no profile photo.') . EOL);
                                        }
                                        $invalid = Probe::validDfrn($parms);
@@ -423,7 +423,7 @@ function dfrn_request_post(App $a)
                                        VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
                                        intval($uid),
                                        intval($contact_record['id']),
-                                       ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
+                                       intval(!empty($_POST['knowyou'])),
                                        DBA::escape(Strings::escapeTags(trim(defaults($_POST, 'dfrn-request-message', '')))),
                                        DBA::escape($hash),
                                        DBA::escape(DateTimeFormat::utcNow())
@@ -484,7 +484,7 @@ function dfrn_request_content(App $a)
 
        // "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
        // to send us to the post section to record the introduction.
-       if (x($_GET, 'dfrn_url')) {
+       if (!empty($_GET['dfrn_url'])) {
                if (!local_user()) {
                        info(L10n::t("Please login to confirm introduction.") . EOL);
                        /* setup the return URL to come back to this page if they use openid */
@@ -499,11 +499,11 @@ function dfrn_request_content(App $a)
                }
 
                $dfrn_url = Strings::escapeTags(trim(hex2bin($_GET['dfrn_url'])));
-               $aes_allow = x($_GET, 'aes_allow') && $_GET['aes_allow'] == 1 ? 1 : 0;
-               $confirm_key = x($_GET, 'confirm_key') ? $_GET['confirm_key'] : "";
+               $aes_allow = !empty($_GET['aes_allow']);
+               $confirm_key = defaults($_GET, 'confirm_key', "");
 
                // Checking fastlane for validity
-               if (x($_SESSION, "fastlane") && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) {
+               if (!empty($_SESSION['fastlane']) && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) {
                        $_POST["dfrn_url"] = $dfrn_url;
                        $_POST["confirm_key"] = $confirm_key;
                        $_POST["localconfirm"] = 1;
@@ -512,8 +512,7 @@ function dfrn_request_content(App $a)
 
                        dfrn_request_post($a);
 
-                       killme();
-                       return; // NOTREACHED
+                       exit();
                }
 
                $tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
@@ -521,7 +520,6 @@ function dfrn_request_content(App $a)
                        '$dfrn_url' => $dfrn_url,
                        '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
                        '$hidethem' => L10n::t('Hide this contact'),
-                       '$hidechecked' => '',
                        '$confirm_key' => $confirm_key,
                        '$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
                        '$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),
@@ -531,7 +529,7 @@ function dfrn_request_content(App $a)
                        'dfrn_rawurl' => $_GET['dfrn_url']
                ]);
                return $o;
-       } elseif ((x($_GET, 'confirm_key')) && strlen($_GET['confirm_key'])) {
+       } elseif (!empty($_GET['confirm_key'])) {
                // we are the requestee and it is now safe to send our user their introduction,
                // We could just unblock it, but first we have to jump through a few hoops to
                // send an email, or even to find out if we need to send an email.
@@ -607,9 +605,9 @@ function dfrn_request_content(App $a)
                // Try to auto-fill the profile address
                // At first look if an address was provided
                // Otherwise take the local address
-               if (x($_GET, 'addr') && ($_GET['addr'] != "")) {
+               if (!empty($_GET['addr'])) {
                        $myaddr = hex2bin($_GET['addr']);
-               } elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
+               } elseif (!empty($_GET['address'])) {
                        $myaddr = $_GET['address'];
                } elseif (local_user()) {
                        if (strlen($a->getURLPath())) {
index e59cf7b820a796a2f2a1beeed2e063316c6db2a8..3fd0aa848bec837401e1132f14e41f1d567572d6 100644 (file)
@@ -30,7 +30,7 @@ function directory_init(App $a)
 
 function directory_post(App $a)
 {
-       if (x($_POST, 'search')) {
+       if (!empty($_POST['search'])) {
                $a->data['search'] = $_POST['search'];
        }
 }
@@ -47,10 +47,10 @@ function directory_content(App $a)
        $o = '';
        Nav::setSelected('directory');
 
-       if (x($a->data, 'search')) {
+       if (!empty($a->data['search'])) {
                $search = Strings::escapeTags(trim($a->data['search']));
        } else {
-               $search = ((x($_GET, 'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
+               $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
        }
 
        $gdirpath = '';
@@ -138,28 +138,28 @@ function directory_content(App $a)
                        }
 //                     if(strlen($rr['dob'])) {
 //                             if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-//                                     $details .= '<br />' . L10n::t('Age: ') . $years ;
+//                                     $details .= '<br />' . L10n::t('Age: ') . $years;
 //                     }
 //                     if(strlen($rr['gender']))
 //                             $details .= '<br />' . L10n::t('Gender: ') . $rr['gender'];
 
                        $profile = $rr;
 
-                       if ((x($profile, 'address')             == 1)
-                               || (x($profile, 'locality')     == 1)
-                               || (x($profile, 'region')       == 1)
-                               || (x($profile, 'postal-code')  == 1)
-                               || (x($profile, 'country-name') == 1)
+                       if (!empty($profile['address'])
+                               || !empty($profile['locality'])
+                               || !empty($profile['region'])
+                               || !empty($profile['postal-code'])
+                               || !empty($profile['country-name'])
                        ) {
                                $location = L10n::t('Location:');
                        } else {
                                $location = '';
                        }
 
-                       $gender   = ((x($profile, 'gender')   == 1) ? L10n::t('Gender:')   : false);
-                       $marital  = ((x($profile, 'marital')  == 1) ? L10n::t('Status:')   : false);
-                       $homepage = ((x($profile, 'homepage') == 1) ? L10n::t('Homepage:') : false);
-                       $about    = ((x($profile, 'about')    == 1) ? L10n::t('About:')    : false);
+                       $gender   = (!empty($profile['gender']) ? L10n::t('Gender:')   : false);
+                       $marital  = (!empty($profile['marital']) ? L10n::t('Status:')   : false);
+                       $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
+                       $about    = (!empty($profile['about']) ? L10n::t('About:')    : false);
 
                        $location_e = $location;
 
index 7f1a6691f59f6da79232434a57ad29bb44eb9883..909a723165b49c84b678535ba713ee38f1127930 100644 (file)
@@ -30,7 +30,7 @@ function dirfind_init(App $a) {
                return;
        }
 
-       if (! x($a->page,'aside')) {
+       if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }
 
index 39661cb76fccc9cf696705f26852c1a544d37934..2a4d2abf43b6d1971db094cffcaba8a65e969f13 100644 (file)
@@ -22,9 +22,14 @@ use Friendica\Model\Profile;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\Strings;
+use Friendica\Module\Objects;
 
 function display_init(App $a)
 {
+       if (ActivityPub::isRequest()) {
+               Objects::rawContent();
+       }
+
        if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
                return;
        }
@@ -47,6 +52,7 @@ function display_init(App $a)
        }
 
        $item = null;
+       $item_user = local_user();
 
        $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
 
@@ -60,6 +66,16 @@ function display_init(App $a)
                        if (DBA::isResult($item)) {
                                $nick = $a->user["nickname"];
                        }
+               // Is this item private but could be visible to the remove visitor?
+               } elseif (remote_user()) {
+                       $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1]);
+                       if (DBA::isResult($item)) {
+                               if (!Contact::isFollower(remote_user(), $item['uid'])) {
+                                       $item = null;
+                               } else {
+                                       $item_user = $item['uid'];
+                               }
+                       }
                }
 
                // Is it an item with uid=0?
@@ -71,9 +87,7 @@ function display_init(App $a)
        }
 
        if (!DBA::isResult($item)) {
-               $a->error = 404;
-               notice(L10n::t('Item not found.') . EOL);
-               return;
+               System::httpExit(404);
        }
 
        if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
@@ -81,10 +95,6 @@ function display_init(App $a)
                displayShowFeed($item["id"], false);
        }
 
-       if (ActivityPub::isRequest()) {
-               $a->internalRedirect(str_replace('display/', 'objects/', $a->query_string));
-       }
-
        if ($item["id"] != $item["parent"]) {
                $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
        }
@@ -224,7 +234,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
                if ($a->argc == 2) {
                        $item_parent = 0;
-                       $fields = ['id', 'parent', 'parent-uri'];
+                       $fields = ['id', 'parent', 'parent-uri', 'uid'];
 
                        if (local_user()) {
                                $condition = ['guid' => $a->argv[1], 'uid' => local_user()];
@@ -234,6 +244,13 @@ function display_content(App $a, $update = false, $update_uid = 0)
                                        $item_parent = $item["parent"];
                                        $item_parent_uri = $item['parent-uri'];
                                }
+                       } elseif (remote_user()) {
+                               $item = Item::selectFirst($fields, ['guid' => $a->argv[1], 'private' => 1]);
+                               if (DBA::isResult($item) && Contact::isFollower(remote_user(), $item['uid'])) {
+                                       $item_id = $item["id"];
+                                       $item_parent = $item["parent"];
+                                       $item_parent_uri = $item['parent-uri'];
+                               }
                        }
 
                        if ($item_parent == 0) {
@@ -249,9 +266,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        }
 
        if (!$item_id) {
-               $a->error = 404;
-               notice(L10n::t('Item not found.').EOL);
-               return;
+               System::httpExit(404);
        }
 
        // We are displaying an "alternate" link if that post was public. See issue 2864
@@ -270,34 +285,23 @@ function display_content(App $a, $update = false, $update_uid = 0)
                                        '$conversation' => $conversation]);
 
        $groups = [];
-
-       $contact = null;
+       $remote_cid = null;
        $is_remote_contact = false;
+       $item_uid = local_user();
 
-       $contact_id = 0;
-
-       if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
-               foreach ($_SESSION['remote'] as $v) {
-                       if ($v['uid'] == $a->profile['uid']) {
-                               $contact_id = $v['cid'];
-                               break;
-                       }
-               }
-       }
-
-       if ($contact_id) {
-               $groups = Group::getIdsByContactId($contact_id);
-               $remote_contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $a->profile['uid']]);
-               if (DBA::isResult($remote_contact)) {
-                       $contact = $remote_contact;
-                       $is_remote_contact = true;
-               }
+       $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
+       if (DBA::isResult($parent)) {
+               $a->profile['uid'] = $parent['uid'];
+               $a->profile['profile_uid'] = $parent['uid'];
+               $is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
        }
 
-       if (!$is_remote_contact) {
-               if (local_user()) {
-                       $contact_id = $_SESSION['cid'];
-                       $contact = $a->contact;
+       if ($is_remote_contact) {
+               $cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
+               if (!empty($cdata['user'])) {
+                       $groups = Group::getIdsByContactId($cdata['user']);
+                       $remote_cid = $cdata['user'];
+                       $item_uid = $parent['uid'];
                }
        }
 
@@ -307,7 +311,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        }
        $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
 
-       if (x($a->profile, 'hidewall') && !$is_owner && !$is_remote_contact) {
+       if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
                notice(L10n::t('Access to this profile has been restricted.') . EOL);
                return;
        }
@@ -327,10 +331,9 @@ function display_content(App $a, $update = false, $update_uid = 0)
                ];
                $o .= status_editor($a, $x, 0, true);
        }
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $is_remote_contact, $groups, $remote_cid);
 
-       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid'], $is_remote_contact, $groups);
-
-       if (local_user() && (local_user() == $a->profile['uid'])) {
+       if (local_user() && (local_user() == $a->profile['profile_uid'])) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
                $unseen = Item::exists($condition);
        } else {
@@ -341,13 +344,12 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return '';
        }
 
-       $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
+       $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, $item_uid];
        $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink'];
        $item = Item::selectFirstForUser(local_user(), $fields, $condition);
 
        if (!DBA::isResult($item)) {
-               notice(L10n::t('Item not found.') . EOL);
-               return $o;
+               System::httpExit(404);
        }
 
        $item['uri'] = $item['parent-uri'];
@@ -361,7 +363,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $o .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
        }
 
-       $o .= conversation($a, [$item], new Pager($a->query_string), 'display', $update_uid, false, 'commented', local_user());
+       $o .= conversation($a, [$item], new Pager($a->query_string), 'display', $update_uid, false, 'commented', $item_uid);
 
        // Preparing the meta header
        $description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
index b518588a591a46042cef3b7978295a42d9f58227..1e53285830dd5d2d272cc8182076bd878a704999 100644 (file)
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
@@ -54,8 +55,6 @@ function editpost_content(App $a)
                '$nickname' => $a->user['nickname']
        ]);
 
-       $tpl = Renderer::getMarkupTemplate("jot.tpl");
-
        if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
                $lockstate = 'lock';
        } else {
@@ -84,9 +83,9 @@ function editpost_content(App $a)
                }
        }
 
-       Addon::callHooks('jot_tool', $jotplugins);
-       //Addon::callHooks('jot_networks', $jotnets);
+       Hook::callAll('jot_tool', $jotplugins);
 
+       $tpl = Renderer::getMarkupTemplate("jot.tpl");
        $o .= Renderer::replaceMacros($tpl, [
                '$is_edit' => true,
                '$return_path' => '/display/' . $item['guid'],
@@ -119,7 +118,7 @@ function editpost_content(App $a)
                '$emailcc' => L10n::t('CC: email addresses'),
                '$public' => L10n::t('Public post'),
                '$jotnets' => $jotnets,
-               '$title' => htmlspecialchars($item['title']),
+               '$title' => $item['title'],
                '$placeholdertitle' => L10n::t('Set title'),
                '$category' => FileTag::fileToList($item['file'], 'category'),
                '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
index f147e005459ab85f1b7c21710007c368a833254e..cb91fae35147ad36480722ae8756b3940e0fe6ee 100644 (file)
@@ -97,13 +97,23 @@ function events_post(App $a)
        // and we'll waste a bunch of time responding to it. Time that
        // could've been spent doing something else.
 
-       $summary  = Strings::escapeHtml(trim(defaults($_POST, 'summary', '')));
-       $desc     = Strings::escapeHtml(trim(defaults($_POST, 'desc', '')));
-       $location = Strings::escapeHtml(trim(defaults($_POST, 'location', '')));
+       $summary  = trim(defaults($_POST, 'summary' , ''));
+       $desc     = trim(defaults($_POST, 'desc'    , ''));
+       $location = trim(defaults($_POST, 'location', ''));
        $type     = 'event';
 
-       $action = ($event_id == '') ? 'new' : "event/" . $event_id;
-       $onerror_path = "events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
+       $params = [
+               'summary'     => $summary,
+               'description' => $desc,
+               'location'    => $location,
+               'start'       => $start_text,
+               'finish'      => $finish_text,
+               'adjust'      => $adjust,
+               'nofinish'    => $nofinish,
+       ];
+
+       $action = ($event_id == '') ? 'new' : 'event/' . $event_id;
+       $onerror_path = 'events/' . $action . '?' . http_build_query($params, null, null, PHP_QUERY_RFC3986);
 
        if (strcmp($finish, $start) < 0 && !$nofinish) {
                notice(L10n::t('Event can not end before it has started.') . EOL);
@@ -137,10 +147,10 @@ function events_post(App $a)
 
 
        if ($share) {
-               $str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
-               $str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
-               $str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
-               $str_contact_deny  = !empty($_POST['contact_deny'])  ? perms2str($_POST['contact_deny'])  : '';
+               $str_group_allow   = perms2str(defaults($_POST, 'group_allow'  , ''));
+               $str_contact_allow = perms2str(defaults($_POST, 'contact_allow', ''));
+               $str_group_deny    = perms2str(defaults($_POST, 'group_deny'   , ''));
+               $str_contact_deny  = perms2str(defaults($_POST, 'contact_deny' , ''));
 
                // Undo the pseudo-contact of self, since there are real contacts now
                if (strpos($str_contact_allow, '<' . $self . '>') !== false) {
@@ -181,7 +191,7 @@ function events_post(App $a)
        if (intval($_REQUEST['preview'])) {
                $html = Event::getHTML($datarray);
                echo $html;
-               killme();
+               exit();
        }
 
        $item_id = Event::store($datarray);
@@ -364,8 +374,9 @@ function events_content(App $a)
                }
 
                if ($a->argc > 1 && $a->argv[1] === 'json') {
+                       header('Content-Type: application/json');
                        echo json_encode($events);
-                       killme();
+                       exit();
                }
 
                if (!empty($_GET['id'])) {
index cc51d41995301def0f1fe7f7a43ed910da538aa2..64af908aa6b71c840c5bd43f2ab69dd5cc0ff0b5 100644 (file)
@@ -27,7 +27,7 @@ function fbrowser_content(App $a)
 
        $template_file = "filebrowser.tpl";
        $mode = "";
-       if (x($_GET, 'mode')) {
+       if (!empty($_GET['mode'])) {
                $mode  = "?mode=".$_GET['mode'];
        }
 
@@ -142,7 +142,7 @@ function fbrowser_content(App $a)
                        break;
        }
 
-       if (x($_GET, 'mode')) {
+       if (!empty($_GET['mode'])) {
                return $o;
        } else {
                echo $o;
index 9336c140475ef0b0b8edc102c9e5f07aa6aa59e7..5dcedb1aafdca58b6b8d0a01b58ed8611fe88155 100644 (file)
@@ -18,8 +18,7 @@ function fetch_init(App $a)
 {
 
        if (($a->argc != 3) || (!in_array($a->argv[1], ["post", "status_message", "reshare"]))) {
-               header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-               killme();
+               System::httpExit(404);
        }
 
        $guid = $a->argv[2];
@@ -45,15 +44,13 @@ function fetch_init(App $a)
                        }
                }
 
-               header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-               killme();
+               System::httpExit(404);
        }
 
        // Fetch some data from the author (We could combine both queries - but I think this is more readable)
        $user = User::getOwnerDataById($item["uid"]);
        if (!$user) {
-               header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-               killme();
+               System::httpExit(404);
        }
 
        $status = Diaspora::buildStatus($item, $user);
index 1ee61ce9e14802448c8a8b87e59a699a18b5ed4c..f8e2539d97e2cf6c9e0f14adb266bcc21dd4d2e4 100644 (file)
@@ -144,11 +144,8 @@ function follow_content(App $a)
                $r[0]['about'] = '';
        }
 
-       $header = L10n::t('Connect/Follow');
-
        $o = Renderer::replaceMacros($tpl, [
-               '$header'        => htmlentities($header),
-               //'$photo'         => ProxyUtils::proxifyUrl($ret['photo'], false, ProxyUtils::SIZE_SMALL),
+               '$header'        => L10n::t('Connect/Follow'),
                '$desc'          => '',
                '$pls_answer'    => L10n::t('Please answer the following:'),
                '$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $ret['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
@@ -170,13 +167,6 @@ function follow_content(App $a)
                '$url_label'     => L10n::t('Profile URL'),
                '$myaddr'        => $myaddr,
                '$request'       => $request,
-               /*
-                * @TODO commented out?
-               '$location'      => Friendica\Content\Text\BBCode::::convert($r[0]['location']),
-               '$location_label'=> L10n::t('Location:'),
-               '$about'         => Friendica\Content\Text\BBCode::::convert($r[0]['about'], false, false),
-               '$about_label'   => L10n::t('About:'),
-               */
                '$keywords'      => $r[0]['keywords'],
                '$keywords_label'=> L10n::t('Tags:')
        ]);
index 77adccbfb6954f6fd7ee0f8fe178b10666fe527c..81275df6fb7a0053be199acd0c699a30febfdffc 100644 (file)
@@ -22,7 +22,7 @@ function friendica_init(App $a)
                }
 
                $sql_extra = '';
-               if (x($a->config, 'admin_nickname')) {
+               if (!empty($a->config['admin_nickname'])) {
                        $sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
                }
                if (!empty(Config::get('config', 'admin_email'))) {
@@ -41,7 +41,7 @@ function friendica_init(App $a)
 
                Config::load('feature_lock');
                $locked_features = [];
-               if (!empty($a->config['feature_lock']) && count($a->config['feature_lock'])) {
+               if (!empty($a->config['feature_lock'])) {
                        foreach ($a->config['feature_lock'] as $k => $v) {
                                if ($k === 'config_loaded') {
                                        continue;
index 7e5c2cc08add11cb7739eeafe7fe79cc4dbb0e18..c8b6db455c6e4dab2d1325558c751f3eb6bb1e2a 100644 (file)
@@ -29,27 +29,27 @@ function hcard_init(App $a)
 
        Profile::load($a, $which, $profile);
 
-       if ((x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == Contact::PAGE_COMMUNITY)) {
+       if (!empty($a->profile['page-flags']) && ($a->profile['page-flags'] == Contact::PAGE_COMMUNITY)) {
                $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
        }
-       if (x($a->profile, 'openidserver')) {
+       if (!empty($a->profile['openidserver'])) {
                $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
        }
-       if (x($a->profile, 'openid')) {
+       if (!empty($a->profile['openid'])) {
                $delegate = ((strstr($a->profile['openid'], '://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
                $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
        }
 
        if (!$blocked) {
-               $keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+               $keywords = defaults($a->profile, 'pub_keywords', '');
                $keywords = str_replace([',',' ',',,'], [' ',',',','], $keywords);
                if (strlen($keywords)) {
-                       $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+                       $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";
                }
        }
 
-       $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
-       $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
+       $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n";
        $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . (($a->getURLPath()) ? '/' . $a->getURLPath() : ''));
        $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
        header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
index b375707404a2cf52799c54649ba5a13a607fa0d0..02ec51dc0bb796163b4dc223b1779018712c4e18 100644 (file)
@@ -29,10 +29,10 @@ function home_init(App $a) {
 if(! function_exists('home_content')) {
 function home_content(App $a) {
 
-       if (x($_SESSION,'theme')) {
+       if (!empty($_SESSION['theme'])) {
                unset($_SESSION['theme']);
        }
-       if (x($_SESSION,'mobile-theme')) {
+       if (!empty($_SESSION['mobile-theme'])) {
                unset($_SESSION['mobile-theme']);
        }
 
index 6160642762a4adcbc427d6f21b048fa62df60c19..101ebd5af2e4e1b9068e9550368ef7bad137565c 100644 (file)
@@ -96,20 +96,20 @@ function hovercard_content()
 
        // Move the contact data to the profile array so we can deliver it to
        $profile = [
-               'name'     => $contact['name'],
-               'nick'     => $contact['nick'],
-               'addr'     => defaults($contact, 'addr', $contact['url']),
-               'thumb'    => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
-               'url'      => Contact::magicLink($contact['url']),
-               'nurl'     => $contact['nurl'], // We additionally store the nurl as identifier
-               'location' => $contact['location'],
-               'gender'   => $contact['gender'],
-               'about'    => $contact['about'],
-               'network => Strings::formatNetworkName($contact['network'], $contact['url']),
-               'tags'     => $contact['keywords'],
-               'bd'       => $contact['birthday'] <= DBA::NULL_DATE ? '' : $contact['birthday'],
+               'name'         => $contact['name'],
+               'nick'         => $contact['nick'],
+               'addr'         => defaults($contact, 'addr', $contact['url']),
+               'thumb'        => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
+               'url'          => Contact::magicLink($contact['url']),
+               'nurl'         => $contact['nurl'], // We additionally store the nurl as identifier
+               'location'     => $contact['location'],
+               'gender'       => $contact['gender'],
+               'about'        => $contact['about'],
+               'network_link' => Strings::formatNetworkName($contact['network'], $contact['url']),
+               'tags'         => $contact['keywords'],
+               'bd'           => $contact['birthday'] <= DBA::NULL_DATE ? '' : $contact['birthday'],
                'account_type' => Contact::getAccountType($contact),
-               'actions'  => $actions,
+               'actions'      => $actions,
        ];
        if ($datatype == 'html') {
                $tpl = Renderer::getMarkupTemplate('hovercard.tpl');
index 5f9173fab817474b8e0f815682184c66e3b8d376..cc801df57c1b62ce0d0878332807c3449c9109b2 100644 (file)
@@ -166,7 +166,7 @@ function item_post(App $a) {
 
        // Now check that valid personal details have been provided
        if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
-               notice(L10n::t('Permission denied.') . EOL) ;
+               notice(L10n::t('Permission denied.') . EOL);
 
                if (!empty($_REQUEST['return'])) {
                        $a->internalRedirect($return_path);
@@ -690,7 +690,7 @@ function item_post(App $a) {
                }
 
                $json = ['cancel' => 1];
-               if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) {
+               if (!empty($_REQUEST['jsreload'])) {
                        $json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload'];
                }
 
@@ -869,7 +869,7 @@ function item_post_return($baseurl, $api_source, $return_path)
        }
 
        $json = ['success' => 1];
-       if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) {
+       if (!empty($_REQUEST['jsreload'])) {
                $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
        }
 
index 97eaca163be125d9e24f3e30da6fe02172e7808d..5ea30a3ffef985ba5d8cc27d4f091588f173341a 100644 (file)
@@ -27,7 +27,7 @@ function like_content(App $a) {
        }
 
        // See if we've been passed a return path to redirect to
-       $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+       $return_path = defaults($_REQUEST, 'return', '');
 
        like_content_return($a, $return_path);
        killme(); // NOTREACHED
index 9a754ac80d9edddc07892840ea897b31b9a43849..f68c3fba509600f621469f5be3a5b2c8b64dab0e 100644 (file)
@@ -42,7 +42,7 @@ function localtime_content(App $a)
                $o .= '<p>' . L10n::t('Current timezone: %s', $_REQUEST['timezone']) . '</p>';
        }
 
-       if (x($a->data, 'mod-localtime')) {
+       if (!empty($a->data['mod-localtime'])) {
                $o .= '<p>' . L10n::t('Converted localtime: %s', $a->data['mod-localtime']) . '</p>';
        }
 
index f92a9454903ac5ddd11684886965afa67e71c2ce..b42b990aad404796b82b0f1480037273feb7539d 100644 (file)
@@ -21,7 +21,7 @@ function manage_post(App $a) {
        $uid = local_user();
        $orig_record = $a->user;
 
-       if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
+       if(!empty($_SESSION['submanage'])) {
                $r = q("select * from user where uid = %d limit 1",
                        intval($_SESSION['submanage'])
                );
@@ -37,7 +37,7 @@ function manage_post(App $a) {
 
        $submanage = $r;
 
-       $identity = (x($_POST['identity']) ? intval($_POST['identity']) : 0);
+       $identity = (!empty($_POST['identity']) ? intval($_POST['identity']) : 0);
        if (!$identity) {
                return;
        }
@@ -101,13 +101,13 @@ function manage_post(App $a) {
        unset($_SESSION['mobile-theme']);
        unset($_SESSION['page_flags']);
        unset($_SESSION['return_path']);
-       if (x($_SESSION, 'submanage')) {
+       if (!empty($_SESSION['submanage'])) {
                unset($_SESSION['submanage']);
        }
-       if (x($_SESSION, 'sysmsg')) {
+       if (!empty($_SESSION['sysmsg'])) {
                unset($_SESSION['sysmsg']);
        }
-       if (x($_SESSION, 'sysmsg_info')) {
+       if (!empty($_SESSION['sysmsg_info'])) {
                unset($_SESSION['sysmsg_info']);
        }
 
index 7491cd1bcc63cd461ed0f50134d3726924141899..d0993698b7507f9905a11dd90934719e2fd2455d 100644 (file)
@@ -59,10 +59,10 @@ function message_post(App $a)
                return;
        }
 
-       $replyto   = x($_REQUEST, 'replyto')   ? Strings::escapeTags(trim($_REQUEST['replyto']))   : '';
-       $subject   = x($_REQUEST, 'subject')   ? Strings::escapeTags(trim($_REQUEST['subject']))   : '';
-       $body      = x($_REQUEST, 'body')      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
-       $recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto'])       : 0;
+       $replyto   = !empty($_REQUEST['replyto'])   ? Strings::escapeTags(trim($_REQUEST['replyto'])) : '';
+       $subject   = !empty($_REQUEST['subject'])   ? Strings::escapeTags(trim($_REQUEST['subject'])) : '';
+       $body      = !empty($_REQUEST['body'])      ? Strings::escapeHtml(trim($_REQUEST['body']))    : '';
+       $recipient = !empty($_REQUEST['messageto']) ? intval($_REQUEST['messageto'])                  : 0;
 
        $ret = Mail::send($recipient, $body, $subject, $replyto);
        $norecip = false;
@@ -247,22 +247,22 @@ function message_content(App $a)
 
                $tpl = Renderer::getMarkupTemplate('prv_message.tpl');
                $o .= Renderer::replaceMacros($tpl, [
-                       '$header' => L10n::t('Send Private Message'),
-                       '$to' => L10n::t('To:'),
+                       '$header'     => L10n::t('Send Private Message'),
+                       '$to'         => L10n::t('To:'),
                        '$showinputs' => 'true',
-                       '$prefill' => $prefill,
-                       '$preid' => $preid,
-                       '$subject' => L10n::t('Subject:'),
-                       '$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
-                       '$text' => x($_REQUEST, 'body') ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '',
-                       '$readonly' => '',
-                       '$yourmessage' => L10n::t('Your message:'),
-                       '$select' => $select,
-                       '$parent' => '',
-                       '$upload' => L10n::t('Upload photo'),
-                       '$insert' => L10n::t('Insert web link'),
-                       '$wait' => L10n::t('Please wait'),
-                       '$submit' => L10n::t('Submit')
+                       '$prefill'    => $prefill,
+                       '$preid'      => $preid,
+                       '$subject'    => L10n::t('Subject:'),
+                       '$subjtxt'    => defaults($_REQUEST, 'subject', ''),
+                       '$text'       => defaults($_REQUEST, 'body', ''),
+                       '$readonly'   => '',
+                       '$yourmessage'=> L10n::t('Your message:'),
+                       '$select'     => $select,
+                       '$parent'     => '',
+                       '$upload'     => L10n::t('Upload photo'),
+                       '$insert'     => L10n::t('Insert web link'),
+                       '$wait'       => L10n::t('Please wait'),
+                       '$submit'     => L10n::t('Submit')
                ]);
                return $o;
        }
@@ -431,24 +431,56 @@ function message_content(App $a)
        }
 }
 
-function get_messages($user, $lstart, $lend)
+/**
+ * @param int $uid
+ * @param int $start
+ * @param int $limit
+ * @return array
+ */
+function get_messages($uid, $start, $limit)
 {
-       //TODO: rewritte with a sub-query to get the first message of each private thread with certainty
-       return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
-               ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`,
-               ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`,
-               ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`,
-               ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`,
-               ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`,
-               ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`,
-               `mail`.`parent-uri`,
-               ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`,
-               ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`,
-               count( * ) as `count`
-               FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
-               WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ",
-               intval($user), intval($lstart), intval($lend)
-       );
+       return DBA::toArray(DBA::p('SELECT
+                       m.`id`,
+                       m.`uid`,
+                       m.`guid`,
+                       m.`from-name`,
+                       m.`from-photo`,
+                       m.`from-url`,
+                       m.`contact-id`,
+                       m.`convid`,
+                       m.`title`,
+                       m.`body`,
+                       m.`seen`,
+                       m.`reply`,
+                       m.`replied`,
+                       m.`unknown`,
+                       m.`uri`,
+                       m.`parent-uri`,
+                       m.`created`,
+                       c.`name`,
+                       c.`url`,
+                       c.`thumb`,
+                       c.`network`,
+                       m2.`count`,
+                       m2.`mailcreated`,
+                       m2.`mailseen`
+               FROM `mail` m
+               JOIN (
+                       SELECT
+                               `parent-uri`,
+                           MIN(`id`)      AS `id`,
+                           COUNT(*)       AS `count`,
+                           MAX(`created`) AS `mailcreated`,
+                           MIN(`seen`)    AS `mailseen`
+                       FROM `mail`
+                       WHERE `uid` = ?
+                       GROUP BY `parent-uri`
+               ) m2 ON m.`parent-uri` = m2.`parent-uri` AND m.`id` = m2.`id`
+               LEFT JOIN `contact` c ON m.`contact-id` = c.`id`
+               WHERE m.`uid` = ?
+               ORDER BY m2.`mailcreated` DESC
+               LIMIT ?, ?'
+               , $uid, $uid, $start, $limit));
 }
 
 function render_messages(array $msg, $t)
index 966c111d569370e84631f0ca392e042585a888de..5819268e9ddda060031d7018d8ff14de1f9a09d4 100644 (file)
@@ -28,7 +28,7 @@ function modexp_init(App $a) {
        $e = $r[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
 
        header("Content-type: application/magic-public-key");
-       echo 'RSA' . '.' . $m . '.' . $e ;
+       echo 'RSA' . '.' . $m . '.' . $e;
 
        killme();
 
index 594a557997c91352542e60eec9727a804518f08c..6a4413b54e88d355ca5977d223f934a6b141cd03 100644 (file)
@@ -42,19 +42,19 @@ function network_init(App $a)
 
        Hook::add('head', __FILE__, 'network_infinite_scroll_head');
 
-       $search = (x($_GET, 'search') ? Strings::escapeHtml($_GET['search']) : '');
+       $search = (!empty($_GET['search']) ? Strings::escapeHtml($_GET['search']) : '');
 
        if (($search != '') && !empty($_GET['submit'])) {
                $a->internalRedirect('search?search=' . urlencode($search));
        }
 
-       if (x($_GET, 'save')) {
+       if (!empty($_GET['save'])) {
                $exists = DBA::exists('search', ['uid' => local_user(), 'term' => $search]);
                if (!$exists) {
                        DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
                }
        }
-       if (x($_GET, 'remove')) {
+       if (!empty($_GET['remove'])) {
                DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
        }
 
@@ -63,9 +63,9 @@ function network_init(App $a)
        $group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
 
        $cid = 0;
-       if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
+       if (!empty($_GET['cid'])) {
                $cid = $_GET['cid'];
-               $_GET['nets'] = 'all';
+               $_GET['nets'] = '';
                $group_id = 0;
        }
 
@@ -86,7 +86,7 @@ function network_init(App $a)
 
        // fetch last used network view and redirect if needed
        if (!$is_a_date_query) {
-               $sel_nets = defaults($_GET, 'nets', false);
+               $sel_nets = defaults($_GET, 'nets', '');
                $sel_tabs = network_query_get_sel_tab($a);
                $sel_groups = network_query_get_sel_group($a);
                $last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected');
@@ -137,7 +137,7 @@ function network_init(App $a)
                        }
                }
 
-               if ($sel_nets !== false) {
+               if ($sel_nets) {
                        $net_args['nets'] = $sel_nets;
                }
 
@@ -151,34 +151,29 @@ function network_init(App $a)
                }
        }
 
-       // If nets is set to all, unset it
-       if (x($_GET, 'nets') && $_GET['nets'] === 'all') {
-               unset($_GET['nets']);
-       }
-
-       if (!x($a->page, 'aside')) {
+       if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }
 
        $a->page['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
        $a->page['aside'] .= ForumManager::widget(local_user(), $cid);
        $a->page['aside'] .= posted_date_widget('network', local_user(), false);
-       $a->page['aside'] .= Widget::networks('network', (x($_GET, 'nets') ? $_GET['nets'] : ''));
+       $a->page['aside'] .= Widget::networks('network', defaults($_GET, 'nets', '') );
        $a->page['aside'] .= saved_searches($search);
-       $a->page['aside'] .= Widget::fileAs('network', (x($_GET, 'file') ? $_GET['file'] : ''));
+       $a->page['aside'] .= Widget::fileAs('network', defaults($_GET, 'file', '') );
 }
 
 function saved_searches($search)
 {
        $srchurl = '/network?f='
-               . ((x($_GET, 'cid'))   ? '&cid='   . rawurlencode($_GET['cid'])   : '')
-               . ((x($_GET, 'star'))  ? '&star='  . rawurlencode($_GET['star'])  : '')
-               . ((x($_GET, 'bmark')) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
-               . ((x($_GET, 'conv'))  ? '&conv='  . rawurlencode($_GET['conv'])  : '')
-               . ((x($_GET, 'nets'))  ? '&nets='  . rawurlencode($_GET['nets'])  : '')
-               . ((x($_GET, 'cmin'))  ? '&cmin='  . rawurlencode($_GET['cmin'])  : '')
-               . ((x($_GET, 'cmax'))  ? '&cmax='  . rawurlencode($_GET['cmax'])  : '')
-               . ((x($_GET, 'file'))  ? '&file='  . rawurlencode($_GET['file'])  : '');
+               . (!empty($_GET['cid'])   ? '&cid='   . rawurlencode($_GET['cid'])   : '')
+               . (!empty($_GET['star'])  ? '&star='  . rawurlencode($_GET['star'])  : '')
+               . (!empty($_GET['bmark']) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
+               . (!empty($_GET['conv'])  ? '&conv='  . rawurlencode($_GET['conv'])  : '')
+               . (!empty($_GET['nets'])  ? '&nets='  . rawurlencode($_GET['nets'])  : '')
+               . (!empty($_GET['cmin'])  ? '&cmin='  . rawurlencode($_GET['cmin'])  : '')
+               . (!empty($_GET['cmax'])  ? '&cmax='  . rawurlencode($_GET['cmax'])  : '')
+               . (!empty($_GET['file'])  ? '&file='  . rawurlencode($_GET['file'])  : '');
        ;
 
        $terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
@@ -233,15 +228,15 @@ function network_query_get_sel_tab(App $a)
                $new_active = 'active';
        }
 
-       if (x($_GET, 'star')) {
+       if (!empty($_GET['star'])) {
                $starred_active = 'active';
        }
 
-       if (x($_GET, 'bmark')) {
+       if (!empty($_GET['bmark'])) {
                $bookmarked_active = 'active';
        }
 
-       if (x($_GET, 'conv')) {
+       if (!empty($_GET['conv'])) {
                $conv_active = 'active';
        }
 
@@ -249,7 +244,7 @@ function network_query_get_sel_tab(App $a)
                $no_active = 'active';
        }
 
-       if ($no_active == 'active' && x($_GET, 'order')) {
+       if ($no_active == 'active' && !empty($_GET['order'])) {
                switch($_GET['order']) {
                        case 'post'    : $postord_active = 'active'; $no_active=''; break;
                        case 'comment' : $all_active     = 'active'; $no_active=''; break;
@@ -672,7 +667,7 @@ function networkThreadedView(App $a, $update, $parent)
 
                        $entries[0] = [
                                'id' => 'network',
-                               'name' => htmlentities($contact['name']),
+                               'name' => $contact['name'],
                                'itemurl' => defaults($contact, 'addr', $contact['nurl']),
                                'thumb' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
                                'details' => $contact['location'],
@@ -914,7 +909,7 @@ function networkThreadedView(App $a, $update, $parent)
                $parents_str = implode(', ', $parents_arr);
        }
 
-       if (x($_GET, 'offset')) {
+       if (!empty($_GET['offset'])) {
                $date_offset = $_GET['offset'];
        }
 
@@ -968,7 +963,7 @@ function network_tabs(App $a)
        $tabs = [
                [
                        'label' => L10n::t('Commented Order'),
-                       'url'   => str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
+                       'url'   => str_replace('/new', '', $cmd) . '?f=&order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
                        'sel'   => $all_active,
                        'title' => L10n::t('Sort by Comment Date'),
                        'id'    => 'commented-order-tab',
@@ -976,7 +971,7 @@ function network_tabs(App $a)
                ],
                [
                        'label' => L10n::t('Posted Order'),
-                       'url'   => str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
+                       'url'   => str_replace('/new', '', $cmd) . '?f=&order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
                        'sel'   => $postord_active,
                        'title' => L10n::t('Sort by Post Date'),
                        'id'    => 'posted-order-tab',
@@ -986,7 +981,7 @@ function network_tabs(App $a)
 
        $tabs[] = [
                'label' => L10n::t('Personal'),
-               'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
+               'url'   => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
                'sel'   => $conv_active,
                'title' => L10n::t('Posts that mention or involve you'),
                'id'    => 'personal-tab',
@@ -996,7 +991,7 @@ function network_tabs(App $a)
        if (Feature::isEnabled(local_user(), 'new_tab')) {
                $tabs[] = [
                        'label' => L10n::t('New'),
-                       'url'   => 'network/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
+                       'url'   => 'network/new' . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : ''),
                        'sel'   => $new_active,
                        'title' => L10n::t('Activity Stream - by date'),
                        'id'    => 'activitiy-by-date-tab',
@@ -1007,7 +1002,7 @@ function network_tabs(App $a)
        if (Feature::isEnabled(local_user(), 'link_tab')) {
                $tabs[] = [
                        'label' => L10n::t('Shared Links'),
-                       'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
+                       'url'   => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
                        'sel'   => $bookmarked_active,
                        'title' => L10n::t('Interesting Links'),
                        'id'    => 'shared-links-tab',
@@ -1017,7 +1012,7 @@ function network_tabs(App $a)
 
        $tabs[] = [
                'label' => L10n::t('Starred'),
-               'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
+               'url'   => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
                'sel'   => $starred_active,
                'title' => L10n::t('Favourite Posts'),
                'id'    => 'starred-posts-tab',
@@ -1025,7 +1020,7 @@ function network_tabs(App $a)
        ];
 
        // save selected tab, but only if not in file mode
-       if (!x($_GET, 'file')) {
+       if (empty($_GET['file'])) {
                PConfig::set(local_user(), 'network.view', 'tab.selected', [
                        $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active
                ]);
index cd59cc780c23ccf7116cf90091ff49d3558b2d55..c2ffe6464ed3fd2c96ba0c079c69774953ca3d80 100644 (file)
@@ -8,7 +8,8 @@ use Friendica\Core\L10n;
 
 function newmember_content(App $a)
 {
-       $o = '<h1>' . L10n::t('Welcome to Friendica') . '</h1>';
+       $o = '<div class="generic-page-wrapper">';
+       $o .= '<h1>' . L10n::t('Welcome to Friendica') . '</h1>';
        $o .= '<h3>' . L10n::t('New Member Checklist') . '</h3>';
        $o .= '<div style="font-size: 120%;">';
        $o .= L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.');
@@ -54,6 +55,7 @@ function newmember_content(App $a)
        $o .= '<li>' . '<a target="newmember" href="help">' . L10n::t('Go to the Help Section') . '</a><br />' . L10n::t('Our <strong>help</strong> pages may be consulted for detail on other program features and resources.') . '</li>' . EOL;
        $o .= '</ul>';
        $o .= '</div>';
+       $o .= '</div>';
 
        return $o;
 }
index 87367d5369e8f3c9c6e52ba72a7e558f4e40166b..e1d51e5a801eae0f8a5bcee7c27d0cc9d43e2c1e 100644 (file)
@@ -48,7 +48,7 @@ function noscrape_init(App $a)
                exit;
        }
 
-       $keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+       $keywords = defaults($a->profile, 'pub_keywords', '');
        $keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
        $keywords = explode(',', $keywords);
 
index 01e6e5ab991d7712343ab746bfb432aa8c517b9d..90afa16ca537db09b91ff69759803eace473a952 100644 (file)
@@ -59,7 +59,7 @@ function notes_content(App $a, $update = false)
        }
 
        $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
-               'wall' => false, 'contact-id'=> $a->contact['id']];
+               'contact-id'=> $a->contact['id']];
 
        $pager = new Pager($a->query_string, 40);
 
@@ -70,7 +70,7 @@ function notes_content(App $a, $update = false)
        $count = 0;
 
        if (DBA::isResult($r)) {
-               $notes = DBA::toArray($r);
+               $notes = Item::inArray($r);
 
                $count = count($notes);
 
index 54c54fa222b00009b4390bb5d23710ed6d5391f5..00c234d157717639ee948ebdc687faad128174a9 100644 (file)
@@ -237,7 +237,7 @@ function notifications_content(App $a)
 
                                        $notif_content[] = Renderer::replaceMacros($tpl, [
                                                '$type'        => $notif['label'],
-                                               '$header'      => htmlentities($header),
+                                               '$header'      => $header,
                                                '$str_notifytype' => L10n::t('Notification type:'),
                                                '$notify_type' => $notif['notify_type'],
                                                '$dfrn_text'   => $dfrn_text,
index 62d0bba078ef9fe00e9ddcb82a59e07bbb4f3b30..6d682d6adfad073c62f07bf0fedb4b91bdcf2393 100644 (file)
@@ -33,13 +33,13 @@ function oexchange_content(App $a) {
                return;
        }
 
-       $url = ((x($_REQUEST,'url') && strlen($_REQUEST['url']))
+       $url = ((!empty($_REQUEST['url']))
                ? urlencode(Strings::escapeTags(trim($_REQUEST['url']))) : '');
-       $title = ((x($_REQUEST,'title') && strlen($_REQUEST['title']))
+       $title = ((!empty($_REQUEST['title']))
                ? '&title=' . urlencode(Strings::escapeTags(trim($_REQUEST['title']))) : '');
-       $description = ((x($_REQUEST,'description') && strlen($_REQUEST['description']))
+       $description = ((!empty($_REQUEST['description']))
                ? '&description=' . urlencode(Strings::escapeTags(trim($_REQUEST['description']))) : '');
-       $tags = ((x($_REQUEST,'tags') && strlen($_REQUEST['tags']))
+       $tags = ((!empty($_REQUEST['tags']))
                ? '&tags=' . urlencode(Strings::escapeTags(trim($_REQUEST['tags']))) : '');
 
        $s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
index 209960ee58b44968bd0c65d010e3824631f41856..4e247b384fe254f26869a5f54354a0536f9104c9 100644 (file)
@@ -20,7 +20,7 @@ function openid_content(App $a) {
 
        Logger::log('mod_openid ' . print_r($_REQUEST,true), Logger::DATA);
 
-       if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
+       if(!empty($_GET['openid_mode']) && !empty($_SESSION['openid'])) {
 
                $openid = new LightOpenID($a->getHostName());
 
index 5670820623449c1e65f2c77da79c09b3e32b71ed..5d493db32c74b2fce0a7e7eeb5ac5c52face3a21 100644 (file)
@@ -77,8 +77,8 @@ function ostatus_subscribe_content(App $a)
 
        $o .= '<p>' . $counter . '/' . $total . ': ' . $url;
 
-       $curlResult = Probe::uri($url);
-       if ($curlResult['network'] == Protocol::OSTATUS) {
+       $probed = Probe::uri($url);
+       if ($probed['network'] == Protocol::OSTATUS) {
                $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
                if ($result['success']) {
                        $o .= ' - ' . L10n::t('success');
index a1bacb0d8f775b5441d8b9052c8c6c4443ced6b6..07f319fdca69e8ab2372b29b1302a81d1c97398c 100644 (file)
@@ -47,8 +47,8 @@ function parse_url_content(App $a)
 
        // Add url scheme if it is missing
        $arrurl = parse_url($url);
-       if (!x($arrurl, 'scheme')) {
-               if (x($arrurl, 'host')) {
+       if (empty($arrurl['scheme'])) {
+               if (!empty($arrurl['host'])) {
                        $url = 'http:' . $url;
                } else {
                        $url = 'http://' . $url;
index 70e0e1882d68b7f94bf05cf1f25412c574adb85f..d1dffd4d058ef8ab892005fffb696546725aef6c 100644 (file)
@@ -283,7 +283,7 @@ function photos_post(App $a)
 
                        if (DBA::isResult($r)) {
                                foreach ($r as $rr) {
-                                       $res[] = "'" . DBA::escape($rr['rid']) . "'" ;
+                                       $res[] = "'" . DBA::escape($rr['rid']) . "'";
                                }
                        } else {
                                $a->internalRedirect($_SESSION['photo_return']);
@@ -365,10 +365,10 @@ function photos_post(App $a)
                return; // NOTREACHED
        }
 
-       if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || !empty($_POST['albname']) !== false)) {
+       if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || isset($_POST['albname']))) {
                $desc        = !empty($_POST['desc'])      ? Strings::escapeTags(trim($_POST['desc']))      : '';
                $rawtags     = !empty($_POST['newtag'])    ? Strings::escapeTags(trim($_POST['newtag']))    : '';
-               $item_id     = !empty($_POST['item_id'])   ? intval($_POST['item_id'])         : 0;
+               $item_id     = !empty($_POST['item_id'])   ? intval($_POST['item_id'])                      : 0;
                $albname     = !empty($_POST['albname'])   ? Strings::escapeTags(trim($_POST['albname']))   : '';
                $origaname   = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
 
@@ -681,8 +681,8 @@ function photos_post(App $a)
                                        $arr['tag']           = $tagged[4];
                                        $arr['inform']        = $tagged[2];
                                        $arr['origin']        = 1;
-                                       $arr['body']          = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
-                                       $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
+                                       $arr['body']          = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]');
+                                       $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n";
 
                                        $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
                                        $arr['object'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
@@ -1353,7 +1353,7 @@ function photos_content(App $a)
                }
 
                if ($prevlink) {
-                       $prevlink = [$prevlink, '<div class="icon prev"></div>'] ;
+                       $prevlink = [$prevlink, '<div class="icon prev"></div>'];
                }
 
                $photo = [
index edc1a1121345cc568079ee2fd3f6a1738442bf37..40700f36f862c70486e949a5f2a9d826fb3758c6 100644 (file)
@@ -188,7 +188,7 @@ function ping_init(App $a)
                $intro_count = count($intros1) + count($intros2);
                $intros = $intros1 + $intros2;
 
-               $myurl = System::baseUrl() . '/profile/' . $a->user['nickname'] ;
+               $myurl = System::baseUrl() . '/profile/' . $a->user['nickname'];
                $mails = q(
                        "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
                        WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -373,12 +373,12 @@ function ping_init(App $a)
        $sysmsgs = [];
        $sysmsgs_info = [];
 
-       if (x($_SESSION, 'sysmsg')) {
+       if (!empty($_SESSION['sysmsg'])) {
                $sysmsgs = $_SESSION['sysmsg'];
                unset($_SESSION['sysmsg']);
        }
 
-       if (x($_SESSION, 'sysmsg_info')) {
+       if (!empty($_SESSION['sysmsg_info'])) {
                $sysmsgs_info = $_SESSION['sysmsg_info'];
                unset($_SESSION['sysmsg_info']);
        }
@@ -483,7 +483,7 @@ function ping_get_notifications($uid)
 
                        if ($notification["visible"]
                                && !$notification["deleted"]
-                               && !(x($result, $notification["parent"]) && !empty($result[$notification["parent"]]))
+                               && empty($result[$notification["parent"]])
                        ) {
                                // Should we condense the notifications or show them all?
                                if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
index cc2493c0864338418d412320e9ac5e56a40854f8..3456beb12896a4b2a507f365b28330d66ba76f54 100644 (file)
@@ -88,7 +88,7 @@ function poco_init(App $a) {
        if (!empty($cid)) {
                $sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
        }
-       if (x($_GET, 'updatedSince')) {
+       if (!empty($_GET['updatedSince'])) {
                $update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince']));
        }
        if ($global) {
@@ -122,7 +122,7 @@ function poco_init(App $a) {
        } else {
                $startIndex = 0;
        }
-       $itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
+       $itemsPerPage = ((!empty($_GET['count'])) ? intval($_GET['count']) : $totalResults);
 
        if ($global) {
                Logger::log("Start global query", Logger::DEBUG);
@@ -164,13 +164,13 @@ function poco_init(App $a) {
        Logger::log("Query done", Logger::DEBUG);
 
        $ret = [];
-       if (x($_GET, 'sorted')) {
+       if (!empty($_GET['sorted'])) {
                $ret['sorted'] = false;
        }
-       if (x($_GET, 'filtered')) {
+       if (!empty($_GET['filtered'])) {
                $ret['filtered'] = false;
        }
-       if (x($_GET, 'updatedSince') && ! $global) {
+       if (!empty($_GET['updatedSince']) && ! $global) {
                $ret['updatedSince'] = false;
        }
        $ret['startIndex']   = (int) $startIndex;
@@ -196,7 +196,7 @@ function poco_init(App $a) {
                'generation' => false
        ];
 
-       if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) {
+       if (empty($_GET['fields']) || ($_GET['fields'] === '@all')) {
                foreach ($fields_ret as $k => $v) {
                        $fields_ret[$k] = true;
                }
index 6f09b348cc51d7b645252a1df180ab1c8c37c84f..f1bad7742b5ebedb6810920a37e171b05d732eca 100644 (file)
@@ -54,7 +54,7 @@ function poke_init(App $a)
                return;
        }
 
-       $parent = (x($_GET,'parent') ? intval($_GET['parent']) : 0);
+       $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : 0);
 
 
        Logger::log('poke: verb ' . $verb . ' contact ' . $contact_id, Logger::DEBUG);
@@ -86,7 +86,7 @@ function poke_init(App $a)
                        $deny_gid   = $item['deny_gid'];
                }
        } else {
-               $private = (x($_GET,'private') ? intval($_GET['private']) : 0);
+               $private = (!empty($_GET['private']) ? intval($_GET['private']) : 0);
 
                $allow_cid     = ($private ? '<' . $target['id']. '>' : $a->user['allow_cid']);
                $allow_gid     = ($private ? '' : $a->user['allow_gid']);
@@ -169,7 +169,7 @@ function poke_content(App $a)
        ]);
 
 
-       $parent = (x($_GET,'parent') ? intval($_GET['parent']) : '0');
+       $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : '0');
 
 
        $verbs = L10n::getPokeVerbs();
index b448ffd2b2e5938b139757226c4211a1afa0bb0f..7c41df8ac5de26f4a476020b12f5482f85e658f7 100644 (file)
@@ -15,7 +15,8 @@ function probe_content(App $a)
                killme();
        }
 
-       $o  = '<h3>Probe Diagnostic</h3>';
+       $o = '<div class="generic-page-wrapper">';
+       $o .= '<h3>Probe Diagnostic</h3>';
 
        $o .= '<form action="probe" method="get">';
        $o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') . '" />';
@@ -30,6 +31,7 @@ function probe_content(App $a)
                $o .= str_replace("\n", '<br />', print_r($res, true));
                $o .= '</pre>';
        }
+       $o .= '</div>';
 
        return $o;
 }
index 3164f173bf717454e52080ad33f92106b268cac8..87ad9a9e97e3211e918574ff5fcbb1c384682c7d 100644 (file)
@@ -33,24 +33,16 @@ function profile_init(App $a)
                $a->page['aside'] = '';
        }
 
-       if ($a->argc > 1) {
-               $which = htmlspecialchars($a->argv[1]);
-       } else {
-               $r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
-               if (DBA::isResult($r)) {
-                       $a->internalRedirect('profile/' . $r[0]['nickname']);
-               } else {
-                       Logger::log('profile error: mod_profile ' . $a->query_string, Logger::DEBUG);
-                       notice(L10n::t('Requested profile is not available.') . EOL);
-                       $a->error = 404;
-                       return;
-               }
+       if ($a->argc < 2) {
+               System::httpExit(400);
        }
 
+       $which = filter_var($a->argv[1], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH | FILTER_FLAG_STRIP_BACKTICK);
+
        $profile = 0;
        if (local_user() && $a->argc > 2 && $a->argv[2] === 'view') {
                $which = $a->user['nickname'];
-               $profile = htmlspecialchars($a->argv[1]);
+               $profile = filter_var($a->argv[1], FILTER_SANITIZE_NUMBER_INT);
        } else {
                DFRN::autoRedir($a, $which);
        }
@@ -139,6 +131,7 @@ function profile_content(App $a, $update = 0)
        require_once 'include/items.php';
 
        $groups = [];
+       $remote_cid = null;
 
        $tab = 'posts';
        $o = '';
@@ -150,42 +143,18 @@ function profile_content(App $a, $update = 0)
                Nav::setSelected('home');
        }
 
-       $contact = null;
-       $remote_contact = false;
-
-       $contact_id = 0;
-
-       if (!empty($_SESSION['remote'])) {
-               foreach ($_SESSION['remote'] as $v) {
-                       if ($v['uid'] == $a->profile['profile_uid']) {
-                               $contact_id = $v['cid'];
-                               break;
-                       }
-               }
-       }
-
-       if ($contact_id) {
-               $groups = Group::getIdsByContactId($contact_id);
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($contact_id),
-                       intval($a->profile['profile_uid'])
-               );
-               if (DBA::isResult($r)) {
-                       $contact = $r[0];
-                       $remote_contact = true;
-               }
-       }
+       $remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
+       $is_owner = local_user() == $a->profile['profile_uid'];
+       $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
 
-       if (!$remote_contact) {
-               if (local_user()) {
-                       $contact_id = $_SESSION['cid'];
-                       $contact = $a->contact;
+       if ($remote_contact) {
+               $cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
+               if (!empty($cdata['user'])) {
+                       $groups = Group::getIdsByContactId($cdata['user']);
+                       $remote_cid = $cdata['user'];
                }
        }
 
-       $is_owner = local_user() == $a->profile['profile_uid'];
-       $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
-
        if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
                notice(L10n::t('Access to this profile has been restricted.') . EOL);
                return;
@@ -236,13 +205,12 @@ function profile_content(App $a, $update = 0)
                }
        }
 
-
        // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $remote_contact, $groups);
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $remote_contact, $groups, $remote_cid);
        $sql_extra2 = '';
 
        if ($update) {
-               $last_updated = (!empty($_SESSION['last_updated'][$last_updated_key]) ? $_SESSION['last_updated'][$last_updated_key] : 0);
+               $last_updated = (defaults($_SESSION['last_updated'], $last_updated_key, 0));
 
                // If the page user is the owner of the page we should query for unseen
                // items. Otherwise use a timestamp of the last succesful update request.
@@ -350,7 +318,7 @@ function profile_content(App $a, $update = 0)
                }
        }
 
-       $o .= conversation($a, $items, $pager, 'profile', $update, false, 'created', local_user());
+       $o .= conversation($a, $items, $pager, 'profile', $update, false, 'created', $a->profile['profile_uid']);
 
        if (!$update) {
                $o .= $pager->renderMinimal(count($items));
index fe3b362317f86e38617e3e53e8cc52a2c8656d68..6a32fbee5a75e916d0143b4b880ce35552d41b97 100644 (file)
@@ -251,7 +251,7 @@ function profiles_post(App $a) {
                $marital = Strings::escapeTags(trim($_POST['marital']));
                $howlong = Strings::escapeTags(trim($_POST['howlong']));
 
-               $with = ((x($_POST,'with')) ? Strings::escapeTags(trim($_POST['with'])) : '');
+               $with = (!empty($_POST['with']) ? Strings::escapeTags(trim($_POST['with'])) : '');
 
                if (! strlen($howlong)) {
                        $howlong = DBA::NULL_DATETIME;
index f0a8d463c4517999d29773112e2aff9b45a4df13..cd2f21dd67904907cc73646688442e1e14c4498f 100644 (file)
@@ -7,6 +7,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
+use Friendica\Core\System;
 
 require_once 'include/items.php';
 
@@ -16,7 +17,7 @@ function hub_return($valid, $body)
                header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
                echo $body;
        } else {
-               header($_SERVER["SERVER_PROTOCOL"] . ' 404 Not Found');
+               System::httpExit(404);
        }
        killme();
 }
@@ -25,8 +26,7 @@ function hub_return($valid, $body)
 
 function hub_post_return()
 {
-       header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
-       killme();
+       System::httpExit(200);
 }
 
 function pubsub_init(App $a)
index c9cb54d2e055a2de70cedeef577935685af8d5ba..11fbf2cf5f3af52f7bc4919fbbb68e7776bc6178 100644 (file)
@@ -10,7 +10,7 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 function post_var($name) {
-       return (x($_POST, $name)) ? Strings::escapeTags(trim($_POST[$name])) : '';
+       return !empty($_POST[$name]) ? Strings::escapeTags(trim($_POST[$name])) : '';
 }
 
 function pubsubhubbub_init(App $a) {
index 701b85953ca1e63683103ba54bc0810566d08fa3..33b7d36f91b141e1dbbc944587cd9ac18666d1d4 100644 (file)
@@ -9,6 +9,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\Strings;
+use Friendica\Util\Network;
 
 function redir_init(App $a) {
 
@@ -34,8 +35,7 @@ function redir_init(App $a) {
 
                $contact_url = $contact['url'];
 
-               if ($contact['network'] !== Protocol::DFRN // Authentication isn't supported for non DFRN contacts.
-                       || (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
+               if ((!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
                        || (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
                {
                        $a->redirect(defaults($url, $contact_url));
@@ -67,7 +67,7 @@ function redir_init(App $a) {
                        // for authentification everytime he/she is visiting a profile page of the local
                        // contact.
                        if ($host == $remotehost
-                               && x($_SESSION, 'remote')
+                               && !empty($_SESSION['remote'])
                                && is_array($_SESSION['remote']))
                        {
                                foreach ($_SESSION['remote'] as $v) {
@@ -81,8 +81,17 @@ function redir_init(App $a) {
                        }
                }
 
+               // When the remote page does support OWA, then we enforce the use of it
+               $basepath = Contact::getBasepath($contact_url);
+               if ($basepath == System::baseUrl()) {
+                       $use_magic = true;
+               } else {
+                       $serverret = Network::curl($basepath . '/magic');
+                       $use_magic = $serverret->isSuccess();
+               }
+
                // Doing remote auth with dfrn.
-               if (local_user() && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
+               if (local_user() && !$use_magic && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
                        $dfrn_id = $orig_id = (($contact['issued-id']) ? $contact['issued-id'] : $contact['dfrn-id']);
 
                        if ($contact['duplex'] && $contact['issued-id']) {
index 2b0d87ca9921c651c6921dc88f1f191f9acfa061..03d4cb02f66196600c0ae6cdb98a14dfd522e3f3 100644 (file)
@@ -84,7 +84,7 @@ function register_post(App $a)
 
        $using_invites = Config::get('system', 'invitation_only');
        $num_invites   = Config::get('system', 'number_invites');
-       $invite_id = ((x($_POST, 'invite_id')) ? Strings::escapeTags(trim($_POST['invite_id'])) : '');
+       $invite_id = (!empty($_POST['invite_id']) ? Strings::escapeTags(trim($_POST['invite_id'])) : '');
 
        if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
                if ($using_invites && $invite_id) {
@@ -93,7 +93,7 @@ function register_post(App $a)
                }
 
                // Only send a password mail when the password wasn't manually provided
-               if (!x($_POST, 'password1') || !x($_POST, 'confirm')) {
+               if (empty($_POST['password1']) || empty($_POST['confirm'])) {
                        $res = Model\User::sendRegisterOpenEmail(
                                $user,
                                Config::get('config', 'sitename'),
@@ -195,38 +195,33 @@ function register_content(App $a)
                }
        }
 
-       if (x($_SESSION, 'theme')) {
+       if (!empty($_SESSION['theme'])) {
                unset($_SESSION['theme']);
        }
-       if (x($_SESSION, 'mobile-theme')) {
+       if (!empty($_SESSION['mobile-theme'])) {
                unset($_SESSION['mobile-theme']);
        }
 
 
-       $username   = x($_REQUEST, 'username')   ? $_REQUEST['username']   : '';
-       $email      = x($_REQUEST, 'email')      ? $_REQUEST['email']      : '';
-       $openid_url = x($_REQUEST, 'openid_url') ? $_REQUEST['openid_url'] : '';
-       $nickname   = x($_REQUEST, 'nickname')   ? $_REQUEST['nickname']   : '';
-       $photo      = x($_REQUEST, 'photo')      ? $_REQUEST['photo']      : '';
-       $invite_id  = x($_REQUEST, 'invite_id')  ? $_REQUEST['invite_id']  : '';
+       $username   = defaults($_REQUEST, 'username'  , '');
+       $email      = defaults($_REQUEST, 'email'     , '');
+       $openid_url = defaults($_REQUEST, 'openid_url', '');
+       $nickname   = defaults($_REQUEST, 'nickname'  , '');
+       $photo      = defaults($_REQUEST, 'photo'     , '');
+       $invite_id  = defaults($_REQUEST, 'invite_id' , '');
 
        $noid = Config::get('system', 'no_openid');
 
        if ($noid) {
-               $oidhtml  = '';
                $fillwith = '';
                $fillext  = '';
                $oidlabel = '';
        } else {
-               $oidhtml  = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
                $fillwith = L10n::t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
                $fillext  = L10n::t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
                $oidlabel = L10n::t("Your OpenID \x28optional\x29: ");
        }
 
-       // I set this and got even more fake names than before...
-       $realpeople = ''; // L10n::t('Members of this network prefer to communicate with real people who use their real names.');
-
        if (Config::get('system', 'publish_all')) {
                $profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
        } else {
@@ -244,8 +239,6 @@ function register_content(App $a)
        $r = q("SELECT COUNT(*) AS `contacts` FROM `contact`");
        $passwords = !$r[0]["contacts"];
 
-       $license = '';
-
        $tpl = Renderer::getMarkupTemplate("register.tpl");
 
        $arr = ['template' => $tpl];
@@ -257,14 +250,12 @@ function register_content(App $a)
        $tos = new Tos();
 
        $o = Renderer::replaceMacros($tpl, [
-               '$oidhtml' => $oidhtml,
                '$invitations' => Config::get('system', 'invitation_only'),
                '$permonly'    => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,
                '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
                '$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
                '$invite_label' => L10n::t('Your invitation code: '),
                '$invite_id'  => $invite_id,
-               '$realpeople' => $realpeople,
                '$regtitle'  => L10n::t('Registration'),
                '$registertext' => BBCode::convert(Config::get('config', 'register_text', '')),
                '$fillwith'  => $fillwith,
@@ -284,7 +275,6 @@ function register_content(App $a)
                '$username'  => $username,
                '$email'     => $email,
                '$nickname'  => $nickname,
-               '$license'   => $license,
                '$sitename'  => $a->getHostName(),
                '$importh'   => L10n::t('Import'),
                '$importt'   => L10n::t('Import your profile to this friendica instance'),
index ee0b66db8a3f282703eb52f415ae7518a341a513..19bf0bc8515ba094091cdec26e7bbf2dcd90a296 100644 (file)
@@ -20,15 +20,15 @@ function removeme_post(App $a)
                return;
        }
 
-       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+       if (!empty($_SESSION['submanage'])) {
                return;
        }
 
-       if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) {
+       if (empty($_POST['qxz_password'])) {
                return;
        }
 
-       if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) {
+       if (empty($_POST['verify'])) {
                return;
        }
 
index 2810b23b1320e0db5eeaaeaf2e810a07ec61d5be..b40fe07157f233f3b3825a0ed3675e3e2c51e9f0 100644 (file)
@@ -24,7 +24,7 @@ require_once 'mod/dirfind.php';
 function search_saved_searches() {
 
        $o = '';
-       $search = ((x($_GET,'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
+       $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
 
        $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
                intval(local_user())
@@ -60,10 +60,10 @@ function search_saved_searches() {
 
 function search_init(App $a) {
 
-       $search = ((x($_GET,'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
+       $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
 
        if (local_user()) {
-               if (x($_GET,'save') && $search) {
+               if (!empty($_GET['save']) && $search) {
                        $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
                                intval(local_user()),
                                DBA::escape($search)
@@ -72,7 +72,7 @@ function search_init(App $a) {
                                DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
                        }
                }
-               if (x($_GET,'remove') && $search) {
+               if (!empty($_GET['remove']) && $search) {
                        DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
                }
 
@@ -92,14 +92,6 @@ function search_init(App $a) {
 
 }
 
-
-
-function search_post(App $a) {
-       if (x($_POST,'search'))
-               $a->data['search'] = $_POST['search'];
-}
-
-
 function search_content(App $a) {
 
        if (Config::get('system','block_public') && !local_user() && !remote_user()) {
@@ -145,16 +137,12 @@ function search_content(App $a) {
 
        Nav::setSelected('search');
 
-       $search = '';
-       if (x($a->data,'search'))
-               $search = Strings::escapeTags(trim($a->data['search']));
-       else
-               $search = ((x($_GET,'search')) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
+       $search = (!empty($_REQUEST['search']) ? Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) : '');
 
        $tag = false;
-       if (x($_GET,'tag')) {
+       if (!empty($_GET['tag'])) {
                $tag = true;
-               $search = (x($_GET,'tag') ? '#' . Strings::escapeTags(trim(rawurldecode($_GET['tag']))) : '');
+               $search = (!empty($_GET['tag']) ? '#' . Strings::escapeTags(trim(rawurldecode($_GET['tag']))) : '');
        }
 
        // contruct a wrapper for the search header
@@ -176,7 +164,7 @@ function search_content(App $a) {
                return dirfind_content($a);
        }
 
-       if (x($_GET,'search-option'))
+       if (!empty($_GET['search-option']))
                switch($_GET['search-option']) {
                        case 'fulltext':
                                break;
index 857012048086679e9fcd8d534948888040c9e27f..1ec3725dc389e5767c9ea5edde993e778b43ae6f 100644 (file)
@@ -146,18 +146,18 @@ function settings_post(App $a)
                return;
        }
 
-       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+       if (!empty($_SESSION['submanage'])) {
                return;
        }
 
-       if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+       if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
 
        $old_page_flags = $a->user['page-flags'];
 
-       if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST, 'remove')) {
+       if (($a->argc > 1) && ($a->argv[1] === 'oauth') && !empty($_POST['remove'])) {
                BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
 
                $key = $_POST['remove'];
@@ -166,7 +166,7 @@ function settings_post(App $a)
                return;
        }
 
-       if (($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST, 'submit')) {
+       if (($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && !empty($_POST['submit'])) {
                BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
 
                $name     = defaults($_POST, 'name'    , '');
@@ -222,23 +222,23 @@ function settings_post(App $a)
        if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
                BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors');
 
-               if (x($_POST, 'general-submit')) {
+               if (!empty($_POST['general-submit'])) {
                        PConfig::set(local_user(), 'system', 'disable_cw', intval($_POST['disable_cw']));
                        PConfig::set(local_user(), 'system', 'no_intelligent_shortening', intval($_POST['no_intelligent_shortening']));
                        PConfig::set(local_user(), 'system', 'ostatus_autofriend', intval($_POST['snautofollow']));
                        PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
                        PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
-               } elseif (x($_POST, 'imap-submit')) {
+               } elseif (!empty($_POST['imap-submit'])) {
 
-                       $mail_server       = ((x($_POST, 'mail_server')) ? $_POST['mail_server'] : '');
-                       $mail_port         = ((x($_POST, 'mail_port')) ? $_POST['mail_port'] : '');
-                       $mail_ssl          = ((x($_POST, 'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
-                       $mail_user         = ((x($_POST, 'mail_user')) ? $_POST['mail_user'] : '');
-                       $mail_pass         = ((x($_POST, 'mail_pass')) ? trim($_POST['mail_pass']) : '');
-                       $mail_action       = ((x($_POST, 'mail_action')) ? trim($_POST['mail_action']) : '');
-                       $mail_movetofolder = ((x($_POST, 'mail_movetofolder')) ? trim($_POST['mail_movetofolder']) : '');
-                       $mail_replyto      = ((x($_POST, 'mail_replyto')) ? $_POST['mail_replyto'] : '');
-                       $mail_pubmail      = ((x($_POST, 'mail_pubmail')) ? $_POST['mail_pubmail'] : '');
+                       $mail_server       = defaults($_POST, 'mail_server', '');
+                       $mail_port         = defaults($_POST, 'mail_port', '');
+                       $mail_ssl          = (!empty($_POST['mail_ssl']) ? strtolower(trim($_POST['mail_ssl'])) : '');
+                       $mail_user         = defaults($_POST, 'mail_user', '');
+                       $mail_pass         = (!empty($_POST['mail_pass']) ? trim($_POST['mail_pass']) : '');
+                       $mail_action       = (!empty($_POST['mail_action']) ? trim($_POST['mail_action']) : '');
+                       $mail_movetofolder = (!empty($_POST['mail_movetofolder']) ? trim($_POST['mail_movetofolder']) : '');
+                       $mail_replyto      = defaults($_POST, 'mail_replyto', '');
+                       $mail_pubmail      = defaults($_POST, 'mail_pubmail', '');
 
 
                        $mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
@@ -315,17 +315,17 @@ function settings_post(App $a)
        if (($a->argc > 1) && ($a->argv[1] === 'display')) {
                BaseModule::checkFormSecurityTokenRedirectOnError('/settings/display', 'settings_display');
 
-               $theme             = x($_POST, 'theme')             ? Strings::escapeTags(trim($_POST['theme']))        : $a->user['theme'];
-               $mobile_theme      = x($_POST, 'mobile_theme')      ? Strings::escapeTags(trim($_POST['mobile_theme'])) : '';
-               $nosmile           = x($_POST, 'nosmile')           ? intval($_POST['nosmile'])            : 0;
-               $first_day_of_week = x($_POST, 'first_day_of_week') ? intval($_POST['first_day_of_week'])  : 0;
-               $noinfo            = x($_POST, 'noinfo')            ? intval($_POST['noinfo'])             : 0;
-               $infinite_scroll   = x($_POST, 'infinite_scroll')   ? intval($_POST['infinite_scroll'])    : 0;
-               $no_auto_update    = x($_POST, 'no_auto_update')    ? intval($_POST['no_auto_update'])     : 0;
-               $bandwidth_saver   = x($_POST, 'bandwidth_saver')   ? intval($_POST['bandwidth_saver'])    : 0;
-               $smart_threading   = x($_POST, 'smart_threading')   ? intval($_POST['smart_threading'])    : 0;
-               $nowarn_insecure   = x($_POST, 'nowarn_insecure')   ? intval($_POST['nowarn_insecure'])    : 0;
-               $browser_update    = x($_POST, 'browser_update')    ? intval($_POST['browser_update'])     : 0;
+               $theme             = !empty($_POST['theme'])             ? Strings::escapeTags(trim($_POST['theme']))        : $a->user['theme'];
+               $mobile_theme      = !empty($_POST['mobile_theme'])      ? Strings::escapeTags(trim($_POST['mobile_theme'])) : '';
+               $nosmile           = !empty($_POST['nosmile'])           ? intval($_POST['nosmile'])            : 0;
+               $first_day_of_week = !empty($_POST['first_day_of_week']) ? intval($_POST['first_day_of_week'])  : 0;
+               $noinfo            = !empty($_POST['noinfo'])            ? intval($_POST['noinfo'])             : 0;
+               $infinite_scroll   = !empty($_POST['infinite_scroll'])   ? intval($_POST['infinite_scroll'])    : 0;
+               $no_auto_update    = !empty($_POST['no_auto_update'])    ? intval($_POST['no_auto_update'])     : 0;
+               $bandwidth_saver   = !empty($_POST['bandwidth_saver'])   ? intval($_POST['bandwidth_saver'])    : 0;
+               $smart_threading   = !empty($_POST['smart_threading'])   ? intval($_POST['smart_threading'])    : 0;
+               $nowarn_insecure   = !empty($_POST['nowarn_insecure'])   ? intval($_POST['nowarn_insecure'])    : 0;
+               $browser_update    = !empty($_POST['browser_update'])    ? intval($_POST['browser_update'])     : 0;
                if ($browser_update != -1) {
                        $browser_update = $browser_update * 1000;
                        if ($browser_update < 10000) {
@@ -333,11 +333,11 @@ function settings_post(App $a)
                        }
                }
 
-               $itemspage_network = x($_POST, 'itemspage_network')  ? intval($_POST['itemspage_network'])  : 40;
+               $itemspage_network = !empty($_POST['itemspage_network'])  ? intval($_POST['itemspage_network'])  : 40;
                if ($itemspage_network > 100) {
                        $itemspage_network = 100;
                }
-               $itemspage_mobile_network = x($_POST, 'itemspage_mobile_network') ? intval($_POST['itemspage_mobile_network']) : 20;
+               $itemspage_mobile_network = !empty($_POST['itemspage_mobile_network']) ? intval($_POST['itemspage_mobile_network']) : 20;
                if ($itemspage_mobile_network > 100) {
                        $itemspage_mobile_network = 100;
                }
@@ -379,7 +379,7 @@ function settings_post(App $a)
 
        BaseModule::checkFormSecurityTokenRedirectOnError('/settings', 'settings');
 
-       if (x($_POST,'resend_relocate')) {
+       if (!empty($_POST['resend_relocate'])) {
                Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', local_user());
                info(L10n::t("Relocate message has been send to your contacts"));
                $a->internalRedirect('settings');
@@ -387,7 +387,7 @@ function settings_post(App $a)
 
        Addon::callHooks('settings_post', $_POST);
 
-       if (x($_POST, 'password') || x($_POST, 'confirm')) {
+       if (!empty($_POST['password']) || !empty($_POST['confirm'])) {
                $newpass = $_POST['password'];
                $confirm = $_POST['confirm'];
 
@@ -397,7 +397,7 @@ function settings_post(App $a)
                        $err = true;
                }
 
-               if (!x($newpass) || !x($confirm)) {
+               if (empty($newpass) || empty($confirm)) {
                        notice(L10n::t('Empty passwords are not allowed. Password unchanged.') . EOL);
                        $err = true;
                }
@@ -423,35 +423,35 @@ function settings_post(App $a)
                }
        }
 
-       $username         = ((x($_POST, 'username'))   ? Strings::escapeTags(trim($_POST['username']))     : '');
-       $email            = ((x($_POST, 'email'))      ? Strings::escapeTags(trim($_POST['email']))        : '');
-       $timezone         = ((x($_POST, 'timezone'))   ? Strings::escapeTags(trim($_POST['timezone']))     : '');
-       $language         = ((x($_POST, 'language'))   ? Strings::escapeTags(trim($_POST['language']))     : '');
-
-       $defloc           = ((x($_POST, 'defloc'))     ? Strings::escapeTags(trim($_POST['defloc']))       : '');
-       $openid           = ((x($_POST, 'openid_url')) ? Strings::escapeTags(trim($_POST['openid_url']))   : '');
-       $maxreq           = ((x($_POST, 'maxreq'))     ? intval($_POST['maxreq'])             : 0);
-       $expire           = ((x($_POST, 'expire'))     ? intval($_POST['expire'])             : 0);
-       $def_gid          = ((x($_POST, 'group-selection')) ? intval($_POST['group-selection']) : 0);
-
-
-       $expire_items     = ((x($_POST, 'expire_items')) ? intval($_POST['expire_items'])        : 0);
-       $expire_notes     = ((x($_POST, 'expire_notes')) ? intval($_POST['expire_notes'])        : 0);
-       $expire_starred   = ((x($_POST, 'expire_starred')) ? intval($_POST['expire_starred']) : 0);
-       $expire_photos    = ((x($_POST, 'expire_photos'))? intval($_POST['expire_photos'])       : 0);
-       $expire_network_only    = ((x($_POST, 'expire_network_only'))? intval($_POST['expire_network_only'])     : 0);
-
-       $allow_location   = (((x($_POST, 'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
-       $publish          = (((x($_POST, 'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
-       $net_publish      = (((x($_POST, 'profile_in_netdirectory')) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
-       $old_visibility   = (((x($_POST, 'visibility')) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
-       $account_type     = (((x($_POST, 'account-type')) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
-       $page_flags       = (((x($_POST, 'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
-       $blockwall        = (((x($_POST, 'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
-       $blocktags        = (((x($_POST, 'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
-       $unkmail          = (((x($_POST, 'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
-       $cntunkmail       = ((x($_POST, 'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
-       $suggestme        = ((x($_POST, 'suggestme')) ? intval($_POST['suggestme'])  : 0);
+       $username         = (!empty($_POST['username'])   ? Strings::escapeTags(trim($_POST['username']))     : '');
+       $email            = (!empty($_POST['email'])      ? Strings::escapeTags(trim($_POST['email']))        : '');
+       $timezone         = (!empty($_POST['timezone'])   ? Strings::escapeTags(trim($_POST['timezone']))     : '');
+       $language         = (!empty($_POST['language'])   ? Strings::escapeTags(trim($_POST['language']))     : '');
+
+       $defloc           = (!empty($_POST['defloc'])     ? Strings::escapeTags(trim($_POST['defloc']))       : '');
+       $openid           = (!empty($_POST['openid_url']) ? Strings::escapeTags(trim($_POST['openid_url']))   : '');
+       $maxreq           = (!empty($_POST['maxreq'])     ? intval($_POST['maxreq'])             : 0);
+       $expire           = (!empty($_POST['expire'])     ? intval($_POST['expire'])             : 0);
+       $def_gid          = (!empty($_POST['group-selection']) ? intval($_POST['group-selection']) : 0);
+
+
+       $expire_items     = (!empty($_POST['expire_items']) ? intval($_POST['expire_items'])     : 0);
+       $expire_notes     = (!empty($_POST['expire_notes']) ? intval($_POST['expire_notes'])     : 0);
+       $expire_starred   = (!empty($_POST['expire_starred']) ? intval($_POST['expire_starred']) : 0);
+       $expire_photos    = (!empty($_POST['expire_photos'])? intval($_POST['expire_photos'])    : 0);
+       $expire_network_only    = (!empty($_POST['expire_network_only'])? intval($_POST['expire_network_only'])  : 0);
+
+       $allow_location   = ((!empty($_POST['allow_location']) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
+       $publish          = ((!empty($_POST['profile_in_directory']) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
+       $net_publish      = ((!empty($_POST['profile_in_netdirectory']) && (intval($_POST['profile_in_netdirectory']) == 1)) ? 1: 0);
+       $old_visibility   = ((!empty($_POST['visibility']) && (intval($_POST['visibility']) == 1)) ? 1 : 0);
+       $account_type     = ((!empty($_POST['account-type']) && (intval($_POST['account-type']))) ? intval($_POST['account-type']) : 0);
+       $page_flags       = ((!empty($_POST['page-flags']) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0);
+       $blockwall        = ((!empty($_POST['blockwall']) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted!
+       $blocktags        = ((!empty($_POST['blocktags']) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
+       $unkmail          = ((!empty($_POST['unkmail']) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
+       $cntunkmail       = (!empty($_POST['cntunkmail']) ? intval($_POST['cntunkmail']) : 0);
+       $suggestme        = (!empty($_POST['suggestme']) ? intval($_POST['suggestme'])  : 0);
        $hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
        $hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
 
@@ -460,28 +460,28 @@ function settings_post(App $a)
 
        $notify = 0;
 
-       if (x($_POST, 'notify1')) {
+       if (!empty($_POST['notify1'])) {
                $notify += intval($_POST['notify1']);
        }
-       if (x($_POST, 'notify2')) {
+       if (!empty($_POST['notify2'])) {
                $notify += intval($_POST['notify2']);
        }
-       if (x($_POST, 'notify3')) {
+       if (!empty($_POST['notify3'])) {
                $notify += intval($_POST['notify3']);
        }
-       if (x($_POST, 'notify4')) {
+       if (!empty($_POST['notify4'])) {
                $notify += intval($_POST['notify4']);
        }
-       if (x($_POST, 'notify5')) {
+       if (!empty($_POST['notify5'])) {
                $notify += intval($_POST['notify5']);
        }
-       if (x($_POST, 'notify6')) {
+       if (!empty($_POST['notify6'])) {
                $notify += intval($_POST['notify6']);
        }
-       if (x($_POST, 'notify7')) {
+       if (!empty($_POST['notify7'])) {
                $notify += intval($_POST['notify7']);
        }
-       if (x($_POST, 'notify8')) {
+       if (!empty($_POST['notify8'])) {
                $notify += intval($_POST['notify8']);
        }
 
@@ -666,7 +666,7 @@ function settings_content(App $a)
                return Login::form();
        }
 
-       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+       if (!empty($_SESSION['submanage'])) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
@@ -796,7 +796,7 @@ function settings_content(App $a)
                $default_group             = PConfig::get(local_user(), 'ostatus', 'default_group');
                $legacy_contact            = PConfig::get(local_user(), 'ostatus', 'legacy_contact');
 
-               if (x($legacy_contact)) {
+               if (!empty($legacy_contact)) {
                        /// @todo Isn't it supposed to be a $a->internalRedirect() call?
                        $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl().'/ostatus_subscribe?url=' . urlencode($legacy_contact) . '">';
                }
index 9b46b522bb9df752a78963da88b4427ea787a626..537f3920232b6bcf4befed19db4c83ae24a9a065 100644 (file)
@@ -33,7 +33,7 @@ function starred_init(App $a) {
        Item::update(['starred' => $starred], ['id' => $message_id]);
 
        // See if we've been passed a return path to redirect to
-       $return_path = (x($_REQUEST,'return') ? $_REQUEST['return'] : '');
+       $return_path = defaults($_REQUEST, 'return', '');
        if ($return_path) {
                $rand = '_=' . time();
                if (strpos($return_path, '?')) {
index b287957b23ea0bbe82133e4a1630e162dbeb76c0..90ab5a3aabbddf46c0db8d1f26ea98655ee3c7fe 100644 (file)
@@ -89,7 +89,7 @@ function subthread_content(App $a) {
 
        $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
        $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
-       $link = XML::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+       $link = XML::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n");
        $body = $item['body'];
 
        $obj = <<< EOT
index ed9f6e0f2191ed8d40ca36ce725b5ce705ca2ec8..7f1fe3386c139f297244f88f0ea45f2d23aba310 100644 (file)
@@ -20,7 +20,7 @@ function suggest_init(App $a)
                return;
        }
 
-       if (x($_GET,'ignore') && intval($_GET['ignore'])) {
+       if (!empty($_GET['ignore'])) {
                // Check if we should do HTML-based delete confirmation
                if ($_REQUEST['confirm']) {
                        // <form> can't take arguments in its "action" parameter
index 5a8047414d648fc1c1d34771e971205fad832de3..f8979ae6cac05f102f7be5cc4423675b1b25fbf5 100644 (file)
@@ -78,7 +78,7 @@ function tagger_content(App $a) {
                $href = System::baseUrl() . '/display/' . $item['guid'];
        }
 
-       $link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n") ;
+       $link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n");
 
        $body = XML::escape($item['body']);
 
index 3785d8750a1922ca510557d2d7c3fe5034c06919..24a41be95ce79a141b97545bb9693ec1476eaa0b 100644 (file)
@@ -17,7 +17,7 @@ function tagrm_post(App $a)
                $a->internalRedirect($_SESSION['photo_return']);
        }
 
-       if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) {
+       if (!empty($_POST['submit']) && ($_POST['submit'] === L10n::t('Cancel'))) {
                $a->internalRedirect($_SESSION['photo_return']);
        }
 
index 5df919d7d6d9f880ffd02a0db9a56fbb7913a893..dfeab8a2f6e4d45988b567ab86c8ea8056d3e9d3 100644 (file)
@@ -42,10 +42,10 @@ function uimport_content(App $a)
        }
 
 
-       if (x($_SESSION, 'theme')) {
+       if (!empty($_SESSION['theme'])) {
                unset($_SESSION['theme']);
        }
-       if (x($_SESSION, 'mobile-theme')) {
+       if (!empty($_SESSION['mobile-theme'])) {
                unset($_SESSION['mobile-theme']);
        }
 
index 433a4782ff872c15b1fa0afabaffe1f09b155e38..a66c88aefd2d9dcfe993c4d81cef222f11efcbd7 100644 (file)
@@ -114,10 +114,8 @@ function unfollow_content(App $a)
        // Makes the connection request for friendica contacts easier
        $_SESSION['fastlane'] = $contact['url'];
 
-       $header = L10n::t('Disconnect/Unfollow');
-
        $o = Renderer::replaceMacros($tpl, [
-               '$header'        => htmlentities($header),
+               '$header'        => L10n::t('Disconnect/Unfollow'),
                '$desc'          => '',
                '$pls_answer'    => '',
                '$does_know_you' => '',
index 8b7acffbdc90fdd597a8680862101430eea1dad0..d36ea96c7de00248a5e6a572fb0c4ee684ecceeb 100644 (file)
@@ -29,18 +29,13 @@ function viewcontacts_init(App $a)
 
        Nav::setSelected('home');
 
-       $nick = $a->argv[1];
-       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
-               DBA::escape($nick)
-       );
-
-       if (!DBA::isResult($r)) {
+       $user = DBA::selectFirst('user', [], ['nickname' => $a->argv[1], 'blocked' => false]);
+       if (!DBA::isResult($user)) {
                System::httpExit(404, ["title" => L10n::t('Page not found.')]);
        }
 
-       $a->data['user'] = $r[0];
-       $a->profile_uid = $r[0]['uid'];
-       $is_owner = (local_user() && (local_user() == $a->profile_uid));
+       $a->data['user'] = $user;
+       $a->profile_uid  = $user['uid'];
 
        Profile::load($a, $a->argv[1]);
 }
@@ -54,82 +49,69 @@ function viewcontacts_content(App $a)
 
        $is_owner = $a->profile['profile_uid'] == local_user();
 
-       $o = "";
-
        // tabs
-       $o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
+       $o = Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
 
        if (!count($a->profile) || $a->profile['hide-friends']) {
                notice(L10n::t('Permission denied.') . EOL);
                return $o;
        }
 
-       $total = 0;
-       $r = q("SELECT COUNT(*) AS `total` FROM `contact`
-               WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
-                       AND NOT `hidden` AND NOT `archive`
-                       AND `network` IN ('%s', '%s', '%s', '%s')",
-               intval($a->profile['uid']),
-               DBA::escape(Protocol::ACTIVITYPUB),
-               DBA::escape(Protocol::DFRN),
-               DBA::escape(Protocol::DIASPORA),
-               DBA::escape(Protocol::OSTATUS)
-       );
-       if (DBA::isResult($r)) {
-               $total = $r[0]['total'];
-       }
+       $condition = [
+               'uid'     => $a->profile['uid'],
+               'blocked' => false,
+               'pending' => false,
+               'hidden'  => false,
+               'archive' => false,
+               'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]
+       ];
+
+       $total = DBA::count('count', $condition);
+
        $pager = new Pager($a->query_string);
 
-       $r = q("SELECT * FROM `contact`
-               WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
-                       AND NOT `hidden` AND NOT `archive`
-                       AND `network` IN ('%s', '%s', '%s', '%s')
-               ORDER BY `name` ASC LIMIT %d, %d",
-               intval($a->profile['uid']),
-               DBA::escape(Protocol::ACTIVITYPUB),
-               DBA::escape(Protocol::DFRN),
-               DBA::escape(Protocol::DIASPORA),
-               DBA::escape(Protocol::OSTATUS),
-               $pager->getStart(),
-               $pager->getItemsPerPage()
-       );
-       if (!DBA::isResult($r)) {
-               info(L10n::t('No contacts.').EOL);
+       $params = ['order' => ['name' => false], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+
+       $contacts_stmt = DBA::select('contact', [], $condition, $params);
+
+       if (!DBA::isResult($contacts_stmt)) {
+               info(L10n::t('No contacts.') . EOL);
                return $o;
        }
 
        $contacts = [];
 
-       foreach ($r as $rr) {
+       while ($contact = DBA::fetch($contacts_stmt)) {
                /// @TODO This triggers an E_NOTICE if 'self' is not there
-               if ($rr['self']) {
+               if ($contact['self']) {
                        continue;
                }
 
-               $contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
+               $contact_details = Contact::getDetailsByURL($contact['url'], $a->profile['uid'], $contact);
 
                $contacts[] = [
-                       'id' => $rr['id'],
-                       'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
-                       'photo_menu' => Contact::photoMenu($rr),
-                       'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
-                       'name' => htmlentities(substr($contact_details['name'], 0, 20)),
-                       'username' => htmlentities($contact_details['name']),
-                       'details'       => $contact_details['location'],
-                       'tags'          => $contact_details['keywords'],
-                       'about'         => $contact_details['about'],
-                       'account_type'  => Contact::getAccountType($contact_details),
-                       'url' => Contact::magicLink($rr['url']),
-                       'sparkle' => '',
-                       'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
-                       'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
+                       'id'           => $contact['id'],
+                       'img_hover'    => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $contact['url']),
+                       'photo_menu'   => Contact::photoMenu($contact),
+                       'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
+                       'name'         => substr($contact_details['name'], 0, 20),
+                       'username'     => $contact_details['name'],
+                       'details'      => $contact_details['location'],
+                       'tags'         => $contact_details['keywords'],
+                       'about'        => $contact_details['about'],
+                       'account_type' => Contact::getAccountType($contact_details),
+                       'url'          => Contact::magicLink($contact['url']),
+                       'sparkle'      => '',
+                       'itemurl'      => (($contact_details['addr'] != "") ? $contact_details['addr'] : $contact['url']),
+                       'network'      => ContactSelector::networkToName($contact['network'], $contact['url']),
                ];
        }
 
+       DBA::close($contacts_stmt);
 
        $tpl = Renderer::getMarkupTemplate("viewcontact_template.tpl");
        $o .= Renderer::replaceMacros($tpl, [
-               '$title' => L10n::t('Contacts'),
+               '$title'    => L10n::t('Contacts'),
                '$contacts' => $contacts,
                '$paginate' => $pager->renderFull($total),
        ]);
index b4254ba64adfc683d3392725f65d77a320530384..ba1a8205c589a8b98a6f2329fb208d75f5a7ee36 100644 (file)
@@ -15,7 +15,7 @@ use Friendica\Util\Strings;
 
 function wall_attach_post(App $a) {
 
-       $r_json = (x($_GET,'response') && $_GET['response']=='json');
+       $r_json = (!empty($_GET['response']) && $_GET['response']=='json');
 
        if ($a->argc > 1) {
                $nick = $a->argv[1];
@@ -85,7 +85,7 @@ function wall_attach_post(App $a) {
                killme();
        }
 
-       if (! x($_FILES,'userfile')) {
+       if (empty($_FILES['userfile'])) {
                if ($r_json) {
                        echo json_encode(['error' => L10n::t('Invalid request.')]);
                }
@@ -120,7 +120,7 @@ function wall_attach_post(App $a) {
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {
-                       echo $msg . EOL ;
+                       echo $msg . EOL;
                }
                @unlink($src);
                killme();
@@ -144,7 +144,7 @@ function wall_attach_post(App $a) {
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {
-                       echo $msg . EOL ;
+                       echo $msg . EOL;
                }
                killme();
        }
@@ -160,7 +160,7 @@ function wall_attach_post(App $a) {
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {
-                       echo $msg . EOL ;
+                       echo $msg . EOL;
                }
                killme();
        }
index 3358433da12450fd2b39a321f173d1ddcb83c547..89655981ea9a090f9f0cf993703459e72df612c2 100644 (file)
@@ -23,11 +23,11 @@ function wall_upload_post(App $a, $desktopmode = true)
 {
        Logger::log("wall upload: starting new upload", Logger::DEBUG);
 
-       $r_json = (x($_GET, 'response') && $_GET['response'] == 'json');
-       $album = (x($_GET, 'album') ? Strings::escapeTags(trim($_GET['album'])) : '');
+       $r_json = (!empty($_GET['response']) && $_GET['response'] == 'json');
+       $album = (!empty($_GET['album']) ? Strings::escapeTags(trim($_GET['album'])) : '');
 
        if ($a->argc > 1) {
-               if (!x($_FILES, 'media')) {
+               if (empty($_FILES['media'])) {
                        $nick = $a->argv[1];
                        $r = q("SELECT `user`.*, `contact`.`id` FROM `user`
                                INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
@@ -110,7 +110,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                killme();
        }
 
-       if (!x($_FILES, 'userfile') && !x($_FILES, 'media')) {
+       if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
                if ($r_json) {
                        echo json_encode(['error' => L10n::t('Invalid request.')]);
                }
@@ -121,13 +121,13 @@ function wall_upload_post(App $a, $desktopmode = true)
        $filename = '';
        $filesize = 0;
        $filetype = '';
-       if (x($_FILES, 'userfile')) {
+       if (!empty($_FILES['userfile'])) {
                $src      = $_FILES['userfile']['tmp_name'];
                $filename = basename($_FILES['userfile']['name']);
                $filesize = intval($_FILES['userfile']['size']);
                $filetype = $_FILES['userfile']['type'];
 
-       } elseif (x($_FILES, 'media')) {
+       } elseif (!empty($_FILES['media'])) {
                if (!empty($_FILES['media']['tmp_name'])) {
                        if (is_array($_FILES['media']['tmp_name'])) {
                                $src = $_FILES['media']['tmp_name'][0];
index b7a62b3ad426f8d9554a5e864be5dd3295e25ebc..780230b8c700e479dfc28744b41877ddb9b88f40 100644 (file)
@@ -20,8 +20,8 @@ function wallmessage_post(App $a) {
                return;
        }
 
-       $subject   = ((x($_REQUEST,'subject'))   ? Strings::escapeTags(trim($_REQUEST['subject']))   : '');
-       $body      = ((x($_REQUEST,'body'))      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '');
+       $subject   = (!empty($_REQUEST['subject'])   ? Strings::escapeTags(trim($_REQUEST['subject']))   : '');
+       $body      = (!empty($_REQUEST['body'])      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '');
 
        $recipient = (($a->argc > 1) ? Strings::escapeTags($a->argv[1]) : '');
        if ((! $recipient) || (! $body)) {
@@ -125,20 +125,20 @@ function wallmessage_content(App $a) {
 
        $tpl = Renderer::getMarkupTemplate('wallmessage.tpl');
        $o = Renderer::replaceMacros($tpl, [
-               '$header' => L10n::t('Send Private Message'),
-               '$subheader' => L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.', $user['username']),
-               '$to' => L10n::t('To:'),
-               '$subject' => L10n::t('Subject:'),
-               '$recipname' => $user['username'],
-               '$nickname' => $user['nickname'],
-               '$subjtxt' => ((x($_REQUEST, 'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-               '$text' => ((x($_REQUEST, 'body')) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : ''),
-               '$readonly' => '',
-               '$yourmessage' => L10n::t('Your message:'),
-               '$parent' => '',
-               '$upload' => L10n::t('Upload photo'),
-               '$insert' => L10n::t('Insert web link'),
-               '$wait' => L10n::t('Please wait')
+               '$header'     => L10n::t('Send Private Message'),
+               '$subheader'  => L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.', $user['username']),
+               '$to'         => L10n::t('To:'),
+               '$subject'    => L10n::t('Subject:'),
+               '$recipname'  => $user['username'],
+               '$nickname'   => $user['nickname'],
+               '$subjtxt'    => defaults($_REQUEST, 'subject', ''),
+               '$text'       => defaults($_REQUEST, 'body', ''),
+               '$readonly'   => '',
+               '$yourmessage'=> L10n::t('Your message:'),
+               '$parent'     => '',
+               '$upload'     => L10n::t('Upload photo'),
+               '$insert'     => L10n::t('Insert web link'),
+               '$wait'       => L10n::t('Please wait')
        ]);
 
        return $o;
index 4f23db6d8f300bd8e42732cee9df1cc44594a261..a48d2dba6bac2634c0032a74ba238f5dfac8503b 100644 (file)
@@ -20,7 +20,8 @@ function webfinger_content(App $a)
                killme();
        }
 
-       $o  = '<h3>Webfinger Diagnostic</h3>';
+       $o = '<div class="generic-page-wrapper">';
+       $o .= '<h3>Webfinger Diagnostic</h3>';
 
        $o .= '<form action="webfinger" method="get">';
        $o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') .'" />';
@@ -28,12 +29,14 @@ function webfinger_content(App $a)
 
        $o .= '<br /><br />';
 
-       if (x($_GET, 'addr')) {
+       if (!empty($_GET['addr'])) {
                $addr = trim($_GET['addr']);
                $res = Probe::lrdd($addr);
                $o .= '<pre>';
                $o .= str_replace("\n", '<br />', print_r($res, true));
                $o .= '</pre>';
        }
+       $o .= '</div>';
+
        return $o;
 }
index d6afe7174662f00d24c27439d13d0a85bfae820b..71d37855169c39a41f1685b5da4dc160c21c8572 100644 (file)
@@ -91,7 +91,7 @@ server {
   # by denying dot files and rewrite request to the front controller
   location ^~ /.well-known/ {
     allow all;
-    try_files $uri /index.php?pagename=$uri&$args;
+    rewrite ^ /index.php?pagename=$uri;
   }
 
   include mime.types;
index 34de340f33c3aabc7f59c341fda955f90e5a4408..d32718271b844cee8171fafa21afff9cd36eea7a 100644 (file)
@@ -80,7 +80,7 @@ text { font:12px Dialog; }
 <text x="149" y="1721" style="font:13px Open Sans">($_POST['localconfirm'] == 1)</text>
 <text x="149" y="1744" style="font:13px Open Sans">-----------------------------------------------------------------------</text>
 <text x="149" y="1767" style="font:13px Open Sans">- if(local_user() &amp;&amp; ($a-&gt;user['nickname'] == $a-</text>
-<text x="149" y="1790" style="font:13px Open Sans">&gt;argv[1]) &amp;&amp; (x($_POST,'dfrn_url')))</text>
+<text x="149" y="1790" style="font:13px Open Sans">&gt;argv[1]) &amp;&amp; !empty($_POST['dfrn_url']))</text>
 <text x="149" y="1813" style="font:13px Open Sans">-&gt;</text>
 <text x="149" y="1859" style="font:13px Open Sans">- $confirm_key comes from $_POST</text>
 <text x="149" y="1905" style="font:13px Open Sans">- get data for contact Karen (contact table) by </text>
@@ -104,7 +104,7 @@ text { font:12px Dialog; }
 <path d="M866,2206 C861.5820313,2206 858,2209.5820313 858,2214 L858,2444 C858,2448.4179688 861.5820313,2452 866,2452 L1434,2452 C1438.4179688,2452 1442,2448.4179688 1442,2444 L1442,2214 C1442,2209.5820313 1438.4179688,2206 1434,2206 Z" style="fill:rgb(255,255,3);stroke:none" clip-path="url(#clip14)" />
 <text x="871" y="2228" style="font:13px Open Sans">http://karenhomepage.com/dfrn_request?confirm_key=”ABC123”</text>
 <text x="871" y="2274" style="font:13px Open Sans">dfrn_request_content() -</text>
-<text x="871" y="2297" style="font:13px Open Sans">(elseif((x($_GET,'confirm_key')) &amp;&amp; strlen($_GET['confirm_key'])) )</text>
+<text x="871" y="2297" style="font:13px Open Sans">elseif (!empty($_GET['confirm_key']))</text>
 <text x="871" y="2320" style="font:13px Open Sans">----------------------------------------------------------------------------------------------</text>
 <text x="871" y="2366" style="font:13px Open Sans">- select the intro by confirm_key (intro table) -&gt; get contact id</text>
 <text x="871" y="2389" style="font:13px Open Sans">- use the intro contact id to get the contact in the contact table</text>
index 845560a4d676df27d4d3548eb8d1b88b1123bd15..261c3e74cb6f970701ae11281c929905470a3fbd 100644 (file)
@@ -523,7 +523,7 @@ class App
                if (!empty($relative_script_path)) {
                        // Module
                        if (!empty($_SERVER['QUERY_STRING'])) {
-                               $path = trim(dirname($relative_script_path, substr_count(trim($_SERVER['QUERY_STRING'], '/'), '/') + 1), '/');
+                               $path = trim(rdirname($relative_script_path, substr_count(trim($_SERVER['QUERY_STRING'], '/'), '/') + 1), '/');
                        } else {
                                // Root page
                                $path = trim($relative_script_path, '/');
@@ -549,7 +549,7 @@ class App
 
                // Use environment variables for mysql if they are set beforehand
                if (!empty(getenv('MYSQL_HOST'))
-                       && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
+                       && !empty(getenv('MYSQL_USERNAME') || !empty(getenv('MYSQL_USER')))
                        && getenv('MYSQL_PASSWORD') !== false
                        && !empty(getenv('MYSQL_DATABASE')))
                {
@@ -668,7 +668,7 @@ class App
                        $this->hostname = Core\Config::get('config', 'hostname');
                }
 
-               return $scheme . '://' . $this->hostname . (!empty($this->getURLPath()) ? '/' . $this->getURLPath() : '' );
+               return $scheme . '://' . $this->hostname . !empty($this->getURLPath() ? '/' . $this->getURLPath() : '' );
        }
 
        /**
@@ -1880,7 +1880,7 @@ class App
         */
        public function internalRedirect($toUrl = '', $ssl = false)
        {
-               if (filter_var($toUrl, FILTER_VALIDATE_URL)) {
+               if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) {
                        throw new InternalServerErrorException("'$toUrl is not a relative path, please use System::externalRedirectTo");
                }
 
@@ -1897,7 +1897,7 @@ class App
         */
        public function redirect($toUrl)
        {
-               if (filter_var($toUrl, FILTER_VALIDATE_URL)) {
+               if (!empty(parse_url($toUrl, PHP_URL_SCHEME))) {
                        Core\System::externalRedirect($toUrl);
                } else {
                        $this->internalRedirect($toUrl);
index b8691e93400ee53aeeac2f18f61bb8fd5113bd85..5166d5848e1463ba1dd8eb424339e2ce3ba67339 100644 (file)
@@ -58,7 +58,7 @@ class Nav
        public static function build(App $a)
        {
                // Placeholder div for popup panel
-               $nav = '<div id="panel" style="display: none;"></div>' ;
+               $nav = '<div id="panel" style="display: none;"></div>';
 
                $nav_info = self::getInfo($a);
 
@@ -170,7 +170,7 @@ class Nav
                // "Home" should also take you home from an authenticated remote profile connection
                $homelink = Profile::getMyURL();
                if (! $homelink) {
-                       $homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : '');
+                       $homelink = defaults($_SESSION, 'visitor_home', '');
                }
 
                if (($a->module != 'home') && (! (local_user()))) {
@@ -234,7 +234,7 @@ class Nav
                // The following nav links are only show to logged in users
                if (local_user()) {
                        $nav['network'] = ['network', L10n::t('Network'), '', L10n::t('Conversations from your friends')];
-                       $nav['net_reset'] = ['network/0?f=&order=comment&nets=all', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')];
+                       $nav['net_reset'] = ['network/?f=', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')];
 
                        $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
 
index c37e36f6073c05d5560c4b1b1c44286deedffed7..6eb11c7b3b2041c4a1fc40e009bdc86334eb3317 100644 (file)
@@ -308,12 +308,12 @@ class OEmbed
                }
 
                $domain = parse_url($url, PHP_URL_HOST);
-               if (!x($domain)) {
+               if (empty($domain)) {
                        return false;
                }
 
                $str_allowed = Config::get('system', 'allowed_oembed', '');
-               if (!x($str_allowed)) {
+               if (empty($str_allowed)) {
                        return false;
                }
 
@@ -334,7 +334,7 @@ class OEmbed
                        throw new Exception('OEmbed failed for URL: ' . $url);
                }
 
-               if (x($title)) {
+               if (!empty($title)) {
                        $o->title = $title;
                }
 
index cb375dcd21e7686b7018512f92ed3d2451a2dcf7..6d2b152ee8de490c8013f3364023b2ac63aaeb8a 100644 (file)
@@ -130,12 +130,12 @@ class BBCode extends BaseObject
 
                $type = "";
                preg_match("/type='(.*?)'/ism", $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $type = strtolower($matches[1]);
                }
 
                preg_match('/type="(.*?)"/ism', $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $type = strtolower($matches[1]);
                }
 
@@ -153,12 +153,12 @@ class BBCode extends BaseObject
 
                $url = "";
                preg_match("/url='(.*?)'/ism", $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $url = $matches[1];
                }
 
                preg_match('/url="(.*?)"/ism', $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $url = $matches[1];
                }
 
@@ -168,12 +168,12 @@ class BBCode extends BaseObject
 
                $title = "";
                preg_match("/title='(.*?)'/ism", $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $title = $matches[1];
                }
 
                preg_match('/title="(.*?)"/ism', $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $title = $matches[1];
                }
 
@@ -186,12 +186,12 @@ class BBCode extends BaseObject
 
                $image = "";
                preg_match("/image='(.*?)'/ism", $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $image = $matches[1];
                }
 
                preg_match('/image="(.*?)"/ism', $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $image = $matches[1];
                }
 
@@ -201,12 +201,12 @@ class BBCode extends BaseObject
 
                $preview = "";
                preg_match("/preview='(.*?)'/ism", $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $preview = $matches[1];
                }
 
                preg_match('/preview="(.*?)"/ism', $attributes, $matches);
-               if (x($matches, 1)) {
+               if (!empty($matches[1])) {
                        $preview = $matches[1];
                }
 
@@ -234,7 +234,7 @@ class BBCode extends BaseObject
                */
 
                $has_title = !empty($item['title']);
-               $plink = (!empty($item['plink']) ? $item['plink'] : '');
+               $plink = defaults($item, 'plink', '');
                $post = self::getAttachmentData($body);
 
                // if nothing is found, it maybe having an image.
@@ -626,7 +626,7 @@ class BBCode extends BaseObject
                        $data["title"] = $data["url"];
                }
 
-               if (($data["text"] == "") && ($data["title"] != "") && ($data["url"] == "")) {
+               if (empty($data["text"]) && !empty($data["title"]) && empty($data["url"])) {
                        return $data["title"] . $data["after"];
                }
 
@@ -1662,7 +1662,7 @@ class BBCode extends BaseObject
                // Summary (e.g. title) is required, earlier revisions only required description (in addition to
                // start which is always required). Allow desc with a missing summary for compatibility.
 
-               if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) {
+               if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
                        $sub = Event::getHTML($ev, $simple_html);
 
                        $text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $text);
index 6451b74faabaf2ab86e83d0feb5ec6ac533182d3..276094a8f9e9d691c0eb743b0cf74bc69fa4bd24 100644 (file)
@@ -908,7 +908,7 @@ class HTML
        public static function micropro($contact, $redirect = false, $class = '', $textmode = false)
        {
                // Use the contact URL if no address is available
-               if (!x($contact, "addr")) {
+               if (empty($contact['addr'])) {
                        $contact["addr"] = $contact["url"];
                }
 
@@ -924,7 +924,7 @@ class HTML
                }
 
                // If there is some js available we don't need the url
-               if (x($contact, 'click')) {
+               if (!empty($contact['click'])) {
                        $url = '';
                }
 
@@ -961,7 +961,7 @@ class HTML
                $save_label = $mode === 'text' ? L10n::t('Save') : L10n::t('Follow');
 
                $values = [
-                               '$s' => htmlspecialchars($s),
+                               '$s' => $s,
                                '$id' => $id,
                                '$action_url' => $url,
                                '$search_label' => L10n::t('Search'),
index 50825c525e526f19520fda725619fbdb68ca3611..ca5ec3fd08b79fcf26b7261182d51aef88a29d4d 100644 (file)
@@ -106,7 +106,7 @@ class Authentication extends BaseObject
 
                $masterUid = $user_record['uid'];
 
-               if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
+               if (!empty($_SESSION['submanage'])) {
                        $user = DBA::selectFirst('user', ['uid'], ['uid' => $_SESSION['submanage']]);
                        if (DBA::isResult($user)) {
                                $masterUid = $user['uid'];
index 150b7e52a77447d85d3a7b7b5197b008a171263b..e6065dfb877d2a1cecc2eb6da2bc3311456c8c98 100644 (file)
@@ -119,11 +119,11 @@ HELP;
                        $db_data = $this->getOption(['d', 'dbdata'], ($save_db) ? getenv('MYSQL_DATABASE') : '');
                        $db_user = $this->getOption(['U', 'dbuser'], ($save_db) ? getenv('MYSQL_USER') . getenv('MYSQL_USERNAME') : '');
                        $db_pass = $this->getOption(['P', 'dbpass'], ($save_db) ? getenv('MYSQL_PASSWORD') : '');
-                       $url_path = $this->getOption(['u', 'urlpath'], (!empty('FRIENDICA_URL_PATH')) ? getenv('FRIENDICA_URL_PATH') : null);
-                       $php_path = $this->getOption(['b', 'phppath'], (!empty('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : null);
-                       $admin_mail = $this->getOption(['A', 'admin'], (!empty('FRIENDICA_ADMIN_MAIL')) ? getenv('FRIENDICA_ADMIN_MAIL') : '');
-                       $tz = $this->getOption(['T', 'tz'], (!empty('FRIENDICA_TZ')) ? getenv('FRIENDICA_TZ') : '');
-                       $lang = $this->getOption(['L', 'lang'], (!empty('FRIENDICA_LANG')) ? getenv('FRIENDICA_LANG') : '');
+                       $url_path = $this->getOption(['u', 'urlpath'], !empty('FRIENDICA_URL_PATH') ? getenv('FRIENDICA_URL_PATH') : null);
+                       $php_path = $this->getOption(['b', 'phppath'], !empty('FRIENDICA_PHP_PATH') ? getenv('FRIENDICA_PHP_PATH') : null);
+                       $admin_mail = $this->getOption(['A', 'admin'], !empty('FRIENDICA_ADMIN_MAIL') ? getenv('FRIENDICA_ADMIN_MAIL') : '');
+                       $tz = $this->getOption(['T', 'tz'], !empty('FRIENDICA_TZ') ? getenv('FRIENDICA_TZ') : '');
+                       $lang = $this->getOption(['L', 'lang'], !empty('FRIENDICA_LANG') ? getenv('FRIENDICA_LANG') : '');
 
                        if (empty($php_path)) {
                                $php_path = $installer->getPHPPath();
@@ -132,7 +132,7 @@ HELP;
                        $installer->createConfig(
                                $php_path,
                                $url_path,
-                               ((!empty($db_port)) ? $db_host . ':' . $db_port : $db_host),
+                               (!empty($db_port) ? $db_host . ':' . $db_port : $db_host),
                                $db_user,
                                $db_pass,
                                $db_data,
index 2fd04523d9728a96f6e08c6c6ead3370afc24bed..4c30c94b04ec274d1780abdbe6395804e8723f9a 100644 (file)
@@ -440,6 +440,13 @@ class Installer
                );
                $returnVal = $returnVal ? $status : false;
 
+               $status = $this->checkFunction('json_encode',
+                       L10n::t('JSON PHP module'),
+                       L10n::t('Error: JSON PHP module required but not installed.'),
+                       true
+               );
+               $returnVal = $returnVal ? $status : false;
+
                return $returnVal;
        }
 
index 19aae2b82348a75b292d3700f641b6383bcce11e..d11fea03a1b017533474c9287a8a3fe3b56005ba 100644 (file)
@@ -643,7 +643,7 @@ class NotificationsManager extends BaseObject
                                        'madeby_zrl' => Contact::magicLink($it['url']),
                                        'madeby_addr' => $it['addr'],
                                        'contact_id' => $it['contact-id'],
-                                       'photo' => ((x($it, 'fphoto')) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
+                                       'photo' => (!empty($it['fphoto']) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
                                        'name' => $it['fname'],
                                        'url' => $it['furl'],
                                        'zrl' => Contact::magicLink($it['furl']),
@@ -675,7 +675,7 @@ class NotificationsManager extends BaseObject
                                        'uid' => $_SESSION['uid'],
                                        'intro_id' => $it['intro_id'],
                                        'contact_id' => $it['contact-id'],
-                                       'photo' => ((x($it, 'photo')) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
+                                       'photo' => (!empty($it['photo']) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"),
                                        'name' => $it['name'],
                                        'location' => BBCode::convert($it['glocation'], false),
                                        'about' => BBCode::convert($it['gabout'], false),
index 44b56fcba373afda90354e624efb2740db7070db..2ca91b4b6ce3d72818467fc5387777f431e504d7 100644 (file)
@@ -48,29 +48,29 @@ class Renderer extends BaseObject
                'internal' => '',
                'smarty3' => '}}'
     ];
-    
-    /**
-     * @brief This is our template processor
-     *
-     * @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty
-     * @param array $r                  key value pairs (search => replace)
-     * 
-     * @return string substituted string
-    */
-    public static function replaceMacros($s, $r)
+
+       /**
+        * @brief This is our template processor
+        *
+        * @param string|FriendicaSmarty $s    The string requiring macro substitution or an instance of FriendicaSmarty
+        * @param array                  $vars key value pairs (search => replace)
+        *
+        * @return string substituted string
+        */
+    public static function replaceMacros($s, $vars)
     {
         $stamp1 = microtime(true);
         $a = self::getApp();
 
         // pass $baseurl to all templates
-        $r['$baseurl'] = System::baseUrl();
+        $vars['$baseurl'] = System::baseUrl();
         $t = self::getTemplateEngine();
 
         try {
-            $output = $t->replaceMacros($s, $r);
+            $output = $t->replaceMacros($s, $vars);
         } catch (Exception $e) {
             echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
-            killme();
+            exit();
         }
 
         $a->saveTimestamp($stamp1, "rendering");
index 91788588faeb3f77e775feae960ac3dfbcceee77..c4f23b1bfc6424dc3beba1947b0133768b9ea3f2 100644 (file)
@@ -26,7 +26,7 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 
        public function read($session_id)
        {
-               if (!x($session_id)) {
+               if (empty($session_id)) {
                        return '';
                }
 
index d24581e996202a6b54be24bfc626abcfb4fec305..3bd06bc1919524e48c1c63fb0fdfab3244caa578 100644 (file)
@@ -126,9 +126,33 @@ class System extends BaseObject
        {
                $err = '';
                if ($val >= 400) {
-                       $err = 'Error';
-                       if (!isset($description["title"])) {
-                               $description["title"] = $err." ".$val;
+                       if (!empty($description['title'])) {
+                               $err = $description['title'];
+                       } else {
+                               $title = [
+                                       '400' => L10n::t('Error 400 - Bad Request'),
+                                       '401' => L10n::t('Error 401 - Unauthorized'),
+                                       '403' => L10n::t('Error 403 - Forbidden'),
+                                       '404' => L10n::t('Error 404 - Not Found'),
+                                       '500' => L10n::t('Error 500 - Internal Server Error'),
+                                       '503' => L10n::t('Error 503 - Service Unavailable'),
+                                       ];
+                               $err = defaults($title, $val, 'Error ' . $val);
+                               $description['title'] = $err;
+                       }
+                       if (empty($description['description'])) {
+                               // Explanations are taken from https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
+                               $explanation = [
+                                       '400' => L10n::t('The server cannot or will not process the request due to an apparent client error.'),
+                                       '401' => L10n::t('Authentication is required and has failed or has not yet been provided.'),
+                                       '403' => L10n::t('The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account.'),
+                                       '404' => L10n::t('The requested resource could not be found but may be available in the future.'),
+                                       '500' => L10n::t('An unexpected condition was encountered and no more specific message is suitable.'),
+                                       '503' => L10n::t('The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later.'),
+                                       ];
+                               if (!empty($explanation[$val])) {
+                                       $description['description'] = $explanation[$val];
+                               }
                        }
                }
 
@@ -248,7 +272,7 @@ class System extends BaseObject
         */
        public static function externalRedirect($url)
        {
-               if (!filter_var($url, FILTER_VALIDATE_URL)) {
+               if (empty(parse_url($url, PHP_URL_SCHEME))) {
                        throw new InternalServerErrorException("'$url' is not a fully qualified URL, please use App->internalRedirect() instead");
                }
 
index 252ea8ef31d5f190c534ed53cbffeec0fc075842..7b2624cb9c638ae67eda5cd7c73c0c1cc840d8ab 100644 (file)
@@ -18,6 +18,10 @@ class Update
         */
        public static function check($via_worker)
        {
+               if (!DBA::connected()) {
+                       return;
+               }
+
                $build = Config::get('system', 'build');
 
                if (empty($build)) {
@@ -118,6 +122,8 @@ class Update
                                        Lock::release('dbupdate');
                                }
                        }
+               } elseif ($force) {
+                       DBStructure::update($verbose, true);
                }
 
                return '';
index 1e2693a944b04c85f475a09a74c36e5a23ec5120..70d93b0cc0900fbc67272a934bccbe48f6a636e0 100644 (file)
@@ -105,7 +105,7 @@ class UserImport
                }
 
 
-               if (!x($account, 'version')) {
+               if (empty($account['version'])) {
                        notice(L10n::t("Error! No version data in file! This is not a Friendica account file?"));
                        return;
                }
index bf3004ead4761eebdc2d46fc026c8240597a47cf..af0c25d0dd749c34e0e48142148e390f7357a69c 100644 (file)
@@ -1044,12 +1044,11 @@ class DBA
         * @param array   $options
         *                - cascade: If true we delete records in other tables that depend on the one we're deleting through
         *                           relations (default: true)
-        * @param boolean $in_process  Internal use: Only do a commit after the last delete
         * @param array   $callstack   Internal use: prevent endless loops
         *
-        * @return boolean|array was the delete successful? When $in_process is set: deletion data
+        * @return boolean was the delete successful?
         */
-       public static function delete($table, array $conditions, array $options = [], $in_process = false, array &$callstack = [])
+       public static function delete($table, array $conditions, array $options = [], array &$callstack = [])
        {
                if (empty($table) || empty($conditions)) {
                        Logger::log('Table and conditions have to be set');
@@ -1098,22 +1097,18 @@ class DBA
                        if ((count($conditions) == 1) && ($field == array_keys($conditions)[0])) {
                                foreach ($rel_def AS $rel_table => $rel_fields) {
                                        foreach ($rel_fields AS $rel_field) {
-                                               $retval = self::delete($rel_table, [$rel_field => array_values($conditions)[0]], $options, true, $callstack);
-                                               $commands = array_merge($commands, $retval);
+                                               $retval = self::delete($rel_table, [$rel_field => array_values($conditions)[0]], $options, $callstack);
                                        }
                                }
                                // We quit when this key already exists in the callstack.
                        } elseif (!isset($callstack[$qkey])) {
-
                                $callstack[$qkey] = true;
 
                                // Fetch all rows that are to be deleted
                                $data = self::select($table, [$field], $conditions);
 
                                while ($row = self::fetch($data)) {
-                                       // Now we accumulate the delete commands
-                                       $retval = self::delete($table, [$field => $row[$field]], $options, true, $callstack);
-                                       $commands = array_merge($commands, $retval);
+                                       self::delete($table, [$field => $row[$field]], $options, $callstack);
                                }
 
                                self::close($data);
@@ -1123,74 +1118,70 @@ class DBA
                        }
                }
 
-               if (!$in_process) {
-                       // Now we finalize the process
-                       $do_transaction = !self::$in_transaction;
+               // Now we finalize the process
+               $do_transaction = !self::$in_transaction;
 
-                       if ($do_transaction) {
-                               self::transaction();
-                       }
+               if ($do_transaction) {
+                       self::transaction();
+               }
 
-                       $compacted = [];
-                       $counter = [];
+               $compacted = [];
+               $counter = [];
 
-                       foreach ($commands AS $command) {
-                               $conditions = $command['conditions'];
-                               reset($conditions);
-                               $first_key = key($conditions);
+               foreach ($commands AS $command) {
+                       $conditions = $command['conditions'];
+                       reset($conditions);
+                       $first_key = key($conditions);
 
-                               $condition_string = self::buildCondition($conditions);
+                       $condition_string = self::buildCondition($conditions);
 
-                               if ((count($command['conditions']) > 1) || is_int($first_key)) {
-                                       $sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
-                                       Logger::log(self::replaceParameters($sql, $conditions), Logger::DATA);
+                       if ((count($command['conditions']) > 1) || is_int($first_key)) {
+                               $sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
+                               Logger::log(self::replaceParameters($sql, $conditions), Logger::DATA);
 
-                                       if (!self::e($sql, $conditions)) {
-                                               if ($do_transaction) {
-                                                       self::rollback();
-                                               }
-                                               return false;
-                                       }
-                               } else {
-                                       $key_table = $command['table'];
-                                       $key_condition = array_keys($command['conditions'])[0];
-                                       $value = array_values($command['conditions'])[0];
-
-                                       // Split the SQL queries in chunks of 100 values
-                                       // We do the $i stuff here to make the code better readable
-                                       $i = isset($counter[$key_table][$key_condition]) ? $counter[$key_table][$key_condition] : 0;
-                                       if (isset($compacted[$key_table][$key_condition][$i]) && count($compacted[$key_table][$key_condition][$i]) > 100) {
-                                               ++$i;
+                               if (!self::e($sql, $conditions)) {
+                                       if ($do_transaction) {
+                                               self::rollback();
                                        }
-
-                                       $compacted[$key_table][$key_condition][$i][$value] = $value;
-                                       $counter[$key_table][$key_condition] = $i;
+                                       return false;
+                               }
+                       } else {
+                               $key_table = $command['table'];
+                               $key_condition = array_keys($command['conditions'])[0];
+                               $value = array_values($command['conditions'])[0];
+
+                               // Split the SQL queries in chunks of 100 values
+                               // We do the $i stuff here to make the code better readable
+                               $i = isset($counter[$key_table][$key_condition]) ? $counter[$key_table][$key_condition] : 0;
+                               if (isset($compacted[$key_table][$key_condition][$i]) && count($compacted[$key_table][$key_condition][$i]) > 100) {
+                                       ++$i;
                                }
+
+                               $compacted[$key_table][$key_condition][$i][$value] = $value;
+                               $counter[$key_table][$key_condition] = $i;
                        }
-                       foreach ($compacted AS $table => $values) {
-                               foreach ($values AS $field => $field_value_list) {
-                                       foreach ($field_value_list AS $field_values) {
-                                               $sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" .
-                                                       substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
+               }
+               foreach ($compacted AS $table => $values) {
+                       foreach ($values AS $field => $field_value_list) {
+                               foreach ($field_value_list AS $field_values) {
+                                       $sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" .
+                                               substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
 
-                                               Logger::log(self::replaceParameters($sql, $field_values), Logger::DATA);
+                                       Logger::log(self::replaceParameters($sql, $field_values), Logger::DATA);
 
-                                               if (!self::e($sql, $field_values)) {
-                                                       if ($do_transaction) {
-                                                               self::rollback();
-                                                       }
-                                                       return false;
+                                       if (!self::e($sql, $field_values)) {
+                                               if ($do_transaction) {
+                                                       self::rollback();
                                                }
+                                               return false;
                                        }
                                }
                        }
-                       if ($do_transaction) {
-                               self::commit();
-                       }
-                       return true;
                }
-
-               return $commands;
+               if ($do_transaction) {
+                       self::commit();
+               }
+               return true;
        }
 
        /**
index b5e444020ab4492059de9a46dd2e37d1dd3a0a3f..92666edb89b78c42cfa3bb80bf48e701cb99ef91 100644 (file)
@@ -538,7 +538,7 @@ class DBStructure
                $primary_keys = [];
                foreach ($structure["fields"] AS $fieldname => $field) {
                        $sql_rows[] = "`".DBA::escape($fieldname)."` ".self::FieldCommand($field);
-                       if (x($field,'primary') && $field['primary']!='') {
+                       if (!empty($field['primary'])) {
                                $primary_keys[] = $fieldname;
                        }
                }
index bb6fc25851424c86bc89480f1f9df309e312a04a..5894814ea6c0e58dddda35b8c2272b779f5c27a5 100644 (file)
@@ -98,6 +98,48 @@ class Contact extends BaseObject
         * @}
         */
 
+       /**
+        * @brief Tests if the given contact is a follower
+        *
+        * @param int $cid Either public contact id or user's contact id
+        * @param int $uid User ID
+        *
+        * @return boolean is the contact id a follower?
+        */
+       public static function isFollower($cid, $uid)
+       {
+               if (self::isBlockedByUser($cid, $uid)) {
+                       return false;
+               }
+
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata['user'])) {
+                       return false;
+               }
+
+               $condition = ['id' => $cdata['user'], 'rel' => [self::FOLLOWER, self::FRIEND]];
+               return DBA::exists('contact', $condition);
+       }
+
+       /**
+        * @brief Get the basepath for a given contact link
+        * @todo Add functionality to store this value in the contact table
+        *
+        * @param string $url The contact link
+        *
+        * @return string basepath
+        */
+       public static function getBasepath($url)
+       {
+               $data = Probe::uri($url);
+               if (!empty($data['baseurl'])) {
+                       return $data['baseurl'];
+               }
+
+               // When we can't probe the server, we use some ugly function that does some pattern matching
+               return PortableContact::detectServer($url);
+       }
+
        /**
         * @brief Returns the contact id for the user and the public contact id for a given contact id
         *
@@ -106,7 +148,7 @@ class Contact extends BaseObject
         *
         * @return array with public and user's contact id
         */
-       private static function getPublicAndUserContacID($cid, $uid)
+       public static function getPublicAndUserContacID($cid, $uid)
        {
                if (empty($uid) || empty($cid)) {
                        return [];
@@ -418,7 +460,8 @@ class Contact extends BaseObject
        public static function updateSelfFromUserID($uid, $update_avatar = false)
        {
                $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
-                       'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl'];
+                       'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl',
+                       'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco'];
                $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
                if (!DBA::isResult($self)) {
                        return;
@@ -481,15 +524,15 @@ class Contact extends BaseObject
                $fields['nurl'] = Strings::normaliseLink($fields['url']);
                $fields['addr'] = $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
                $fields['request'] = System::baseUrl() . '/dfrn_request/' . $user['nickname'];
-               $fields['notify'] = System::baseUrl() . '/dfrn_notify/'  . $user['nickname'];
-               $fields['poll'] = System::baseUrl() . '/dfrn_poll/'    . $user['nickname'];
+               $fields['notify'] = System::baseUrl() . '/dfrn_notify/' . $user['nickname'];
+               $fields['poll'] = System::baseUrl() . '/dfrn_poll/'. $user['nickname'];
                $fields['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
-               $fields['poco'] = System::baseUrl() . '/poco/'         . $user['nickname'];
+               $fields['poco'] = System::baseUrl() . '/poco/' . $user['nickname'];
 
                $update = false;
 
                foreach ($fields as $field => $content) {
-                       if (isset($self[$field]) && $self[$field] != $content) {
+                       if ($self[$field] != $content) {
                                $update = true;
                        }
                }
@@ -1061,7 +1104,7 @@ class Contact extends BaseObject
                        $update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days'));
 
                        // We force the update if the avatar is empty
-                       if (!x($contact, 'avatar')) {
+                       if (empty($contact['avatar'])) {
                                $update_contact = true;
                        }
                        if (!$update_contact || $no_update) {
@@ -1147,7 +1190,7 @@ class Contact extends BaseObject
 
                $url = $data["url"];
                if (!$contact_id) {
-                       DBA::insert('contact', [
+                       $fields = [
                                'uid'       => $uid,
                                'created'   => DateTimeFormat::utcNow(),
                                'url'       => $data["url"],
@@ -1176,10 +1219,13 @@ class Contact extends BaseObject
                                'writable'  => 1,
                                'blocked'   => 0,
                                'readonly'  => 0,
-                               'pending'   => 0]
-                       );
+                               'pending'   => 0];
+
+                       $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
+
+                       DBA::update('contact', $fields, $condition, true);
 
-                       $s = DBA::select('contact', ['id'], ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
+                       $s = DBA::select('contact', ['id'], $condition, ['order' => ['id'], 'limit' => 2]);
                        $contacts = DBA::toArray($s);
                        if (!DBA::isResult($contacts)) {
                                return 0;
@@ -1204,8 +1250,10 @@ class Contact extends BaseObject
                        }
 
                        if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
-                               DBA::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
-                                       Strings::normaliseLink($data["url"]), $contact_id]);
+                               $condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self`",
+                                       Strings::normaliseLink($data["url"]), 0, $contact_id];
+                               Logger::log('Deleting duplicate contact ' . json_encode($condition), Logger::DEBUG);
+                               DBA::delete('contact', $condition);
                        }
                }
 
@@ -1618,7 +1666,7 @@ class Contact extends BaseObject
                        return $result;
                }
 
-               if (x($arr['contact'], 'name')) {
+               if (!empty($arr['contact']['name'])) {
                        $ret = $arr['contact'];
                } else {
                        $ret = Probe::uri($url, $network, $uid, false);
@@ -1664,16 +1712,15 @@ class Contact extends BaseObject
                }
 
                // do we have enough information?
-
-               if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) {
+               if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) {
                        $result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL;
-                       if (!x($ret, 'poll')) {
+                       if (empty($ret['poll'])) {
                                $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        }
-                       if (!x($ret, 'name')) {
+                       if (empty($ret['name'])) {
                                $result['message'] .= L10n::t('An author or name was not found.') . EOL;
                        }
-                       if (!x($ret, 'url')) {
+                       if (empty($ret['url'])) {
                                $result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
                        }
                        if (strpos($url, '@') !== false) {
@@ -2031,6 +2078,10 @@ class Contact extends BaseObject
         */
        public static function magicLink($contact_url, $url = '')
        {
+               if (!local_user()) {
+                       return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
+               }
+
                $cid = self::getIdForURL($contact_url, 0, true);
                if (empty($cid)) {
                        return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
@@ -2064,7 +2115,7 @@ class Contact extends BaseObject
         */
        public static function magicLinkbyContact($contact, $url = '')
        {
-               if ($contact['network'] != Protocol::DFRN) {
+               if (!local_user() || ($contact['network'] != Protocol::DFRN)) {
                        return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
                }
 
index 886f124153ac0a41bbbd1e7f58f6f4907aeba085..d25f2a151ab8f90af1d17846808ea021635868bc 100644 (file)
@@ -14,9 +14,9 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require_once 'boot.php';
@@ -53,11 +53,11 @@ class Event extends BaseObject
 
                if ($simple) {
                        if (!empty($event['summary'])) {
-                               $o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+                               $o = "<h3>" . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . "</h3>";
                        }
 
                        if (!empty($event['desc'])) {
-                               $o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+                               $o .= "<div>" . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . "</div>";
                        }
 
                        $o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
@@ -67,7 +67,7 @@ class Event extends BaseObject
                        }
 
                        if (!empty($event['location'])) {
-                               $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($event['location'], false, $simple) . "</p>";
+                               $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple) . "</p>";
                        }
 
                        return $o;
@@ -75,7 +75,7 @@ class Event extends BaseObject
 
                $o = '<div class="vevent">' . "\r\n";
 
-               $o .= '<div class="summary event-summary">' . BBCode::convert($event['summary'], false, $simple) . '</div>' . "\r\n";
+               $o .= '<div class="summary event-summary">' . BBCode::convert(Strings::escapeHtml($event['summary']), false, $simple) . '</div>' . "\r\n";
 
                $o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
                        . DateTimeFormat::utc($event['start'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
@@ -90,12 +90,12 @@ class Event extends BaseObject
                }
 
                if (!empty($event['desc'])) {
-                       $o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+                       $o .= '<div class="description event-description">' . BBCode::convert(Strings::escapeHtml($event['desc']), false, $simple) . '</div>' . "\r\n";
                }
 
                if (!empty($event['location'])) {
                        $o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span>&nbsp;<span class="location">'
-                               . BBCode::convert($event['location'], false, $simple)
+                               . BBCode::convert(Strings::escapeHtml($event['location']), false, $simple)
                                . '</span></div>' . "\r\n";
 
                        // Include a map of the location if the [map] BBCode is used.
@@ -592,10 +592,9 @@ class Event extends BaseObject
                                $drop =                  [System::baseUrl() . '/events/drop/' . $event['id'] , L10n::t('Delete event')   , '', ''];
                        }
 
-                       $title = strip_tags(html_entity_decode(BBCode::convert($event['summary']), ENT_QUOTES, 'UTF-8'));
+                       $title = BBCode::convert(Strings::escapeHtml($event['summary']));
                        if (!$title) {
-                               list($title, $_trash) = explode("<br", BBCode::convert($event['desc']), 2);
-                               $title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
+                               list($title, $_trash) = explode("<br", BBCode::convert(Strings::escapeHtml($event['desc'])), 2);
                        }
 
                        $author_link = $event['author-link'];
@@ -605,8 +604,9 @@ class Event extends BaseObject
                        $event['plink']       = Contact::magicLink($author_link, $plink);
 
                        $html = self::getHTML($event);
-                       $event['desc']     = BBCode::convert($event['desc']);
-                       $event['location'] = BBCode::convert($event['location']);
+                       $event['summary']  = BBCode::convert(Strings::escapeHtml($event['summary']));
+                       $event['desc']     = BBCode::convert(Strings::escapeHtml($event['desc']));
+                       $event['location'] = BBCode::convert(Strings::escapeHtml($event['location']));
                        $event_list[] = [
                                'id'       => $event['id'],
                                'start'    => $start,
index 06040403a95101dce550baf2310aa6d79aa8dd08..4ba4e3ca7c18299ac9effa73a20882a9a26eb7a5 100644 (file)
@@ -276,10 +276,10 @@ class FileTag
         }
 
         if ($cat == true) {
-            $pattern = '<' . self::encode($file) . '>' ;
+            $pattern = '<' . self::encode($file) . '>';
             $termtype = TERM_CATEGORY;
         } else {
-            $pattern = '[' . self::encode($file) . ']' ;
+            $pattern = '[' . self::encode($file) . ']';
             $termtype = TERM_FILE;
         }
 
index 3acffb059d796f8f1a65efab0fe0854ab0e828fe..44d1edecd78c5dcdf2cec638600e7e8993ee4178 100644 (file)
@@ -966,8 +966,8 @@ class GContact
 
                $statistics = json_decode($curlResult->getBody());
 
-               if (!empty($statistics->config)) {
-                       if ($statistics->config->instance_with_ssl) {
+               if (!empty($statistics->config->instance_address)) {
+                       if (!empty($statistics->config->instance_with_ssl)) {
                                $server = "https://";
                        } else {
                                $server = "http://";
@@ -976,8 +976,8 @@ class GContact
                        $server .= $statistics->config->instance_address;
 
                        $hostname = $statistics->config->instance_address;
-               } elseif (!empty($statistics)) {
-                       if ($statistics->instance_with_ssl) {
+               } elseif (!empty($statistics->instance_address)) {
+                       if (!empty($statistics->instance_with_ssl)) {
                                $server = "https://";
                        } else {
                                $server = "http://";
index 1640cb87b1aa63471c30e2bc40e292600e0b7294..5424b77dcfaec483ed3365e92e7ec82ff5226650 100644 (file)
@@ -33,7 +33,7 @@ class Group extends BaseObject
        public static function create($uid, $name)
        {
                $return = false;
-               if (x($uid) && x($name)) {
+               if (!empty($uid) && !empty($name)) {
                        $gid = self::getIdByName($uid, $name); // check for dupes
                        if ($gid !== false) {
                                // This could be a problem.
@@ -202,7 +202,7 @@ class Group extends BaseObject
         */
        public static function removeByName($uid, $name) {
                $return = false;
-               if (x($uid) && x($name)) {
+               if (!empty($uid) && !empty($name)) {
                        $gid = self::getIdByName($uid, $name);
 
                        $return = self::remove($gid);
@@ -400,8 +400,8 @@ class Group extends BaseObject
                        ];
                }
 
-               // Don't show the groups when there is only one
-               if (count($display_groups) <= 2) {
+               // Don't show the groups on the network page when there is only one
+               if ((count($display_groups) <= 2) && ($each == 'network')) {
                        return '';
                }
 
index 0c420550b8fa1d28ce3551aa43fe7d718ccaeda5..9acff3bfa8490bb5241162ed0d4784af5e1f0c7b 100644 (file)
@@ -1359,15 +1359,15 @@ class Item extends BaseObject
                $item['owner-name']    = trim(defaults($item, 'owner-name', ''));
                $item['owner-link']    = trim(defaults($item, 'owner-link', ''));
                $item['owner-avatar']  = trim(defaults($item, 'owner-avatar', ''));
-               $item['received']      = ((x($item, 'received') !== false) ? DateTimeFormat::utc($item['received']) : DateTimeFormat::utcNow());
-               $item['created']       = ((x($item, 'created') !== false) ? DateTimeFormat::utc($item['created']) : $item['received']);
-               $item['edited']        = ((x($item, 'edited') !== false) ? DateTimeFormat::utc($item['edited']) : $item['created']);
-               $item['changed']       = ((x($item, 'changed') !== false) ? DateTimeFormat::utc($item['changed']) : $item['created']);
-               $item['commented']     = ((x($item, 'commented') !== false) ? DateTimeFormat::utc($item['commented']) : $item['created']);
+               $item['received']      = (isset($item['received'])  ? DateTimeFormat::utc($item['received'])  : DateTimeFormat::utcNow());
+               $item['created']       = (isset($item['created'])   ? DateTimeFormat::utc($item['created'])   : $item['received']);
+               $item['edited']        = (isset($item['edited'])    ? DateTimeFormat::utc($item['edited'])    : $item['created']);
+               $item['changed']       = (isset($item['changed'])   ? DateTimeFormat::utc($item['changed'])   : $item['created']);
+               $item['commented']     = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']);
                $item['title']         = trim(defaults($item, 'title', ''));
                $item['location']      = trim(defaults($item, 'location', ''));
                $item['coord']         = trim(defaults($item, 'coord', ''));
-               $item['visible']       = ((x($item, 'visible') !== false) ? intval($item['visible'])         : 1);
+               $item['visible']       = (isset($item['visible']) ? intval($item['visible']) : 1);
                $item['deleted']       = 0;
                $item['parent-uri']    = trim(defaults($item, 'parent-uri', $item['uri']));
                $item['post-type']     = defaults($item, 'post-type', self::PT_ARTICLE);
@@ -1626,7 +1626,7 @@ class Item extends BaseObject
                // It is mainly used in the "post_local" hook.
                unset($item['api_source']);
 
-               if (x($item, 'cancel')) {
+               if (!empty($item['cancel'])) {
                        Logger::log('post cancelled by addon.');
                        return 0;
                }
@@ -3214,7 +3214,7 @@ class Item extends BaseObject
                }
        }
 
-       public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null)
+       public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null, $remote_cid = null)
        {
                $local_user = local_user();
                $remote_user = remote_user();
@@ -3237,7 +3237,7 @@ class Item extends BaseObject
                         * If pre-verified, the caller is expected to have already
                         * done this and passed the groups into this function.
                         */
-                       $set = PermissionSet::get($owner_id, $remote_user, $groups);
+                       $set = PermissionSet::get($owner_id, $remote_cid, $groups);
 
                        if (!empty($set)) {
                                $sql_set = " OR (`item`.`private` IN (1,2) AND `item`.`wall` AND `item`.`psid` IN (" . implode(',', $set) . "))";
@@ -3443,7 +3443,7 @@ class Item extends BaseObject
                                $filesubtype = 'unkn';
                        }
 
-                       $title = Strings::escapeHtml(trim(!empty($mtch[4]) ? $mtch[4] : $mtch[1]));
+                       $title = Strings::escapeHtml(trim(defaults($mtch, 4, $mtch[1])));
                        $title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes');
 
                        $icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
@@ -3455,7 +3455,7 @@ class Item extends BaseObject
                }
 
                // Map.
-               if (strpos($s, '<div class="map">') !== false && x($item, 'coord')) {
+               if (strpos($s, '<div class="map">') !== false && !empty($item['coord'])) {
                        $x = Map::byCoordinates(trim($item['coord']));
                        if ($x) {
                                $s = preg_replace('/\<div class\=\"map\"\>/', '$0' . $x, $s);
index 559babb7620bd66300753cb8aad1a6dfae231195..452f7e57c8e3838d3da43e97878a8e12734c27ed 100644 (file)
@@ -22,11 +22,14 @@ class ItemURI extends BaseObject
         */
        public static function insert($fields)
        {
-               if (!DBA::exists('item-uri', ['uri' => $fields['uri']])) {
+               // If the URI gets too long we only take the first parts and hope for best
+               $uri = substr($fields['uri'], 0, 255);
+
+               if (!DBA::exists('item-uri', ['uri' => $uri])) {
                        DBA::insert('item-uri', $fields, true);
                }
 
-               $itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $fields['uri']]);
+               $itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $uri]);
 
                if (!DBA::isResult($itemuri)) {
                        // This shouldn't happen
@@ -45,6 +48,9 @@ class ItemURI extends BaseObject
         */
        public static function getIdByURI($uri)
        {
+               // If the URI gets too long we only take the first parts and hope for best
+               $uri = substr($uri, 0, 255);
+
                $itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $uri]);
 
                if (!DBA::isResult($itemuri)) {
index a9b4c0fb736fd139957518921de46f03cac308d5..a87730087f3a024934edd24c60f69a09692175e6 100644 (file)
@@ -97,7 +97,7 @@ class Photo
                $photo = DBA::selectFirst(
                        'photo', ['resource-id'], ['uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos']
                );
-               if (x($photo['resource-id'])) {
+               if (!empty($photo['resource-id'])) {
                        $hash = $photo['resource-id'];
                } else {
                        $hash = self::newResource();
index 61357ef77a42bd22efb3441693d30a5b4f8d1666..132f9f33449f81a76f175e70840c0eee12a6fbfe 100644 (file)
@@ -99,7 +99,7 @@ class Profile
         *      load a lot of theme-specific content
         *
         * @brief Loads a profile into the page sidebar.
-        * @param object  $a            App
+        * @param App     $a
         * @param string  $nickname     string
         * @param int     $profile      int
         * @param array   $profiledata  array
@@ -288,7 +288,7 @@ class Profile
                $location = false;
 
                // This function can also use contact information in $profile
-               $is_contact = x($profile, 'cid');
+               $is_contact = !empty($profile['cid']);
 
                if (!is_array($profile) && !count($profile)) {
                        return $o;
@@ -297,9 +297,9 @@ class Profile
                $profile['picdate'] = urlencode(defaults($profile, 'picdate', ''));
 
                if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) {
-                       $profile['network_name'] = Strings::formatNetworkName($profile['network'], $profile['url']);
+                       $profile['network_link'] = Strings::formatNetworkName($profile['network'], $profile['url']);
                } else {
-                       $profile['network_name'] = '';
+                       $profile['network_link'] = '';
                }
 
                Addon::callHooks('profile_sidebar_enter', $profile);
@@ -337,6 +337,11 @@ class Profile
                        }
                }
 
+               // Is the remote user already connected to that user?
+               if ($connect && Contact::isFollower(remote_user(), $profile['uid'])) {
+                       $connect = false;
+               }
+
                if ($connect && ($profile['network'] != Protocol::DFRN) && !isset($profile['remoteconnect'])) {
                        $connect = false;
                }
@@ -357,7 +362,7 @@ class Profile
 
                // See issue https://github.com/friendica/friendica/issues/3838
                // Either we remove the message link for remote users or we enable creating messages from remote users
-               if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) {
+               if (remote_user() || (self::getMyURL() && !empty($profile['unkmail']) && ($profile['uid'] != local_user()))) {
                        $wallmessage = L10n::t('Message');
 
                        if (remote_user()) {
@@ -424,23 +429,23 @@ class Profile
                // Fetch the account type
                $account_type = Contact::getAccountType($profile);
 
-               if (x($profile, 'address')
-                       || x($profile, 'location')
-                       || x($profile, 'locality')
-                       || x($profile, 'region')
-                       || x($profile, 'postal-code')
-                       || x($profile, 'country-name')
+               if (!empty($profile['address'])
+                       || !empty($profile['location'])
+                       || !empty($profile['locality'])
+                       || !empty($profile['region'])
+                       || !empty($profile['postal-code'])
+                       || !empty($profile['country-name'])
                ) {
                        $location = L10n::t('Location:');
                }
 
-               $gender   = x($profile, 'gender')   ? L10n::t('Gender:')   : false;
-               $marital  = x($profile, 'marital')  ? L10n::t('Status:')   : false;
-               $homepage = x($profile, 'homepage') ? L10n::t('Homepage:') : false;
-               $about    = x($profile, 'about')    ? L10n::t('About:')    : false;
-               $xmpp     = x($profile, 'xmpp')     ? L10n::t('XMPP:')     : false;
+               $gender   = !empty($profile['gender'])   ? L10n::t('Gender:')   : false;
+               $marital  = !empty($profile['marital'])  ? L10n::t('Status:')   : false;
+               $homepage = !empty($profile['homepage']) ? L10n::t('Homepage:') : false;
+               $about    = !empty($profile['about'])    ? L10n::t('About:')    : false;
+               $xmpp     = !empty($profile['xmpp'])     ? L10n::t('XMPP:')     : false;
 
-               if ((x($profile, 'hidewall') || $block) && !local_user() && !remote_user()) {
+               if ((!empty($profile['hidewall']) || $block) && !local_user() && !remote_user()) {
                        $location = $gender = $marital = $homepage = $about = false;
                }
 
@@ -448,7 +453,7 @@ class Profile
                $firstname = $split_name['first'];
                $lastname = $split_name['last'];
 
-               if (x($profile, 'guid')) {
+               if (!empty($profile['guid'])) {
                        $diaspora = [
                                'guid' => $profile['guid'],
                                'podloc' => System::baseUrl(),
@@ -507,10 +512,8 @@ class Profile
                        $p['about'] = BBCode::convert($p['about']);
                }
 
-               if (isset($p['address'])) {
-                       $p['address'] = BBCode::convert($p['address']);
-               } elseif (isset($p['location'])) {
-                       $p['address'] = BBCode::convert($p['location']);
+               if (empty($p['address']) && !empty($p['location'])) {
+                       $p['address'] = $p['location'];
                }
 
                if (isset($p['photo'])) {
@@ -890,7 +893,7 @@ class Profile
                }
 
                $tab = false;
-               if (x($_GET, 'tab')) {
+               if (!empty($_GET['tab'])) {
                        $tab = Strings::escapeTags(trim($_GET['tab']));
                }
 
@@ -1001,7 +1004,7 @@ class Profile
         */
        public static function getMyURL()
        {
-               if (x($_SESSION, 'my_url')) {
+               if (!empty($_SESSION['my_url'])) {
                        return $_SESSION['my_url'];
                }
                return null;
@@ -1118,6 +1121,17 @@ class Profile
                $_SESSION['visitor_home'] = $visitor['url'];
                $_SESSION['my_url'] = $visitor['url'];
 
+               /// @todo replace this and the query for this variable with some cleaner functionality
+               $_SESSION['remote'] = [];
+
+               $remote_contacts = DBA::select('contact', ['id', 'uid'], ['nurl' => $visitor['nurl'], 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]);
+               while ($contact = DBA::fetch($remote_contacts)) {
+                       if (($contact['uid'] == 0) || Contact::isBlockedByUser($visitor['id'], $contact['uid'])) {
+                               continue;
+                       }
+
+                       $_SESSION['remote'][] = ['cid' => $contact['id'], 'uid' => $contact['uid'], 'url' => $visitor['url']];
+               }
                $arr = [
                        'visitor' => $visitor,
                        'url' => $a->query_string
@@ -1173,7 +1187,7 @@ class Profile
         */
        public static function getThemeUid()
        {
-               $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
+               $uid = (!empty($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
                if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (!$uid))) {
                        return local_user();
                }
index 3718887122436ad35784b0f7b1f3b7cc8fc91620..0d44acd2c988958237e35beb3b7343e4bc5964c0 100644 (file)
@@ -156,7 +156,7 @@ class Term
                                $link = '';
                        }
 
-                       if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'url' => $link])) {
+                       if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'term' => $term])) {
                                continue;
                        }
 
index aef4bcbfc2878f9d132d81778ae59918eae805bd..a6a9fc95253efb6d64abd2eb4a30bf08ca1788dd 100644 (file)
@@ -98,6 +98,19 @@ class User
                if (!DBA::isResult($r)) {
                        return false;
                }
+
+               if (empty($r['nickname'])) {
+                       return false;
+               }
+
+               // Check if the returned data is valid, otherwise fix it. See issue #6122
+               $url = System::baseUrl() . '/profile/' . $r['nickname'];
+               $addr = $r['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+
+               if (($addr != $r['addr']) || ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url']))) {
+                       Contact::updateSelfFromUserID($uid);
+               }
+
                return $r;
        }
 
@@ -412,12 +425,12 @@ class User
                $password   = !empty($data['password'])   ? trim($data['password'])           : '';
                $password1  = !empty($data['password1'])  ? trim($data['password1'])          : '';
                $confirm    = !empty($data['confirm'])    ? trim($data['confirm'])            : '';
-               $blocked    = !empty($data['blocked'])    ? intval($data['blocked'])          : 0;
-               $verified   = !empty($data['verified'])   ? intval($data['verified'])         : 0;
+               $blocked    = !empty($data['blocked']);
+               $verified   = !empty($data['verified']);
                $language   = !empty($data['language'])   ? Strings::escapeTags(trim($data['language']))   : 'en';
 
-               $publish = !empty($data['profile_publish_reg']) && intval($data['profile_publish_reg']) ? 1 : 0;
-               $netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
+               $publish = !empty($data['profile_publish_reg']);
+               $netpublish = $publish && Config::get('system', 'directory');
 
                if ($password1 != $confirm) {
                        throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));
index 66e8c97fdf94e89f19259eb5a201cfd9943bebc5..410f5878bb3f9fb20d2f01c5f182f889f8e0c2ec 100644 (file)
@@ -40,11 +40,8 @@ class Contact extends BaseModule
                }
 
                $nets = defaults($_GET, 'nets', '');
-               if ($nets == 'all') {
-                       $nets = '';
-               }
 
-               if (!x($a->page, 'aside')) {
+               if (empty($a->page['aside'])) {
                        $a->page['aside'] = '';
                }
 
@@ -78,18 +75,17 @@ class Contact extends BaseModule
                        $a->data['contact'] = $contact;
 
                        if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) {
-                               $networkname = Strings::formatNetworkName($contact['network'], $contact['url']);
+                               $network_link = Strings::formatNetworkName($contact['network'], $contact['url']);
                        } else {
-                               $networkname = '';
+                               $network_link = '';
                        }
 
-                       /// @TODO Add nice spaces
                        $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('vcard-widget.tpl'), [
                                '$name'         => $contact['name'],
                                '$photo'        => $contact['photo'],
                                '$url'          => Model\Contact::MagicLink($contact['url']),
                                '$addr'         => defaults($contact, 'addr', ''),
-                               '$network_name' => $networkname,
+                               '$network_link' => $network_link,
                                '$network'      => L10n::t('Network:'),
                                '$account_type' => Model\Contact::getAccountType($contact)
                        ]);
@@ -514,7 +510,7 @@ class Contact extends BaseModule
                                $relation_text = '';
                        }
 
-                       $relation_text = sprintf($relation_text, htmlentities($contact['name']));
+                       $relation_text = sprintf($relation_text, $contact['name']);
 
                        $url = Model\Contact::magicLink($contact['url']);
                        if (strpos($url, 'redir/') === 0) {
@@ -646,7 +642,7 @@ class Contact extends BaseModule
                                '$profileurllabel'=> L10n::t('Profile URL'),
                                '$profileurl'     => $contact['url'],
                                '$account_type'   => Model\Contact::getAccountType($contact),
-                               '$location'       => BBCode::convert($contact['location']),
+                               '$location'       => $contact['location'],
                                '$location_label' => L10n::t('Location:'),
                                '$xmpp'           => BBCode::convert($contact['xmpp']),
                                '$xmpp_label'     => L10n::t('XMPP:'),
index 9e44612717b5c62eaf78fc784845172270119a57..e5ebe2a4d66239e4551232fb68c49b3fe639e05a 100644 (file)
@@ -28,8 +28,8 @@ class Feed extends BaseModule
        {
                $a = self::getApp();
 
-               $last_update = x($_GET, 'last_update') ? $_GET['last_update'] : '';
-               $nocache     = x($_GET, 'nocache') && local_user();
+               $last_update = defaults($_GET, 'last_update', '');
+               $nocache     = !empty($_GET['nocache']) && local_user();
 
                if ($a->argc < 2) {
                        System::httpExit(400);
@@ -44,6 +44,7 @@ class Feed extends BaseModule
                        case 'posts':
                        case 'comments':
                        case 'activity':
+                               // Correct type names, no change needed
                                break;
                        case 'replies':
                                $type = 'comments';
@@ -53,8 +54,8 @@ class Feed extends BaseModule
                }
 
                $nickname = $a->argv[1];
-               header("Content-type: application/atom+xml");
+               header("Content-type: application/atom+xml; charset=utf-8");
                echo OStatus::feed($nickname, $last_update, 10, $type, $nocache, true);
-               killme();
+               exit();
        }
 }
index 25312bdf3af22caf43846ec65532ef4a5a391527..692e4043adce99f6fec85c4326a6b9ead51404cb 100644 (file)
@@ -9,6 +9,7 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\HTTPSignature;
+use Friendica\Core\Logger;
 
 /**
  * ActivityPub Inbox
index 2da679eeefffd725cc3cb680d71bf37badd474e5..4d85ef15ceff2a408a79087e92234daf4f349ae5 100644 (file)
@@ -25,12 +25,12 @@ class Itemsource extends \Friendica\BaseModule
                        $conversation = Model\Conversation::getByItemUri($item['uri']);
 
                        $item_uri = $item['uri'];
-                       $source = htmlspecialchars($conversation['source']);
+                       $source = $conversation['source'];
                }
 
                $tpl = Renderer::getMarkupTemplate('debug/itemsource.tpl');
                $o = Renderer::replaceMacros($tpl, [
-                       '$guid'          => ['guid', L10n::t('Item Guid'), htmlentities(defaults($_REQUEST, 'guid', '')), ''],
+                       '$guid'          => ['guid', L10n::t('Item Guid'), defaults($_REQUEST, 'guid', ''), ''],
                        '$source'        => $source,
                        '$item_uri'      => $item_uri
                ]);
index 330988df50cc1b94ec8fb5314b38ae6715ce4e71..82d70498281fc6547a6e7a79520c6bca96793c8b 100644 (file)
@@ -34,11 +34,11 @@ class Login extends BaseModule
        {
                $a = self::getApp();
 
-               if (x($_SESSION, 'theme')) {
+               if (!empty($_SESSION['theme'])) {
                        unset($_SESSION['theme']);
                }
 
-               if (x($_SESSION, 'mobile-theme')) {
+               if (!empty($_SESSION['mobile-theme'])) {
                        unset($_SESSION['mobile-theme']);
                }
 
@@ -68,7 +68,7 @@ class Login extends BaseModule
                        self::openIdAuthentication($openid_url, !empty($_POST['remember']));
                }
 
-               if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
+               if (!empty($_POST['auth-params']) && $_POST['auth-params'] === 'login') {
                        self::passwordAuthentication(
                                trim($_POST['username']),
                                trim($_POST['password']),
@@ -163,7 +163,7 @@ class Login extends BaseModule
                $_SESSION['last_login_date'] = DateTimeFormat::utcNow();
                Authentication::setAuthenticatedSessionForUser($record, true, true);
 
-               if (x($_SESSION, 'return_path')) {
+               if (!empty($_SESSION['return_path'])) {
                        $return_path = $_SESSION['return_path'];
                        unset($_SESSION['return_path']);
                } else {
@@ -221,15 +221,15 @@ class Login extends BaseModule
                        }
                }
 
-               if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
-                       if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
+               if (!empty($_SESSION['authenticated'])) {
+                       if (!empty($_SESSION['visitor_id']) && empty($_SESSION['uid'])) {
                                $contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id']]);
                                if (DBA::isResult($contact)) {
                                        self::getApp()->contact = $contact;
                                }
                        }
 
-                       if (x($_SESSION, 'uid')) {
+                       if (!empty($_SESSION['uid'])) {
                                // already logged in user returning
                                $check = Config::get('system', 'paranoia');
                                // extra paranoia - if the IP changed, log them out
index ecfe18e596b528b3587af7be1ae9b06b7201663a..f0be114e3dbb056aa1c46897360d3e4ef1158d3d 100644 (file)
@@ -28,10 +28,10 @@ class Magic extends BaseModule
 
                Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA);
 
-               $addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
-               $dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
-               $test = ((x($_REQUEST, 'test')) ? intval($_REQUEST['test']) : 0);
-               $owa  = ((x($_REQUEST, 'owa'))  ? intval($_REQUEST['owa'])  : 0);
+               $addr = defaults($_REQUEST, 'addr', '');
+               $dest = defaults($_REQUEST, 'dest', '');
+               $test = (!empty($_REQUEST['test']) ? intval($_REQUEST['test']) : 0);
+               $owa  = (!empty($_REQUEST['owa'])  ? intval($_REQUEST['owa'])  : 0);
 
                // NOTE: I guess $dest isn't just the profile url (could be also
                // other profile pages e.g. photo). We need to find a solution
@@ -43,7 +43,7 @@ class Magic extends BaseModule
                }
 
                if (!$cid) {
-                       Logger::log('No contact record found: ' . print_r($_REQUEST, true), Logger::DEBUG);
+                       Logger::log('No contact record found: ' . json_encode($_REQUEST), Logger::DEBUG);
                        // @TODO Finding a more elegant possibility to redirect to either internal or external URL
                        $a->redirect($dest);
                }
index b2587799d19bdc9b9bc9ac495cbf428a777b9cec..1aafbfa9b8160d8e8c1f6447080850f9f0f5867f 100644 (file)
@@ -161,11 +161,21 @@ class CurlResult
 
                if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode== 307) {
                        $redirect_parts = parse_url(defaults($this->info, 'redirect_url', ''));
+                       if (empty($redirect_parts)) {
+                               $redirect_parts = [];
+                       }
+
                        if (preg_match('/(Location:|URI:)(.*?)\n/i', $this->header, $matches)) {
-                               $redirect_parts = array_merge($redirect_parts, parse_url(trim(array_pop($matches))));
+                               $redirect_parts2 = parse_url(trim(array_pop($matches)));
+                               if (!empty($redirect_parts2)) {
+                                       $redirect_parts = array_merge($redirect_parts, $redirect_parts2);
+                               }
                        }
 
                        $parts = parse_url(defaults($this->info, 'url', ''));
+                       if (empty($parts)) {
+                               $parts = [];
+                       }
 
                        /// @todo Checking the corresponding RFC which parts of a redirect can be ommitted.
                        $components = ['scheme', 'host', 'path', 'query', 'fragment'];
@@ -177,7 +187,7 @@ class CurlResult
 
                        $this->redirectUrl = Network::unparseURL($redirect_parts);
 
-                       $this->isRedirectUrl = filter_var($this->redirectUrl, FILTER_VALIDATE_URL) !== false;
+                       $this->isRedirectUrl = true;
                } else {
                        $this->isRedirectUrl = false;
                }
index 9c57d624f89356d670c7e4f202d740282110ac95..b4e297afa2096b9aac07dd5ddcf51bfbcede087c 100644 (file)
@@ -164,7 +164,7 @@ class Probe
                        }
                }
 
-               self::$baseurl = "http://".$host;
+               self::$baseurl = $host_url;
 
                Logger::log("Probing successful for ".$host, Logger::DEBUG);
 
@@ -347,7 +347,7 @@ class Probe
                        $data['url'] = $uri;
                }
 
-               if (x($data, 'photo')) {
+               if (!empty($data['photo'])) {
                        $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
                } else {
                        $data['photo'] = System::baseUrl() . '/images/person-300.jpg';
@@ -358,7 +358,7 @@ class Probe
                                $data['name'] = $data['nick'];
                        }
 
-                       if (!x($data, 'name')) {
+                       if (empty($data['name'])) {
                                $data['name'] = $data['url'];
                        }
                }
@@ -1317,7 +1317,7 @@ class Probe
                                                if ($curlResult->isTimeout()) {
                                                        return false;
                                                }
-                                               $pubkey = $curlResult['body'];
+                                               $pubkey = $curlResult->getBody();
                                        }
 
                                        $key = explode(".", $pubkey);
index bd336f7583fb6c994da174bfe7b9584ed8ddcd49..d787e2ee98e771e163026e1cc90e9a052ba1ddb8 100644 (file)
@@ -45,6 +45,8 @@ class OEmbed
                        if (in_array($key, ['thumbnail_width', 'thumbnail_height', 'width', 'height'])) {
                                // These values should be numbers, so ensure that they really are numbers.
                                $value = (int)$value;
+                       } elseif (is_array($value)) {
+                               // Ignoring arrays.
                        } elseif ($key != 'html') {
                                // Avoid being able to inject some ugly stuff through these fields.
                                $value = htmlentities($value);
index 50d903f025088bef65dade66d87a4e708493d34a..1ca1e222ebe92a2c3e3394395bdad02e57ed14af 100644 (file)
@@ -67,7 +67,7 @@ class Post extends BaseObject
                $this->setTemplate('wall');
                $this->toplevel = $this->getId() == $this->getDataValue('parent');
 
-               if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
+               if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
                        foreach ($_SESSION['remote'] as $visitor) {
                                if ($visitor['cid'] == $this->getDataValue('contact-id')) {
                                        $this->visiting = true;
@@ -253,7 +253,7 @@ class Post extends BaseObject
                $responses = get_responses($conv_responses, $response_verbs, $this, $item);
 
                foreach ($response_verbs as $value => $verbs) {
-                       $responses[$verbs]['output'] = x($conv_responses[$verbs], $item['uri']) ? format_like($conv_responses[$verbs][$item['uri']], $conv_responses[$verbs][$item['uri'] . '-l'], $verbs, $item['uri']) : '';
+                       $responses[$verbs]['output'] = !empty($conv_responses[$verbs][$item['uri']]) ? format_like($conv_responses[$verbs][$item['uri']], $conv_responses[$verbs][$item['uri'] . '-l'], $verbs, $item['uri']) : '';
                }
 
                /*
@@ -678,7 +678,7 @@ class Post extends BaseObject
         */
        private function setTemplate($name)
        {
-               if (!x($this->available_templates, $name)) {
+               if (empty($this->available_templates[$name])) {
                        Logger::log('[ERROR] Item::setTemplate : Template not available ("' . $name . '").', Logger::DEBUG);
                        return false;
                }
index bff8767f380a4a76a9ff43c6892b623f2110e1d7..d2f5b3b2d5bc44b2cd08c29eb3232158caabf16f 100644 (file)
@@ -209,20 +209,20 @@ class Processor
         */
        public static function createEvent($activity, $item)
        {
-               $event['summary'] = $activity['name'];
-               $event['desc'] = $activity['content'];
-               $event['start'] = $activity['start-time'];
-               $event['finish'] = $activity['end-time'];
+               $event['summary']  = HTML::toBBCode($activity['name']);
+               $event['desc']     = HTML::toBBCode($activity['content']);
+               $event['start']    = $activity['start-time'];
+               $event['finish']   = $activity['end-time'];
                $event['nofinish'] = empty($event['finish']);
                $event['location'] = $activity['location'];
-               $event['adjust'] = true;
-               $event['cid'] = $item['contact-id'];
-               $event['uid'] = $item['uid'];
-               $event['uri'] = $item['uri'];
-               $event['edited'] = $item['edited'];
-               $event['private'] = $item['private'];
-               $event['guid'] = $item['guid'];
-               $event['plink'] = $item['plink'];
+               $event['adjust']   = true;
+               $event['cid']      = $item['contact-id'];
+               $event['uid']      = $item['uid'];
+               $event['uri']      = $item['uri'];
+               $event['edited']   = $item['edited'];
+               $event['private']  = $item['private'];
+               $event['guid']     = $item['guid'];
+               $event['plink']    = $item['plink'];
 
                $condition = ['uri' => $item['uri'], 'uid' => $item['uid']];
                $ev = DBA::selectFirst('event', ['id'], $condition);
index c074e49f6c8d95b1ddd9fb2067174fb08ca9270b..7fe1f128f496b746efbed1bd24ccf854964913d6 100644 (file)
@@ -599,6 +599,7 @@ class Receiver
                $photo = defaults($profile, 'photo', null);
                unset($profile['photo']);
                unset($profile['baseurl']);
+               unset($profile['guid']);
 
                $profile['nurl'] = Strings::normaliseLink($profile['url']);
                DBA::update('contact', $profile, ['id' => $cid]);
index 22c8a3518e3520bef551897b96569663f2e7642b..e70e6184776ccd64b2ca76a5fb626020c442e83e 100644 (file)
@@ -643,7 +643,7 @@ class Transmitter
                        $data['object'] = $item['thr-parent'];
                }
 
-               $owner = User::getOwnerDataById($item['uid']);
+               $owner = User::getOwnerDataById($item['contact-uid']);
 
                if (!$object_mode) {
                        return LDSignature::sign($data, $owner);
index b67b7c021fc76d5a10f85e00202db00fee54b3c6..7c807b921e22cad9ff923fed1def135bd8b9918a 100644 (file)
@@ -2637,7 +2637,7 @@ class DFRN
                        if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) {
                                Logger::log("Item ".$item["uri"]." seems to contain an event.", Logger::DEBUG);
                                $ev = Event::fromBBCode($item["body"]);
-                               if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
+                               if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
                                        Logger::log("Event in item ".$item["uri"]." was found.", Logger::DEBUG);
                                        $ev["cid"]     = $importer["id"];
                                        $ev["uid"]     = $importer["importer_uid"];
@@ -2925,7 +2925,7 @@ class DFRN
        public static function autoRedir(App $a, $contact_nick)
        {
                // prevent looping
-               if (x($_REQUEST, 'redir') && intval($_REQUEST['redir'])) {
+               if (!empty($_REQUEST['redir'])) {
                        return;
                }
 
@@ -3077,10 +3077,10 @@ class DFRN
         */
        private static function isEditedTimestampNewer($existing, $update)
        {
-               if (!x($existing, 'edited') || !$existing['edited']) {
+               if (empty($existing['edited'])) {
                        return true;
                }
-               if (!x($update, 'edited') || !$update['edited']) {
+               if (empty($update['edited'])) {
                        return false;
                }
 
index d59eb7a0ad268c302b510eb341011d37b9313a2d..38d9deb7f8371b0b13815aee93a4db16bbf13eff 100644 (file)
@@ -3727,12 +3727,12 @@ class Diaspora
                } elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
                        $message = self::constructLike($item, $owner);
                        $type = "like";
-               } else {
+               } elseif (!in_array($item["verb"], [ACTIVITY_FOLLOW])) {
                        $message = self::constructComment($item, $owner);
                        $type = "comment";
                }
 
-               if (!$message) {
+               if (empty($message)) {
                        return false;
                }
 
index ba8c311901a9bc241db400ee96f45dd0253469ba..358ff27db00bb36e02d814dab0a912c1d70e0f8d 100644 (file)
@@ -117,7 +117,7 @@ class Email
                        return $ret;
                }
 
-               if (!$struc->parts) {
+               if (empty($struc->parts)) {
                        $ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'html');
                        $html = $ret['body'];
 
@@ -482,13 +482,11 @@ class Email
                        '[\r\n]\s*-----BEGIN PGP SIGNATURE-----\s*[\r\n].*'.
                        '[\r\n]\s*-----END PGP SIGNATURE-----(.*)/is';
 
-               preg_match($pattern, $message, $result);
-
-               $cleaned = trim($result[1].$result[2].$result[3]);
+               if (preg_match($pattern, $message, $result)) {
+                       $cleaned = trim($result[1].$result[2].$result[3]);
 
-               $cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned);
-
-               if ($cleaned == '') {
+                       $cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned);
+               } else {
                        $cleaned = $message;
                }
 
index 45000d77005e8b8bd6801a80809aab28d52d0182..361d333b40f2a208f4422401711dc3d110f89d75 100644 (file)
@@ -1543,8 +1543,10 @@ class OStatus
         */
        private static function constructObjecttype(array $item)
        {
-               if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT]))
+               if (!empty($item['object-type']) && in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT])) {
                        return $item['object-type'];
+               }
+
                return ACTIVITY_OBJ_NOTE;
        }
 
index 0f4ef12f9dd4943a9b11bc360352f18afa593479..fb7b9d7bab5798fb706a14b383b072b7b49304a2 100644 (file)
@@ -84,7 +84,7 @@ class PortableContact
                        return;
                }
 
-               $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ;
+               $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation');
 
                Logger::log('load: ' . $url, Logger::DEBUG);
 
@@ -734,7 +734,7 @@ class PortableContact
                        }
                }
 
-               if (is_array($nodeinfo['metadata']) && isset($nodeinfo['metadata']['nodeName'])) {
+               if (isset($nodeinfo['metadata']['nodeName'])) {
                        $server['site_name'] = $nodeinfo['metadata']['nodeName'];
                }
 
@@ -817,7 +817,7 @@ class PortableContact
                        }
                }
 
-               if (is_array($nodeinfo['metadata']) && isset($nodeinfo['metadata']['nodeName'])) {
+               if (isset($nodeinfo['metadata']['nodeName'])) {
                        $server['site_name'] = $nodeinfo['metadata']['nodeName'];
                }
 
@@ -1375,15 +1375,15 @@ class PortableContact
                                                $site_name = $data['site_name'];
                                        }
 
-                                       $info = $data['info'];
+                                       $info = defaults($data, 'info', '');
                                        $register_policy = defaults($data, 'register_policy', REGISTER_CLOSED);
                                        if (in_array($register_policy, ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'])) {
-                                               $register_policy = constant($data['register_policy']);
+                                               $register_policy = constant($register_policy);
                                        } else {
                                                Logger::log("Register policy '$register_policy' from $server_url is invalid.");
                                                $register_policy = REGISTER_CLOSED; // set a default value
                                        }
-                                       $platform = $data['platform'];
+                                       $platform = defaults($data, 'platform', '');
                                }
                        }
                }
@@ -1778,7 +1778,7 @@ class PortableContact
                                $curlResult = Network::curl($url);
 
                                if ($curlResult->isSuccess()) {
-                                       $data = json_decode($curlResult["body"], true);
+                                       $data = json_decode($curlResult->getBody(), true);
 
                                        if (!empty($data)) {
                                                self::discoverServer($data, 3);
index e544a76d1bd4fb562fbf8a82f27798bd3bd09b07..413d746dcfce3620eabc87ddb0af38b8e8eb1285 100644 (file)
@@ -28,7 +28,7 @@ class FriendicaSmarty extends Smarty
                // setTemplateDir can be set to an array, which Smarty will parse in order.
                // The order is thus very important here
                $template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
-               if (x($a->theme_info, "extends")) {
+               if (!empty($a->theme_info['extends'])) {
                        $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
                }
 
@@ -42,6 +42,8 @@ class FriendicaSmarty extends Smarty
                $this->left_delimiter = Renderer::getTemplateLeftDelimiter('smarty3');
                $this->right_delimiter = Renderer::getTemplateRightDelimiter('smarty3');
 
+               $this->escape_html = true;
+
                // Don't report errors so verbosely
                $this->error_reporting = E_ALL & ~E_NOTICE;
        }
index 1053ab08e064b2121191fee4a39e327f69612334..2b6d7a877b31e613da744f850c53882eeee01906 100644 (file)
@@ -67,7 +67,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
 
                if (file_exists("{$root}view/theme/$theme/$filename")) {
                        $template_file = "{$root}view/theme/$theme/$filename";
-               } elseif (x($a->theme_info, 'extends') && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename))) {
+               } elseif (!empty($a->theme_info['extends']) && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename))) {
                        $template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info['extends'], $filename);
                } elseif (file_exists("{$root}/$filename")) {
                        $template_file = "{$root}/$filename";
index 42aab8f5f3ef625409d199d291c05a1e64986bb9..b291076cc088bfae898e5c0e5917daf1c5f4dbde 100644 (file)
@@ -36,7 +36,7 @@ class Emailer
                Addon::callHooks('emailer_send_prepare', $params);
 
                $email_textonly = false;
-               if (x($params, "uid")) {
+               if (!empty($params['uid'])) {
                        $email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
                }
 
index 956d6ff3728d36b4d55a8b8abe4f81c406f636ce..07ff5e805d9b3293c921786d7ac195ac6ea02ff5 100644 (file)
@@ -204,6 +204,8 @@ class HTTPSignature
 
                if (preg_match('/algorithm="(.*?)"/ism', $header, $matches)) {
                        $ret['algorithm'] = $matches[1];
+               } else {
+                       $ret['algorithm'] = 'rsa-sha256';
                }
 
                if (preg_match('/headers="(.*?)"/ism', $header, $matches)) {
index 78d81816e25b1747c0f749e9488470bdcdfb6727..cd3a6ec2708899d49483a7bfb3c73a92c7d762cf 100644 (file)
@@ -93,8 +93,13 @@ class JsonLD
                        'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
                        'toot' => (object)['@id' => 'http://joinmastodon.org/ns#', '@type' => '@id']];
 
-               $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+               // Trying to avoid memory problems with large content fields
+               if (!empty($json['object']['source']['content'])) {
+                       $content = $json['object']['source']['content'];
+                       $json['object']['source']['content'] = '';
+               }
 
+               $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
 
                try {
                        $compacted = jsonld_compact($jsonobj, $context);
@@ -104,7 +109,13 @@ class JsonLD
                        Logger::log('compacting error:' . print_r($e, true), Logger::DEBUG);
                }
 
-               return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
+               $json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
+
+               if (isset($json['as:object']['as:source']['as:content']) && !empty($content)) {
+                       $json['as:object']['as:source']['as:content'] = $content;
+               }
+
+               return $json;
        }
 
        /**
index c9fde441fdcfcbcb4e80bdafff36b02cd163cca3..5acdfd9013aeae4a981af022bc74896bd39c9363 100644 (file)
@@ -27,7 +27,7 @@ class LDSignature
                }
 
                $actor = JsonLD::fetchElement($data, 'actor', 'id');
-               if (empty($actor)) {
+               if (empty($actor) || !is_string($actor)) {
                        return false;
                }
 
index 0ac0f2aeb71b2b7ccd3865a057b770ee70cb87f8..ab0958d6423ffae00d37a1b46792401c42b61ac7 100644 (file)
@@ -121,7 +121,7 @@ class Network
 
                @curl_setopt($ch, CURLOPT_HEADER, true);
 
-               if (x($opts, "cookiejar")) {
+               if (!empty($opts['cookiejar'])) {
                        curl_setopt($ch, CURLOPT_COOKIEJAR, $opts["cookiejar"]);
                        curl_setopt($ch, CURLOPT_COOKIEFILE, $opts["cookiejar"]);
                }
@@ -130,7 +130,7 @@ class Network
                //      @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
                //      @curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
 
-               if (x($opts, 'accept_content')) {
+               if (!empty($opts['accept_content'])) {
                        curl_setopt(
                                $ch,
                                CURLOPT_HTTPHEADER,
@@ -156,15 +156,15 @@ class Network
                /// @todo  We could possibly set this value to "gzip" or something similar
                curl_setopt($ch, CURLOPT_ENCODING, '');
 
-               if (x($opts, 'headers')) {
+               if (!empty($opts['headers'])) {
                        @curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
                }
 
-               if (x($opts, 'nobody')) {
+               if (!empty($opts['nobody'])) {
                        @curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
                }
 
-               if (x($opts, 'timeout')) {
+               if (!empty($opts['timeout'])) {
                        @curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
                } else {
                        $curl_time = Config::get('system', 'curl_timeout', 60);
@@ -362,7 +362,7 @@ class Network
                /// @TODO Really suppress function outcomes? Why not find them + debug them?
                $h = @parse_url($url);
 
-               if ((is_array($h)) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+               if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
                        return $url;
                }
 
@@ -489,7 +489,7 @@ class Network
                }
 
                $str_allowed = Config::get('system', 'allowed_email', '');
-               if (!x($str_allowed)) {
+               if (empty($str_allowed)) {
                        return true;
                }
 
index 48e580d67892587ab648f2f0960c8a5193094caf..473774b71dba283c7cbecf28e9a99d8f2a25cd5d 100644 (file)
@@ -140,18 +140,18 @@ class Strings
     }
 
     /**
-     * @brief translate and format the networkname of a contact
+     * @brief Translate and format the network name of a contact
      *
-     * @param string $network   Networkname of the contact (e.g. dfrn, rss and so on)
-     * @param string $url       The contact url
+     * @param string $network Network name of the contact (e.g. dfrn, rss and so on)
+     * @param string $url     The contact url
      * 
-     * @return string   Formatted network name
+     * @return string Formatted network name
      */
-    public static function formatNetworkName($network, $url = 0)
+    public static function formatNetworkName($network, $url = '')
     {
-        if ($network != "") {
-            if ($url != "") {
-                $network_name = '<a href="' . $url  .'">' . ContactSelector::networkToName($network, $url) . "</a>";
+        if ($network != '') {
+            if ($url != '') {
+                $network_name = '<a href="' . $url  .'">' . ContactSelector::networkToName($network, $url) . '</a>';
             } else {
                 $network_name = ContactSelector::networkToName($network);
             }
@@ -161,7 +161,7 @@ class Strings
     }
 
     /**
-     * @brief Remove intentation from a text
+     * @brief Remove indentation from a text
      * 
      * @param string $text  String to be transformed.
      * @param string $chr   Optional. Indentation tag. Default tab (\t).
index 140d3db37a38c7353ef17faa6d2ce31a8ca17ba4..44b9601164fadd92bb194ddc04759c7b87800291 100644 (file)
@@ -481,7 +481,7 @@ class Temporal
                        $o .= "<td $today>";
                        $day = str_replace(' ', '&nbsp;', sprintf('%2.2d', $d));
                        if ($started) {
-                               if (x($links, $d) !== false) {
+                               if (isset($links[$d])) {
                                        $o .= "<a href=\"{$links[$d]}\">$day</a>";
                                } else {
                                        $o .= $day;
index 0c565daa73ec5ceb9e54611686d50b90b714a866..164b1cf4d203747739b2e603073b134a906ba8e1 100644 (file)
@@ -119,7 +119,7 @@ class CronJobs
                }
 
                // delete user records for recently removed accounts
-               $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"]);
+               $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() "]);
                while ($user = DBA::fetch($users)) {
                        // Delete the contacts of this user
                        $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
index 4f51db2dfbc5662f9e645c19d1549e4b5b3c6178..49638c7c9482fbf76c23fe4c47bc60d6d71d6d45 100644 (file)
@@ -35,7 +35,7 @@ class GProbe {
                        $result = Cache::get("gprobe:".$urlparts["host"]);
                        if (!is_null($result)) {
                                if (in_array($result["network"], [Protocol::FEED, Protocol::PHANTOM])) {
-                                       Logger::log("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), Logger::DEBUG);
+                                       Logger::log("DDoS attempt detected for ".$urlparts["host"]." by ".defaults($_SERVER, "REMOTE_ADDR", '').". server data: ".print_r($_SERVER, true), Logger::DEBUG);
                                        return;
                                }
                        }
index e0108ddcfef503a1abebf83c3e49dc0ea900bec2..00ad1543d62f0322e2852fdf44038ed9593dbf29 100644 (file)
@@ -106,7 +106,7 @@ class Notifier
                        $inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0);
                        foreach ($inboxes as $inbox) {
                                Logger::log('Account removal for user ' . $item_id . ' to ' . $inbox .' via ActivityPub', Logger::DEBUG);
-                               Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+                               Worker::add(['priority' => PRIORITY_NEGLIGIBLE, 'created' => $a->queue['created'], 'dont_fork' => true],
                                        'APDelivery', Delivery::REMOVAL, '', $inbox, $item_id);
                        }
 
index 22fbf700a2d49f36a364b056cbb251f9649571eb..f254596720fb56aa1757b4ab64935fbf520b937d 100644 (file)
@@ -201,7 +201,7 @@ class OnePoll
                        $url = $contact['poll'] . '?dfrn_id=' . $idtosend
                                . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
                                . '&type=data&last_update=' . $last_update
-                               . '&perm=' . $perm ;
+                               . '&perm=' . $perm;
 
                        $curlResult = Network::curl($url);
 
index 29a0e907e5cb702104cc91cae04ec42040e28fc5..813277ebbd730322c57734184613dad42c5fb81c 100644 (file)
@@ -47,7 +47,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
                }
 
                $this->db_host = getenv('MYSQL_HOST');
-               $this->db_port = (!empty(getenv('MYSQL_PORT'))) ? getenv('MYSQL_PORT') : null;
+               $this->db_port = !empty(getenv('MYSQL_PORT')) ? getenv('MYSQL_PORT') : null;
                $this->db_data = getenv('MYSQL_DATABASE');
                $this->db_user = getenv('MYSQL_USERNAME') . getenv('MYSQL_USER');
                $this->db_pass = getenv('MYSQL_PASSWORD');
index 32a80a77e0988adc3ef3283d3d22c776a7f61802..3d7effe52b0dc26d5952353fd172bdd695564dfb 100644 (file)
@@ -43,6 +43,8 @@ class InstallerTest extends MockedTest
                $this->mockL10nT('Error: iconv PHP module required but not installed.', 1);
                $this->mockL10nT('POSIX PHP module', 1);
                $this->mockL10nT('Error: POSIX PHP module required but not installed.', 1);
+               $this->mockL10nT('JSON PHP module', 1);
+               $this->mockL10nT('Error: JSON PHP module required but not installed.', 1);
        }
 
        private function assertCheckExist($position, $title, $help, $status, $required, $assertionArray)
@@ -177,6 +179,17 @@ class InstallerTest extends MockedTest
                        true,
                        $install->getChecks());
 
+               $this->mockFunctionL10TCalls();
+               $this->setFunctions(['json_encode' => false]);
+               $install = new Installer();
+               $this->assertFalse($install->checkFunctions());
+               $this->assertCheckExist(9,
+                       'JSON PHP module',
+                       'Error: JSON PHP module required but not installed.',
+                       false,
+                       true,
+                       $install->getChecks());
+
                $this->mockFunctionL10TCalls();
                $this->setFunctions([
                        'curl_init' => true,
@@ -184,7 +197,8 @@ class InstallerTest extends MockedTest
                        'openssl_public_encrypt' => true,
                        'mb_strlen' => true,
                        'iconv_strlen' => true,
-                       'posix_kill' => true
+                       'posix_kill' => true,
+                       'json_encode' => true
                ]);
                $install = new Installer();
                $this->assertTrue($install->checkFunctions());
index 29a21ff33a4d21929e54d0c94a425d0fc95f7814..dc124a8454ccf56fc042c77681c05eb9a7fb9e9b 100644 (file)
@@ -1,19 +1,19 @@
 <!DOCTYPE html >
 <html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">
 <head>
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
   <script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+  <?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
 </head>
 <body>
-       <?php if(x($page,'nav')) echo $page['nav']; ?>
-       <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+       <?php if(!empty($page['nav'])) echo $page['nav']; ?>
+       <aside><?php if(!empty($page['aside'])) echo $page['aside']; ?></aside>
        <section>
-               <?php if(x($page,'content')) echo $page['content']; ?>
+               <?php if(!empty($page['content'])) echo $page['content']; ?>
                <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
                <div id="page-footer"></div>
        </section>
-       <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
-       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+       <right_aside><?php if(!empty($page['right_aside'])) echo $page['right_aside']; ?></right_aside>
+       <footer><?php if(!empty($page['footer'])) echo $page['footer']; ?></footer>
 </body>
 </html>
index 0b1a4b8b776d6ba2c6ce7f77f5cf90d0dc2bac4d..dabd422dbb4538a81c7b6554483791023f8d8ce3 100644 (file)
@@ -1,12 +1,12 @@
 <!DOCTYPE html >
 <html>
 <head>
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
   <script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+  <?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
 </head>
 <body>
-       <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
+       <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(!empty($page['content'])) echo $page['content']; ?>
                <div id="page-footer"></div>
        </section>
 </body>
index 5b96e282e3fbc44b32aa98da936e388bfb3b5d19..70262041983f955b38c2ba9945cc4e1cc8e6a4a3 100644 (file)
@@ -7,5 +7,5 @@
  * only the pure content\r
  */\r
 \r
-if(x($page,'content')) echo $page['content'];\r
+if(!empty($page['content'])) echo $page['content'];\r
 \r
index 7c68a73064ee065113c9ec507283df026b5cee65..48706535f4a0c34d0fd70ae79dbf7e50ec7cc943 100644 (file)
 
 {{if $networks}}
 <hr style="clear:both"/>
-<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle|escape:'html'}}" />
+<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
 <div id="profile-jot-email-end"></div>
 {{if $jotnets}}
-{{$jotnets}}
+{{$jotnets nofilter}}
 {{/if}}{{/if}}
 
 <script>
@@ -28,7 +28,7 @@ $(document).ready(function() {
        if(typeof acl=="undefined"){
                acl = new ACL(
                        baseurl+"/acl",
-                       [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ],
+                       [ {{$allowcid nofilter}},{{$allowgid nofilter}},{{$denycid nofilter}},{{$denygid nofilter}} ],
                        {{$features.aclautomention}},
                        {{if $APP->is_mobile}}true{{else}}false{{/if}}
                );
index 96b26d2d096563e6693f0ee9dbff6f7d37a369ca..f4e8e5c23c41b704c191ca223b48007c42a006b2 100644 (file)
@@ -3,7 +3,7 @@
        <h1>{{$title}} - {{$page}}</h1>
 
        <p><span class='toggleaddon icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$addon}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
-       <p>{{$info.description}}</p>
+       <p>{{$info.description nofilter}}</p>
 
        <p class="author">{{$str_author}}
        {{foreach $info.author as $a name=authors}}
        </p>
 
        {{if $screenshot}}
-       <a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1|escape}}" /></a>
+       <a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
        {{/if}}
 
        {{if $admin_form}}
        <h3>{{$settings}}</h3>
        <form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$addon}}/">
-               {{$admin_form}}
+               {{$admin_form nofilter}}
        </form>
        {{/if}}
 
        {{if $readme}}
        <h3>Readme</h3>
        <div id="addon_readme">
-               {{$readme}}
+               {{$readme nofilter}}
        </div>
        {{/if}}
 </div>
index 93266bf1455fe28ad41b62762e6016e025c41609..c144a5eec617b11d985a2e7080cdf8819a1bf94d 100644 (file)
@@ -14,7 +14,7 @@
                                <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
                                {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
 
-                                       <div class='desc'>{{$p.2.description}}</div>
+                               <div class='desc'>{{$p.2.description nofilter}}</div>
                        </li>
                {{/foreach}}
                </ul>
index 3afeb5355c99f20da8c58ce1c19f03f234cb3441..f454938627cc24f9bcd382820a0234a2703d6ba9 100644 (file)
@@ -10,7 +10,7 @@
 </script>
 <div id="adminpage">
        <h1>{{$title}} - {{$page}}</h1>
-       <p>{{$description}}</p>
+       <p>{{$description nofilter}}</p>
        <form action="{{$baseurl}}/admin/contactblock" method="post">
         <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 
                                {{foreach $contacts as $contact}}
                                <tr>
                                        <td class="checkbox"><input type="checkbox" class="contacts_ckbx" id="id_contact_{{$contact.id}}" name="contacts[]" value="{{$contact.id}}"/></td>
-                                       <td><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname|escape}}" title="{{$contact.nickname|escape}}"></td>
-                                       <td class="name">{{$contact.name|escape}}</td>
-                                       <td class="addr">{{$contact.addr|escape}}</td>
-                                       <td class="addr"><a href="{{$contact.url}}" title="{{$contact.nickname|escape}}" >{{$contact.url}}</a></td>
+                                       <td><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname}}" title="{{$contact.nickname}}"></td>
+                                       <td class="name">{{$contact.name}}</td>
+                                       <td class="addr">{{$contact.addr}}</td>
+                                       <td class="addr"><a href="{{$contact.url}}" title="{{$contact.nickname}}" >{{$contact.url}}</a></td>
                                </tr>
                                {{/foreach}}
                        </tbody>
                </table>
                <p><a href="#" onclick="return selectall('contacts_ckbx');">{{$select_all}}</a> | <a href="#" onclick="return selectnone('contacts_ckbx');">{{$select_none}}</a></p>
-               {{$paginate}}
-               <div class="submit"><input type="submit" name="page_contactblock_unblock" value="{{$unblock|escape:'html'}}" /></div>
+               {{$paginate nofilter}}
+               <div class="submit"><input type="submit" name="page_contactblock_unblock" value="{{$unblock}}" /></div>
        {{else}}
-               <p>{{$no_data|escape:'html'}}</p>
+               <p>{{$no_data}}</p>
        {{/if}}
        </form>
 
@@ -58,6 +58,6 @@
                                </tr>
                        </tbody>
                </table>
-               <div class="submit"><input type="submit" name="page_contactblock_block" value="{{$submit|escape:'html'}}" /></div>
+               <div class="submit"><input type="submit" name="page_contactblock_block" value="{{$submit}}" /></div>
        </form>
 </div>
index b2e6357a9a14f41402c67355910083e8a36dd62c..a218a38f56523d78418b727f93dd465641a10159 100644 (file)
@@ -2,13 +2,13 @@
     <h1>{{$title}} - {{$page}}</h1>
        
        <form action="{{$baseurl}}/admin/logs" method="post">
-           <input type='hidden' name='form_security_token' value="{{$form_security_token|escape:'html'}}">
+           <input type='hidden' name='form_security_token' value="{{$form_security_token}}">
 
            {{include file="field_checkbox.tpl" field=$debugging}}
            {{include file="field_input.tpl" field=$logfile}}
            {{include file="field_select.tpl" field=$loglevel}}
        
-           <div class="submit"><input type="submit" name="page_logs" value="{{$submit|escape:'html'}}" /></div>
+           <div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
        
        </form>
 
index 1ca0708bfcd1474fb7bef53639115688383bb890..f0b696fae42ffd9637ed29de353749c3d412c3a8 100644 (file)
@@ -17,7 +17,7 @@
                {{/foreach}}
 
                <div class="settings-submit-wrapper" >
-                       <input type="submit" name="submit" class="settings-features-submit" value="{{$submit|escape:'html'}}" />
+                       <input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
                </div>
        </div>
        {{/foreach}}
index 34b1e3b1b207d813622c9d37869c3e615e52c47c..dd40654b51b550204d250625ce298deeb50f6bfd 100644 (file)
@@ -39,7 +39,7 @@
        });
 </script>
 <div id='adminpage'>
-       <h1>{{$title|escape}} - {{$page|escape}}</h1>
+       <h1>{{$title}} - {{$page}}</h1>
 
        <form action="{{$baseurl}}/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@@ -58,7 +58,7 @@
        {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
        {{include file="field_checkbox.tpl" field=$hide_help}}
        {{include file="field_select.tpl" field=$singleuser}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$registration}}</h3>
        {{include file="field_input.tpl" field=$register_text}}
        {{include file="field_checkbox.tpl" field=$no_multi_reg}}
        {{include file="field_checkbox.tpl" field=$no_openid}}
        {{include file="field_checkbox.tpl" field=$no_regfullname}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$upload}}</h3>
        {{include file="field_input.tpl" field=$maximagesize}}
        {{include file="field_input.tpl" field=$maximagelength}}
        {{include file="field_input.tpl" field=$jpegimagequality}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$corporate}}</h3>
        {{include file="field_input.tpl" field=$allowed_sites}}
        {{/if}}
        {{include file="field_checkbox.tpl" field=$dfrn_only}}
        {{include file="field_input.tpl" field=$global_directory}}
-       <div class="submit"><input type="submit" name="republish_directory" value="{{$republish|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}" /></div>
        {{include file="field_checkbox.tpl" field=$newuser_private}}
        {{include file="field_checkbox.tpl" field=$enotify_no_content}}
        {{include file="field_checkbox.tpl" field=$private_addons}}
        {{include file="field_checkbox.tpl" field=$disable_embedded}}
        {{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
        {{include file="field_checkbox.tpl" field=$explicit_content}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$advanced}}</h3>
        {{include file="field_select.tpl" field=$rino}}
        {{include file="field_checkbox.tpl" field=$suppress_tags}}
        {{include file="field_checkbox.tpl" field=$nodeinfo}}
        {{include file="field_select.tpl" field=$check_new_version_url}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$portable_contacts}}</h3>
        {{include file="field_checkbox.tpl" field=$poco_completion}}
        {{include file="field_select.tpl" field=$poco_discovery}}
        {{include file="field_select.tpl" field=$poco_discovery_since}}
        {{include file="field_checkbox.tpl" field=$poco_local_search}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$performance}}</h3>
        {{include file="field_checkbox.tpl" field=$only_tag_search}}
        {{include file="field_input.tpl" field=$dbclean_expire_days}}
        {{include file="field_input.tpl" field=$dbclean_unclaimed}}
        {{include file="field_input.tpl" field=$dbclean_expire_conv}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
-       <h3>{{$worker_title|escape}}</h3>
+       <h3>{{$worker_title}}</h3>
        {{include file="field_input.tpl" field=$maxloadavg}}
        {{include file="field_input.tpl" field=$min_memory}}
        {{include file="field_input.tpl" field=$worker_queues}}
        {{include file="field_checkbox.tpl" field=$worker_fastlane}}
        {{include file="field_checkbox.tpl" field=$worker_frontend}}
 
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
-       <h3>{{$relay_title|escape}}</h3>
+       <h3>{{$relay_title}}</h3>
        {{include file="field_checkbox.tpl" field=$relay_subscribe}}
        {{include file="field_input.tpl" field=$relay_server}}
        {{include file="field_checkbox.tpl" field=$relay_directly}}
        {{include file="field_input.tpl" field=$relay_server_tags}}
        {{include file="field_checkbox.tpl" field=$relay_user_tags}}
 
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        </form>
 
        <h3>{{$relocate}}</h3>
        <strong>{{$relocate_warning}}</strong>
        {{include file="field_input.tpl" field=$relocate_url}}
-       <input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
-       <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button|escape:'html'}}" /></div>
+       <input type="hidden" name="page_site" value="{{$submit}}">
+       <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}" /></div>
        </form>
 
 </div>
index 75244924bd14f1865e86442399c5a7687dfb394b..d4e1bcb48e7c8b8cb415063cc4a53ab48dc8ede0 100644 (file)
@@ -6,11 +6,11 @@
                {{include file="field_checkbox.tpl" field=$displaytos}}
                {{include file="field_checkbox.tpl" field=$displayprivstatement}}
                {{include file="field_textarea.tpl" field=$tostext}}
-               <div class="submit"><input type="submit" name="page_tos" value="{{$submit|escape:'html'}}" /></div>
+               <div class="submit"><input type="submit" name="page_tos" value="{{$submit}}" /></div>
        </form>
        <h2>{{$preview}}</h2>
        {{for $i=1 to 3}}
-       <p>{{$privtext[$i]}}</p>
+       <p>{{$privtext[$i] nofilter}}</p>
        {{/for}}
 </div>
 
index f06b0f9734b31b9a11601654195ec150e1ed63f7..88feb6136a22148ede0f58f902620df5ea74d8d7 100644 (file)
@@ -35,8 +35,8 @@
                                        <td class="email">{{$u.email}}</td>
                                        <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
                                        <td class="tools">
-                                               <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve|escape}}'><span class='icon like'></span></a>
-                                               <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny|escape}}'><span class='icon dislike'></span></a>
+                                               <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
+                                               <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
                                        </td>
                                </tr>
                                <tr>
@@ -46,7 +46,7 @@
                                </tbody>
                        </table>
                        <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-                       <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny|escape:'html'}}"/> <input type="submit" name="page_users_approve" value="{{$approve|escape:'html'}}" /></div>                    
+                       <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>
                {{else}}
                        <p>{{$no_pending}}</p>
                {{/if}}
@@ -79,8 +79,8 @@
                                <tbody>
                                {{foreach $users as $u}}
                                        <tr>
-                                               <td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname|escape}}" title="{{$u.nickname|escape}}"></td>
-                                               <td class='name'><a href="{{$u.url}}" title="{{$u.nickname|escape}}" >{{$u.name}}</a></td>
+                                               <td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+                                               <td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
                                                <td class='email'>{{$u.email}}</td>
                                                <td class='register_date'>{{$u.register_date}}</td>
                                                <td class='login_date'>{{$u.login_date}}</td>
@@ -94,8 +94,8 @@
                                                {{/if}}
                                                <td class="tools">
                                                {{if $u.is_deletable}}
-                                                       <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock|escape}}{{else}}{{$block|escape}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-                                                       <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete|escape}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                                       <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                                       <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
                                                {{else}}
                                                        &nbsp;
                                                {{/if}}
                                </tbody>
                        </table>
                        <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-                       <div class="submit"><input type="submit" name="page_users_block" value="{{$block|escape:'html'}}/{{$unblock|escape:'html'}}" /> <input type="submit" name="page_users_delete" value="{{$delete|escape:'html'}}" onclick="return confirm_delete_multi()" /></div>                                                
+                       <div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>
                {{else}}
                        NO USERS?!?
                {{/if}}
                                <tbody>
                                {{foreach $deleted as $u}}
                                        <tr>
-                                               <td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname|escape}}" title="{{$u.nickname|escape}}"></td>
-                                               <td class='name'><a href="{{$u.url}}" title="{{$u.nickname|escape}}" >{{$u.name}}</a></td>
+                                               <td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+                                               <td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
                                                <td class='email'>{{$u.email}}</td>
                                                <td class='register_date'>{{$u.register_date}}</td>
                                                <td class='login_date'>{{$u.login_date}}</td>
     </tr> 
       </tbody> 
   </table> 
-  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit|escape:'html'}}" /></div>             
+  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit}}" /></div>
   </form>
 </div>
index 3d1d7573d7d51c1a289be4eb463ff3ca32debb7d..72aedd8b70aa02afc9a0f5e588a6eaa1401ea2e8 100644 (file)
@@ -4,12 +4,12 @@
 
 
 <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-<input type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" >
+<input type="text" size="64" name="albumname" value="{{$album}}" >
 
 <div id="photo-album-edit-name-end"></div>
 
-<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
+<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
 
 </form>
 </div>
index 1efd6fdcbad1a49d7961076fc1aaefa339945a08..55303b3d746595d9e9ed58e7c8746d9950e1e010 100644 (file)
@@ -3,6 +3,6 @@
 
 <ul>
        {{foreach $apps as $ap}}
-       <li>{{$ap}}</li>
+       <li>{{$ap nofilter}}</li>
        {{/foreach}}
 </ul>
index c7e10482ef0875e942c50ce9a5b51eaf135aca2f..ffc7b19d092c17798b72f0f32fa01c3cb3ee14fb 100644 (file)
@@ -13,7 +13,7 @@
 {{$invite_desc}}
 </p>
 <p>
-{{$desc}}
+{{$desc nofilter}}
 </p>
 {{/if}}
 
 {{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
 {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
 
 <div id="dfrn-request-url-wrapper" >
        <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
         {{if $myaddr}}
                 {{$myaddr}}
-                <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr|escape:'html'}}" />
+                <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}" />
         {{else}}
-        <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+        <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
         {{/if}}
         {{if $url}}
-                <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+                <input type="hidden" name="url" id="url" value="{{$url}}" />
         {{/if}}
        <div id="dfrn-request-url-end"></div>
 </div>
@@ -53,8 +53,8 @@
 
        <div id="dfrn-request-submit-wrapper">
                {{if $submit}}
-                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
                {{/if}}
-               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
        </div>
 </form>
index 659864af3622c0712d04a7570a77e6460e14f711..caa829621aa924ddb11df51c3ff2026e9b34194f 100644 (file)
@@ -21,7 +21,7 @@
                        <h3 class="panel-title">{{$result.title}}</h3>
                </div>
                <div class="panel-body">
-                       {{$result.content}}
+                       {{$result.content nofilter}}
                </div>
        </div>
        {{/foreach}}
index 9261ff8d32af1e912266d98aaa3cffba217ac5b2..6aa51d470267c7eb3a3b54d564f984484d3e3ce4 100644 (file)
@@ -1,10 +1,10 @@
 
 {{if $count}}
 <div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title|escape}}</div>
+<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
 <div id="birthday-title-end"></div>
 {{foreach $events as $event}}
-<div class="birthday-list" id="birthday-{{$event.id}}"> <a href="{{$event.link}}">{{$event.title|escape}}</a> {{$event.date}} </div>
+<div class="birthday-list" id="birthday-{{$event.id}}"> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
 {{/foreach}}
 </div>
 {{/if}}
index d2cfbe82a90063ab988b9baefa8c824abbf5ceea..e3cf0fc32cf1a0d1e5be72fd8d1265abb62aa6fc 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="categories-sidebar" class="widget">
        <h3>{{$title}}</h3>
-       <div id="nets-desc">{{$desc}}</div>
+       <div id="nets-desc">{{$desc nofilter}}</div>
        
        <ul class="categories-ul">
                <li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
index 63ec5d728b453d75fbefae77afe4bd69c1c57b23..6ad01b991b94dd31fad05118f08d3249db80765b 100644 (file)
                                        <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
                                        <option value=""></option>
                                {{foreach $qcomment as $qc}}
-                                       <option value="{{$qc|escape:'html'}}">{{$qc}}</option>
+                                       <option value="{{$qc}}">{{$qc}}</option>
                                {{/foreach}}
                                        </select>
                                {{/if}}
 
                                <div class="comment-edit-text-end"></div>
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-                                       <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit|escape:'html'}}" />
+                                       <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
                                        {{if $preview}}<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>{{/if}}
                                        <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
                                </div>
index eb96fabb4dc863d7120c2e44382ac56af6f2301c..bb812c502e0f7d9541194c3efabe624e36f66ef2 100644 (file)
@@ -4,4 +4,4 @@
 <p class="hint">{{$global_community_hint}}</p>
 {{/if}}
 
-{{$content}}
+{{$content nofilter}}
index a365678184b400804dcf0af7a986d9103f41c95a..496724e3d9c4209c5b9281e5f2613e8e6b13fb0f 100644 (file)
@@ -4,11 +4,11 @@
 
        <h3 id="confirm-message">{{$message}}</h3>
        {{foreach $extra_inputs as $input}}
-       <input type="hidden" name="{{$input.name}}" value="{{$input.value|escape:'html'}}" />
+       <input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
        {{/foreach}}
 
-       <input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm|escape:'html'}}" />
-       <input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel|escape:'html'}}" />
+       <input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm}}" />
+       <input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}" />
 
 </form>
 </center>
index 52e3e1e774915c13d5f045747ada3f3a14d9404b..49a0e43582e1bbbeab542ee89f0d711c390b8c8d 100644 (file)
@@ -5,7 +5,7 @@
                <a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
                <div class='contact-block-content'>
                {{foreach $micropro as $m}}
-                       {{$m}}
+                       {{$m nofilter}}
                {{/foreach}}
                </div>
 {{/if}}
index b4c34f74e2ca3a08f7ca52207837f963f0143856..08570ec496bc1fb868f38cceaed710acd2b9b66e 100644 (file)
@@ -1,7 +1,7 @@
 <div id="contact-edit-wrapper" >
 
        {{* Insert Tab-Nav *}}
-       {{$tab_str}}
+       {{$tab_str nofilter}}
 
 
        <div id="contact-edit-nav-wrapper" >
@@ -32,7 +32,7 @@
                                                {{if $poll_enabled}}
                                                        <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
-                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
+                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
                                                        {{/if}}
                                                        </li>
                                                {{/if}}
@@ -46,7 +46,7 @@
                                        </ul>
 
                                        <ul>
-                                               <!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
+                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
                                                {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
                                        </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}
@@ -56,7 +56,7 @@
                                {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
                                {{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
                                {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-                               {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+                               {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
                        </div>{{* End of contact-edit-links *}}
 
                        <div id="contact-edit-links-end"></div>
                                {{/if}}
                        </div>
 
-                       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+                       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
                        {{/if}}
                        <div class="contact-edit-submit-end clearfix"></div>
 
index 6845c6256261fb6b31b7977e28ec6e1ec2f17d5b..06918533ca0ee4bcfcbbb33b194142b6d7683cc0 100644 (file)
@@ -5,7 +5,7 @@
                onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
                onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
 
-                       <a href="{{$contact.url}}" title="{{$contact.img_hover|escape}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" /></a>
+                       <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
                        {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
@@ -31,7 +31,7 @@
 
        <div class="contact-entry-desc">
                <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >
-                       {{$contact.name|escape}}
+                       {{$contact.name}}
                        {{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
                </div>
                {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
index d85fcfb5af41460c698b20a0c4a8ea57d2eea377..b320b0d050255da730248d852559033d6df086d1 100644 (file)
@@ -5,14 +5,14 @@
 
 <div id="contacts-search-wrapper">
 <form id="contacts-search-form" action="{{$cmd}}" method="get" >
-<span class="contacts-search-desc">{{$desc}}</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit|escape:'html'}}" />
+<span class="contacts-search-desc">{{$desc nofilter}}</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
 </form>
 </div>
 <div id="contacts-search-end"></div>
 
-{{$tabs}}
+{{$tabs nofilter}}
 
 <form action="{{$baseurl}}/contact/batch/" method="POST">
 {{foreach $contacts as $contact}}
@@ -21,7 +21,7 @@
 <div id="contact-edit-end"></div>
 <div id="contacts-actions">
 {{foreach $batch_actions as $n=>$l}}
- <input class="batch-action" name="{{$n}}" value="{{$l|escape:'html'}}" type="submit">
+ <input class="batch-action" name="{{$n}}" value="{{$l}}" type="submit">
  {{/foreach}}
  </div>
 </form>
@@ -53,7 +53,7 @@
  });
  </script>
 
-{{$paginate}}
+{{$paginate nofilter}}
 
 
 
index 5b0610fcbd98f0b1a21d9c5a87fce3e13fe84b7a..af578acdaaf29e9efa6b234a052bd9361802eaff 100644 (file)
@@ -1,7 +1,7 @@
 
-{{$vcard_widget}}
-{{$findpeople_widget}}
-{{$follow_widget}}
-{{$groups_widget}}
-{{$networks_widget}}
+{{$vcard_widget nofilter}}
+{{$findpeople_widget nofilter}}
+{{$follow_widget nofilter}}
+{{$groups_widget nofilter}}
+{{$networks_widget nofilter}}
 
index e323b12e1b9019ba7552c63c21e7452623324977..ae2ad56657670d81ae0d3b3d2405107c8eb55316 100644 (file)
@@ -8,5 +8,6 @@
        {{/if}}
 
        {{* output the content *}}
-       {{$content}}
+       {{$content nofilter}}
+
 </div>
index e46cd1395e667a701f7780ae4591cc749817e7a3..5a4ca2d634082dd09d644a9ed0e6430864d43ecf 100644 (file)
@@ -1,5 +1,5 @@
 
-{{$live_update}}
+{{$live_update nofilter}}
 
 {{foreach $threads as $thread}}
 <div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
index 72528bd26193246ff80c4684dc73e3e549ed4904..bb24e096ea8de1fa5f76c99ad38b4025a30ef929 100644 (file)
@@ -1,10 +1,10 @@
 {{include file="section_title.tpl"}}
 
-{{$tab_str}}
+{{$tab_str nofilter}}
 
-<div class="crepair-error-message">{{$warning}}</div><br>
+<div class="crepair-error-message">{{$warning nofilter}}</div><br>
 <div class="crepair-return">
-       {{$info}}<br>
+       {{$info nofilter}}<br>
        <!-- <a href="{{$returnaddr}}">{{$return}}</a> -->
 </div>
 <br />
@@ -43,6 +43,6 @@
        {{include file="field_select.tpl" field=$remote_self}}
        {{/if}}
 
-       <input type="submit" name="submit" value="{{$lbl_submit|escape:'html'}}" />
+       <input type="submit" name="submit" value="{{$lbl_submit}}" />
 
 </form>
index 144277310e0c1c50dc984d339c8530c70f33b972..8378e5067e950c0fe35a30e4f567d0c7077a54d9 100644 (file)
@@ -1,6 +1,6 @@
 <h1>{{$title}}</h1>
 <p id="cropimage-desc">
-       {{$desc}}
+       {{$desc nofilter}}
 </p>
 
 <div id="cropimage-wrapper">
@@ -48,7 +48,7 @@
        <input type="hidden" name="width"  id="width" />
 
        <div id="crop-image-submit-wrapper" >
-               <input type="submit" name="submit" value="{{$done|escape:'html'}}" />
+               <input type="submit" name="submit" value="{{$done}}" />
        </div>
 
 </form>
index 0cb6e7e3ece4ca5a51d322f72f56ef23a2ade331..0a875515d68fd45f03d80d7db54e6982cc116bc3 100644 (file)
@@ -8,14 +8,14 @@
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 {{include file="field_select.tpl" field=$parent_user}}
 {{include file="field_password.tpl" field=$parent_password}}
-<div class="submit"><input type="submit" name="delegate" value="{{$submit|escape:'html'}}" /></div>
+<div class="submit"><input type="submit" name="delegate" value="{{$submit}}" /></div>
 </form>
 </div>
 {{/if}}
 
 <h4>{{$delegates_header}}</h4>
 
-<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
+<div id="delegate-desc" class="delegate-desc">{{$desc nofilter}}</div>
 
 <h4>{{$head_delegates}}</h4>
 
index d49b5bbf2d44e8a68c0ff40b48bc8671c4e23015..693f8cbf92d13bb74099122e6f07c115f67cd3fa 100644 (file)
 <input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
 <input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
 <input type="hidden" name="localconfirm" value="1" />
-{{$aes_allow}}
+{{$aes_allow nofilter}}
 
 <label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">{{$hidethem}}</label>
-<input type="checkbox" name="hidden-contact" value="1" {{if $hidechecked}}checked="checked" {{/if}} />
+<input type="checkbox" name="hidden-contact" value="1" />
 
 
 <div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit}}" />
 </div>
 </form>
\ No newline at end of file
index 8e686c33dc1642df69898dc0ba7cfc3cbe6aa0aa..39fa295debc98ec3deff70453e82d193498c7a90 100644 (file)
@@ -12,7 +12,7 @@
 {{$invite_desc}}
 </p>
 <p>
-{{$desc}}
+{{$desc nofilter}}
 </p>
 {{/if}}
 
 {{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
 {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
 
 <div id="dfrn-request-url-wrapper" >
        <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
        {{if $myaddr}}
                {{$myaddr}}
-               <input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+               <input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
        {{else}}
-       <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+       <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
        {{/if}}
        {{if $url}}
-               <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+               <input type="hidden" name="url" id="url" value="{{$url}}" />
        {{/if}}
        <div id="dfrn-request-url-end"></div>
 </div>
@@ -83,8 +83,8 @@
 
        <div id="dfrn-request-submit-wrapper">
                {{if $submit}}
-                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
                {{/if}}
-               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
        </div>
 </form>
index 46f17de40e06849636fe3761d4e04ece19a8c12c..4c9fe1298e2a92521668e60828c3f225e3224432 100644 (file)
@@ -10,9 +10,9 @@
 
 <div id="directory-search-wrapper">
        <form id="directory-search-form" action="directory" method="get" >
-               <span class="dirsearch-desc">{{$desc}}</span>
-               <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" />
-               <input type="submit" name="submit" id="directory-search-submit" value="{{$submit|escape:'html'}}" class="button" />
+               <span class="dirsearch-desc">{{$desc nofilter}}</span>
+               <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+               <input type="submit" name="submit" id="directory-search-submit" value="{{$submit}}" class="button" />
        </form>
 </div>
 
@@ -28,4 +28,4 @@
 
 <div class="directory-end" ></div>
 
-{{$paginate}}
+{{$paginate nofilter}}
index 94fac7447134f5ad9c86b36e274d5686efa9604d..d9eeb841fd9b22a50cfce991022878bbefdf0331 100644 (file)
@@ -1,4 +1,3 @@
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
@@ -6,28 +5,33 @@
        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 </head>
 <body>
-<table style="border:1px solid #ccc">
+       <table style="border:1px solid #ccc">
        <tbody>
-       <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
-
+               <tr>
+                       <td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;">
+                               <img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/friendica-32.png'>
+                               <div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div>
+                               <div style="clear: both;"></div>
+                       </td>
+               </tr>
 
-       <tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
+               <tr><td colspan="2" style="padding-top:22px;">{{$preamble nofilter}}</td></tr>
 
-
-       {{if $content_allowed}}
+{{if $content_allowed}}
        {{if $source_photo}}
-       <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
-               <td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
-       {{/if}}
-       <tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
-       <tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
-       {{/if}}
-       <tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
-       <tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr>
-       <tr><td></td><td>{{$thanks}}</td></tr>
-       <tr><td></td><td>{{$site_admin}}</td></tr>
+               <tr>
+                       <td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
+                       <td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td>
+               </tr>
+               {{/if}}
+               <tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
+               <tr><td style="padding-right:22px;">{{$htmlversion nofilter}}</td></tr>
+{{/if}}
+               <tr><td colspan="2" style="padding-top:11px;">{{$hsitelink nofilter}}</td></tr>
+               <tr><td colspan="2" style="padding-bottom:11px;">{{$hitemlink nofilter}}</td></tr>
+               <tr><td></td><td>{{$thanks}}</td></tr>
+               <tr><td></td><td>{{$site_admin}}</td></tr>
        </tbody>
-</table>
+       </table>
 </body>
 </html>
-
index 495cf2eb188460ec49912a2557e9342b7c486a38..f1d2bf102b0b7e213a3f26365ac1c8bd3806274d 100644 (file)
@@ -3,7 +3,7 @@
        <div class="event">
        
        {{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-       {{$event.html}}
+       {{$event.html nofilter}}
        {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" class="plink-event-link icon s22 remote-link"></a>{{/if}}
        {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
        {{if $event.copy}}<a href="{{$event.copy.0}}" title="{{$event.copy.1}}" class="copy-event-link icon s22 copy"></a>{{/if}}
index de8de44e88ce43341e50ce2454967c5bc5537383..0527c69905e1227fc8278e5d80dd904affc04252 100644 (file)
@@ -2,7 +2,7 @@
 <h3>{{$title}}</h3>
 
 <p>
-{{$desc}}
+{{$desc nofilter}}
 </p>
 
 <form id="event-edit-form" action="{{$post}}" method="post" >
@@ -12,9 +12,9 @@
 <input type="hidden" name="uri" value="{{$uri}}" />
 <input type="hidden" name="preview" id="event-edit-preview" value="0" />
 
-{{$s_dsel}}
+{{$s_dsel nofilter}}
 
-{{$f_dsel}}
+{{$f_dsel nofilter}}
 
 {{include file="field_checkbox.tpl" field=$nofinish}}
 
 {{include file="field_checkbox.tpl" field=$share}}
 {{/if}}
 
-{{$acl}}
+{{$acl nofilter}}
 
 <div class="clear"></div>
-<input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
-<input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>
-
index af9a554942e8c3f7745f7aa7c310475a0cbc27d7..3480228c10bd30a733951b5aa4e8b97ac3f49e51 100644 (file)
@@ -1,30 +1,30 @@
 
 <div class="vevent">
-       <div class="summary event-summary">{{$title|escape}}</div>
+       <div class="summary event-summary">{{$title}}</div>
 
        <div class="event-start">
                <span class="event-label">{{$dtstart_label}}</span>&nbsp;
-               <span class="dtstart" title="{{$dtstart_title|escape}}">{{$dtstart_dt}}</span>
+               <span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
        </div>
 
        {{if $finish}}
        <div class="event-end">
                <span class="event-label">{{$dtend_label}}</span>&nbsp;
-               <span class="dtend" title="{{$dtend_title|escape}}">{{$dtend_dt}}</span>
+               <span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
        </div>
        {{/if}}
 
        {{if $description}}
-       <div class="description event-description">{{$description}}</div>
+       <div class="description event-description">{{$description nofilter}}</div>
        {{/if}}
 
        {{if $location}}
        <div class="event-location">
                <span class="event-label">{{$location_label}}</span>&nbsp;
                {{if $location.name}}
-               <span class="location">{{$location.name}}</span>
+               <span class="location">{{$location.name nofilter}}</span>
                {{/if}}
-               {{if $location.map}}{{$location.map}}{{/if}}
+               {{if $location.map}}{{$location.map nofilter}}{{/if}}
                
        </div>
        {{/if}}
index f723cb44c433836cb8f6dac068ee4524b144b2b5..cae7b328226e44a122bc3c2b1e06c37b7970cfa5 100644 (file)
@@ -1,5 +1,5 @@
 
-{{$tabs}}
+{{$tabs nofilter}}
 {{include file="section_title.tpl"}}
 
 <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
@@ -16,7 +16,7 @@
        <div class="event">
        {{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
        {{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
-       {{$event.html}}
+       {{$event.html nofilter}}
        {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" class="plink-event-link icon s22 remote-link"></a>{{/if}}
        {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
        </div>
index ed9354bdef7c3f57cc9cc401f0b1a49935e7abcd..ab375401a299567e8c542259fc87a847827279b5 100644 (file)
@@ -1,5 +1,5 @@
 
-{{$tabs}}
+{{$tabs nofilter}}
 <h2>{{$title}}</h2>
 
 <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
index 08278954c3b99f0dd5e939b5a91afc098226b362..2fcb1908d70b2e419036f30485ad819d12126808 100644 (file)
@@ -1,10 +1,10 @@
 
 {{if $count}}
 <div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title|escape}}</div>
+<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
 <div id="event-title-end"></div>
 {{foreach $events as $event}}
-<div class="event-list" id="event-{{$event.id}}"> <a class="ajax-popupbox" href="events/?id={{$event.id}}">{{$event.title|escape}}</a> - {{$event.date}} </div>
+<div class="event-list" id="event-{{$event.id}}"> <a class="ajax-popupbox" href="events/?id={{$event.id}}">{{$event.title}}</a> - {{$event.date}} </div>
 {{/foreach}}
 </div>
 {{/if}}
index 2fd6c3d69473685a65c8261ffefb1db38b788a80..8a5e0c2fa054dca714f0d1f882d61f33dae46178 100644 (file)
@@ -2,7 +2,7 @@
 <div id="adminpage">
        <h2>{{$banner}}</h2>
 
-       <div id="failed_updates_desc">{{$desc}}</div>
+       <div id="failed_updates_desc">{{$desc nofilter}}</div>
 
        {{if $failed}}
        {{foreach $failed as $f}}
index 8275d4595ded2734fe038bab7db3d7d8c3e52464..4bdb5a09120f93f3c58e6646ea36b831e3fc0b3d 100644 (file)
@@ -3,6 +3,6 @@
                <input type="hidden" name="{{$field.0}}" value="0">
                <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip" value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}>
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 876e607cdfef9958c6f48acfe2442be10bda180e..a22be7f46796e280efbc45e2f4db275e2d87462b 100644 (file)
@@ -4,17 +4,17 @@
                {{* html5 don't work on Chrome, Safari and IE9
                <input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
                <datalist id="data_{{$field.0}}" >
-                  {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{/foreach}}
+                  {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
                </datalist> *}}
                
-               <input id="id_{{$field.0}}" type="text" value="{{$field.2}}" aria-describedby='{{$field.0}}_tip'>
+               <input id="id_{{$field.0}}" type="text" value="{{$field.2 nofilter}}" aria-describedby='{{$field.0}}_tip'>
                <select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())">
                        <option value="">{{$field.5}}</option>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
                </select>
                
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
 
index 6649b0ff94e1c334b5138c88ae801d4e00d0cc20..8dcad3ded7cb2d6c1aface4d5e7fe4b8816f55e1 100644 (file)
@@ -2,8 +2,8 @@
        
        <div class='field custom'>
                <label for='{{$field.0}}'>{{$field.1}}</label>
-               {{$field.2}}
+               {{$field.2 nofilter}}
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 850656bb8c8f0da0cc8a814f2bdcfc2839737efe..efe2c77c1b38b35977d36fa46009434dcf16b1af 100644 (file)
@@ -1,8 +1,8 @@
        
        <div class='field input' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
+               <input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2 nofilter}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
                {{if $field.3}}
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 9c5f04e796d6ddeefc403e4622dc289f66b6a597..0bb6ef2c544c75f942b8ca297b1f8be4b51173de 100644 (file)
@@ -2,8 +2,8 @@
        
        <div class='field checkbox'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="true"{{/if}} aria-describedby='{{$field.0}}_tip'>
+               <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}} aria-describedby='{{$field.0}}_tip'>
                {{if $field.4}}
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4}}</span>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4 nofilter}}</span>
                {{/if}}
        </div>
index 9a18bbc13c3cb02a9659090be948e5364ea1ae55..5faa8c7e96bbc5000ae22007bcafa867684f9880 100644 (file)
@@ -1,8 +1,8 @@
        
        <div class='field input openid' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
+               <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2 nofilter}}" aria-describedby='{{$field.0}}_tip'>
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 4b4d4f2b2e3a5905390007ad63fdfed33ec0d571..26522fbc783180adce58558abe158d84aa301d76 100644 (file)
@@ -1,8 +1,8 @@
        
        <div class='field password' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
+               <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2 nofilter}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
                {{if $field.3}}
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 1e1d8e0b10c129131380e846a7eca61ef2421bba..7fe96a3dd80f8620d56f1c2b4f3f46681237c08d 100644 (file)
@@ -1,7 +1,7 @@
        <div class='field radio'>
                <label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label>
-               <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2|escape:'html'}}" {{if $field.4}}checked{{/if}} aria-describedby={{$field.0}}_{{$field.2}}_tip'>
+               <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked{{/if}} aria-describedby={{$field.0}}_{{$field.2}}_tip'>
                {{if $field.3}}
-               <span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3}}</span>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index bc346ddb0b86d3671d2da984c007392acc3da162..1e1fa15b655c9d96b4c9a069e3f13e625517b868 100644 (file)
@@ -2,8 +2,8 @@
        
        <div class='field richtext'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext" aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
+               <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext" aria-describedby='{{$field.0}}_tip'>{{$field.2 nofilter}}</textarea>
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 87a2ab9ff8eb6fedbd2ab8a99c01e69963689c71..2016a0bb7e81a4c538bae6fc599204a41ebe2ad4 100644 (file)
@@ -3,9 +3,9 @@
        <div class='field select'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
                </select>
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 147c028eff36f82c3256746e5f06e19f777cbd56..1f4630e995eb0825b4becbd340a5b1c08c1df76e 100644 (file)
@@ -3,9 +3,9 @@
        <div class='field select'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
-                       {{$field.4}}
+                       {{$field.4 nofilter}}
                </select>
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 60594a26667a0bdd36b9e447ef4db86ef518bea8..2ee145b0c4d6185a13596503767d98a2eb812f67 100644 (file)
@@ -2,8 +2,8 @@
        
        <div class='field textarea'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <textarea name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
+               <textarea name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>{{$field.2 nofilter}}</textarea>
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 5f56c187ef957df5a4a253cbe233645612a34379..6242cc67119162f99ca3e515735342d0ce67cbce 100644 (file)
@@ -3,10 +3,10 @@
        <div class='field select'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} aria-describedby='{{$field.0}}_tip'>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
                </select>
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
                {{if $field.5}}<div id="theme-preview"></div>{{/if}}
        </div>
index 7e7c3cc4eea64f683cf1692058f02d0a5a093cdf..182efcf18d35b9a01ef01ff50bd8b23bd5d9c4b5 100644 (file)
@@ -2,7 +2,7 @@
        <div class='field yesno'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <div class='onoff' id="id_{{$field.0}}_onoff">
-                       <input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
+                       <input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2 nofilter}}" aria-describedby='{{$field.0}}_tip'>
                        <a href="#" class='off'>
                                {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
                        </a>
@@ -11,6 +11,6 @@
                        </a>
                </div>
                {{if $field.3}}
-               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
index 1ba459bd3aef9582a5030e82295f6271c14844ae..a55c90bc93382e0e204f68cf4e018df5e37dbc0b 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="fileas-sidebar" class="widget">
        <h3>{{$title}}</h3>
-       <div id="nets-desc">{{$desc}}</div>
+       <div id="nets-desc">{{$desc nofilter}}</div>
        
        <ul class="fileas-ul">
                <li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li>
index 27a73d0398a6201ae3dc741653ebe631c52dfa3d..f1417c12dba440674cadec73d043e369c12629f5 100644 (file)
@@ -40,7 +40,7 @@
        </div>
 
        <div class="upload">
-               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{$upload}}</button>
+               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> {{$upload}}</button>
        </div>
 </div>
 
index 27aa9b2f5b3ab5c9180ebef9d67cbee3e6ec9cc2..77f48e8aee1bc0a360d466d6e440be6fb9b4077d 100644 (file)
@@ -1,5 +1,5 @@
 
 {{include file="field_combobox.tpl"}}
 <div class="settings-submit-wrapper" >
-       <input id="filer_save" type="button" class="settings-submit" value="{{$submit|escape:'html'}}" />
+       <input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
 </div>
index b622bb3e1dd0a65e28ee68a1c2b90cd10331c244..07e64d89c9caa443891b5c86079c5dfd115bb261 100644 (file)
@@ -1,4 +1,4 @@
 {{foreach $items as $item }}\r
-<p>{{$item.title|escape}}  ({{$item.mime|escape}}) ({{$item.filename|escape}})</p>\r
+<p>{{$item.title}}  ({{$item.mime}}) ({{$item.filename}})</p>\r
 {{/foreach}}\r
 {{include "paginate.tpl"}}\r
index ece5ed17b860e6e6a1388507d501400c4c5b12ed..12a562123558e8c295bbb6243727fe1e996309d6 100644 (file)
@@ -1,9 +1,9 @@
 
 <div id="follow-sidebar" class="widget">
        <h3>{{$connect}}</h3>
-       <div id="connect-desc">{{$desc}}</div>
+       <div id="connect-desc">{{$desc nofilter}}</div>
        <form action="follow" method="get" >
-               <input id="side-follow-url" type="text" name="url" value="{{$value|escape:'html'}}" size="24" placeholder="{{$hint|escape:'html'}}" title="{{$hint|escape:'html'}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow|escape:'html'}}" />
+               <input id="side-follow-url" type="text" name="url" value="{{$value}}" size="24" placeholder="{{$hint}}" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
        </form>
 </div>
 
index 124079a1d9aeedcba7888e918fedad0d242dec4a..57f4098958ee9230030f5396f96ef15dc6e2dbd8 100644 (file)
@@ -1,7 +1,7 @@
 
 <div class="widget{{if $class}} {{$class}}{{/if}}">
        {{if $title}}<h3>{{$title}}</h3>{{/if}}
-       {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
+       {{if $desc}}<div class="desc">{{$desc nofilter}}</div>{{/if}}
        
        <ul role="menu">
                {{foreach $items as $item}}
index cb9f4198b4cfbccf7316b0c113d64493f02f8b75..cc12bc736c2751366617a4ff760cfe558bc71ddf 100644 (file)
@@ -8,9 +8,9 @@
                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
                
                {{include file="field_input.tpl" field=$gname}}
-               {{if $drop}}{{$drop}}{{/if}}
+               {{if $drop}}{{$drop nofilter}}{{/if}}
                <div id="group-edit-submit-wrapper" >
-                       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" >
+                       <input type="submit" name="submit" value="{{$submit}}" >
                </div>
                <div id="group-edit-select-end" ></div>
        </form>
@@ -23,4 +23,4 @@
                {{include file="groupeditor.tpl"}}
        </div>
 {{/if}}
-{{if $desc}}<div class="clear" id="group-edit-desc">{{$desc}}</div>{{/if}}
+{{if $desc}}<div class="clear" id="group-edit-desc">{{$desc nofilter}}</div>{{/if}}
index f1983d7dc6d9137b3860ce5e92ef2ff3647ec8ea..e76b97b8b94c87822daf51c9ee43f49d3b369ff6 100644 (file)
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
 
 {{foreach $stylesheets as $stylesheetUrl}}
-<link rel="stylesheet" href="{{$stylesheetUrl|escape:"html":"UTF-8"}}" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="screen" />
 {{/foreach}}
 
 <link rel="shortcut icon" href="{{$shortcut_icon}}" />
index 6e50a75306bced68d00b751cddac686bd71e90d0..eb3f402fc634199e737efbf1cc30a13ef49295e0 100644 (file)
@@ -1,14 +1,14 @@
 
 {{* custom content from hook will replace everything. *}}
 {{if $content != '' }}
-       {{$content}}
+       {{$content nofilter}}
 {{else}}
 
        {{if $customhome != false }}
                {{include file="$customhome"}}
        {{else}}
-               {{$defaultheader}}
+               {{$defaultheader nofilter}}
        {{/if}}
 
-       {{$login}}
+       {{$login nofilter}}
 {{/if}}
index ec87591b9fa03b864dc92fb2fdeeda9a832c398f..a688f57b202c1a25c16f21d868a24722e73f971b 100644 (file)
@@ -3,31 +3,31 @@
                <div class="hover-card-header left-align">
                        <div class="hover-card-pic left-align">
                                <span class="image-wrapper medium">
-                                       <a href="{{$profile.url}}" title="{{$profile.name|escape}}"><img href="" class="left-align thumbnail" src="{{$profile.thumb}}" alt="{{$profile.name|escape}}"></a>
+                                       <a href="{{$profile.url}}" title="{{$profile.name}}"><img href="" class="left-align thumbnail" src="{{$profile.thumb}}" alt="{{$profile.name}}"></a>
                                </span>
                        </div>
                        <div class="hover-card-content">
                                <div class="profile-entry-name">
-                                       <h4 class="left-align1"><a href="{{$profile.url}}">{{$profile.name|escape}}</a></h4>{{if $profile.account_type}}<span>{{$profile.account_type}}</span>{{/if}}
+                                       <h4 class="left-align1"><a href="{{$profile.url}}">{{$profile.name}}</a></h4>{{if $profile.account_type}}<span>{{$profile.account_type}}</span>{{/if}}
                                </div>
                                <div class="profile-details">
-                                       <span class="profile-addr">{{$profile.addr|escape}}</span>
-                                       {{if $profile.network}}<span class="profile-network"> ({{$profile.network}})</span>{{/if}}
+                                       <span class="profile-addr">{{$profile.addr}}</span>
+                                       {{if $profile.network_link}}<span class="profile-network">({{$profile.network_link nofilter}})</span>{{/if}}
                                </div>
-                               {{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about}}</div>{{/if}}*}}
+                               {{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about nofilter}}</div>{{/if}}*}}
 
                        </div>
                        <div class="hover-card-actions  right-aligned">
                                {{* here are the differnt actions like privat message, poke, delete and so on *}}
                                {{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}
                                <div class="hover-card-actions-social">
-                                       {{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.pm.1}}')" aria-label="{{$profile.actions.pm.0}}" title="{{$profile.actions.pm.0|escape}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
-                                       {{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.poke.1}}')" aria-label="{{$profile.actions.poke.0}}" title="{{$profile.actions.poke.0|escape}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.pm.1}}')" aria-label="{{$profile.actions.pm.0}}" title="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.poke.1}}')" aria-label="{{$profile.actions.poke.0}}" title="{{$profile.actions.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
                                </div>
                                <div class="hover-card-actions-connection">
-                                       {{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" aria-label="{{$profile.actions.network.0}}" title="{{$profile.actions.network.0|escape}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-                                       {{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" aria-label="{{$profile.actions.edit.0}}" title="{{$profile.actions.edit.0|escape}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
-                                       {{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" aria-label="{{$profile.actions.follow.0}}" title="{{$profile.actions.follow.0|escape}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" aria-label="{{$profile.actions.network.0}}" title="{{$profile.actions.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" aria-label="{{$profile.actions.edit.0}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" aria-label="{{$profile.actions.follow.0}}" title="{{$profile.actions.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
                                </div>
                        </div>
                </div>
index 55cc133ff0606314ce3a9151eb4775c78d9d71d2..6b366d6f045411d69325b17aad61b467c5a271f3 100644 (file)
@@ -4,6 +4,6 @@
        </head>
        <body>
                <h1>{{$title}}</h1>
-               <p>{{$description}}</p>
+               <p>{{$description nofilter}}</p>
        </body>
 </html>
index f960729111f77d862577f1203d31532003c3a68c..151b78dec206fc1163890b8a68e3406af8fb0d25 100644 (file)
@@ -4,7 +4,7 @@
 <form  action="{{$baseurl}}/index.php?q=install" method="post">
 <table>
 {{foreach $checks as $check}}
-       <tr><td>{{$check.title}} </td><td>
+       <tr><td>{{$check.title nofilter}} </td><td>
        {{if $check.status}}
                <img src="{{$baseurl}}/view/install/green.png" alt="Ok">
        {{else}}
@@ -17,7 +17,7 @@
        </td><td>{{if $check.required}}(required){{/if}}</td></tr>
        {{if $check.help}}
        <tr><td class="help" colspan="3">
-               <blockquote>{{$check.help}}</blockquote>
+               <blockquote>{{$check.help nofilter}}</blockquote>
                {{if $check.error_msg}}
                <div class="error_header"><b>{{$check.error_msg.head}}</br><a href="{{$check.error_msg.url}}">{{$check.error_msg.url}}</a></b></div>
                <blockquote>{{$check.error_msg.msg}}</blockquote>
 </table>
 
 {{if $phpath}}
-       <input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}">
+       <input type="hidden" name="phpath" value="{{$phpath}}">
 {{/if}}
 
 {{if $passed}}
        <input type="hidden" name="pass" value="2">
-       <input type="submit" value="{{$next|escape:'html'}}">
+       <input type="submit" value="{{$next}}">
 {{else}}
        <input type="hidden" name="pass" value="1">
-       <input type="submit" value="{{$reload|escape:'html'}}">
+       <input type="submit" value="{{$reload}}">
 {{/if}}
 </form>
index 6c018db722922647c8577e81992c3ea1fab98b10..a4fa430247a34e828f7a26ec7e1e8a97a67042ad 100644 (file)
@@ -1,13 +1,10 @@
-
-
 <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
-
 <p>
-{{$info_01}}<br>
-{{$info_02}}<br>
-{{$info_03}}
+       {{$info_01}}<br>
+       {{$info_02}}<br>
+       {{$info_03}}
 </p>
 
 <table>
 
 <form id="install-form" action="{{$baseurl}}/install" method="post">
 
-<input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}" />
-<input type="hidden" name="pass" value="3" />
+       <input type="hidden" name="phpath" value="{{$phpath}}" />
+       <input type="hidden" name="pass" value="3" />
 
-{{include file="field_input.tpl" field=$dbhost}}
-{{include file="field_input.tpl" field=$dbuser}}
-{{include file="field_password.tpl" field=$dbpass}}
-{{include file="field_input.tpl" field=$dbdata}}
+       {{include file="field_input.tpl" field=$dbhost}}
+       {{include file="field_input.tpl" field=$dbuser}}
+       {{include file="field_password.tpl" field=$dbpass}}
+       {{include file="field_input.tpl" field=$dbdata}}
 
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> 
+       <input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
 
 </form>
-
index 5c8d765e314d7d1e45c9549c10ed0aea8cc311c1..8e643b7a1b8a1669a564201ae1484130f176f964 100644 (file)
@@ -1,13 +1,10 @@
-
-
 <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
-
 {{foreach $checks as $check}}
 <img src="{{$baseurl}}/view/install/red.png" alt="Requirement not satisfied">
-{{$check.title}}
-<textarea rows="24" cols="80">{{$check.help}}</textarea>
+{{$check.title nofilter}}
+<textarea rows="24" cols="80">{{$check.help nofilter}}</textarea>
 {{/foreach}}
 
-{{$text}}
+{{$text nofilter}}
index 55e5ea34b10e95d46bbb00afe4ce8931c230fb8f..a7e4886ae7f178c44d8a9dae14279d1644b8faa0 100644 (file)
@@ -6,18 +6,18 @@
 
 <form id="install-form" action="{{$baseurl}}/install" method="post">
 
-<input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}" />
-<input type="hidden" name="dbhost" value="{{$dbhost|escape:'html'}}" />
-<input type="hidden" name="dbuser" value="{{$dbuser|escape:'html'}}" />
-<input type="hidden" name="dbpass" value="{{$dbpass|escape:'html'}}" />
-<input type="hidden" name="dbdata" value="{{$dbdata|escape:'html'}}" />
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="dbhost" value="{{$dbhost}}" />
+<input type="hidden" name="dbuser" value="{{$dbuser}}" />
+<input type="hidden" name="dbpass" value="{{$dbpass}}" />
+<input type="hidden" name="dbdata" value="{{$dbdata}}" />
 <input type="hidden" name="pass" value="4" />
 
 {{include file="field_input.tpl" field=$adminmail}}
-{{$timezone}}
+{{$timezone nofilter}}
 {{include file="field_select.tpl" field=$language}}
 
-<input id="install-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> 
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
 
 </form>
 
index 9ebd256db8eb168a7cadb5fd5ecab4b2509a6d67..049e482f23db92e98d6e3fd3a4762207b3340dc0 100644 (file)
@@ -3,18 +3,18 @@
 <div class="intro-wrapper" id="intro-{{$contact_id}}" >
 
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
-<img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
+<img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" />
 <dl><dt>{{$lbl_url}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>
 {{if $location}}<dl><dt>{{$lbl_location}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $gender}}<dl><dt>{{$lbl_gender}}</dt><dd>{{$gender}}</dd></dl>{{/if}}
 {{if $keywords}}<dl><dt>{{$lbl_keywords}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$lbl_about}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+{{if $about}}<dl><dt>{{$lbl_about}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
 <div class="intro-knowyou">{{$lbl_knowyou}} {{$knowyou}}</div>
 <div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
 <div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
 <form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}" />
-{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />{{/if}}
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />{{/if}}
 </form>
 <div class="intro-form-end"></div>
 
@@ -24,9 +24,9 @@
 <input type="hidden" name="intro_id" value="{{$intro_id}}" >
 <input type="hidden" name="contact_id" value="{{$contact_id}}" >
 
-{{$dfrn_text}}
+{{$dfrn_text nofilter}}
 
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve|escape:'html'}}" />
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>
 <div class="intro-end"></div>
index 2087635e4fb34c42b8b9b7e4f62448c1a222b750..6f161fd4f53798e831d5a891c605142f689d0f1b 100644 (file)
@@ -11,7 +11,7 @@
                {{include file="field_textarea.tpl" field=$message}}
 
                <div id="invite-submit-wrapper">
-                       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+                       <input type="submit" name="submit" value="{{$submit}}" />
                </div>
 
        </div>
index ca6d506ac6a8411a5a8a063136084fca66281f16..c0f463e48a26b05a2d0cd324326af599a462db78 100644 (file)
@@ -9,8 +9,8 @@
                <input type="hidden" name="wall" value="{{$wall}}" />
                <input type="hidden" name="post_type" value="{{$posttype}}" />
                <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-               <input type="hidden" name="return" value="{{$return_path|escape:'html'}}" />
-               <input type="hidden" name="location" id="jot-location" value="{{$defloc|escape:'html'}}" />
+               <input type="hidden" name="return" value="{{$return_path}}" />
+               <input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
                <input type="hidden" name="coord" id="jot-coord" value="" />
                <input type="hidden" name="post_id" value="{{$post_id}}" />
                <input type="hidden" name="preview" id="jot-preview" value="0" />
                {{if $notes_cid}}
                <input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
                {{/if}}
-               <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle|escape:'html'}}" value="{{$title|escape:'html'}}" class="jothidden" style="display:none"></div>
+               <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
                {{if $placeholdercategory}}
-               <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory|escape:'html'}}" value="{{$category|escape:'html'}}" class="jothidden" style="display:none" /></div>
+               <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
                {{/if}}
                <div id="jot-text-wrap">
                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
+               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content nofilter}}{{/if}}</textarea>
                </div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
-       <input type="submit" id="profile-jot-submit" name="submit" value="{{$share|escape:'html'}}" />
+       <input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
 
        <div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-               <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload|escape:'html'}}"></a></div>
+               <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
        </div>
        <div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-               <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach|escape:'html'}}"></a></div>
+               <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
        </div>
 
        <div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
                <a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
        </div>
        <div id="profile-video-wrapper" style="display: {{$visitor}};" >
-               <a id="profile-video" class="icon video" title="{{$video|escape:'html'}}" onclick="jotVideoURL();return false;"></a>
+               <a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
        </div>
        <div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-               <a id="profile-audio" class="icon audio" title="{{$audio|escape:'html'}}" onclick="jotAudioURL();return false;"></a>
+               <a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
        </div>
        <div id="profile-location-wrapper" style="display: {{$visitor}};" >
-               <a id="profile-location" class="icon globe" title="{{$setloc|escape:'html'}}" onclick="jotGetLocation();return false;"></a>
+               <a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
        </div>
        <div id="profile-nolocation-wrapper" style="display: none;" >
-               <a id="profile-nolocation" class="icon noglobe" title="{{$noloc|escape:'html'}}" onclick="jotClearLocation();return false;"></a>
+               <a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
        </div>
 
        <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-               <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset|escape:'html'}}" ></a>{{$bang}}
+               <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
        </div>
 
        <!-- {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}} -->
-       {{if $preview}}<input type="submit" onclick="preview_post(); return false;" id="jot-preview-link" value="{{$preview|escape:'html'}}" />{{/if}}
+       {{if $preview}}<input type="submit" onclick="preview_post(); return false;" id="jot-preview-link" value="{{$preview}}" />{{/if}}
 
        <div id="profile-jot-perms-end"></div>
 
 
        <div id="profile-jot-plugin-wrapper">
-       {{$jotplugins}}
+       {{$jotplugins nofilter}}
        </div>
 
        <div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-               <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" />
+               <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
        </div>
 
        <div id="jot-preview-content" style="display:none;"></div>
 
        <div style="display: none;">
                <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                       {{$acl}}
+                       {{$acl nofilter}}
                </div>
        </div>
 
index 029ebb0343591c35b34ca9465966be0d4d7e5a1f..19db6afc7c6240174e0f757cec748049c5a8fa50 100644 (file)
@@ -10,7 +10,7 @@
        {{include file="field_input.tpl" field=$lname}}
        {{include file="field_password.tpl" field=$lpassword}}
        <div id="login-lost-password-link">
-               <a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
+               <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
        </div>
        </div>
        
        {{/if}}
 
        <div id="login-submit-wrapper" >
-               <input type="submit" name="submit" id="login-submit-button" value="{{$login|escape:'html'}}" />
+               <input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
        </div>
 
        {{include file="field_checkbox.tpl" field=$lremember}}
        
        {{foreach $hiddens as $k=>$v}}
-               <input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
+               <input type="hidden" name="{{$k}}" value="{{$v}}" />
        {{/foreach}}
        
 </div>
@@ -35,8 +35,8 @@
 
 {{if $register}}
 <div id="login-extra-links">
-       <h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3>
-       <a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>
+       <h3 id="login-head" class="sr-only">{{$register.title}}</h3>
+       <a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>
 </div>
 {{/if}}
 
index 343088d5582719652e169c32fb8151b0ae46640d..ba66f831cc3874c8cb0493669d1d7818818403a1 100644 (file)
@@ -2,6 +2,6 @@
 <form action="{{$dest_url}}" method="post" >
 <div class="logout-wrapper">
 <input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="{{$logout|escape:'html'}}" />
+<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
 </div>
 </form>
index 3dfbb7a2375b094559236d416f536082ff3e94f5..3c4f422197898c3a9f1a49f09fddfc5afd2db855 100644 (file)
@@ -2,7 +2,7 @@
 <h3>{{$title}}</h3>
 
 <p id="lostpass-desc">
-{{$desc}}
+{{$desc nofilter}}
 </p>
 
 <form action="lostpass" method="post" >
@@ -12,7 +12,7 @@
 </div>
 <div id="login-extra-end"></div>
 <div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit|escape:'html'}}" />
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
 </div>
 <div id="login-submit-end"></div>
 </form>
index 9ad7fec345e221b989aa1da8427a01d9c2dbf2fa..905bf36254f3ed69bbac7a5e8845afee2115890c 100644 (file)
@@ -7,7 +7,7 @@
                <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
                <div class="mail-conv-date">{{$mail.date}}</div>
                <div class="mail-conv-subject">{{$mail.subject}}</div>
-               <div class="mail-conv-body">{{$mail.body}}</div>
+               <div class="mail-conv-body">{{$mail.body nofilter}}</div>
        <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
        <div class="mail-conv-outside-wrapper-end"></div>
 </div>
index 289b93648fd21ef1f791e96064f5e21c3092eac3..d54bfc5bfb294b9669c72833937bf9f58302115d 100644 (file)
@@ -1,4 +1,2 @@
 
 <h3>{{$messages}}</h3>
-
-{{$tab_content}}
index dd27092e9badb689925bc4bc940c5be704a2237e..d881e5fb624bb5cb77d77104ce235359ac9c10da 100644 (file)
@@ -1,6 +1,6 @@
 
 <h3>{{$title}}</h3>
-<div id="identity-manage-desc">{{$desc}}</div>
+<div id="identity-manage-desc">{{$desc nofilter}}</div>
 <div id="identity-manage-choose">{{$choose}}</div>
 
 <div id="identity-selector-wrapper" role="menu">
index 903cfcda6910dead31892e1a31345b9c368a09b6..0d63cea77cd9813f04ab1975f85e2a05d72b44e0 100644 (file)
@@ -3,7 +3,7 @@
 
   {{if $tabs}}
        <div id="message-preview">
-               {{$tabs}}
+               {{$tabs nofilter}}
        </div>
   {{/if}}
 
index 1fc4df37ff64439175526471c1966a3e64b5251f..d52bf172a0e1957c6802dd51d30e664b100216cc 100644 (file)
@@ -4,27 +4,27 @@
                                <input type="hidden" name="type" value="{{$type}}" />
                                <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
                                <input type="hidden" name="parent" value="{{$parent}}" />
-                               <input type="hidden" name="return" value="{{$return_path|escape:'html'}}" />
+                               <input type="hidden" name="return" value="{{$return_path}}" />
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 
                                <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}">
-                                       <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle|escape:'html'}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle|escape:'html'}}" title="{{$mytitle|escape:'html'}}" /></a>
+                                       <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
                                </div>
                                <div class="comment-edit-photo-end"></div>
                                <div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
                                        <div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-                                       <input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname|escape:'html'}}" />
+                                       <input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
                                        <div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-                                       <input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail|escape:'html'}}" />
+                                       <input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
                                        <div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-                                       <input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl|escape:'html'}}" />
+                                       <input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
                                </div>
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
 
                                <div class="comment-edit-text-end"></div>
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
-                                       <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit|escape:'html'}}" />
+                                       <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
                                        <span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
                                        <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
                                </div>
index 3c71fa938a2b1cab944b65d9ca9f6fcd965693dc..17a60113ca2e6bbbd33a32c957c4d2ed39d7c848 100644 (file)
@@ -63,7 +63,7 @@
        {{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
        </span>
        <span id="nav-end"></span>
-       <span id="banner">{{$banner}}</span>
+       <span id="banner">{{$banner nofilter}}</span>
 </nav>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
index ea28bc665c2fbf3b9e4e0c0ef1576ba8c9cd5fc8..5ea602aadd42e87995b223bee4ed498e535fa118 100644 (file)
@@ -1,8 +1,8 @@
 
 <div id="nets-sidebar" class="widget">
        <h3>{{$title}}</h3>
-       <div id="nets-desc">{{$desc}}</div>
-       <a href="{{$base}}?nets=all" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
+       <div id="nets-desc">{{$desc nofilter}}</div>
+       <a href="{{$base}}" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
        <ul role="menu" class="nets-ul">
        {{foreach $nets as $net}}
        <li role="menuitem" ><a href="{{$base}}?nets={{$net.ref}}" class="nets-link{{if $net.selected}} nets-selected{{/if}}">{{$net.name}}</a></li>
index 1a08fefc3257ecaa66df94fc13e37be495fb4bcc..27626396c0b2744be4f2de02ffd0cc52813ad955 100644 (file)
@@ -6,7 +6,7 @@
 {{/foreach}}
 <div id="contact-edit-end"></div>
 
-{{$paginate}}
+{{$paginate nofilter}}
 
 
 
index f3068226c48c3707eb3d563afe9d92f15b75c7d7..9438db682c40b1cd4337c7ceacdc72d89d3a9a36 100644 (file)
@@ -11,7 +11,7 @@
        {{* The notifications *}}
        {{if $notif_content}}
        {{foreach $notif_content as $notification}}
-               {{$notification}}
+               {{$notification nofilter}}
        {{/foreach}}
        {{/if}}
 
@@ -21,5 +21,5 @@
        {{/if}}
 
        {{* The pager *}}
-       {{$notif_paginate}}
+       {{$notif_paginate nofilter}}
 </div>
index adaa539d1279cb890e7af213f7e45d8e5c00fe14..6fb69ed6816000ae89594a53ddcb082d3de2d42d 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-       <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
+       <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
index 2550806713c36314c4434144521169134b210896..9df15546512ea064ce665da687f66cf7172a735f 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
+       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
index 2550806713c36314c4434144521169134b210896..9df15546512ea064ce665da687f66cf7172a735f 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
+       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
index 2550806713c36314c4434144521169134b210896..9df15546512ea064ce665da687f66cf7172a735f 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
+       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
index adaa539d1279cb890e7af213f7e45d8e5c00fe14..6fb69ed6816000ae89594a53ddcb082d3de2d42d 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-       <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
+       <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
index a50b2cf2ad69e2d37322c3fe5dd6f05e9222f569..0373b0d01a2de7e4c25527fe0447be0f3be70926 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
+       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
index 2550806713c36314c4434144521169134b210896..9df15546512ea064ce665da687f66cf7172a735f 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
+       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
index 2550806713c36314c4434144521169134b210896..9df15546512ea064ce665da687f66cf7172a735f 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
+       <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
index d513d6b2efde4b1125dfaab769806fde94ccc2cb..10d9d5069dc70d5130ab80d5ad48ef5599129fbc 100644 (file)
@@ -7,5 +7,5 @@
 </div>
 <h3>{{$authorize}}</h3>
 <form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes|escape:'html'}}" /></div>
+<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
 </form>
index 67f7a8086ba9c3efe368388542607a53163abb2d..d4d99c2dac8df4975b3c4da4917fdb4decadebd4 100644 (file)
@@ -3,7 +3,7 @@
        <h3>{{$nv.findpeople}}</h3>
        <div id="peoplefind-desc">{{$nv.desc}}</div>
        <form action="dirfind" method="get" />
-               <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$nv.hint|escape:'html'}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$nv.findthem|escape:'html'}}" />
+               <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$nv.hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$nv.findthem}}" />
        </form>
        <div class="side-link" id="side-match-link"><a href="match" >{{$nv.similar}}</a></div>
        <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div>
index 08df8f7567fccaddc0ed63fada74df73e2b92b88..cae3b868af01e6abd553a23e02ad723d70ff663e 100644 (file)
 
 {{foreach $photos as $photo}}
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$photo.id}}">
-       <a href="{{$photo.link}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$photo.id}}" title="{{$photo.title|escape}}">
-               <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name|escape}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt|escape}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title|escape}}" class="photo-album-photo lframe resize{{$photo.twist}}" id="photo-album-photo-{{$photo.id}}" />
+       <a href="{{$photo.link}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+               <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" class="photo-album-photo lframe resize{{$photo.twist}}" id="photo-album-photo-{{$photo.id}}" />
                <p class='caption'>{{$photo.desc}}</p>          
        </a>
 </div>
 <div class="photo-album-image-wrapper-end"></div>
 {{/foreach}}
 
-{{$paginate}}
+{{$paginate nofilter}}
index 8bad963020dd40327436173c4fee6aecba2dd53b..8b22dfb44cd682756b382c891dbf6e9017ace0c1 100644 (file)
 
                <div style="display: none;">
                        <div id="photo-edit-perms-select" >
-                               {{$aclselect}}
+                               {{$aclselect nofilter}}
                        </div>
                </div>
        </div>
        <div id="photo-edit-perms-end"></div>
 
-       <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-       <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete|escape:'html'}}" onclick="return confirmDelete();" />
+       <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+       <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete();" />
 
        <div id="photo-edit-end"></div>
 </form>
index 0dd8c4e996a3ed56329debee9edd87350b702244..902f742327bc905eece8222ff40a9e768fba74ee 100644 (file)
@@ -1,7 +1,7 @@
 <div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$photo.id}}">
-       <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title|escape}}">
-               <img src="{{$photo.src}}" alt="{{$photo.alt|escape}}" title="{{$photo.title|escape}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
+       <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+               <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
        </a>
-       <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt|escape}}" >{{$photo.album.name|escape}}</a></div>
+       <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
 </div>
 
index 8fa3de61d224435162ac12af323b6f6ffb794875..4f5be40fc500f1e251db1db71941e3b0ff5b4b04 100644 (file)
 </div>
 
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
 <div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
+<div id="photo-caption">{{$desc nofilter}}</div>
 {{if $tags}}
 <div id="in-this-photo-text">{{$tags.0}}</div>
 <div id="in-this-photo">{{$tags.1}}</div>
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-       {{$likebuttons}}
-       {{$like}}
-       {{$dislike}}    
+       {{$likebuttons nofilter}}
+       {{$like nofilter}}
+       {{$dislike nofilter}}
 </div>
 {{/if}}
 
-{{$comments}}
+{{$comments nofilter}}
 
-{{$paginate}}
+{{$paginate nofilter}}
 
index 91444e2d55473a8770247221cc62d100a39dfc69..e178e977a710917510436e700a034e6c85928cf1 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="photos-upload-submit-wrapper" >
-       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" id="photos-upload-submit" />
+       <input type="submit" name="submit" value="{{$submit}}" id="photos-upload-submit" />
 </div>
index 19456187bc8704acc40472f7949542a4c75b1d1f..b75c5a41a4caa1a79f6ef2f161950d6581121b6b 100644 (file)
@@ -11,4 +11,4 @@
 </div>
 <div class="photos-end"></div>
 
-{{$paginate}}
+{{$paginate nofilter}}
index aeb6e5957b0577dab59a3dae0d1f9212c7d3e63f..9e606242ed81325bd9fa63eec4f592f39a641ad8 100644 (file)
 
        <div style="display: none;">
                <div id="photos-upload-permissions-wrapper">
-                       {{$aclselect}}
+                       {{$aclselect nofilter}}
                </div>
        </div>
 
        <div id="photos-upload-spacer"></div>
 
-       {{$alt_uploader}}
+       {{$alt_uploader nofilter}}
 
-       {{$default_upload_box}}
-       {{$default_upload_submit}}
+       {{$default_upload_box nofilter}}
+       {{$default_upload_submit nofilter}}
 
        <div class="photos-upload-end" ></div>
 </form>
index 18191de03fc4e633c7265fa644af4729a19a6e97..91aadcdd8cc5e0bc6d27239aaa6c78ef76399159 100644 (file)
@@ -1,7 +1,7 @@
 
 <h3>{{$title}}</h3>
 
-<div id="poke-desc">{{$desc}}</div>
+<div id="poke-desc">{{$desc nofilter}}</div>
 
 
 <div id="poke-wrapper">
@@ -9,7 +9,7 @@
 
        <div id="poke-recipient">
                <div id="poke-recip-label">{{$clabel}}</div>
-               <input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" name="pokename" autocomplete="off" />
+               <input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" />
                <input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
                <input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
        </div>
@@ -28,7 +28,7 @@
                <input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
        </div>
 
-       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+       <input type="submit" name="submit" value="{{$submit}}" />
 
        </form>
 </div>
index e61c4dd963c85b7755a92b2076ee0c5710ac080b..ff106fa29f5c18dfa3fddbe6d37186624ff283ee 100644 (file)
@@ -1,6 +1,6 @@
 
 <p id="hide-wall-text">
-{{$desc}}
+{{$desc nofilter}}
 </p>
 
                <div id="hide-wall-yes-wrapper">
index 942c2e3e89626a31114074a189eb5427616a7116..bfc13e85ebd3401bb136173e63c931ff2485a18d 100644 (file)
@@ -1,6 +1,6 @@
 
 <p id="profile-in-directory">
-{{$desc}}
+{{$desc nofilter}}
 </p>
 
                <div id="profile-in-dir-yes-wrapper">
index 559caed3421f342b8aeb437ba163e3c0a317346c..c91601bce86770abc015f98f4c833f5e965ec3d1 100644 (file)
@@ -1,6 +1,6 @@
 
 <p id="profile-in-directory">
-{{$desc}}
+{{$desc nofilter}}
 </p>
 
                <div id="profile-in-netdir-yes-wrapper">
index 19d4490eaf50124a2c5f528e278d486ab78c467e..83685d86e50b2da0813fbee33679e9b8f02f9ef6 100644 (file)
@@ -58,7 +58,7 @@
 {{if $profile.homepage}}
 <dl id="aprofile-homepage" class="aprofile">
  <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1}}</dd>
+ <dd>{{$profile.homepage.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.about}}
 <dl id="aprofile-about" class="aprofile">
  <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1}}</dd>
+ <dd>{{$profile.about.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.interest}}
 <dl id="aprofile-interest" class="aprofile">
  <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1}}</dd>
+ <dd>{{$profile.interest.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.likes}}
 <dl id="aprofile-likes" class="aprofile">
  <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1}}</dd>
+ <dd>{{$profile.likes.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.dislikes}}
 <dl id="aprofile-dislikes" class="aprofile">
  <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1}}</dd>
+ <dd>{{$profile.dislikes.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.contact}}
 <dl id="aprofile-contact" class="aprofile">
  <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1}}</dd>
+ <dd>{{$profile.contact.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.music}}
 <dl id="aprofile-music" class="aprofile">
  <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1}}</dd>
+ <dd>{{$profile.music.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.book}}
 <dl id="aprofile-book" class="aprofile">
  <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1}}</dd>
+ <dd>{{$profile.book.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.tv}}
 <dl id="aprofile-tv" class="aprofile">
  <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1}}</dd>
+ <dd>{{$profile.tv.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.film}}
 <dl id="aprofile-film" class="aprofile">
  <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1}}</dd>
+ <dd>{{$profile.film.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.romance}}
 <dl id="aprofile-romance" class="aprofile">
  <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1}}</dd>
+ <dd>{{$profile.romance.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.work}}
 <dl id="aprofile-work" class="aprofile">
  <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1}}</dd>
+ <dd>{{$profile.work.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.education}}
 <dl id="aprofile-education" class="aprofile">
  <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1}}</dd>
+ <dd>{{$profile.education.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.forumlist}}
 <dl id="aprofile-forumlist" class="aprofile">
  <dt>{{$profile.forumlist.0}}</dt>
- <dd>{{$profile.forumlist.1}}</dd>
+ <dd>{{$profile.forumlist.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
index 2363bd3f060b3d74d1933e3f91173788dd43219e..08e833f10a400205b4f209708c5a2e64fd96266d 100644 (file)
@@ -1,15 +1,15 @@
 
-{{$default}}
+{{$default nofilter}}
 
 <h1>{{$banner}}</h1>
 
 <div id="profile-edit-links">
 <ul>
-<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}">{{$profpic}}</a></li>
-<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof|escape:'html'}}">{{$viewprof}}</a></li>
-<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof|escape:'html'}}">{{$cl_prof}}</a></li>
+<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li>
+<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
 <li></li>
-<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof|escape:'html'}}" {{$disabled}} >{{$del_prof}}</a></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
 
 </ul>
 </div>
 {{include file="field_yesno.tpl" field=$details}}
 <div id="profile-edit-profile-name-wrapper" >
 <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
+<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
 </div>
 <div id="profile-edit-profile-name-end"></div>
 
 <div id="profile-edit-name-wrapper" >
 <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
+<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
 </div>
 <div id="profile-edit-name-end"></div>
 
 <div id="profile-edit-pdesc-wrapper" >
 <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1|escape:'html'}}" />
+<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1}}" />
 </div>
 <div id="profile-edit-pdesc-end"></div>
 
 
 <div id="profile-edit-gender-wrapper" >
 <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender}}
+{{$gender nofilter}}
 </div>
 <div id="profile-edit-gender-end"></div>
 
 <div id="profile-edit-dob-wrapper" >
-{{$dob}}
+{{$dob nofilter}}
 </div>
 <div id="profile-edit-dob-end"></div>
 
-{{$hide_friends}}
+{{$hide_friends nofilter}}
 
 <div class="profile-edit-submit-wrapper" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
 
 <div id="profile-edit-address-wrapper" >
 <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
+<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
 </div>
 <div id="profile-edit-address-end"></div>
 
 <div id="profile-edit-locality-wrapper" >
 <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
 </div>
 <div id="profile-edit-locality-end"></div>
 
 
 <div id="profile-edit-postal-code-wrapper" >
 <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
+<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
 
 
 <div id="profile-edit-hometown-wrapper" >
 <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
-<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown.2|escape:'html'}}" />
+<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
 </div>
 <div id="profile-edit-hometown-end"></div>
 
 <div class="profile-edit-submit-end"></div>
 
 <div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
-{{$marital}}
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital nofilter}} </label>
+{{$marital nofilter}}
 </div>
 <label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
 <input type="text" size="32" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
 <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$howlong.1}} </label>
-<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.1|escape:'html'}}" />
+<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.1}}" />
 
 <div id="profile-edit-marital-end"></div>
 
 <div id="profile-edit-sexual-wrapper" >
 <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
-{{$sexual}}
+{{$sexual nofilter}}
 </div>
 <div id="profile-edit-sexual-end"></div>
 
 
 <div id="profile-edit-homepage-wrapper" >
 <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
-<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2|escape:'html'}}" />
+<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>
 
 <div id="profile-edit-xmpp-wrapper" >
 <label id="profile-edit-xmpp-label" for="profile-edit-xmpp" >{{$xmpp.1}} </label>
-<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2|escape:'html'}}" />
+<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2}}" />
 </div><div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
 <div id="profile-edit-xmpp-end"></div>
 
 
 <div id="profile-edit-politic-wrapper" >
 <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic.2|escape:'html'}}" />
+<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
 </div>
 <div id="profile-edit-politic-end"></div>
 
 <div id="profile-edit-religion-wrapper" >
 <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion.2|escape:'html'}}" />
+<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
 </div>
 <div id="profile-edit-religion-end"></div>
 
 <div id="profile-edit-pubkeywords-wrapper" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
 </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div id="profile-edit-prvkeywords-wrapper" >
 <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
 </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
 <div id="profile-edit-prvkeywords-end"></div>
 
 {{/if}}
 <div id="profile-edit-profile-name-wrapper" >
 <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
+<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
 </div>
 <div id="profile-edit-profile-name-end"></div>
 
 <div id="profile-edit-name-wrapper" >
 <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
+<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
 </div>
 <div id="profile-edit-name-end"></div>
 
 {{if $personal_account}}
 <div id="profile-edit-gender-wrapper" >
 <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender}}
+{{$gender nofilter}}
 </div>
 <div id="profile-edit-gender-end"></div>
 
 <div id="profile-edit-dob-wrapper" >
-{{$dob}}
+{{$dob nofilter}}
 </div>
 <div id="profile-edit-dob-end"></div>
 {{/if}}
 
 <div id="profile-edit-homepage-wrapper" >
 <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
-<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2|escape:'html'}}" />
+<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>
 
 <div id="profile-edit-xmpp-wrapper" >
 <label id="profile-edit-xmpp-label" for="profile-edit-xmpp" >{{$xmpp.1}} </label>
-<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2|escape:'html'}}" />
+<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2}}" />
 </div><div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
 <div id="profile-edit-xmpp-end"></div>
 
 
-{{$hide_friends}}
+{{$hide_friends nofilter}}
 
 <div id="profile-edit-address-wrapper" >
 <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
+<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
 </div>
 <div id="profile-edit-address-end"></div>
 
 <div id="profile-edit-locality-wrapper" >
 <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
 </div>
 <div id="profile-edit-locality-end"></div>
 
 
 <div id="profile-edit-postal-code-wrapper" >
 <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
+<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
 
 
 <div id="profile-edit-pubkeywords-wrapper" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
 </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div id="profile-edit-prvkeywords-wrapper" >
 <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
 </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
 <div id="profile-edit-prvkeywords-end"></div>
 
index 69b39b9b334c0b096071a01cb2638caa016316fc..e7c3a31dda686b60128ebf11229fdbd45f5fb78f 100644 (file)
@@ -7,6 +7,6 @@
        <div class="profile-listing-name" id="profile-listing-name-{{$id}}">
                <a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a>
        </div>
-       <div class="profile-listing-visible">{{$visible}}</div>
+       <div class="profile-listing-visible">{{$visible nofilter}}</div>
 </div>
 <div class="profile-listing-end"></div>
index 88514c554aae5731531263832d3dac9a1f7797f4..65f38f3a649bc97804b2d4440a205cb79c8fa7d8 100644 (file)
@@ -10,5 +10,5 @@
 </div>
 
 <div id="profile-listing-profiles">
-       {{$profiles}}
+       {{$profiles nofilter}}
 </div>
index 1695d01e273d3d6118818286da5575a4fa3c0796..e7c6b896086b82a11d00b1dbf8874c6fc82908e9 100644 (file)
 </select>
 
 <div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit|escape:'html'}}">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
 </div>
 
 </form>
 
 <div id="profile-photo-link-select-wrapper">
-{{$select}}
+{{$select nofilter}}
 </div>
\ No newline at end of file
index 14e1a03736dffca63725199882c630bf3a2caea0..124fca154f16f965182c249a31b26e42208ea0f3 100644 (file)
@@ -1,19 +1,19 @@
 
 <div class="vcard h-card">
 
-       <div class="fn label p-name">{{$profile.name|escape}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
        
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
        
        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
        {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}"></a></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
        {{else}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name|escape}}"></a></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
        {{/if}}
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-       {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
+       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
                <dd class="adr h-adr">
@@ -47,7 +47,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about}}</dd></dl>{{/if}}
+       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
        {{include file="diaspora_vcard.tpl"}}
        
@@ -70,6 +70,6 @@
        </div>
 </div>
 
-{{$contact_block}}
+{{$contact_block nofilter}}
 
 
index 654671af0ecd8e3e13852b0d7ed0677d7d7f7753..087d08dbbc52db16cd82525a4d9f7d427cafe96e 100644 (file)
@@ -5,10 +5,10 @@
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
-{{$parent}}
+{{$parent nofilter}}
 
 <div id="prvmail-to-label">{{$to}}</div>
-{{$select}}
+{{$select nofilter}}
 
 <div id="prvmail-subject-label">{{$subject}}</div>
 <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
 
 
 <div id="prvmail-submit-wrapper" >
-       <input type="submit" id="prvmail-submit" name="submit" value="{{$submit|escape:'html'}}" tabindex="13" />
+       <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
        <div id="prvmail-upload-wrapper" >
-               <div id="prvmail-upload" class="icon border camera" title="{{$upload|escape:'html'}}" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
        </div> 
        <div id="prvmail-link-wrapper" >
-               <div id="prvmail-link" class="icon border link" title="{{$insert|escape:'html'}}" onclick="jotGetLink();" ></div>
+               <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
        </div> 
        <div id="prvmail-rotator-wrapper" >
-               <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait|escape:'html'}}" title="{{$wait|escape:'html'}}" style="display: none;" />
+               <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
        </div> 
 </div>
 <div id="prvmail-end"></div>
index 2e5588ae71ff0220274301cb50fe9da49934318e..2b23934b792796c08b7e71da29c085ed0d9b1db4 100644 (file)
@@ -5,44 +5,39 @@
        <input type="hidden" name="photo" value="{{$photo}}" />
        <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 
-       {{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
+       {{if $registertext != ""}}<div class="error-message">{{$registertext nofilter}} </div>{{/if}}
 
        {{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
 
-       <p id="register-realpeople">{{$realpeople}}</p>
-
        <p id="register-fill-desc">{{$fillwith}}</p>
        <p id="register-fill-ext">{{$fillext}}</p>
 
 {{if $oidlabel}}
        <div id="register-openid-wrapper" >
-       <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input    type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid|escape:'html'}}" >
+       <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
        </div>
        <div id="register-openid-end" ></div>
 {{/if}}
 
 {{if $invitations}}
-
        <p id="register-invite-desc">{{$invite_desc}}</p>
        <div id="register-invite-wrapper" >
                <label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
                <input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
        </div>
        <div id="register-name-end" ></div>
-
 {{/if}}
 
-
        <div id="register-name-wrapper" >
                <label for="register-name" id="label-register-name" >{{$namelabel}}</label>
-               <input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username|escape:'html'}}" >
+               <input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
        </div>
        <div id="register-name-end" ></div>
 
 
        <div id="register-email-wrapper" >
                <label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-               <input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email|escape:'html'}}" >
+               <input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
        </div>
        <div id="register-email-end" ></div>
 
@@ -55,7 +50,7 @@
 
        <div id="register-nickname-wrapper" >
                <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
-               <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname|escape:'html'}}" ><div id="register-sitename">@{{$sitename}}</div>
+               <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" ><div id="register-sitename">@{{$sitename}}</div>
        </div>
        <div id="register-nickname-end" ></div>
 
     {{include file="field_textarea.tpl" field=$permonlybox}}
 {{/if}}
 
-       {{$publish}}
+       {{$publish nofilter}}
 
-       {{if $showtoslink}}
+{{if $showtoslink}}
        <p><a href="{{$baseurl}}/tos">{{$tostext}}</a></p>
-       {{/if}}
-       {{if $showprivstatement}}
+{{/if}}
+{{if $showprivstatement}}
        <h4>{{$privstatement.0}}</h4>
        {{for $i=1 to 3}}
-       <p>{{$privstatement[$i]}}</p>
+       <p>{{$privstatement[$i] nofilter}}</p>
        {{/for}}
-       {{/if}}
+{{/if}}
 
        <div id="register-submit-wrapper">
-               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt|escape:'html'}}" />
+               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
        </div>
        <div id="register-submit-end" ></div>
 
-<h3>{{$importh}}</h3>
+       <h3>{{$importh}}</h3>
        <div id ="import-profile">
                <a href="uimport">{{$importt}}</a>
        </div>
 </form>
-
-{{$license}}
-
-
index f5f43360a71a6e51c44ecfdee6050e8299a01df0..4ae682f4361bb453b3ac5d4a8e5c12faab79555c 100644 (file)
@@ -1,17 +1,17 @@
 
 <div id="remote-friends-in-common" class="bigwidget">
-       <div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/rem/{{$uid}}/{{$cid}}">{{$more}}</a>{{/if}}</div>
+       <div id="rfic-desc">{{$desc nofilter}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/rem/{{$uid}}/{{$cid}}">{{$more}}</a>{{/if}}</div>
        {{if $items}}
        {{foreach $items as $item}}
        <div class="profile-match-wrapper">
                <div class="profile-match-photo">
                        <a href="{{$item.url}}">
-                               <img src="{{$item.photo}}" width="80" height="80" alt="{{$item.name|escape}}" title="{{$item.name|escape}}" />
+                               <img src="{{$item.photo}}" width="80" height="80" alt="{{$item.name}}" title="{{$item.name}}" />
                        </a>
                </div>
                <div class="profile-match-break"></div>
                <div class="profile-match-name">
-                       <a href="{{$item.url}}" title="{{$item.name|escape}}">{{$item.name|escape}}</a>
+                       <a href="{{$item.url}}" title="{{$item.name}}">{{$item.name}}</a>
                </div>
                <div class="profile-match-end"></div>
        </div>
index 4acfb9ff1a3589ea908c8699b09dc35a960dc880..1e52bfa4e53a3b988839124acaa3871b941d1e0c 100644 (file)
@@ -3,7 +3,7 @@
 
 <div id="remove-account-wrapper">
 
-<div id="remove-account-desc">{{$desc}}</div>
+<div id="remove-account-desc">{{$desc nofilter}}</div>
 
 <form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
 <input type="hidden" name="verify" value="{{$hash}}" />
@@ -14,7 +14,7 @@
 </div>
 <div id="remove-account-pass-end"></div>
 
-<input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" value="{{$submit}}" />
 
 </form>
 </div>
index 28a7ed58aae521a7a5acb212e578449eb4654064..5000e4acb1186af5912f14f278f3c49fd2b36e08 100644 (file)
@@ -1,7 +1,7 @@
 
 <div class="widget" id="saved-search-list">
        <h3 id="search">{{$title}}</h3>
-       {{$searchbox}}
+       {{$searchbox nofilter}}
        
        <ul role="menu" id="saved-search-ul">
                {{foreach $saved as $search}}
index a97574b7b4f5e93d8f3f52f23a39a17d0e3d703b..38aa947498cb974c237474ffcdc05c86ae34259c 100644 (file)
@@ -6,12 +6,12 @@
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
                                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name|escape}}" /></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                                        <ul>
-                                               {{$item.item_photo_menu}}
+                                               {{$item.item_photo_menu nofilter}}
                                        </ul>
                                </div>
                        </div>
                        <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
                                {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
                                {{else}}<div class="wall-item-lock"></div>{{/if}}       
-                               <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+                               <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location nofilter}}</div>
                        </div>
                </div>
                <div class="wall-item-author">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</span></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
                                <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
                                
                </div>                  
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title|escape}}</div>
+                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                        <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body nofilter}}</div>
                        {{if $item.has_cats}}
                        <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                        </div>
@@ -54,7 +54,7 @@
 
        <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
        {{if $item.conv}}
-                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title|escape}}'>{{$item.conv.title|escape}}</a>
+                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
        {{/if}}
        </div>
 
index 32ec5a04840a3fdcca8c1490a5a5b0c301ddcd8b..567ac81b7f7eab9c1a7e5737cd55098091151073 100644 (file)
@@ -5,7 +5,7 @@
 <form action="settings/addon" method="post" autocomplete="off">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-{{$settings_addons}}
+{{$settings_addons nofilter}}
 
 </form>
 
index a237917682c39eafabb8a24461ed5090b89a801a..e275e68ce362358bd95a20efbce3557e32329b2f 100644 (file)
@@ -14,7 +14,7 @@
        {{include file="field_checkbox.tpl" field=$disable_cw}}
        {{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
        {{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
-       {{$default_group}}
+       {{$default_group nofilter}}
        {{include file="field_input.tpl" field=$legacy_contact}}
 
        <p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
@@ -23,7 +23,7 @@
 </div>
 <div class="clear"></div>
 
-{{$settings_connectors}}
+{{$settings_connectors nofilter}}
 
 {{if $mail_disabled}}
 
@@ -35,7 +35,7 @@
        <span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
                <img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
        </span>
-       <p>{{$imap_desc}}</p>
+       <p>{{$imap_desc nofilter}}</p>
        {{include file="field_custom.tpl" field=$imap_lastcheck}}
        {{include file="field_input.tpl" field=$mail_server}}
        {{include file="field_input.tpl" field=$mail_port}}
@@ -48,7 +48,7 @@
        {{include file="field_input.tpl" field=$mail_movetofolder}}
 
        <div class="settings-submit-wrapper" >
-               <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+               <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
        </div>
        </div>
 {{/if}}
index e1a01238045ae114f7adc536fc15a255443532b9..4b769d421bf8bc8d90d7e0ccbf91a211a5c88b95 100644 (file)
 {{include file="field_checkbox.tpl" field=$infinite_scroll}}
 {{include file="field_checkbox.tpl" field=$bandwidth_saver}}
 {{include file="field_checkbox.tpl" field=$smart_threading}}
-<h2>{{$calendar_title|escape}}</h2>
+<h2>{{$calendar_title}}</h2>
 {{include file="field_select.tpl" field=$first_day_of_week}}
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
 {{if $theme_config}}
 <h2>{{$stitle}}</h2>
-{{$theme_config}}
+{{$theme_config nofilter}}
 {{/if}}
 
 </form>
index eb3f67f8136d5d1c6bad619195ad97c72c6d0418..2793e477b1dbde77b59915284ac6f916c9f674ed 100644 (file)
@@ -13,7 +13,7 @@
        {{include file="field_yesno.tpl" field=$fcat}}
 {{/foreach}}
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-features-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
 </div>
 </div>
 {{/foreach}}
index 8decc2dd4fc6a2ea0eb9f2361b58dd1948135faa..a6dc4d74cab66998eb13b06993cc282250123eb3 100644 (file)
@@ -1,6 +1,5 @@
 
-
-<div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="info-message">{{$desc}}</div>
+<div id="settings-nick-wrapper">
+       <div id="settings-nickname-desc" class="info-message">{{$desc nofilter}}</div>
 </div>
 <div id="settings-nick-end" ></div>
index 164930ecbad5a37c8b97932605b01a4be2f6da0a..edb0ff63ec16738aacfb4a0c0d6a373530845576 100644 (file)
@@ -23,8 +23,8 @@
                        {{/if}}
                {{/if}}
                {{if $app.my}}
-               <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="icon s22 edit" title="{{$edit|escape:'html'}}">&nbsp;</a>
-               <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="icon s22 delete" title="{{$delete|escape:'html'}}">&nbsp;</a>
+               <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="icon s22 edit" title="{{$edit}}">&nbsp;</a>
+               <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="icon s22 delete" title="{{$delete}}">&nbsp;</a>
                {{/if}}         
        </div>
        {{/foreach}}
index 9019981542a34772d6d609c45bdbd938a6d912fb..eed9f6ea339da473d854bfa3055bfe9bd976031d 100644 (file)
@@ -11,7 +11,7 @@
 {{include file="field_input.tpl" field=$icon}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 <!-- <input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" /> -->
 </div>
 
index d017367fef43b81d57f7b6108837e80c9c4ea707..c95c0b14307787e6935a6f60f953ac5d4482eede 100644 (file)
@@ -1,6 +1,6 @@
 <h1>{{$ptitle}}</h1>
 
-{{$nickname_block}}
+{{$nickname_block nofilter}}
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@@ -16,7 +16,7 @@
 {{/if}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
@@ -33,7 +33,7 @@
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
 
 {{include file="field_input.tpl" field=$maxreq}}
 
-{{$profile_in_dir}}
+{{$profile_in_dir nofilter}}
 
-{{$profile_in_net_dir}}
+{{$profile_in_net_dir nofilter}}
 
-{{$hide_friends}}
+{{$hide_friends nofilter}}
 
-{{$hide_wall}}
+{{$hide_wall nofilter}}
 
-{{$blockwall}}
+{{$blockwall nofilter}}
 
-{{$blocktags}}
+{{$blocktags nofilter}}
 
-{{$suggestme}}
+{{$suggestme nofilter}}
 
-{{$unkmail}}
+{{$unkmail nofilter}}
 
 
 {{include file="field_input.tpl" field=$cntunkmail}}
@@ -90,7 +90,7 @@
 
        <div style="display: none;">
                <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                       {{$aclselect}}
+                       {{$aclselect nofilter}}
                </div>
        </div>
 
 <br/>
 <div id="settings-default-perms-end"></div>
 
-{{$group_select}}
+{{$group_select nofilter}}
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
 {{include file="field_checkbox.tpl" field=$email_textonly}}
 {{include file="field_checkbox.tpl" field=$detailed_notif}}
 
-
-<!--
-<div class="field">
- <button onclick="javascript:Notification.requestPermission(function(perm){if(perm === 'granted')alert('{{$desktop_notifications_success_message}}');});return false;">{{$desktop_notifications}}</button>
- <span class="field_help">{{$desktop_notifications_note}}</span>
-</div>
--->
 {{include file="field_yesno.tpl" field=$desktop_notifications}}
 <script>
 (function(){
 </div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
 <div class="settings-content-block">
 <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
 
-{{$pagetype}}
+{{$pagetype nofilter}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
 <div id="settings-pagetype-desc">{{$relocate_text}}</div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button|escape:'html'}}" />
+<input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" />
 </div>
 </div>
 
index ee78f842c0559ffa60dd7ff53a989e4ed66ee563..2e892d334b22d6ba221096f054b7d350733e999b 100644 (file)
@@ -8,5 +8,5 @@
                <div><a href="{{$profile}}" target="_blank" class="shared-wall-item-name"><span class="shared-author">{{$author}}</span></a></div>
                <div class="shared-wall-item-ago"><small><a href="{{$link}}" target="_blank"><span class="shared-time">{{$posted}}</a></a></small></div>
        </div>
-       <blockquote class="shared_content">{{$content}}</blockquote>
+       <blockquote class="shared_content">{{$content nofilter}}</blockquote>
 </div>
index edc0dbdba3ac9759866a7d369eb060129b54f3ab..44fe86510448c8f59902b24b7e328c359044c9f9 100644 (file)
@@ -5,18 +5,18 @@
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
 {{if $madeby}}<div class="intro-madeby">{{$lbl_madeby}} {{$madeby}}</div>{{/if}}
 <div class="intro-fullname" >{{$fullname}}</div>
-<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" /></a>
+<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
 <div class="intro-note" >{{$note}}</div>
 <div class="intro-wrapper-end"></div>
 <form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}" />
-<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
 </form>
 <div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="{{$request}}" method="get">
 {{include file="field_checkbox.tpl" field=$hidden}}
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve|escape:'html'}}" />
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>
 <div class="intro-end"></div>
index b88a9f236d2e9be9e46a86470cfbf3d2ea208ecc..ac492b6ddd99a5cb83f5a08eca9aacabc4653e81 100644 (file)
@@ -10,7 +10,7 @@
                <id>{{$item_id}}</id>
                <title>{{$title}}</title>
                <published>{{$published}}</published>
-               <content type="{{$type}}" >{{$content}}</content>
+               <content type="{{$type}}" >{{$content nofilter}}</content>
                <link rel="mentioned" href="{{$accturi}}" />
                <as:actor>
                <as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
index 6a230142baece8f5c522c3ceaec54a541ae67bad..d993c6b33b982cb59b74d939be5a5bef6de5be93 100644 (file)
@@ -1,5 +1,5 @@
 
-{{$live_update}}
+{{$live_update nofilter}}
 
 {{foreach $threads as $thread}}
 {{include file="{{$thread.template}}" item=$thread}}
index 8692c7e940acb415e110d0ae77b0eaafe43500b5..b0a48406c204530f2bede8a96e7e12a617364dc5 100644 (file)
@@ -1,11 +1,11 @@
 <h1>{{$title}}</h1>
 
-{{$tostext}}
+{{$tostext nofilter}}
 
 {{if $displayprivstatement}}
-<h2>{{$privstatementtitle}}</h2>
-<p>{{$privacy_operate}}</p>
-<p>{{$privacy_distribute}}</p>
-<p>{{$privacy_delete}}</p>
+<h2>{{$privstatementtitle nofilter}}</h2>
+<p>{{$privacy_operate nofilter}}</p>
+<p>{{$privacy_distribute nofilter}}</p>
+<p>{{$privacy_delete nofilter}}</p>
 {{/if}}
 
index 0aca00a05f4c9f2d4203be3fe6923468626b94e2..05c79ab75763ae66ba2bc38c7a7067463c4fd870 100644 (file)
@@ -8,7 +8,7 @@
      \r
      \r
        <div id="register-submit-wrapper">\r
-               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt|escape:'html'}}" />\r
+               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />\r
        </div>\r
        <div id="register-submit-end" ></div>    \r
 </form>\r
index eed94193f5a598ab84f7d8250cf0cb74be330dda..240466460efff31630eb2baee11472f5db73d44a 100644 (file)
@@ -1,14 +1,14 @@
 
 <div class="vcard h-card">
-       <div class="fn p-name">{{$name|escape}}</div>
-       {{if $addr}}<div class="p-addr">{{$addr|escape}}</div>{{/if}}
+       <div class="fn p-name">{{$name}}</div>
+       {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
        {{if $pdesc}}<div class="title p-job-title">{{$pdesc}}</div>{{/if}}
        {{if $url}}
-       <div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name|escape}}" /></a></div>
+       <div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
        {{else}}
-       <div id="profile-photo-wrapper"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name|escape}}" /></div>
+       <div id="profile-photo-wrapper"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
        {{/if}}
-       {{if $account_type}}<div class="account-type">{{$account_type|escape}}</div>{{/if}}
-       {{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
+       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+       {{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
        <div id="profile-vcard-break"></div>
 </div>
index 3ea277a42bd6ea0cdf0f1a315de95baf866191ff..562270e35285de733e948d89f8302f1e507b8c6c 100644 (file)
@@ -1,7 +1,7 @@
 
 {{include file="section_title.tpl"}}
 
-{{$tab_str}}
+{{$tab_str nofilter}}
 
 <div id="viewcontact_wrapper-{{$id}}">
 {{foreach $contacts as $contact}}
@@ -11,4 +11,4 @@
 <div class="clear"></div>
 <div id="view-contact-end"></div>
 
-{{$paginate}}
+{{$paginate nofilter}}
index f0d7a5d89d2e5e237449936f3d6dc5bd9ff48039..e3e19be514631b13538f14cd55932681fd97aa0c 100644 (file)
@@ -1,2 +1,2 @@
 
-{{$phrase}}
+{{$phrase nofilter}}
index 1e2b99c22618b612fb4c739563e2d1d0de465d72..60cfe7df7453a60d3d4f58f79399310f602e705f 100644 (file)
@@ -1,7 +1,7 @@
 {{if count($reasons) > 1}}
 <ul class="content-filter-reasons">
        {{foreach $reasons as $reason}}
-       <li>{{$reason|escape:html}}</li>
+       <li>{{$reason}}</li>
        {{/foreach}}
 </ul>
 <p>
 </p>
 {{else}}
 <p>
-       {{$reasons.0|escape:html}}
+       {{$reasons.0}}
        <button type="button" id="content-filter-wrap-{{$rnd}}" class="btn btn-default btn-xs content-filter-button" onclick="openClose('content-filter-{{$rnd}}');">
                <i class="glyphicon glyphicon-eye-open"></i> {{$openclose}}
        </button>
 </p>
 {{/if}}
 <div id="content-filter-{{$rnd}}" class="content-filter-content" style="display: none;">
-       {{$html}}
+       {{$html nofilter}}
 </div>
index 6f54d024da47ad0354976fd262d9300b5f51e8c2..b3ed2af02686edd1472c40cf716d4102dbed0daf 100644 (file)
                <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
                        {{if $item.owner_url}}
                        <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape:'html'}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                               <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name|escape}}" /></a>
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+                               <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
                        </div>
-                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall|escape}}" /></div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
                        {{/if}}
                        <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}"
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape:'html'}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name|escape}}" /></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul>
-                        {{$item.item_photo_menu}}
+                        {{$item.item_photo_menu nofilter}}
                     </ul>
                 </div>
 
                        </div>
                        <div class="wall-item-photo-end"></div>
                        <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-                               {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock|escape}}" onclick="lockview(event,{{$item.id}});" /></div>
+                               {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
                                {{else}}<div class="wall-item-lock"></div>{{/if}}
-                               <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+                               <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location nofilter}}</div>
                        </div>
                </div>
                <div class="wall-item-author">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape:'html'}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape:'html'}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a> {{$item.vwall}}{{/if}}<br />
-                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime|escape:'html'}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
                </div>
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title|escape}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                        <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}<span>
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body nofilter}}<span>
                        <div class="body-tag">
                        {{if !$item.suppress_tags}}
                                {{foreach $item.tags as $tag}}
-                               <span class="tag">{{$tag}}</span>
+                               <span class="tag">{{$tag nofilter}}</span>
                                {{/foreach}}
                        {{/if}}
                        </div>
                        {{if $item.has_cats}}
-                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove|escape:'html'}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                        </div>
                        {{/if}}
 
                        {{if $item.has_folders}}
-                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove|escape:'html'}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                        </div>
                        {{/if}}
                        </div>
                <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
                        {{if $item.vote}}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-                               <a href="#" class="icon like{{if $item.responses.like.self}} active{{/if}}" title="{{$item.vote.like.0|escape:'html'}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-                               {{if $item.vote.dislike}}<a href="#" class="icon dislike{{if $item.responses.dislike.self}} active{{/if}}" title="{{$item.vote.dislike.0|escape:'html'}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
-                               {{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0|escape:'html'}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
-                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape:'html'}}" title="{{$item.wait|escape:'html'}}" style="display: none;" />
+                               <a href="#" class="icon like{{if $item.responses.like.self}} active{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+                               {{if $item.vote.dislike}}<a href="#" class="icon dislike{{if $item.responses.dislike.self}} active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
+                               {{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                        </div>
                        {{/if}}
                        {{if $item.plink}}
-                               <div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title|escape:'html'}}" target="_blank" class="icon remote-link{{$item.sparkle}} u-url"></a></div>
+                               <div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="_blank" class="icon remote-link{{$item.sparkle}} u-url"></a></div>
                        {{/if}}
                        {{if $item.edpost}}
-                               <a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape:'html'}}"></a>
+                               <a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
                        {{/if}}
 
                        {{if $item.star}}
-                       <a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle|escape:'html'}}"></a>
+                       <a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
                        {{/if}}
                        {{if $item.tagger}}
-                       <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add|escape:'html'}}"></a>
+                       <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
                        {{/if}}
                        {{if $item.filer}}
-                       <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer|escape:'html'}}"></a>
+                       <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
                        {{/if}}
                        {{if $item.isevent }}
                        <div class="wall-item-attend-wrapper">
-                               <a href="#" id="attendyes-{{$item.id}}" class="icon attendyes{{if $item.responses.attendyes.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendyes'); return false;" title="{{$item.attend.0|escape:'html'}}"></a>
-                               <a href="#" id="attendno-{{$item.id}}" class="icon attendno{{if $item.responses.attendno.self}} active{{/if}}"  onclick="dolike({{$item.id}},'attendno'); return false;" title="{{$item.attend.1|escape:'html'}}"></a>
-                               <a href="#" id="attendmaybe-{{$item.id}}"  class="icon attendmaybe{{if $item.responses.attendmaybe.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" title="{{$item.attend.2|escape:'html'}}"></a>
+                               <a href="#" id="attendyes-{{$item.id}}" class="icon attendyes{{if $item.responses.attendyes.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendyes'); return false;" title="{{$item.attend.0}}"></a>
+                               <a href="#" id="attendno-{{$item.id}}" class="icon attendno{{if $item.responses.attendno.self}} active{{/if}}"  onclick="dolike({{$item.id}},'attendno'); return false;" title="{{$item.attend.1}}"></a>
+                               <a href="#" id="attendmaybe-{{$item.id}}"  class="icon attendmaybe{{if $item.responses.attendmaybe.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" title="{{$item.attend.2}}"></a>
                        </div>
                        {{/if}}
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete|escape:'html'}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
                        </div>
-                               {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select|escape:'html'}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+                               {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
                        <div class="wall-item-delete-end"></div>
                </div>
        </div>
        <div class="wall-item-wrapper-end"></div>
        {{if $item.responses}}
                {{foreach $item.responses as $verb=>$response}}
-                       <div class="wall-item-{{$verb}} {{$item.indent}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                       <div class="wall-item-{{$verb}} {{$item.indent}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
                {{/foreach}}
        {{/if}}
                        {{if $item.threaded}}
                        {{if $item.comment}}
                        <div class="wall-item-comment-wrapper {{$item.indent}}" >
-                               {{$item.comment}}
+                               {{$item.comment nofilter}}
                        </div>
                        {{/if}}
                        {{/if}}
 
 {{if $item.flatten}}
 <div class="wall-item-comment-wrapper" >
-       {{$item.comment}}
+       {{$item.comment nofilter}}
 </div>
 {{/if}}
 </div>
index e6a6be908fb6d9d9c447ba70180ea37699ec435b..29f95fe4970e8e7fcaaa8b7ce3e2d18d0e8a36c0 100644 (file)
@@ -1,4 +1,4 @@
-
+<div class="generic-page-wrapper">
 
 <h3>{{$header}}</h3>
 
@@ -7,13 +7,13 @@
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post" >
 
-{{$parent}}
+{{$parent nofilter}}
 
 <div id="prvmail-to-label">{{$to}}</div>
 {{$recipname}}
 
 <div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt|escape:'html'}}" {{$readonly}} tabindex="11" />
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
 
 <div id="prvmail-message-label">{{$yourmessage}}</div>
 <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 <div id="prvmail-submit-wrapper" >
        <input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
        <div id="prvmail-link-wrapper" >
-               <div id="prvmail-link" class="icon border link" title="{{$insert|escape:'html'}}" onclick="jotGetLink();" ></div>
+               <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
        </div> 
        <div id="prvmail-rotator-wrapper" >
-               <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait|escape:'html'}}" title="{{$wait|escape:'html'}}" style="display: none;" />
+               <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
        </div> 
 </div>
 <div id="prvmail-end"></div>
 </form>
 </div>
+</div>
index da30967cd6ed6a55f616ea85a60d2e4f0454cb6f..32da71f816633b51fc3d08ad4bfa683238847714 100644 (file)
@@ -21,8 +21,8 @@ function showHideForumlist() {
                {{if $forum.id <= $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc|escape}}" class="label sparkle" target="_blank">
-                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc|escape}}" />
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
                        <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
@@ -31,8 +31,8 @@ function showHideForumlist() {
                {{if $forum.id > $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc|escape}}" class="label sparkle" target="_blank">
-                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc|escape}}" />
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
                        <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
index ff55f462f12649aeba346213302230ede911f751..6d102350cc26e6c1d687aaa6d9ec82933ba05b81 100644 (file)
@@ -15,7 +15,7 @@ $uid = Profile::getThemeUid();
 $s_colorset = Config::get('duepuntozero', 'colorset');
 $colorset = PConfig::get($uid, 'duepuntozero', 'colorset');
 
-if (!x($colorset)) {
+if (empty($colorset)) {
        $colorset = $s_colorset;
 }
 
index fcab9dbdeae0f8f5836dc0bb8c41058ba724cfcf..aac7aaeb24ada5407d232207bc3d7912e23ea9e2 100644 (file)
@@ -65,7 +65,7 @@
        {{if $nav.manage}}<a id="nav-manage-link" class="nav-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
        </span>
        <span id="nav-end"></span>
-       <span id="banner">{{$banner}}</span>
+       <span id="banner">{{$banner nofilter}}</span>
 </nav>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
index 31afc71fea646d9c34ac0e96eee766384a201a57..a7d0a0bc5adc13443c4fbc8d98782493385733d2 100644 (file)
@@ -1,16 +1,16 @@
 
 <div class="vcard h-card">
 
-       <div class="fn label p-name">{{$profile.name|escape}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
        
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
        
        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}"></div>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 
-       {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
+       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
 
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
@@ -56,6 +56,6 @@
        </div>
 </div>
 
-{{$contact_block}}
+{{$contact_block nofilter}}
 
 
index 093e5239ff6c8c066b373137caf61171d7fc5a62..3f658ef8115ffa65af3d90124a00c5c2373af1ac 100644 (file)
@@ -5,7 +5,7 @@
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
-{{$parent}}
+{{$parent nofilter}}
 
 <div id="prvmail-to-label">{{$to}}</div>
 
@@ -13,7 +13,7 @@
 <input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
 <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
 {{else}}
-{{$select}}
+{{$select nofilter}}
 {{/if}}
 
 <div id="prvmail-subject-label">{{$subject}}</div>
index 3f290becf49d40baa10dac112fc0ebd2e15bae35..e4de79c40a764d3a30734decd1bb83c5b9d6bd70 100644 (file)
@@ -392,7 +392,7 @@ class Color {
             $hsl['L'] = ($hsl['L'] < 0) ? 0:$hsl['L']/100;
         } else {
             // We need to find out how much to darken
-            $hsl['L'] = $hsl['L']/2 ;
+            $hsl['L'] = $hsl['L']/2;
         }
 
         return $hsl;
index 24c722e8e3f51347215e696f11c091d82c79b12b..ce7fd4d777ef39539aee13839b1041a79348fcac 100644 (file)
@@ -36,7 +36,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                // if the page is an standard page (so we don't have it twice for modals)
                //
                /// @todo Think about to move js stuff in the footer
-               if (!$minimal && x($page, 'htmlhead')) {
+               if (!$minimal && !empty($page['htmlhead'])) {
                        echo $page['htmlhead'];
                }
 
@@ -67,7 +67,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
        <body id="top" class="mod-<?php echo $a->module . " " . $is_singleuser_class . " " . $view_mode_class;?>">
                <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
 <?php
-       if (x($page, 'nav') && !$minimal) {
+       if (!empty($page['nav']) && !$minimal) {
                echo str_replace(
                        "~config.sitename~",
                        Config::get('config', 'sitename'),
@@ -83,7 +83,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
        if ($minimal) {
 ?>
                <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important; display:block!important;">
-                       <?php if (x($page, 'content')) echo $page['content']; ?>
+                       <?php if (!empty($page['content'])) echo $page['content']; ?>
                        <div id="page-footer"></div>
                </section>
 <?php
@@ -94,15 +94,15 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                        <div class="container">
                                <div class="row">
 <?php
-                               if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != $basepath)) {
+                               if ((empty($_REQUEST['pagename']) || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != $basepath)) {
                                        echo '
                                        <aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';
 
-                                               if (x($page, 'aside')) {
+                                               if (!empty($page['aside'])) {
                                                        echo $page['aside'];
                                                }
 
-                                               if (x($page, 'right_aside')) {
+                                               if (!empty($page['right_aside'])) {
                                                        echo $page['right_aside'];
                                                }
 
@@ -113,7 +113,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                                                <section class="sectiontop ';
                                                        echo $a->argv[0];
                                                        echo '-content-wrapper">';
-                                                       if (x($page, 'content')) {
+                                                       if (!empty($page['content'])) {
                                                                echo $page['content'];
                                                        }
                                                        echo '
@@ -124,7 +124,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                                } else {
                                        echo '
                                        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
-                                               if (x($page, 'content')) {
+                                               if (!empty($page['content'])) {
                                                        echo $page['content'];
                                                }
                                                echo '
index 3f8ed1ed0b0e87a857aff5e56c84781768d8bbff..dcb87b6d27f160687dfd5f268f9a8c69ab0ee8f6 100644 (file)
@@ -22,7 +22,7 @@ function load_page(App $a)
                require 'view/theme/frio/none.php';
        } else {
                $template = 'view/theme/' . $a->getCurrentTheme() . '/'
-                       . ((x($a->page, 'template')) ? $a->page['template'] : 'default' ) . '.php';
+                       . defaults($a->page, 'template', 'default' ) . '.php';
                if (file_exists($template)) {
                        require_once $template;
                } else {
index 64c4544cd877b1c7df4337fe394c94e54f95247e..71b5028a453b209549f4b1a74847611a8778542d 100644 (file)
@@ -7,20 +7,20 @@
 <!DOCTYPE html >
 <html>
 <head>
-       <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+       <title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
        <meta name="viewport" content="initial-scale=1.0">
        <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
        <script type="text/javascript">var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
        <script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script>
        <?php $baseurl = Friendica\Core\System::baseUrl(); ?>
        <?php $frio = "view/theme/frio"; ?>
-       <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
+       <?php if(!empty($page['htmlhead'])) echo $page['htmlhead']; ?>
 </head>
 <body id="top">
 <?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
 <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
 <?php
-       if(x($page,'nav')) {
+       if(!empty($page['nav'])) {
        echo    str_replace("~config.sitename~",Friendica\Core\Config::get('config','sitename'),
                        str_replace("~system.banner~",Friendica\Core\Config::get('system','banner'),
                        $page['nav']
@@ -33,8 +33,8 @@
 <?php
                                        echo"
                                        <aside class=\"col-lg-3 col-md-3 hidden-sm hidden-xs\">
-                                               "; if(x($page,'aside')) echo $page['aside']; echo"
-                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
+                                               "; if(!empty($page['aside'])) echo $page['aside']; echo"
+                                               "; if(!empty($page['right_aside'])) echo $page['right_aside']; echo"
                                                "; include('includes/photo_side.php'); echo"
                                        </aside>
 
@@ -42,7 +42,7 @@
                                                <section class=\"sectiontop\">
                                                                <div class=\"panel "; echo $a->argv[0]; echo "-content-wrapper\">
                                                                        <div class=\"panel-body\">";
-                                                                               if(x($page,'content')) echo $page['content']; echo"
+                                                                               if(!empty($page['content'])) echo $page['content']; echo"
                                                                                <div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
                                                                        </div>
                                                                </div>
index e0f65960f6886e620feafd8a4aad89c019daec15..7570ae0e5774b13ba52de1b78f39921ffea624ef 100644 (file)
@@ -63,7 +63,7 @@ if ($a->module !== 'install') {
 // Setting $scheme to '' wasn't working for some reason, so we'll check it's
 // not --- like the mobile theme does instead.
 // Allow layouts to over-ride the scheme.
-if (x($_REQUEST, 'scheme')) {
+if (!empty($_REQUEST['scheme'])) {
        $scheme = $_REQUEST['scheme'];
 }
 
index 9ccd5326c18358231a53071991fe094608422808..6a9e38eb37168bef2023537fb6839e8992991240 100644 (file)
 <hr style="clear:both"/>
 <div class="form-group">
        <label for="profile-jot-email" id="profile-jot-email-label">{{$emailcc}}</label>
-       <input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle|escape:'html'}}" />
+       <input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle}}" />
 </div>
 <div id="profile-jot-email-end"></div>
 
 {{if $jotnets}}
-{{$jotnets}}
+{{$jotnets nofilter}}
 {{/if}}{{/if}}
 
 <script type="text/javascript">
@@ -33,7 +33,7 @@ $(document).ready(function() {
        if(typeof acl=="undefined"){
                acl = new ACL(
                        baseurl+"/acl",
-                       [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ],
+                       [ {{$allowcid nofilter}},{{$allowgid nofilter}},{{$denycid nofilter}},{{$denygid nofilter}} ],
                        {{$features.aclautomention}},
                        {{if $APP->is_mobile}}true{{else}}false{{/if}}
                );
index 38efb62bd464944c41e87277bf4dda2f06360690..fa598f4679d0f4f3912b9b27252c45d3a76bc16a 100644 (file)
@@ -12,9 +12,9 @@
                        <li class="addon {{$p.1}}">
                                <span class="offset-anchor" id="{{$p.0}}"></span>
                                <a class='toggleaddon' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}#{{$p.0}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
-                               <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name|escape}}</span></a> - <span class="version">{{$p.2.version}}</span>
+                               <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
                                {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
-                               <div class='desc'>{{$p.2.description}}</div>
+                               <div class='desc'>{{$p.2.description nofilter}}</div>
                        </li>
                {{/foreach}}
                </ul>
index 3ac9a25173e864634f4b3bd35f9a8a8e3ca72b97..7d187aac8e178586444b74876f7f66ab4f836cf6 100644 (file)
@@ -3,7 +3,7 @@
 
 <div id="admin-contactblock" class="adminpage generic-page-wrapper">
        <h1>{{$title}} - {{$page}}</h1>
-       <p>{{$description}}</p>
+       <p>{{$description nofilter}}</p>
 
        {{* We organize the settings in collapsable panel-groups *}}
        <div class="panel-group panel-group-settings" id="admin-settings" role="tablist" aria-multiselectable="true">
@@ -24,7 +24,7 @@
                                        {{include file="field_input.tpl" field=$contacturl}}
 
                                        <div class="admin-settings-submit-wrapper form-group pull-right">
-                                               <button type="submit" class="btn btn-primary" name="page_contactblock_block" value="1">{{$submit|escape:'html'}}</button>
+                                               <button type="submit" class="btn btn-primary" name="page_contactblock_block" value="1">{{$submit}}</button>
                                        </div>
                                        <div class="clear"></div>
                                </form>
@@ -67,9 +67,9 @@
                                                                                        <label for="id_contact_{{$contact.id}}"></label>
                                                                                </div>
                                                                        </td>
-                                                                       <td><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname|escape}}" title="{{$contact.addr|escape}}"></td>
-                                                                       <td class="name">{{$contact.name|escape}}</td>
-                                                                       <td class="addr" colspan="3"><a href="{{$contact.url}}" title="{{$contact.addr|escape}}" >{{$contact.url|escape}}</a></td>
+                                                                       <td><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname}}" title="{{$contact.addr}}"></td>
+                                                                       <td class="name">{{$contact.name}}</td>
+                                                                       <td class="addr" colspan="3"><a href="{{$contact.url}}" title="{{$contact.addr}}" >{{$contact.url}}</a></td>
                                                                </tr>
                                                        {{/foreach}}
                                                </tbody>
                                                                <td>
                                                                        {{* Checkbox to select all blocked contacts *}}
                                                                        <div class="checkbox">
-                                                                               <input type="checkbox" id="contactblock-select" class="selecttoggle contacts_ckbx" data-select-class="contacts_ckbx" data-select-all="{{$select_all}}" data-select-none="{{$select_none}}" title="{{$select_all|escape}}"/>
+                                                                               <input type="checkbox" id="contactblock-select" class="selecttoggle contacts_ckbx" data-select-class="contacts_ckbx" data-select-all="{{$select_all}}" data-select-none="{{$select_none}}" title="{{$select_all}}"/>
                                                                                <label for="contactblock-select"></label>
                                                                        </div>
                                                                </td>
                                                                <td colspan="5">
                                                                        {{$total_contacts}}
                                                                        <div class="admin-settings-submit-wrapper form-group pull-right">
-                                                                               <button type="submit" class="btn btn-small btn-default pull-right" name="page_contactblock_unblock" value="1">{{$unblock|escape:'html'}}</button>
+                                                                               <button type="submit" class="btn btn-small btn-default pull-right" name="page_contactblock_unblock" value="1">{{$unblock}}</button>
                                                                        </div>
                                                                        <div class="clear"></div>
                                                                </td>
                                                </tfoot>
                                        </table>
 
-                                       {{$paginate}}
+                                       {{$paginate nofilter}}
 
                                        {{else}}
-                                       <p>{{$no_data|escape:'html'}}</p>
+                                       <p>{{$no_data}}</p>
                                        {{/if}}
                                </form>
                        </div>
index 3ebe89052e243545bfe2e6eedac37ca72b0a6902..dde38639991636fe3fbcdf427e8f0e4551260bc9 100644 (file)
                </tr>
                {{foreach $entries as $e}}
                <tr>
-                       <td>{{$e.id|escape}}</td>
-                       <td>{{$e.name|escape}}</td>
-                       <td><a href="{{$e.nurl}}">{{$e.nurl|escape}}</a></td>
-                       <td>{{$e.network|escape}}</td>
-                       <td>{{$e.created|escape}}</td>
-                       <td>{{$e.last|escape}}</td>
+                       <td>{{$e.id}}</td>
+                       <td>{{$e.name}}</td>
+                       <td><a href="{{$e.nurl}}">{{$e.nurl}}</a></td>
+                       <td>{{$e.network}}</td>
+                       <td>{{$e.created}}</td>
+                       <td>{{$e.last}}</td>
                </tr>
                {{/foreach}}
        </table>
index 77ae1d532b9eba6803e6f4bdab83cb79ef2e7202..7228b9022bd878ea3bdd78d6f9fa119d25fef434 100644 (file)
@@ -54,7 +54,7 @@
 <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css" type="text/css" media="screen"/>
 
 <div id='adminpage' class="adminpage generic-page-wrapper">
-       <h1>{{$title|escape}} - {{$page}}</h1>
+       <h1>{{$title}} - {{$page}}</h1>
        <form action="{{$baseurl}}/admin/site" method="post">
                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
                <input type='hidden' name='active_panel' value=''>
@@ -88,7 +88,7 @@
                                        {{include file="field_checkbox.tpl" field=$hide_help}}
                                        {{include file="field_select.tpl" field=$singleuser}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_checkbox.tpl" field=$no_openid}}
                                        {{include file="field_checkbox.tpl" field=$no_regfullname}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_input.tpl" field=$maximagelength}}
                                        {{include file="field_input.tpl" field=$jpegimagequality}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_checkbox.tpl" field=$dfrn_only}}
                                        {{include file="field_input.tpl" field=$global_directory}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish|escape:'html'}}"/>
+                                               <input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/>
                                        </div>
                                        {{include file="field_checkbox.tpl" field=$newuser_private}}
                                        {{include file="field_checkbox.tpl" field=$enotify_no_content}}
                                        {{include file="field_checkbox.tpl" field=$explicit_content}}
 
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_checkbox.tpl" field=$nodeinfo}}
                                        {{include file="field_select.tpl" field=$check_new_version_url}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_select.tpl" field=$poco_discovery_since}}
                                        {{include file="field_checkbox.tpl" field=$poco_local_search}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_input.tpl" field=$dbclean_unclaimed}}
                                        {{include file="field_input.tpl" field=$dbclean_expire_conv}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                <div class="section-subtitle-wrapper" role="tab" id="admin-settings-worker">
                                        <h4>
                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-worker-collapse" aria-expanded="false" aria-controls="admin-settings-worker-collapse">
-                                                       {{$worker_title|escape}}
+                                                       {{$worker_title}}
                                                </a>
                                        </h4>
                                </div>
                                        {{include file="field_checkbox.tpl" field=$worker_fastlane}}
                                        {{include file="field_checkbox.tpl" field=$worker_frontend}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                <div class="section-subtitle-wrapper" role="tab" id="admin-relay-corporate">
                                        <h4>
                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relay-collapse" aria-expanded="false" aria-controls="admin-settings-relay-collapse">
-                                                       {{$relay_title|escape}}
+                                                       {{$relay_title}}
                                                </a>
                                        </h4>
                                </div>
                                        {{include file="field_input.tpl" field=$relay_server_tags}}
                                        {{include file="field_checkbox.tpl" field=$relay_user_tags}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                        <form action="{{$baseurl}}/admin/site" method="post">
                                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
                                {{include file="field_input.tpl" field=$relocate_url}}
-                               <input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
+                               <input type="hidden" name="page_site" value="{{$submit}}">
                                <input type='hidden' name='active_panel' value='admin-settings-relocate-collapse'>
                                <div class="panel-footer">
-                                       <input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}"/>
+                                       <input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button}}"/>
                                </div>
                        </form>
                </div>
index 564a6607918c38c3fae2e0bc0465b4d10540646c..388c281f58702700ee232c90ace4a049aae4fb4a 100644 (file)
                {{* The Friendica version. *}}
                <div id="admin-summary-version" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 admin-summary">
                        <hr class="admin-summary-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$version.0|escape}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">{{$platform}} '{{$codename|escape}}' {{$version.1|escape}} - {{$build|escape}}</div>
+                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$version.0}}</div>
+                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">{{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</div>
                </div>
 
                {{* Server Settings. *}}
                <div id="admin-summary-php" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 admin-summary">
                        <hr class="admin-summary-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$serversettings.label|escape}}</div>
+                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$serversettings.label}}</div>
                        <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">
                                <table class="table">
                                <tbody>
index 031ffd0a474ed20f8ea82e206ddc0e630a8a313d..92ef9be6fa4c7115f43f2d3ea5021c7da01e7a92 100644 (file)
                                                                        </div>
                                                                </td>
                                                                <td>{{$u.created}}</td>
-                                                               <td>{{$u.name|escape}}</td>
+                                                               <td>{{$u.name}}</td>
                                                                <td>{{$u.email}}</td>
                                                                <td>
-                                                                       <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="admin-settings-action-link" title="{{$approve|escape}}"><i class="fa fa-check" aria-hidden="true"></i></a>
-                                                                       <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="admin-settings-action-link" title="{{$deny|escape}}"><i class="fa fa-trash-o" aria-hidden="true"></i></a>
+                                                                       <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="admin-settings-action-link" title="{{$approve}}"><i class="fa fa-check" aria-hidden="true"></i></a>
+                                                                       <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="admin-settings-action-link" title="{{$deny}}"><i class="fa fa-trash-o" aria-hidden="true"></i></a>
                                                                </td>
                                                        </tr>
                                                        {{if $u.note}}
                                                                &nbsp;
                                                                {{/if}}
                                                                </td>
-                                                               <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname|escape}}"></td>
-                                                               <td><a href="{{$u.url}}" title="{{$u.nickname|escape}}"> {{$u.name|escape}}</a></td>
+                                                               <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
+                                                               <td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
                                                                <td>{{$u.email}}</td>
                                                                {{if $order_users == $th_users.2.1}}
                                                                <td>{{$u.register_date}}</td>
                                                                                {{if $u.page_flags_raw==3}}fa-heart{{/if}}              {{* PAGE_FREELOVE *}}
                                                                                {{if $u.page_flags_raw==4}}fa-rss{{/if}}                {{* PAGE_BLOG *}}
                                                                                {{if $u.page_flags_raw==5}}fa-user-secret{{/if}}        {{* PAGE_PRVGROUP *}}
-                                                                               " title="{{$u.page_flags|escape}}">
+                                                                               " title="{{$u.page_flags}}">
                                                                        </i>
                                                                        {{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}
                                                                        <i class="fa
                                                                                {{if $u.account_type_raw==1}}fa-sitemap{{/if}}          {{* ACCOUNT_TYPE_ORGANISATION *}}
                                                                                {{if $u.account_type_raw==2}}fa-newspaper-o{{/if}}      {{* ACCOUNT_TYPE_NEWS *}}
                                                                                {{if $u.account_type_raw==3}}fa-comments{{/if}}         {{* ACCOUNT_TYPE_COMMUNITY *}}
-                                                                               " title="{{$u.account_type|escape}}">
+                                                                               " title="{{$u.account_type}}">
                                                                        </i>
                                                                        {{/if}}
-                                                                       {{if $u.is_admin}}<i class="fa fa-user-md text-primary" title="{{$siteadmin|escape}}"></i>{{/if}}
-                                                                       {{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired|escape}}"></i>{{/if}}
+                                                                       {{if $u.is_admin}}<i class="fa fa-user-md text-primary" title="{{$siteadmin}}"></i>{{/if}}
+                                                                       {{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
                                                                </td>
                                                                {{/if}}
 
                                                                                <i class="fa fa-circle-o" aria-hidden="true"></i>
                                                                                {{/if}}
                                                                        </a>
-                                                                       <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete|escape}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name|escape}}')">
+                                                                       <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
                                                                                <i class="fa fa-trash" aria-hidden="true"></i>
                                                                        </a>
                                                                        {{else}}
                                                <tbody>
                                                {{foreach $deleted as $u}}
                                                        <tr>
-                                                               <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname|escape}}"></td>
-                                                               <td><a href="{{$u.url}}" title="{{$u.nickname|escape}}" >{{$u.name|escape}}</a></td>
+                                                               <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
+                                                               <td><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
                                                                <td>{{$u.email}}</td>
                                                                <td>{{$u.deleted}}</td>
                                                        </tr>
index f4a60b7d038716e5933959ae5f2039b6d78a7067..0b58d520d8b305f333a18cbd3bab072b69911dfe 100644 (file)
@@ -2,12 +2,12 @@
        <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
                <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
                <div class="pull-left photo-album-edit-name">
-                       <input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name">
+                       <input class="form-control" type="text" size="64" name="albumname" value="{{$album}}" id="photo-album-edit-name">
                </div>
 
                <div class="pull-right">
-                       <input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-                       <input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
+                       <input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+                       <input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
                </div>
        </form>
        <div class="clear"></div>
diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl
new file mode 100644 (file)
index 0000000..9c737cf
--- /dev/null
@@ -0,0 +1,62 @@
+<div class="generic-page-wrapper">
+<h1>{{$header}}</h1>
+
+{{if $myaddr == ""}}
+<p id="dfrn-request-intro">
+{{$page_desc}}<br />
+<ul id="dfrn-request-networks">
+<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
+<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
+<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
+</ul>
+</p>
+<p>
+{{$invite_desc}}
+</p>
+<p>
+{{$desc}}
+</p>
+{{/if}}
+
+{{if $request}}
+<form action="{{$request}}" method="post" />
+{{else}}
+<form action="dfrn_request/{{$nickname}}" method="post" />
+{{/if}}
+
+{{if $photo}}
+<img src="{{$photo}}" alt="" id="dfrn-request-photo">
+{{/if}}
+
+{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
+{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
+{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
+{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+
+<div id="dfrn-request-url-wrapper" >
+       <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
+        {{if $myaddr}}
+                {{$myaddr}}
+                <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr|escape:'html'}}" />
+        {{else}}
+        <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+        {{/if}}
+        {{if $url}}
+                <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+        {{/if}}
+       <div id="dfrn-request-url-end"></div>
+</div>
+
+
+<div id="dfrn-request-info-wrapper" >
+
+</div>
+
+       <div id="dfrn-request-submit-wrapper">
+               {{if $submit}}
+                       <input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+               {{/if}}
+               <input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+       </div>
+</form>
+</div>
\ No newline at end of file
index 804d07ac01476ced53f302cecaafe2db4e1fb203..4ef5f2caa1114d589ffa07798a63fdb616d83244 100644 (file)
                        {{/if}}
                        <ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
                                <li>
-                                       <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg|escape}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
+                                       <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
                                                <i class="fa fa-picture-o"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl|escape}}" onclick="insertFormatting('url',{{$id}});">
+                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
                                                <i class="fa fa-link"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach|escape}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
+                                       <button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
                                                <i class="fa fa-paperclip"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline|escape}}" onclick="insertFormatting('u',{{$id}});">
+                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
                                                <i class="fa fa-underline"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic|escape}}" onclick="insertFormatting('i',{{$id}});">
+                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
                                                <i class="fa fa-italic"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold|escape}}" onclick="insertFormatting('b',{{$id}});">
+                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
                                                <i class="fa fa-bold"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote|escape}}" onclick="insertFormatting('quote',{{$id}});">
+                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
                                                <i class="fa fa-quote-left"></i>
                                        </button>
                                </li>
index 207ffefcb94424a609ac72295ffc1cda365078aa..76c6db039820712b43d5b72c1356429a8063a554 100644 (file)
@@ -6,7 +6,7 @@
                <li>
                        <ul class="tabs  flex-nav" role="menu" >
                        {{foreach $tabs as $tab}}
-                               <li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}"{{/if}} {{if $tab.title}} title="{{$tab.title|escape}}"{{/if}}>{{$tab.label}}</a></li>
+                               <li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}"{{/if}} {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
                        {{/foreach}}
                        </ul>
                </li>
@@ -31,7 +31,7 @@
                        <ul class="tabs" role="menu">
                                {{foreach $tabs as $tab}}
                                        {{if $tab.sel}}
-                                       <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title|escape}}"{{/if}}>{{$tab.label}}</a></li>
+                                       <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
                                        {{else}}
                                        {{$exttabs[]=$tab}}
                                        {{/if}}
@@ -50,7 +50,7 @@
                                        </button>
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
                                                {{foreach $exttabs as $tab}}
-                                               <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title|escape}}"{{/if}}>{{$tab.label}}</a></li>
+                                               <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
                                                {{/foreach}}
                                        </ul>
                                </li>
index d0de608319a9bb27e079bfbdb7f21ea40296060e..62611593c80dcc4fd1cb522e85dd3e5cdbd21813 100644 (file)
@@ -3,12 +3,12 @@
 
        <div id="confirm-message">{{$message}}</div>
        {{foreach $extra_inputs as $input}}
-       <input type="hidden" name="{{$input.name}}" value="{{$input.value|escape:'html'}}" />
+       <input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
        {{/foreach}}
 
        <div class="form-group pull-right settings-submit-wrapper" >
-               <button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm|escape:'html'}}">{{$confirm|escape:'html'}}</button>
-               <button type="submit" name="canceled" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel|escape:'html'}}</button>
+               <button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm}}">{{$confirm}}</button>
+               <button type="submit" name="canceled" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel}}</button>
        </div>
 
 </form>
index 45b582a6ffe71c0bb1250973b45e97767bde0c6b..0ae647979071a4f463965bb42d1d5c7dd0907c52 100644 (file)
@@ -10,7 +10,7 @@
 
        <div class='contact-block-content'>
                {{foreach $micropro as $m}}
-                       {{$m}}
+                       {{$m nofilter}}
                {{/foreach}}
        </div>
        {{/if}}
index e7d90ca2861ff69530ba16256a4411ddc0b31e6b..fd5f1c0f1c1b41bc76965b416c9ed52a4b8883ac 100644 (file)
@@ -1,11 +1,11 @@
 
 <div class="generic-page-wrapper">
-       {{if $header}}<h3>{{$header|escape}}:&nbsp;{{$name|escape}}{{if $account_type}}&nbsp;<small>({{$account_type|escape}})</small>{{/if}}</h3>{{/if}}
+       {{if $header}}<h3>{{$header}}:&nbsp;{{$name}}{{if $account_type}}&nbsp;<small>({{$account_type}})</small>{{/if}}</h3>{{/if}}
 
        <div id="contact-edit-wrapper" >
 
                {{* Insert Tab-Nav *}}
-               {{$tab_str}}
+               {{$tab_str nofilter}}
 
 
                <div id="contact-edit-content-wrapper">
                                                </button>
 
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu" >
-                                                       {{if $lblsuggest}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title|escape}}">{{$contact_actions.suggest.label|escape}}</a></li>{{/if}}
-                                                       {{if $poll_enabled}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title|escape}}">{{$contact_actions.update.label|escape}}</a></li>{{/if}}
+                                                       {{if $lblsuggest}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
+                                                       {{if $poll_enabled}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
                                                        {{if $lblsuggest || $poll_enabled}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{/if}}
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title|escape}}">{{$contact_actions.block.label|escape}}</a></li>
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title|escape}}">{{$contact_actions.ignore.label|escape}}</a></li>
-                                                       {{if $contact_actions.archive.url}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title|escape}}">{{$contact_actions.archive.label|escape}}</a></li>{{/if}}
-                                                       {{if $contact_actions.delete.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title|escape}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label|escape}}</button></li>{{/if}}
+                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
+                                                       {{if $contact_actions.archive.url}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>{{/if}}
+                                                       {{if $contact_actions.delete.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>{{/if}}
                                                </ul>
                                        </li>
                                </ul>
 
 
                                <div id="contact-edit-status-wrapper">
-                                       <span id="contact-edit-contact-status">{{$contact_status|escape}}</span>
+                                       <span id="contact-edit-contact-status">{{$contact_status}}</span>
 
                                        {{* Block with status information about the contact *}}
                                        <ul>
-                                               {{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text|escape}}</div></li>{{/if}}
-                                               {{if $nettype}}<li><div id="contact-edit-nettype">{{$nettype|escape}}</div></li>{{/if}}
+                                               {{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}}
+                                               {{if $nettype}}<li><div id="contact-edit-nettype">{{$nettype}}</div></li>{{/if}}
 
                                                {{if $poll_enabled}}
-                                                       <li><div id="contact-edit-last-update-text">{{$lastupdtext|escape}} <span id="contact-edit-last-updated">{{$last_update|escape}}</span></div>
+                                                       <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
-                                                               <form id="contact-edit-poll-form" action="/contact/{{$contact_id}}" method="post"> 
-                                                                       <span id="contact-edit-poll-text">{{$updpub|escape}}</span> {{$poll_interval}}
-                                                                       <input class="btn btn-primary" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-                                                               </form>
+                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
+                                                               <input class="btn btn-primary" type="submit" name="submit" value="{{$submit}}" />
                                                        {{/if}}
                                                        </li>
                                                {{/if}}
 
-                                               {{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact|escape}}</div></li>{{/if}}
-                                               {{if $insecure}}<li><div id="insecure-message">{{$insecure|escape}}</div></li>  {{/if}}
-                                               {{if $blocked && !$pending}}<li><div id="block-message">{{$blocked|escape}}</div></li>{{/if}}
-                                               {{if $pending}}<li><div id="pending-message">{{$pending|escape}}</div></li>{{/if}}
-                                               {{if $ignored}}<li><div id="ignore-message">{{$ignored|escape}}</div></li>{{/if}}
-                                               {{if $archived}}<li><div id="archive-message">{{$archived|escape}}</div></li>{{/if}}
+                                               {{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
+                                               {{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li> {{/if}}
+                                               {{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+                                               {{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
+                                               {{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
+                                               {{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
                                        </ul>
 
                                        <ul>
-                                               <!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent|escape}}</a></li> -->
-                                               {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text|escape}}</a></div></li>{{/if}}
+                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
+                                               {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
                                        </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}
 
                                                <div id="contact-edit-profile-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="contact-edit-profile">
                                                        <div class="section-content-tools-wrapper">
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$profileurllabel|escape}}</div><a target="blank" href="{{$url}}">{{$profileurl|escape}}</a>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$profileurllabel}}</div><a target="blank" href="{{$url}}">{{$profileurl}}</a>
                                                                </div>
 
                                                                {{if $location}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$location_label|escape}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$location|escape}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$location_label}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$location}}</div>
                                                                </div>
                                                                {{/if}}
 
                                                                {{if $xmpp}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$xmpp_label|escape}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$xmpp|escape}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$xmpp_label}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$xmpp}}</div>
                                                                </div>
                                                                {{/if}}
 
                                                                {{if $keywords}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$keywords_label|escape}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$keywords|escape}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$keywords_label}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$keywords}}</div>
                                                                </div>
                                                                {{/if}}
 
                                                                {{if $about}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$about_label|escape}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$about|escape}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$about_label}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$about nofilter}}</div>
                                                                </div>
                                                                {{/if}}
                                                        </div>
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-settings">
                                                        <h4>
                                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#contact-edit-tools" href="#contact-edit-settings-collapse" aria-expanded="false" aria-controls="contact-edit-settings-collapse">
-                                                                       {{$contact_settings_label|escape}}
+                                                                       {{$contact_settings_label}}
                                                                </a>
                                                        </h4>
                                                </div>
                                                <div id="contact-edit-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="contact-edit-settings">
                                                        <div class="section-content-tools-wrapper">
 
-                                                               <input type="hidden" name="contact_id" value="{{$contact_id|escape}}">
+                                                               <input type="hidden" name="contact_id" value="{{$contact_id}}">
 
                                                                {{include file="field_checkbox.tpl" field=$notify}}
                                                                {{if $fetch_further_information}}
                                                                {{include file="field_checkbox.tpl" field=$hidden}}
 
                                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit|escape}}</button>
+                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
                                                        </div>
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-info">
                                                        <h4>
                                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#contact-edit-tools" href="#contact-edit-info-collapse" aria-expanded="false" aria-controls="contact-edit-info-collapse">
-                                                                       {{$lbl_info1|escape}}
+                                                                       {{$lbl_info1}}
                                                                </a>
                                                        </h4>
                                                </div>
                                                                {{include file="field_textarea.tpl" field=$cinfo}}
 
                                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit|escape}}</button>
+                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
                                                                {{if $reason}}
-                                                               <h4>{{$lbl_info2|escape}}</h4>
+                                                               <h4>{{$lbl_info2}}</h4>
                                                                <p>{{$reason}}</p>
                                                                <div class="clear"></div>
                                                                {{/if}}
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-profile-select">
                                                        <h4>
                                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#contact-edit-tools" href="#contact-edit-profile-select-collapse" aria-expanded="false" aria-controls="contact-edit-profile-select-collapse">
-                                                                       {{$lbl_vis1|escape}}
+                                                                       {{$lbl_vis1}}
                                                                </a>
                                                        </h4>
                                                </div>
                                                        <div class="section-content-tools-wrapper">
                                                                {{if $profile_select}}
                                                                        <div id="contact-edit-profile-select-text">
-                                                                               <p>{{$lbl_vis2|escape}}</p>
+                                                                               <p>{{$lbl_vis2}}</p>
                                                                        </div>
                                                                        <div class="form-group">
                                                                        {{$profile_select}}
                                                                {{/if}}
 
                                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit|escape}}</button>
+                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
                                                        </div>
index 604f8d7e5dce1063969879687c24f58fd7955133..e7af64c68c73633cdf762c8e6ae78242419b1f5c 100644 (file)
@@ -6,14 +6,14 @@
                        <div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}">
 
                                <div class="contact-photo-image-wrapper hidden-xs">
-                                       <img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" />
+                                       <img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
                                </div>
 
                                {{* For very small displays we use a dropdown menu for contact relating actions *}}
                                <button type="button" class="btn btn-link dropdown-toggle visible-xs" id="contact-photo-menu-button-{{$contact.id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                        {{* use a smaller picture on very small displays (e.g. mobiles) *}}
                                        <div class="contact-photo-image-wrapper visible-xs">
-                                               <img class="contact-photo-xs media-object" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" />
+                                               <img class="contact-photo-xs media-object" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
 
                                                {{* Overlay background on hover the avatar picture *}}
                                                <div class="contact-photo-overlay">
                        {{* The contact actions like private mail, delete contact, edit contact and so on *}}
                        <div class="contact-actions pull-right nav-pills preferences hidden-xs">
                                {{if $contact.photo_menu.pm}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0|escape}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}">
                                        <i class="fa fa-envelope" aria-hidden="true"></i>
                                </button>
                                {{/if}}
                                {{if $contact.photo_menu.poke}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0|escape}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}">
                                        <i class="fa fa-heartbeat" aria-hidden="true"></i>
                                </button>
                                {{/if}}
                                {{if $contact.photo_menu.network}}
-                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0|escape}}">
+                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}">
                                        <i class="fa fa-cloud" aria-hidden="true"></i>
                                </a>
                                {{/if}}
                                {{if $contact.photo_menu.edit}}
-                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0|escape}}">
+                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}">
                                        <i class="fa fa-user" aria-hidden="true"></i>
                                </a>
                                {{/if}}
                                {{if $contact.photo_menu.drop}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0|escape}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}">
                                        <i class="fa fa-user-times" aria-hidden="true"></i>
                                </button>
                                {{/if}}
                                {{if $contact.photo_menu.follow}}
-                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0|escape}}">
+                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}">
                                        <i class="fa fa-user-plus" aria-hidden="true"></i>
                                </a>
                                {{/if}}
                                {{if $contact.photo_menu.hide}}
-                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0|escape}}">
+                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}">
                                        <i class="fa fa-times" aria-hidden="true"></i>
                                </a>
                                {{/if}}
@@ -84,7 +84,7 @@
                        {{* The button to add or remove contacts from a contact group - group edit page *}}
                        {{if $contact.change_member}}
                        <div class="contact-group-actions pull-right nav-pills preferences">
-                               <button type="button" class="contact-action-link contact-group-link btn-link" onclick="groupChangeMember({{$contact.change_member.gid}},{{$contact.change_member.cid}},'{{$contact.change_member.sec_token}}'); return true;" data-toggle="tooltip" title="{{$contact.change_member.title|escape}}">
+                               <button type="button" class="contact-action-link contact-group-link btn-link" onclick="groupChangeMember({{$contact.change_member.gid}},{{$contact.change_member.cid}},'{{$contact.change_member.sec_token}}'); return true;" data-toggle="tooltip" title="{{$contact.change_member.title}}">
                                        {{if $contact.label == "members"}}
                                        <i class="fa fa-times-circle" aria-hidden="true"></i>
                                        {{elseif $contact.label == "contacts"}}
@@ -97,7 +97,7 @@
                        {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
                        <div class="contact-entry-desc">
                                <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
-                                       <h4 class="media-heading"><a href="{{$contact.url}}">{{$contact.name|escape}}</a>
+                                       <h4 class="media-heading"><a href="{{$contact.url}}">{{$contact.name}}</a>
                                        {{if $contact.account_type}} <small class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</small>{{/if}}
                                        {{if $contact.account_type == 'Forum'}}<i class="fa fa-comments-o" aria-hidden="true"></i>{{/if}}
                                        {{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
@@ -133,14 +133,14 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        <div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}">
 
                                <div class="contact-photo-image-wrapper hidden-xs">
-                                       <img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name|escape}" />
+                                       <img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name}" />
                                </div>
 
                                {{* For very small displays we use a drobdown menu for contact relating actions *}}
                                <button type="button" class="btn btn-link dropdown-toggle visible-xs" id="contact-photo-menu-button{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                        {{* use a smaller picture on very small displays (e.g. mobiles) *}}
                                        <div class="contact-photo-image-wrapper visible-xs">
-                                               <img class="contact-photo-xs media-object" src="{$thumb}" {11} alt="{$name|escape}" />
+                                               <img class="contact-photo-xs media-object" src="{$thumb}" {11} alt="{$name}" />
 
                                                {{* Overlay background on hover the avatar picture *}}
                                                <div class="contact-photo-overlay">
@@ -172,32 +172,32 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        {{* The contact actions like private mail, delete contact, edit contact and so on *}}
                        <div class="contact-actions pull-right nav-pills preferences hidden-xs">
                                {if $photo_menu.pm}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0|escape}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}">
                                        <i class="fa fa-envelope" aria-hidden="true"></i>
                                </button>
                                {/if}
                                {if $photo_menu.poke}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0|escape}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}">
                                        <i class="fa fa-heartbeat" aria-hidden="true"></i>
                                </button>
                                {/if}
                                {if $photo_menu.network}
-                               <a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0|escape}">
+                               <a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}">
                                        <i class="fa fa-cloud" aria-hidden="true"></i>
                                </a>
                                {/if}
                                {if $photo_menu.edit}
-                               <a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0|escape}">
-                                       <i class="fa fa-pencil" aria-hidden="true"></i>
+                               <a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}">
+                                       <i class="fa fa-user" aria-hidden="true"></i>
                                </a>
                                {/if}
                                {if $photo_menu.drop}
-                               <a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0|escape}">
+                               <a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}">
                                        <i class="fa fa-user-times" aria-hidden="true"></i>
                                </a>
                                {/if}
                                {if $photo_menu.follow}
-                               <a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0|escape}">
+                               <a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}">
                                        <i class="fa fa-user-plus" aria-hidden="true"></i>
                                </a>
                                {/if}
@@ -207,7 +207,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        {{* The button to add or remove contacts from a contact group - group edit page *}}
                        {if $contact.change_member}
                        <div class="contact-group-actions pull-right nav-pills preferences">
-                               <button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({$contact.change_member.gid},{$contact.change_member.cid},'{$contact.change_member.sec_token}'); return true;" data-toggle="tooltip" title="{$contact.change_member.title|escape}">
+                               <button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({$contact.change_member.gid},{$contact.change_member.cid},'{$contact.change_member.sec_token}'); return true;" data-toggle="tooltip" title="{$contact.change_member.title}">
                                        {if $contact.label == "members"}
                                        <i class="fa fa-times-circle" aria-hidden="true"></i>
                                        {elseif $contact.label == "contacts"}
@@ -220,7 +220,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
                        <div class="contact-entry-desc">
                                <div class="contact-entry-name" id="contact-entry-name-{$id}">
-                                       <h4 class="media-heading"><a href="{$url}">{$name|escape}</a>
+                                       <h4 class="media-heading"><a href="{$url}">{$name}</a>
                                        {if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if}
                                        {if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if}
                                        {{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
index 705e377ed358ebc9e19d17c9b0bcb4eebe25a5e3..37821a58708f980cb885d2d74b9cf241231e6e7e 100644 (file)
@@ -3,7 +3,7 @@
        var dropContact = "{{$contact_drop_confirm}}";
 </script>
 
-{{$tabs}}
+{{$tabs nofilter}}
 
 <div id="contacts" class="generic-page-wrapper">
 
@@ -17,7 +17,7 @@
                <form id="contacts-search-form" class="navbar-form" role="search" action="{{$cmd}}" method="get" >
                        <div class="row">
                                <div class="form-group form-group-search">
-                                       <input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search|escape:'html'}}" placeholder="{{$desc}}"/>
+                                       <input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
                                        <button class="btn btn-default btn-sm form-button-search" type="submit" id="contacts-search-submit">{{$submit}}</button>
                                </div>
                        </div>
@@ -31,7 +31,7 @@
        <form name="batch_actions_submit" action="{{$baseurl}}/contact/batch/" method="POST">
 
                {{* we put here a hidden input element. This is needed to transmit the batch actions with javascript*}}
-               <input type="hidden" class="batch-action no-input fakelist" name="batch_submit" value="{{$l|escape:'html'}}">
+               <input type="hidden" class="batch-action no-input fakelist" name="batch_submit" value="{{$l}}">
 
                {{* We put the contact batch actions in a dropdown menu *}}
                <ul class="nav nav-pills preferences">
@@ -61,5 +61,5 @@
                <div id="contact-edit-end" class="clear"></div>
        </form>
 
-       {{$paginate}}
+       {{$paginate nofilter}}
 </div>
index 75ab272df84fa09cd11dbfa16a6c0beffa2116e0..5e5aeecc253199bc50906aa7263afbe77d082171 100644 (file)
@@ -1,10 +1,10 @@
 <div id="credits" class="generic-page-wrapper">
         {{include file="section_title.tpl"}}
-        <p>{{$thanks|escape}}</p>
+        <p>{{$thanks}}</p>
 
         <ul class="credits">
                 {{foreach $names as $name}}
-                 <li>{{$name|escape}}</li>
+                 <li>{{$name}}</li>
                 {{/foreach}}
         </ul>
         <div class="clear"></div>
index d4cdec5018920961dc3506724b420eddd5372f33..6695682e0b9f95d8c0fd586efbaa07d3fe1842d6 100644 (file)
@@ -2,18 +2,18 @@
 <div id="crepair" class="generic-page-wrapper">
        {{include file="section_title.tpl"}}
 
-       {{$tab_str}}
+       {{$tab_str nofilter}}
 
-       <div class="crepair-error-message">{{$warning}}</div><br>
+       <div class="crepair-error-message">{{$warning nofilter}}</div><br>
        <div class="crepair-return">
-               {{$info}}<br>
+               {{$info nofilter}}<br>
                <!-- <a href="{{$returnaddr}}">{{$return}}</a> -->
        </div>
        <br />
 
        <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
 
-               <!-- <h4>{{$contact_name|escape}}</h4> -->
+               <!-- <h4>{{$contact_name}}</h4> -->
 
                <div id="contact-update-profile-wrapper">
                {{if $update_profile}}
@@ -46,7 +46,7 @@
                {{/if}}
 
                <div class="pull-right settings-submit-wrapper" >
-                       <button type="submit" name="submit" class="btn btn-primary" value="{{$lbl_submit|escape:'html'}}">{{$lbl_submit|escape:'html'}}</button>
+                       <button type="submit" name="submit" class="btn btn-primary" value="{{$lbl_submit}}">{{$lbl_submit}}</button>
                </div>
                <div class="clear"></div>
 
diff --git a/view/theme/frio/templates/dfrn_request.tpl b/view/theme/frio/templates/dfrn_request.tpl
new file mode 100644 (file)
index 0000000..2f363f5
--- /dev/null
@@ -0,0 +1,92 @@
+<div class="generic-page-wrapper">
+<h1>{{$header}}</h1>
+
+{{if $myaddr}}
+{{else}}
+<p id="dfrn-request-intro">
+{{$page_desc}}<br />
+<ul id="dfrn-request-networks">
+<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
+<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
+<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
+</ul>
+{{$invite_desc}}
+</p>
+<p>
+{{$desc}}
+</p>
+{{/if}}
+
+{{if $request}}
+<form action="{{$request}}" method="post">
+{{else}}
+<form action="dfrn_request/{{$nickname}}" method="post">
+{{/if}}
+
+{{if $photo}}
+<img src="{{$photo}}" alt="" id="dfrn-request-photo" />
+{{/if}}
+
+{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
+{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
+{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
+{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+
+<div id="dfrn-request-url-wrapper" >
+       <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
+       {{if $myaddr}}
+               {{$myaddr}}
+               <input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+       {{else}}
+       <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+       {{/if}}
+       {{if $url}}
+               <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+       {{/if}}
+       <div id="dfrn-request-url-end"></div>
+</div>
+
+<p id="dfrn-request-options">
+{{$pls_answer}}
+</p>
+
+<div id="dfrn-request-info-wrapper" >
+
+{{include file="field_yesno.tpl" field=$does_know_you}}
+<!--
+<p id="doiknowyou">
+{{$does_know}}
+</p>
+
+               <div id="dfrn-request-know-yes-wrapper">
+               <label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
+               <input type="radio" name="knowyou" id="knowyouyes" value="1" />
+
+               <div id="dfrn-request-knowyou-break" ></div>
+               </div>
+               <div id="dfrn-request-know-no-wrapper">
+               <label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
+               <input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
+
+               <div id="dfrn-request-knowyou-end"></div>
+               </div>
+-->
+
+<p id="dfrn-request-message-desc">
+{{$add_note}}
+</p>
+       <div id="dfrn-request-message-wrapper">
+       <textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
+       </div>
+
+
+</div>
+
+       <div id="dfrn-request-submit-wrapper">
+               {{if $submit}}
+                       <input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+               {{/if}}
+               <input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+       </div>
+</form>
+</div>
\ No newline at end of file
index 4bb739e78cba951e6e16c55be8e4776e48de27e5..98ec3f5e2f8d54505f38830edb68992f68a44a1d 100644 (file)
@@ -15,7 +15,7 @@
                        <div class="col-md-2"></div>
                        <div class="col-md-8 ">
                                <div class="form-group form-group-search">
-                                       <input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search|escape:'html'}}" placeholder="{{$desc}}"/>
+                                       <input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
                                        <button class="btn btn-default btn-sm form-button-search" type="submit" id="directory-search-submit">{{$submit}}</button>
                                </div>
                        </div>
@@ -37,4 +37,4 @@
 
 <div class="directory-end" ></div>
 
-{{$paginate}}
+{{$paginate nofilter}}
index 82ed1de09288862c557ba73d7e90addec1b6cbc7..39695819af9539b83c4c952d3cf3e195cf6256e4 100644 (file)
@@ -6,19 +6,19 @@
                                <div class="event-owner media-left">
                                        {{if $event.item.author_name}}
                                        <a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" /></a>
-                                       <a href="{{$event.item.author_link}}" >{{$event.item.author_name|escape}}</a>
+                                       <a href="{{$event.item.author_link}}" >{{$event.item.author_name}}</a>
                                        {{/if}}
                                </div>
                                <div class="media-body">
-                                       {{$event.html}}
+                                       {{$event.html nofilter}}
                                </div>
                        </div>
 
                        <div class="event-buttons pull-right">
-                               {{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1|escape}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
-                               {{if $event.copy}}<button type="button" class="btn" onclick="eventEdit('{{$event.copy.0}}')" title="{{$event.copy.1|escape}}"><i class="fa fa-files-o" aria-hidden="true"></i></button>{{/if}}
-                               {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1|escape}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
-                               {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1|escape}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
+                               {{if $event.copy}}<button type="button" class="btn" onclick="eventEdit('{{$event.copy.0}}')" title="{{$event.copy.1}}"><i class="fa fa-files-o" aria-hidden="true"></i></button>{{/if}}
+                               {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
                        </div>
                        <div class="clear"></div>
                </div>
index 41b11c5bb781d8478e6b26886064d4f96d591e61..661bdecb2664b92adeb121e7879f2dded971566a 100644 (file)
 
                        <div id="event-edit-time">
                                {{* The field for event starting time *}}
-                               {{$s_dsel}}
+                               {{$s_dsel nofilter}}
 
                                {{* The field for event finish time *}}
-                               {{$f_dsel}}
+                               {{$f_dsel nofilter}}
 
                                {{* checkbox if the the event doesn't have a finish time *}}
                                {{include file="field_checkbox.tpl" field=$nofinish}}
@@ -64,7 +64,7 @@
 
                        {{* The submit button - saves the event *}}
                        <div class="pull-right" >
-                               <button id="event-submit" type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                               <button id="event-submit" type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                        </div>
                        <div class="clear"></div>
                </div>
                                <ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                        {{* commented out because it isn't implemented yet
                                        <li>
-                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
+                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
                                                        <i class="fa fa-picture-o"></i>
                                                </button>
                                        </li>
                                        *}}
                                        <li>
-                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
+                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
                                                        <i class="fa fa-link"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
+                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
                                                        <i class="fa fa-video-camera"></i>
                                                </button>
                                        </li>
 
                                        <li>
-                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
+                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
                                                        <i class="fa fa-underline"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
+                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
                                                        <i class="fa fa-italic"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
+                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
                                                        <i class="fa fa-bold"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
+                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
                                                        <i class="fa fa-quote-left"></i>
                                                </button>
                                        </li>
                                <ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                        {{* commented out because it isn't implemented yet
                                        <li>
-                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
+                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
                                                        <i class="fa fa-picture-o"></i>
                                                </button>
                                        </li>
                                        *}}
                                        <li>
-                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
+                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
                                                        <i class="fa fa-link"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
+                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
                                                        <i class="fa fa-video-camera"></i>
                                                </button>
                                        </li>
 
                                        <li>
-                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
+                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
                                                        <i class="fa fa-underline"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
+                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
                                                        <i class="fa fa-italic"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
+                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
                                                        <i class="fa fa-bold"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
+                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
                                                        <i class="fa fa-quote-left"></i>
                                                </button>
                                        </li>
 
                {{* The tab for the permissions (if event sharing is enabled) *}}
                <div id="event-acl-wrapper" style="display: none">
-                       {{$acl}}
+                       {{$acl nofilter}}
                </div>
 
                {{* The tab for the event preview (content is inserted by js) *}}
index 58f39a0ee14d30db17255b37afbcecb4fe51fbb9..9264e9d2e3e92861606755ccb185b826475ff3d9 100644 (file)
                                        </span>
                                </div>
                                <div class="event-card-content media-body">
-                                       <div class="event-title event-card-title summary event-summary">{{$title}}</div>
+                                       <div class="event-title event-card-title summary event-summary">{{$title nofilter}}</div>
+
                                        {{* If there is a map, we insert a button for showing/hiding the map *}}
                                        {{if $location.map}}<button id="event-map-btn-{{$id}}" class="event-map-btn btn-link fakelink nav nav-pills preferences" data-map-id="event-location-map-{{$id}}" data-show-label="{{$show_map_label}}" data-hide-label="{{$hide_map_label}}">{{$map_btn_label}}</button>{{/if}}
                                        <div class="event-property">
                                                <span class="event-date">
-                                                       <span class="event-start dtstart" title="{{$dtstart_title|escape}}">{{$start_short}}</span>
-                                                       {{if $finish}} - <span class="event-end dtend" title="{{$dtend_title|escape}}">{{if $same_date}}{{$end_time}}{{else}}{{$end_short}}{{/if}}</span>{{/if}}
+                                                       <span class="event-start dtstart" title="{{$dtstart_title}}">{{$start_short}}</span>
+                                                       {{if $finish}} - <span class="event-end dtend" title="{{$dtend_title}}">{{if $same_date}}{{$end_time}}{{else}}{{$end_short}}{{/if}}</span>{{/if}}
                                                </span>
                                                {{if $location.name}}
                                                <span role="presentation" aria-hidden="true"> · </span>
-                                               <span class="event-location event-card-location">{{$location.name|escape}}</span>
+                                               <span class="event-location event-card-location">{{$location.name nofilter}}</span>
                                                {{/if}}
                                        </div>
                                        <div class="event-card-profile-name profile-entry-name">
-                                               <a href="{{$author_link}}" class="userinfo">{{$author_name|escape}}</a>
+                                               <a href="{{$author_link}}" class="userinfo">{{$author_name}}</a>
                                        </div>
                                        {{if $location.map}}
-                                       <div id="event-location-map-{{$id}}" class="event-location-map">{{$location.map}}</div>
+                                       <div id="event-location-map-{{$id}}" class="event-location-map">{{$location.map nofilter}}</div>
                                        {{/if}}
                                </div>
                                <div class="clearfix"></div>
@@ -41,7 +42,7 @@
        {{* The content of the event description *}}
        {{if $description}}
        <div class="description event-description">
-               {{$description}}
+               {{$description nofilter}}
        </div>
        {{/if}}
 </div>
index 3866282a33e19e9438acf9d0057352406f105876..f233866f0b6a05d0f876f4f9bd433efb5fc2563d 100644 (file)
@@ -1,11 +1,11 @@
 <div class="generic-page-wrapper">
-       {{$tabs}}
+       {{$tabs nofilter}}
        {{include file="section_title.tpl" title=$title pullright=1}}
 
        {{* The link to create a new event *}}
        {{if $new_event.0}}
        <div class="pull-right" id="new-event-link">
-               <button type="button" class="btn-link page-action faded-icon" onclick="addToModal('{{$new_event.0}}')" title="{{$new_event.1|escape}}" data-toggle="tooltip">
+               <button type="button" class="btn-link page-action faded-icon" onclick="addToModal('{{$new_event.0}}')" title="{{$new_event.1}}" data-toggle="tooltip">
                        <i class="fa fa-plus"></i>
                </button>
        </div>
@@ -40,9 +40,9 @@
 
                {{* The buttons to change the month/weeks/days *}}
                <div id="fc-fc-header-left" class="btn-group">
-                       <button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$previous.1|escape}}"><i class="fa fa-angle-up" aria-hidden="true"></i></button>
-                       <button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next.1|escape}}"><i class="fa fa-angle-down" aria-hidden="true"></i></button>
-                       <button class="btn btn-eventnav btn-separator" onclick="changeView('today', false);" title="{{$today|escape}}"><i class="fa fa-bullseye" aria-hidden="true"></i></button>
+                       <button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$previous.1}}"><i class="fa fa-angle-up" aria-hidden="true"></i></button>
+                       <button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next.1}}"><i class="fa fa-angle-down" aria-hidden="true"></i></button>
+                       <button class="btn btn-eventnav btn-separator" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye" aria-hidden="true"></i></button>
                </div>
 
                {{* The title (e.g. name of the mont/week/day) *}}
index 1fde3634abebe8433a1f36f3fa08720026052dd7..5dc8916666021eb740aafcaea7eab5c6d037c8be 100644 (file)
@@ -5,7 +5,7 @@
                        <label for="id_{{$field.0}}">
                                {{$field.1}}
                                {{if $field.3}}
-                               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+                               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
                                {{/if}}
                        </label>
        </div>
index 704db346d265e66fba1f6a2f9ab1fd548da90d8d..285501ef3b669fdac5cfcb538fd34fa27b717388 100644 (file)
@@ -2,12 +2,12 @@
 <div class="form-group field input color">
        <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}</label>
        <div class="input-group" id="{{$field.0}}">
-               <input class="form-control color" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}" aria-describedby="{{$field.0}}_tip">
+               <input class="form-control color" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2 nofilter}}" aria-describedby="{{$field.0}}_tip">
                {{if $field.4}}<span class="required">{{$field.4}}</span>{{/if}}
                <span class="input-group-addon"><i></i></span>
        </div>
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
        <div id="end_{{$field.0}}" class="field_end"></div>
 </div>
index 158073a64e88bcc5a217fb5eb3e77f683fc7bcd4..5b5c90779109a9ed681cd7c58162a0ddb66a3cd0 100644 (file)
@@ -1,8 +1,8 @@
 
 <div class="form-group field custom">
        <label for="{{$field.0}}">{{$field.1}}</label>
-       {{$field.2}}
+       {{$field.2 nofilter}}
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
 </div>
index c5f8ac86d2e5a00833c88ff8d0de40f22c80850a..143aa19e0fd3706416a2e3d90c62a7add7387ad0 100644 (file)
@@ -2,12 +2,12 @@
 <div class="form-group field input file">
        <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}</label>
        <div class="input-group" id="{{$field.0}}">
-               <input class="form-control file" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}" aria-describedby="{{$field.0}}_tip">
+               <input class="form-control file" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2 nofilter}}" aria-describedby="{{$field.0}}_tip">
                {{if $field.4}}<span class="required">{{$field.4}}</span>{{/if}}
                <span class="input-group-addon image-select"><i class="fa fa-picture-o"></i></span>
        </div>
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
        <div id="end_{{$field.0}}" class="field_end"></div>
 </div>
index 6ea3923b92db286cccf005ddb6ff1af17ef95b40..ef55203a05b51973fd0868cbed2fa4adf5e49a1a 100644 (file)
@@ -3,9 +3,9 @@
        {{if !isset($label) || $label != false }}
        <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
        {{/if}}
-       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2|escape:'html'}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
+       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2 nofilter}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
        <div class="clear"></div>
 </div>
index f898c87faf0001b5a81035afafd2db179492559c..18a2ea6ca57b4413a957a565e278ac2ca8a20ade 100644 (file)
@@ -1,9 +1,9 @@
 
        <div class="form-group field checkbox">
-               <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip">
+               <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip">
                <label for="id_{{$field.0}}">{{$field.1}}</label>
                {{if $field.4}}
-               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.4}}</span>
+               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.4 nofilter}}</span>
                {{/if}}
        </div>
        <div class="clear"></div>
index 66f8c9e80927c1dedc91b4c510594011b24ab306..b05270de31a8d76a7f1a0c4c4f797a4033c86140 100644 (file)
@@ -1,9 +1,9 @@
 
 <div id="id_{{$field.0}}_wrapper" class="form-group field input openid">
        <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}</label>
-       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
+       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2 nofilter}}" aria-describedby="{{$field.0}}_tip">
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
        <div class="clear"></div>
 </div>
index 7bef420a18aea32fbdb187d8eef47cf4d43f3f0b..92c98a44c1e9a8cfc2aba805d39f92f1455e92cd 100644 (file)
@@ -1,9 +1,9 @@
 
 <div id="id_{{$field.0}}_wrapper" class="form-group field input password">
        <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
-       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
+       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2 nofilter}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
        <div class="clear"></div>
 </div>
index 725e1c96aff8926a77f43c7c02f27d34761964ef..35f99c9d61a14285698fbbac90ce0eb02ea0df1d 100644 (file)
@@ -5,7 +5,7 @@
                        <label for="id_{{$field.0}}_{{$field.2}}">
                                {{$field.1}}
                                {{if $field.3}}
-                               <span class="help-block" id="{{$field.0}}_{{$field.2}}_tip" role="tooltip">{{$field.3}}</span>
+                               <span class="help-block" id="{{$field.0}}_{{$field.2}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
                                {{/if}}
                        </label>
                </div>
index 594b91002efa5e246f783772ec538c106f9c6ed6..2a609ed71dadbca0fd1b8707f811f842abe0ffe7 100644 (file)
@@ -2,9 +2,9 @@
 <div class="form-group field select">
                <label for="id_{{$field.0}}">{{$field.1}}</label>
                <select name="{{$field.0}}" id="id_{{$field.0}}" class="form-control" aria-describedby="{{$field.0}}_tip">
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
                </select>
                {{if $field.3}}
-               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
                {{/if}}
 </div>
index 52b63079c1a2db07f09285fbc16181d25847be19..bbd8368f261ed7e64ed83c24b349b8e3cfcbecf3 100644 (file)
@@ -2,9 +2,9 @@
 <div class="form-group field select">
        <label for="id_{{$field.0}}">{{$field.1}}</label>
        <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">
-               {{$field.4}}
+               {{$field.4 nofilter}}
        </select>
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
 </div>
index 1aea484de786fe3a9cb530789692689270e0044e..baf2e844870f04fbd48445cc9766e17380083cd5 100644 (file)
@@ -3,7 +3,7 @@
                <label for="id_{{$field.0}}">{{$field.1}}</label>
                <textarea class="form-control text-autosize" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
                {{if $field.3}}
-               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
                {{/if}}
                <div class="clear"></div>
        </div>
index fc1f7243af55cb5576d3a88c64c2567630bb877c..78c179436bac2cf6cfd408f01bac85697760a96a 100644 (file)
@@ -6,7 +6,7 @@
                {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
        </select>
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
        {{if $field.5=="preview"}}<div id="theme-preview"></div>{{/if}}
 </div>
index 47649fe676b6cc28695da3b2f08e0f1a45a7c11f..22ef4461e43ecc752a0b4dc6118d12f94b21ac1f 100644 (file)
@@ -4,7 +4,7 @@
                <div class="onoff toggle btn btn-xs pull-right" id="id_{{$field.0}}_onoff">
                        
                        <div class="switchlabel toggle-group">
-                               <input  type="hidden" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
+                               <input  type="hidden" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2 nofilter}}" aria-describedby="{{$field.0}}_tip">
                                <label class="btn btn-default btn-xs  active toggle-off">
                                        {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
                                </label>
@@ -15,7 +15,7 @@
                        </div>
                </div>
                {{if $field.3}}
-               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
                {{/if}}
        </div>
        <div class="clear"></div>
index a4645841f13162ed030def5c758b615bdccd1c25..b7d867e82ac21b835480ed88828bf8435ed81532 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="fileas-sidebar" class="widget">
        <h3>{{$title}}</h3>
-       <div id="nets-desc">{{$desc}}</div>
+       <div id="nets-desc">{{$desc nofilter}}</div>
        
        <ul class="fileas-ul">
                <li class="tool{{if $sel_all}} selected{{/if}}"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li>
index ce58ef0b98165c6e8e5551febd91ea991cfb4db9..d452810c88a1d4453557f42372902e496fa2f585 100644 (file)
@@ -9,8 +9,8 @@
 
 <div class="fbrowser {{$type}}">
        <div class="fbrowser-content">
-               <input id="fb-nickname" type="hidden" name="type" value="{{$nickname|escape}}" />
-               <input id="fb-type" type="hidden" name="type" value="{{$type|escape}}" />
+               <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
+               <input id="fb-type" type="hidden" name="type" value="{{$type}}" />
 
                <div class="error hidden">
                        <span></span> <button type="button" class="btn btn-link close" aria-label="Close">X</a>
@@ -47,9 +47,9 @@
                                <div class="fbrowser-content-container">
                                        {{foreach $files as $f}}
                                        <div class="photo-album-image-wrapper">
-                                               <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1|escape}}" data-img="{{$f.2|escape}}">
-                                                       <img src="{{$f.2}}" alt="{{$f.1|escape}}">
-                                                       <p>{{$f.1|escape}}</p>
+                                               <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+                                                       <img src="{{$f.2}}" alt="{{$f.1}}">
+                                                       <p>{{$f.1}}</p>
                                                </a>
                                        </div>
                                        {{/foreach}}
index 99ab29ac35627d4a705ebf9d68fdd2c8cafe329f..fadd0a6dfbd923e69fac036b79249a8d5cd2058a 100644 (file)
@@ -3,10 +3,10 @@
        <h3>{{$connect}}</h3>
 
        <form action="follow" method="get">
-               <label for="side-follow-url" id="connect-desc">{{$desc}}</label>
+               <label for="side-follow-url" id="connect-desc">{{$desc nofilter}}</label>
                {{* The input field - For visual consistence we are using a search input field*}}
                <div class="form-group form-group-search">
-                       <input id="side-follow-url" class="search-input form-control form-search" type="text" name="url" value="{{$value|escape:'html'}}" placeholder="{{$hint|escape:'html'}}" data-toggle="tooltip" title="{{$hint|escape:'html'}}" />
+                       <input id="side-follow-url" class="search-input form-control form-search" type="text" name="url" value="{{$value}}" placeholder="{{$hint}}" data-toggle="tooltip" title="{{$hint}}" />
                        <button id="side-follow-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$follow}}</button>
                </div>
        </form>
index 5510eae9171f2692797d7ec391d37fa15c80d360..e03e46fe1a410a11e0476bc05215c3054fe3d1d2 100644 (file)
@@ -1,7 +1,7 @@
 
 <div class="widget{{if $class}} {{$class}}{{/if}}">
        {{if $title}}<h3>{{$title}}</h3>{{/if}}
-       {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
+       {{if $desc}}<div class="desc">{{$desc nofilter}}</div>{{/if}}
 
        <ul role="menu">
                {{foreach $items as $item}}
index 9d663b3edd0ab0f796c17929c8f60675f9efdddf..1a30dae87997ad92065bd36836813f5280e508d4 100644 (file)
@@ -1,4 +1,3 @@
-
 {{* This template is for the "group" module. It provides the user the possibility to
     modify a specific contact group (remove contact group, edit contact group name,
     add or remove contacts to the contact group.
@@ -13,7 +12,7 @@
                <button type="button" id="group-rename" class="btn btn-clear" onclick="showHide('group-edit-wrapper'); showHide('group-edit-header'); return false;" title="{{$edit_name}}" data-toggle="tooltip">
                        <i class="fa fa-pencil" aria-hidden="true"></i>
                </button>
-               {{if $drop}}{{$drop}}{{/if}}
+               {{if $drop}}{{$drop nofilter}}{{/if}}
        </div>
        {{/if}}
 
@@ -32,8 +31,8 @@
                                {{include file="field_input.tpl" field=$gname label=false}}
                                </div>
                                <div id="group-edit-submit-wrapper" class="form-group pull-right">
-                                       <button class="btn btn-primary btn-small" type="submit" name="submit" value="{{$submit|escape:'html'}}">
-                                               {{$submit|escape:'html'}}
+                                       <button class="btn btn-primary btn-small" type="submit" name="submit" value="{{$submit}}">
+                                               {{$submit}}
                                        </button>
                                </div>
                        </form>
index c8d30c0b5010cb510298eae5e114706b59998544..d8f8b1d82dc531bc1e7906d81eb534226e1606fc 100644 (file)
@@ -26,7 +26,7 @@
 <link rel="stylesheet" href="view/theme/frio/font/open_sans/open-sans.css" type="text/css" media="screen"/>
 
 {{foreach $stylesheets as $stylesheetUrl}}
-<link rel="stylesheet" href="{{$stylesheetUrl|escape:"html":"UTF-8"}}" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="screen" />
 {{/foreach}}
 
 {{* own css files *}}
index dd53a1eae43b785229b0de759e75805b1b8f07c6..8552f25830d0ae991c7c0e57066587a6b8f3d141 100644 (file)
@@ -5,7 +5,7 @@
        <div class="col-sm-12">
                <div class="panel panel-default login-panel-content">
                        <div class="panel-body">
-                               {{$content}}
+                               {{$content nofilter}}
                        </div>
                </div>
        </div>
                {{if $customhome != false }}
                        {{include file="$customhome"}}
                {{else}}
-                       {{$defaultheader}}
+                       {{$defaultheader nofilter}}
                {{/if}}
        </div>
        <div class="col-md-5 col-sm-12 login-form">
-       {{$login}}
+       {{$login nofilter}}
        </div>
 {{/if}}
 </div>
\ No newline at end of file
index 9b34afcd9efc4e97583336ecd9b645ab0d024c12..cea74d2fae93376bd2b1918b91355641dce6ca5e 100644 (file)
@@ -5,20 +5,20 @@
 
        {{* Contact Photo *}}
        <div class="intro-photo-wrapper dropdown pull-left" >
-               <img id="photo-{{$intro_id}}" class="intro-photo media-object" src="{{$photo}}" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
+               <img id="photo-{{$intro_id}}" class="intro-photo media-object" src="{{$photo}}" title="{{$fullname}}" alt="{{$fullname}}" />
        </div>
 
        <div class="media-body">
                {{* The intro actions like approve, ignore, discard intro*}}
                <div class="intro-actions pull-right nav-pills preferences">
-                       <button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve|escape:'html'}}" title="{{$approve|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
+                       <button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve}}" title="{{$approve}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
 
                        <form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-                               <button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore|escape:'html'}}" aria-label="{{$ignore|escape:'html'}}" title="{{$ignore|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
-                               {{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard|escape:'html'}}" aria-label="{{$discard|escape:'html'}}" title="{{$discard|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}}
+                               <button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore}}" aria-label="{{$ignore}}" title="{{$ignore}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
+                               {{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard}}" aria-label="{{$discard}}" title="{{$discard}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}}
                        </form>
                </div>
-               <div class='intro-enty-name'><h4 class="media-heading"><a href="{{$zrl}}">{{$fullname|escape}}</a></h4></div>
+               <div class='intro-enty-name'><h4 class="media-heading"><a href="{{$zrl}}">{{$fullname}}</a></h4></div>
                <div class="intro-desc"><span class="intro-desc-label">{{$str_notifytype}}</span>&nbsp;{{$notify_type}}</div>
                {{* if the contact was suggestested by another contact, the contact who made the suggestion is displayed*}}
                {{if $madeby}}<div class="intro-madeby"><span class="intro-madeby-label">{{$lbl_madeby}}</span>&nbsp;<a href="{{$madeby_zrl}}">{{$madeby}}</a></div>{{/if}}
@@ -30,7 +30,7 @@
                        {{if $location}}<div class="intro-location"><span class="intro-location-label">{{$lbl_location}}</span>&nbsp;{{$location}}</div>{{/if}}
                        {{if $gender}}<div class="intro-gender"><span class="intro-gender-label">{{$lbl_gender}}</span>&nbsp;{{$gender}}</div>{{/if}}
                        {{if $keywords}}<div class="intro-keywords"><span class="intro-keywords-label">{{$lbl_keywords}}</span>&nbsp;{{$keywords}}</div>{{/if}}
-                       {{if $about}}<div class="intro-about"><span class="intro-about-label">{{$lbl_about}}</span>&nbsp;{{$about}}</div>{{/if}}
+                       {{if $about}}<div class="intro-about"><span class="intro-about-label">{{$lbl_about}}</span>&nbsp;{{$about nofilter}}</div>{{/if}}
                        <div class="intro-knowyou"><span class="intro-knowyou-label">{{$lbl_knowyou}}</span>{{$knowyou}}</div>
                        <div class="intro-note intro-note-{{$intro_id}}">{{$note}}</div>
                </div>
@@ -42,7 +42,7 @@
                        {{if $location}}<div class="intro-location"><span class="intro-location-label">{{$lbl_location}}</span>{{$location}}</div>{{/if}}
                        {{if $gender}}<div class="intro-gender"><span class="intro-gender-label">{{$lbl_gender}}</span>{{$gender}}</div>{{/if}}
                        {{if $keywords}}<div class="intro-keywords"><span class="intro-keywords-label">{{$lbl_keywords}}</span>{{$keywords}}</div>{{/if}}
-                       {{if $about}}<div class="intro-about"><span class="intro-about-label">{{$lbl_about}}</span>{{$about}}</div>{{/if}}
+                       {{if $about}}<div class="intro-about"><span class="intro-about-label">{{$lbl_about}}</span>{{$about nofilter}}</div>{{/if}}
                        <div class="intro-knowyou"><span class="intro-knowyou-label">{{$lbl_knowyou}}</span>{{$knowyou}}</div>
                        <div class="intro-note intro-note-{{$intro_id}}">{{$note}}</div>
                </div>
@@ -51,7 +51,7 @@
                a bootstrap modal in the case of approval *}}
                <div id="intro-approve-wrapper-{{$intro_id}}" style="display: none;">
 
-                       <h3 class="heading">{{$fullname|escape}}{{if $addr}}&nbsp;({{$addr}}){{/if}}</h3>
+                       <h3 class="heading">{{$fullname}}{{if $addr}}&nbsp;({{$addr}}){{/if}}</h3>
                        <form class="intro-approve-form" {{if $request}}action="{{$request}}" method="get"{{else}}action="dfrn_confirm" method="post"{{/if}}>
                                {{include file="field_checkbox.tpl" field=$hidden}}
                                {{if $type != "friend_suggestion"}}
                                <input type="hidden" name="contact_id" value="{{$contact_id}}" >
                                {{/if}}
 
-                               {{$dfrn_text}}
+                               {{$dfrn_text nofilter}}
 
                                <div class="pull-right">
-                                       <button class="btn btn-primary intro-submit-approve" type="submit" name="submit" value="{{$approve|escape:'html'}}">{{$approve|escape:'html'}}</button>
+                                       <button class="btn btn-primary intro-submit-approve" type="submit" name="submit" value="{{$approve}}">{{$approve}}</button>
                                </div>
                                <div class="clear"></div>
                        </form>
        {{if $APP->is_mobile}}
        <div class="intro-action-buttons">
                <form class="intro-form pull-left" action="notifications/{{$intro_id}}" method="post">
-                       <button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}">{{$ignore|escape:'html'}}</button>
-                       {{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}">{{$discard|escape:'html'}}</button>&nbsp;{{/if}}
+                       <button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}">{{$ignore}}</button>
+                       {{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard}}">{{$discard}}</button>&nbsp;{{/if}}
                </form>
-               <button class="btn btn-small btn-primary intro-submit-approve pull-right" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}')">{{$approve|escape:'html'}}</button>
+               <button class="btn btn-small btn-primary intro-submit-approve pull-right" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}')">{{$approve}}</button>
        </div>
        <div class="clear"></div>
        {{/if}}
index 9ff20240aefc08463d084c962daca4be1393153f..31da60665c2c34de279e9fd6718c346f1a8585cf 100644 (file)
@@ -11,7 +11,7 @@
                        {{include file="field_textarea.tpl" field=$message}}
 
                        <div id="invite-submit-wrapper" class="form-group pull-right">
-                               <button type="submit" name="submit" class="btn btn-primary">{{$submit|escape:'html'}}</button>
+                               <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
                        </div>
                        <div class="clear"></div>
                </div>
index 13e4d2ec1d2802cb3038c89b7e77a0ea683593d0..d5ba1bcc458e4f503947fc2548f194e57e750e13 100644 (file)
@@ -89,7 +89,7 @@
 
                                        {{* The jot text field in which the post text is inserted *}}
                                        <div id="jot-text-wrap">
-                                               <textarea rows="2" cols="64" class="profile-jot-text form-control text-autosize" id="profile-jot-text" name="body" placeholder="{{$share}}" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;">{{if $content}}{{$content}}{{/if}}</textarea>
+                                               <textarea rows="2" cols="64" class="profile-jot-text form-control text-autosize" id="profile-jot-text" name="body" placeholder="{{$share}}" onFocus="jotTextOpenUI(this);" onBlur="jotTextCloseUI(this);" style="min-width:100%; max-width:100%;">{{if $content}}{{$content nofilter}}{{/if}}</textarea>
                                        </div>
 
                                        <ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
                                                <li role="presentation" class="pull-right"><button class="btn btn-primary" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw" aria-hidden="true"></i> {{$share}}</button></li>
                                                <li role="presentation" id="character-counter" class="grey jothidden text-info pull-right"></li>
                                                <li role="presentation" id="profile-rotator-wrapper" class="pull-right" style="display: {{$visitor}};" >
-                                                       <img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$wait|escape}}" title="{{$wait|escape}}" style="display: none;" />
+                                                       <img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
                                                </li>
                                                <li role="presentation" id="profile-jot-plugin-wrapper">
-                                                       {{$jotplugins}}
+                                                       {{$jotplugins nofilter}}
                                                </li>
                                        </ul>
 
                                </div>
 
                                <div id="profile-jot-acl-wrapper" class="minimize" aria-labelledby="jot-perms-lnk" role="tabpanel" aria-hidden="true">
-                                       {{$acl}}
+                                       {{$acl nofilter}}
                                </div>
 
                                <div id="jot-preview-content" class="minimize" aria-labelledby="jot-preview-lnk" role="tabpanel" aria-hidden="true"></div>
index f58a7698ba75d979928ad3aa5836555d805274ff..deb2383f4badd624d9d06ef52caa6050fa04339e 100644 (file)
@@ -9,5 +9,5 @@
                <i class="faded-icon page-action fa fa-thumbs-down" aria-hidden="true"></i>
        </button>
        {{/if}}
-       <img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait|escape}}" title="{{$wait|escape}}" style="display: none;" />
+       <img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 </div>
index ae586a3e6a020bbded3e3612aafaa6b7f87b7438..ebbdeee41066a98a5a1acabdbfcc0a737197663f 100644 (file)
@@ -9,7 +9,7 @@
                        {{include file="field_input.tpl" field=$lname}}
                        {{include file="field_password.tpl" field=$lpassword}}
                        <div id="login-lost-password-link">
-                               <a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
+                               <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
                        </div>
                        <div id="login-end"></div>
                </div>
 
                <div id="login-submit-wrapper">
                        <div class="pull-right" >
-                               <button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button>
+                               <button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login}}">{{$login}}</button>
                        </div>
                </div>
 
 
                {{foreach $hiddens as $k=>$v}}
-                       <input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
+                       <input type="hidden" name="{{$k}}" value="{{$v}}" />
                {{/foreach}}
 
                <div id="login-end"></div>
@@ -39,8 +39,8 @@
 
 {{if $register}}
 <div id="login-extra-links">
-       <h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3>
-       <a href="register" title="{{$register.title|escape:'html'}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>
+       <h3 id="login-head" class="sr-only">{{$register.title}}</h3>
+       <a href="register" title="{{$register.title}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>
 </div>
 {{/if}}
 
index b5154aa4c086f90da5804a54cf49d9220693deaf..80f5e7547b7537747ac35bd5070b1b4986e35741 100644 (file)
@@ -2,16 +2,16 @@
        <div class="media">
                <div class="pull-left contact-photo-wrapper">
                        <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}">
-                               <img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name|escape}}" title="{{$mail.from_addr}}" />
+                               <img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" />
                        </a>
                </div>
                <div class="media-body">
                        <div class="text-muted time mail-ago pull-right" title="{{$mail.date}}" data-toggle="tooltip">{{$mail.date}}</div>
                        <div class="mail-conv-delete-end"></div>
-                       <h4 class="media-heading"><a href="{{$mail.from_url}}" title="{{$mail.from_addr}}">{{$mail.from_name|escape}}</a></h4>
+                       <h4 class="media-heading"><a href="{{$mail.from_url}}" title="{{$mail.from_addr}}">{{$mail.from_name}}</a></h4>
 
                        <div class="mail-body">
-                               {{$mail.body}}
+                               {{$mail.body nofilter}}
                        </div>
                        {{*<a href="message/dropconv/{{$mail.id}}" onclick="return confirmDelete();" title="{{$delete}}" class="close pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >&times;</a> *}}
                </div>
index fa4f46cf8ca2cc1fc8869c90b98a1abfad9737a0..70182b5e7cd40cd9ac238629d740d385fb4a7921 100644 (file)
@@ -16,4 +16,3 @@
 </div>
 
 <div class="clear"></div>
-{{$tab_content}}
index e6a024f11c68a123d25e8a823f9d0001abebbf7e..4a797d47c0b760cb48aa3a51e18998457f51318f 100644 (file)
@@ -5,13 +5,13 @@
                <div class="media">
                        <div class="pull-left contact-photo-wrapper">
                                <a href="{{$from_url}}" title="{{$from_addr}}">
-                                       <img class="media-object" src="{{$from_photo}}" alt="{{$from_name|escape}}" title="{{$from_addr|escape}}" />
+                                       <img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" title="{{$from_addr}}" />
                                </a>
                        </div>
                        <div class="media-body">
                                <div class="text-muted time ago pull-right" title="{{$date}}">{{$ago}}</div>
 
-                               <h4 class="media-heading">{{$from_name|escape}}</h4>
+                               <h4 class="media-heading">{{$from_name}}</h4>
                                <div class="mail-list-subject"><a href="message/{{$id}}">{{$subject}}</a></div>
                                <a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);">
                                <i class="faded-icon fa fa-trash"></i>
index 214bfd7f1a4a173572ff8d5aa0bf99e94f3e61b1..de1d68b0ad418f510cfb93d0811f64c05d1f5b1d 100644 (file)
@@ -2,7 +2,7 @@
        {{if $tabs}}
        <div id="message-preview" class="panel panel-default">
                <ul class="media-list">
-               {{$tabs}}
+               {{$tabs nofilter}}
                </ul>
        </div>
        {{/if}}
index 6f20c247c4cb6c3ddecdae001e34d72b77c4d34f..d64eae9c49a3169a1fc09f7e90fdc44ef5e95eeb 100644 (file)
                                <ul class="nav navbar-nav navbar-left" role="menubar">
                                        <li id="nav-communication" class="nav-segment" role="presentation">
                                                {{if $nav.network}}
-                                               <a accesskey="n" role="menuitem" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3|escape}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notify"></span></a>
+                                               <a accesskey="n" role="menuitem" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notify"></span></a>
                                                {{/if}}
 
                                                {{if $nav.home}}
-                                               <a accesskey="p" role="menuitem" class="nav-menu {{$sel.home}}" href="{{$nav.home.0}}" data-toggle="tooltip" aria-label="{{$nav.home.3}}" title="{{$nav.home.3|escape}}"><i class="fa fa-lg fa-home" aria-hidden="true"></i><span id="home-update" class="nav-home-badge badge nav-notify"></span></a>
+                                               <a accesskey="p" role="menuitem" class="nav-menu {{$sel.home}}" href="{{$nav.home.0}}" data-toggle="tooltip" aria-label="{{$nav.home.3}}" title="{{$nav.home.3}}"><i class="fa fa-lg fa-home" aria-hidden="true"></i><span id="home-update" class="nav-home-badge badge nav-notify"></span></a>
                                                {{/if}}
 
                                                {{if $nav.community}}
-                                               <a accesskey="c" role="menuitem" class="nav-menu {{$sel.community}}" href="{{$nav.community.0}}" data-toggle="tooltip" aria-label="{{$nav.community.3}}" title="{{$nav.community.3|escape}}"><i class="fa fa-lg fa-bullseye" aria-hidden="true"></i></a>
+                                               <a accesskey="c" role="menuitem" class="nav-menu {{$sel.community}}" href="{{$nav.community.0}}" data-toggle="tooltip" aria-label="{{$nav.community.3}}" title="{{$nav.community.3}}"><i class="fa fa-lg fa-bullseye" aria-hidden="true"></i></a>
                                                {{/if}}
                                        </li>
 
                                        <li id="nav-personal" class="nav-segment hidden-xs" role="presentation">
                                                {{if $nav.messages}}
-                                               <a role="menuitem" id="nav-messages-link" href="{{$nav.messages.0}}" data-toggle="tooltip" aria-label="{{$nav.messages.1}}" title="{{$nav.messages.1|escape}}" class="nav-menu {{$sel.messages}}"><i class="fa fa-envelope fa-lg" aria-hidden="true"></i><span id="mail-update" class="nav-mail-badge badge nav-notify"></span></a>
+                                               <a role="menuitem" id="nav-messages-link" href="{{$nav.messages.0}}" data-toggle="tooltip" aria-label="{{$nav.messages.1}}" title="{{$nav.messages.1}}" class="nav-menu {{$sel.messages}}"><i class="fa fa-envelope fa-lg" aria-hidden="true"></i><span id="mail-update" class="nav-mail-badge badge nav-notify"></span></a>
                                                {{/if}}
 
                                                {{if $nav.events}}
-                                               <a accesskey="e" role="menuitem" id="nav-events-link" href="{{$nav.events.0}}" data-toggle="tooltip" aria-label="{{$nav.events.1}}" title="{{$nav.events.1|escape}}" class="nav-menu"><i class="fa fa-lg fa-calendar"></i></a>
+                                               <a accesskey="e" role="menuitem" id="nav-events-link" href="{{$nav.events.0}}" data-toggle="tooltip" aria-label="{{$nav.events.1}}" title="{{$nav.events.1}}" class="nav-menu"><i class="fa fa-lg fa-calendar"></i></a>
                                                {{/if}}
 
                                                {{if $nav.contacts}}
-                                               <a role="menuitem" id="nav-contacts-link" class="nav-menu {{$sel.contacts}} {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" data-toggle="tooltip" aria-label="{{$nav.contacts.1}}" title="{{$nav.contacts.1|escape}}" ><i class="fa fa-users fa-lg" aria-hidden="true"></i></a>
-                                               <span id="intro-update" class="nav-intro-badge badge nav-notify" onclick="window.location.href = '{{$nav.introductions.0}}' " data-toggle="tooltip" aria-label="{{$nav.introductions.3}}" title="{{$nav.introductions.3|escape}}"></span>
+                                               <a role="menuitem" id="nav-contacts-link" class="nav-menu {{$sel.contacts}} {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" data-toggle="tooltip" aria-label="{{$nav.contacts.1}}" title="{{$nav.contacts.1}}" ><i class="fa fa-users fa-lg" aria-hidden="true"></i></a>
+                                               <span id="intro-update" class="nav-intro-badge badge nav-notify" onclick="window.location.href = '{{$nav.introductions.0}}' " data-toggle="tooltip" aria-label="{{$nav.introductions.3}}" title="{{$nav.introductions.3}}"></span>
                                                {{/if}}
                                        </li>
 
                                        {{* The notifications dropdown *}}
                                        {{if $nav.notifications}}
                                                <li id="nav-notification" class="nav-segment hidden-xs" role="presentation">
-                                                       <a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1|escape}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                       <a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                                <i class="fa fa-exclamation-circle fa-lg" aria-hidden="true"></i>
                                                                <span role="menuitem" class="sr-only">{{$nav.notifications.1}}</span>
                                                                <span id="notify-update" class="nav-notify-badge badge nav-notify dropdown" data-toggle="dropdown"></span>
@@ -84,7 +84,7 @@
                                                                        <div class="arrow"></div>
                                                                        {{$nav.notifications.1}}
                                                                        <div class="dropdown-header-link">
-                                                                               <button role="menuitem" type="button" class="btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" aria-label="{{$nav.notifications.mark.3}}" title="{{$nav.notifications.mark.3|escape}}">{{$nav.notifications.mark.1}}</button>
+                                                                               <button role="menuitem" type="button" class="btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" aria-label="{{$nav.notifications.mark.3}}" title="{{$nav.notifications.mark.3}}">{{$nav.notifications.mark.1}}</button>
                                                                        </div>
 
                                                                </li>
                                        {{if $nav.search}}
                                        <li id="search-box" class="hidden-xs">
                                                        <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
-                                                               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name|escape}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
+                                                               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
                                                                <div class="form-group form-group-search">
-                                                                       <input accesskey="s" id="nav-search-input-field" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint|escape}}" placeholder="{{$nav.search.1}}">
+                                                                       <input accesskey="s" id="nav-search-input-field" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
                                                                        <button class="btn btn-default btn-sm form-button-search" type="submit">{{$nav.search.1}}</button>
                                                                </div>
                                                        </form>
                                        <li id="nav-user-linkmenu" class="dropdown account nav-menu hidden-xs">
                                                <button accesskey="u" id="main-menu" class="btn-link dropdown-toggle nav-avatar" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-controls="nav-user-menu">
                                                        <div class="user-title pull-left hidden-xs hidden-sm hidden-md">
-                                                               <strong>{{$nav.userinfo.name|escape}}</strong><br>
+                                                               <strong>{{$nav.userinfo.name}}</strong><br>
                                                                {{if $nav.remote}}<span class="trunctate">{{$nav.remote}}</span>{{/if}}
                                                        </div>
 
-                                                       <img  id="avatar" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name|escape}}">
+                                                       <img  id="avatar" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}">
                                                        <span class="caret"></span>
                                                </button>
 
                                                {{* The list of available usermenu links *}}
                                                <ul id="nav-user-menu" class="dropdown-menu pull-right menu-popup" role="menu" aria-labelledby="main-menu">
                                                        {{if $nav.remote}}{{if $nav.sitename}}
-                                                       <li id="nav-sitename" role="menuitem">{{$nav.sitename|escape}}</li>
+                                                       <li id="nav-sitename" role="menuitem">{{$nav.sitename}}</li>
                                                        <li role="presentation" class="divider"></li>
                                                        {{/if}}{{/if}}
                                                        {{foreach $nav.usermenu as $usermenu}}
-                                                       <li role="presentation"><a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3|escape}}">{{$usermenu.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
                                                        {{/foreach}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{if $nav.notifications}}
-                                                       <li role="presentation"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1|escape}}"><i class="fa fa-exclamation-circle fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation-circle fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.messages}}
-                                                       <li role="presentation"><a role="menuitem" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3|escape}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notify"></span></a></li>
+                                                       <li role="presentation"><a role="menuitem" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notify"></span></a></li>
                                                        {{/if}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{if $nav.contacts}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-menu-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3|escape}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a><span id="intro-update-li" class="nav-intro-badge badge nav-notify"></span></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-menu-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a><span id="intro-update-li" class="nav-intro-badge badge nav-notify"></span></li>
                                                        {{/if}}
                                                        {{if $nav.manage}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3|escape}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.manage.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.manage.1}}</a></li>
                                                        {{/if}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3|escape}}"><i class="fa fa-sitemap fa-fw" aria-hidden="true"></i>{{$nav.directory.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="fa fa-sitemap fa-fw" aria-hidden="true"></i>{{$nav.directory.1}}</a></li>
                                                        <li role="presentation" class="divider"></li>
                                                        {{if $nav.apps}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-apps-link" class="nav-link {{$nav.apps.2}} {{$sel.manage}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3|escape}}" ><i class="fa fa-puzzle-piece fa-fw" aria-hidden="true"></i> {{$nav.apps.1}}</a>
+                                                       <li role="presentation"><a role="menuitem" id="nav-apps-link" class="nav-link {{$nav.apps.2}} {{$sel.manage}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" ><i class="fa fa-puzzle-piece fa-fw" aria-hidden="true"></i> {{$nav.apps.1}}</a>
                                                        <li role="presentation" class="divider"></li>
                                                        {{/if}}
                                                        {{if $nav.help}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3|escape}}" ><i class="fa fa-question-circle fa-fw" aria-hidden="true"></i> {{$nav.help.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="fa fa-question-circle fa-fw" aria-hidden="true"></i> {{$nav.help.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.settings}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3|escape}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.admin}}
-                                                       <li role="presentation"><a accesskey="a" role="menuitem" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3|escape}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
+                                                       <li role="presentation"><a accesskey="a" role="menuitem" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.tos}}
                                                        <li role="presentation" class="divider"></li>
-                                                       <li role="presentation"><a role="menuitem" id="nav-tos-link" class="nav-link {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3|escape}}" ><i class="fa fa-file-text" aria-hidden="true"></i> {{$nav.tos.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-tos-link" class="nav-link {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}" ><i class="fa fa-file-text" aria-hidden="true"></i> {{$nav.tos.1}}</a></li>
                                                        {{/if}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{if $nav.logout}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3|escape}}" ><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i> {{$nav.logout.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" ><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i> {{$nav.logout.1}}</a></li>
                                                        {{else}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3|escape}}" ><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> {{$nav.login.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" ><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> {{$nav.login.1}}</a></li>
                                                        {{/if}}
                                                </ul>
                                        </li>{{* End of userinfo dropdown menu *}}
                                <div class="nav-container">
                                        <ul role="menu" class="list-group">
                                                {{if $nav.remote}}{{if $nav.sitename}}
-                                               <li role="menuitem" class="nav-sitename list-group-item">{{$nav.sitename|escape}}</li>
+                                               <li role="menuitem" class="nav-sitename list-group-item">{{$nav.sitename}}</li>
                                                {{/if}}{{/if}}
-                                               <li role="presentation" class="list-group-item"><img src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name|escape}}" style="max-width:15px; max-height:15px; min-width:15px; min-height:15px; width:15px; height:15px;"> {{$nav.userinfo.name|escape}}{{if $nav.remote}} ({{$nav.remote}}){{/if}}</li>
+                                               <li role="presentation" class="list-group-item"><img src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:15px; max-height:15px; min-width:15px; min-height:15px; width:15px; height:15px;"> {{$nav.userinfo.name}}{{if $nav.remote}} ({{$nav.remote}}){{/if}}</li>
                                                {{foreach $nav.usermenu as $usermenu}}
-                                               <li role="menuitem" class="list-group-item"><a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3|escape}}">{{$usermenu.1}}</a></li>
+                                               <li role="menuitem" class="list-group-item"><a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
                                                {{/foreach}}
                                                {{if $nav.notifications}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1|escape}}"><i class="fa fa-exclamation-circle fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation-circle fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.contacts}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3|escape}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.messages}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3|escape}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.manage}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3|escape}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.manage.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.manage.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.settings}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3|escape}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.admin}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3|escape}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.logout}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3|escape}}" ><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i> {{$nav.logout.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" ><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i> {{$nav.logout.1}}</a></li>
                                                {{else}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3|escape}}" ><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> {{$nav.login.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" ><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> {{$nav.login.1}}</a></li>
                                                {{/if}}
                                        </ul>
                                </div>
                        <ul class="nav navbar-nav navbar-right">
                                <li role="presentation">
                                        <a href="login?mode=none" id="nav-login"
-                                               data-toggle="tooltip" aria-label="{{$nav.login.3}}" title="{{$nav.login.3|escape}}">
+                                               data-toggle="tooltip" aria-label="{{$nav.login.3}}" title="{{$nav.login.3}}">
                                                        <i class="fa fa-sign-in fa-fw" aria-hidden="true"></i>
                                        </a>
                                </li>
                                <li role="presentation">
-                                       <a href="{{$nav.about.0}}" id="nav-about" data-toggle="tooltip" aria-label="{{$nav.about.3}}" title="{{$nav.about.3|escape}}">
+                                       <a href="{{$nav.about.0}}" id="nav-about" data-toggle="tooltip" aria-label="{{$nav.about.3}}" title="{{$nav.about.3}}">
                                                <i class="fa fa-info fa-fw" aria-hidden="true"></i>
                                        </a>
                                </li>
 {{* provide a a search input for mobile view, which expands by pressing the search icon *}}
 <div id="search-mobile" class="hidden-lg hidden-md collapse">
        <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
-               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name|escape}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
+               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
                <div class="form-group form-group-search">
-                       <input id="nav-search-input-field-mobile" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint|escape}}" placeholder="{{$nav.search.1}}">
+                       <input id="nav-search-input-field-mobile" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
                        <button class="btn btn-default btn-sm form-button-search" type="submit">{{$nav.search.1}}</button>
                </div>
        </form>
index da637e7cf754c8b9d6887c326306d682e2017c31..8bc0c91d65bfcf5fa7e7df87d64d2a96c7ff704f 100644 (file)
@@ -1,9 +1,9 @@
 
 <div id="nets-sidebar" class="widget">
        <h3>{{$title}}</h3>
-       <div id="nets-desc">{{$desc}}</div>
+       <div id="nets-desc">{{$desc nofilter}}</div>
        <ul role="menu" class="nets-ul">
-               <li role="menuitem" {{if $sel_all}}class="selected"{{/if}}><a href="{{$base}}?nets=all" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a></li>
+               <li role="menuitem" {{if $sel_all}}class="selected"{{/if}}><a href="{{$base}}" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a></li>
                {{foreach $nets as $net}}
                <li role="menuitem" {{if $net.selected}}class="selected"{{/if}}><a href="{{$base}}?nets={{$net.ref}}" class="nets-link{{if $net.selected}} nets-selected{{/if}}">{{$net.name}}</a></li>
                {{/foreach}}
index b6b1d2da91a1bf9519b9feb522b93149b2d01709..1be92c4b24e249876e2ff6dd49d85cc73d51209a 100644 (file)
@@ -14,7 +14,7 @@
                {{if $notif_content}}
                <ul class="notif-network-list media-list">
                {{foreach $notif_content as $notification}}
-                       <li>{{$notification}}</li>
+                       <li>{{$notification nofilter}}</li>
                {{/foreach}}
                </ul>
                {{/if}}
@@ -26,5 +26,5 @@
        </div>
 
        {{* The pager *}}
-       {{$notif_paginate}}
+       {{$notif_paginate nofilter}}
 </div>
index 6122ecdfbbf798966aaf51f71f04a07cfd5693b0..a42647cff8915564537244b2c3bc104c20c61c03 100644 (file)
@@ -5,7 +5,7 @@
        </div>
        <div class="notif-desc-wrapper media-body">
                <a href="{{$item_link}}">
-                       {{$item_text}}
+                       {{$item_text nofilter}}
                        <div><time class="notif-when time" data-toggle="tooltip" title="{{$item_when}}">{{$item_ago}}</time></div>
                </a>
        </div>
index 21b3e47e839fae395dd7d51a03c698f21037d55c..fc5d249b4b5c7e97c66e129895396fee6366ca6b 100644 (file)
@@ -5,8 +5,8 @@
                {{* The search field *}}
                <label for="side-peoplefind-url" id="peoplefind-desc">{{$nv.desc}}</label>
                <div class="form-group form-group-search">
-                       <input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$nv.hint|escape:'html'}}" />
-                       <button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$nv.findthem|escape: 'html'}}</button>
+                       <input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$nv.hint}}" />
+                       <button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$nv.findthem}}</button>
                </div>
        </form>
 
index 235b9c46db65968485b746913bfe61299ec10d71..a34e8ea8616483c0e4683c90642e9aa5e415881c 100644 (file)
@@ -37,7 +37,7 @@
        </div>
        <div class="photo-album-end"></div>
 
-       {{$paginate}}
+       {{$paginate nofilter}}
 </div>
 
 <script type="text/javascript">$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
index 8267fd6315469c05b43d525a31a6fe9d90be243d..935e6288b3ef8bd344fe7a0739b049138a08bf1e 100644 (file)
@@ -23,7 +23,7 @@
        <div class="contact-photo-wrapper mframe p-author h-card pull-left">
                <a class="userinfo u-url" id="wall-item-photo-menu-{{$id}}" href="{{$profile_url}}">
                        <div class="contact-photo-image-wrapper">
-                               <img src="{{$thumb}}" class="contact-photo-xs media-object p-name u-photo" id="wall-item-photo-{{$id}}" alt="{{$name|escape}}" />
+                               <img src="{{$thumb}}" class="contact-photo-xs media-object p-name u-photo" id="wall-item-photo-{{$id}}" alt="{{$name}}" />
                        </div>
                </a>
        </div>
index c64f9b89b5d55a7c405445dd0eb0fc5a849ebe69..a86aa7f80926e46c105980a0c6c8687f17c17692 100644 (file)
@@ -1,4 +1,4 @@
-<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title|escape}}">
-       <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name|escape}}{{elseif $photo.desc}}{{$photo.desc|escape}}{{elseif $photo.alt}}{{$photo.alt|escape}}{{else}}{{$photo.unknown|escape}}{{/if}}" title="{{$photo.title|escape}}" id="photo-top-photo-{{$photo.id}}" />
+<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+       <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
 </a>
 
index e540a03f90fe7412b248f69b17d58e24d9ca7027..359c42669622c9f334451048c163f9c3f8c41717 100644 (file)
@@ -5,24 +5,24 @@
 
 <div id="photo-view-{{$id}}" class="generic-page-wrapper">
        <div class="pull-left" id="photo-edit-link-wrap">
-               <a class="page-action faded-icon" id="photo-album-link" href="{{$album.0}}" title="{{$album.1|escape}}" data-toggle="tooltip">
+               <a class="page-action faded-icon" id="photo-album-link" href="{{$album.0}}" title="{{$album.1}}" data-toggle="tooltip">
                        <i class="fa fa-folder-open"></i>&nbsp;{{$album.1}}
                </a>
        </div>
        <div class="pull-right" id="photo-edit-link-wrap">
                {{if $tools}}
                <span class="icon-padding"> </span>
-               <a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1|escape}}" data-toggle="tooltip">
+               <a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1}}" data-toggle="tooltip">
                        <i class="page-action faded-icon fa fa-pencil"></i>
                </a>
                <span class="icon-padding"> </span>
-               <a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1|escape}}" data-toggle="tooltip">
+               <a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1}}" data-toggle="tooltip">
                        <i class="page-action faded-icon fa fa-user"></i>
                </a>
                {{/if}}
                {{if $lock}}
                <span class="icon-padding"> </span>
-               <a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$lock|escape}}" data-toggle="tooltip">
+               <a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$lock}}" data-toggle="tooltip">
                        <i class="page-action faded-icon fa fa-lock"></i>
                </a>
                {{/if}}
@@ -33,7 +33,7 @@
                <div id="photo-photo">
                        {{* The photo *}}
                        <div class="photo-container">
-                               <a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" alt="{{$photo.filename|escape}}"/></a>
+                               <a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" alt="{{$photo.filename}}"/></a>
                        </div>
 
                        {{* Overlay buttons for previous and next photo *}}
 
                <div id="photo-photo-end"></div>
                {{* The photo description *}}
-               <div id="photo-caption">{{$desc}}</div>
+               <div id="photo-caption">{{$desc nofilter}}</div>
 
                {{* Tags and mentions *}}
                {{if $tags}}
                <div id="photo-tags">{{$tags.title}}
                        {{foreach $tags.tags as $t}}
                        <span class="category label btn-success sm">
-                               <span class="p-category">{{$t.name|escape}}</span>
+                               <span class="p-category">{{$t.name}}</span>
                                {{if $t.removeurl}} <a href="{{$t.removeurl}}">(X)</a> {{/if}}
                        </span>
                        {{/foreach}}
                {{/if}}
 
                {{* The part for editing the photo - only available for the edit subpage *}}
-               {{if $edit}}{{$edit}}{{/if}}
+               {{if $edit}}{{$edit nofilter}}{{/if}}
 
                {{if $likebuttons}}
                <div id="photo-like-div">
-                       {{$likebuttons}}
-                       {{$like}}
-                       {{$dislike}}
+                       {{$likebuttons nofilter}}
+                       {{$like nofilter}}
+                       {{$dislike nofilter}}
                </div>
                {{/if}}
                <hr>
@@ -82,8 +82,8 @@
 
        {{* Insert the comments *}}
        <div id="photo-comment-wrapper-{{$id}}" class="photo-comment-wrapper">
-               {{$comments}}
+               {{$comments nofilter}}
        </div>
 
-       {{$paginate}}
+       {{$paginate nofilter}}
 </div>
index 73d5e506453b84bc3ae6a3c3aaf14c62dffdd315..b1ff212e20a773cb338a677097295806d5a4ed2b 100644 (file)
@@ -1,2 +1,2 @@
 
-<button id="photos-upload-submit" class="btn btn-primary">{{$submit|escape:'html'}}</button>
+<button id="photos-upload-submit" class="btn btn-primary">{{$submit}}</button>
index f02246c5c785a0c6b6e4f5bfd3c898b2a4140d58..81d0f967e29852cdb60d788e0cf5321cf0c8936c 100644 (file)
@@ -28,7 +28,7 @@
 
                        <div id="photos-upload-spacer"></div>
 
-                       {{$alt_uploader}}
+                       {{$alt_uploader nofilter}}
                {{/if}}
 
 
@@ -43,9 +43,9 @@
                                                <i id="jot-perms-icon" class="fa {{$lockstate}}"></i> 
                                        </button>
 
-                                       {{$default_upload_submit}}
+                                       {{$default_upload_submit nofilter}}
                                </div>
-                               {{$default_upload_box}}
+                               {{$default_upload_box nofilter}}
                        </div>
                        <div class="clearfix"></div>
                {{/if}}
@@ -63,7 +63,7 @@
                                                <h4 id="modal-title" class="modal-title">{{$permissions}}</h4>
                                        </div>
                                        <div id="photos-upload-permissions-wrapper" class="modal-body">
-                                               {{$aclselect}}
+                                               {{$aclselect nofilter}}
                                        </div>
                                </div>
                        </div>
index 6fb3b399b1c0d34c5d863cf0295baf3e5d290a7b..b015c4447f26b273c777b06102bcab6b9719e11f 100644 (file)
@@ -2,7 +2,7 @@
 <div id="poke-wrapper">
 
        <h3 class="heading">{{$title}}</h3>
-       <div id="poke-desc">{{$desc}}</div>
+       <div id="poke-desc">{{$desc nofilter}}</div>
 
        <form id="poke-form" action="poke" method="get">
 
@@ -11,7 +11,7 @@
                        {{* The input field with the recipient name*}}
                        <div id="poke-recip-wrapper" class="form-group">
                                <label for="poke-recip">{{$clabel}}</label>
-                               <input id="poke-recip" class="form-control" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" name="pokename" autocomplete="off" />
+                               <input id="poke-recip" class="form-control" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" />
                                <input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
                                <input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
                        </div>
@@ -37,7 +37,7 @@
                <div id="poke-content-wrapper-end"></div>
 
                <div id="poke-submit-wrapper">
-                       <button class="btn btn-primary pull-right" type="submit" name="submit" value="{{$submit|escape:'html'}}"><i class="fa fa-slideshare"></i>&nbsp;{{$submit|escape:'html'}}</button>
+                       <button class="btn btn-primary pull-right" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-slideshare"></i>&nbsp;{{$submit}}</button>
                </div>
 
                <div id="poke-submit-wrapper-end"></div>
index 256a4138a4c405bc57cd94461f5b4844df4c372d..a35955c1707ee15b6a6ed7e95968128214fad279 100644 (file)
@@ -82,7 +82,7 @@
                        <div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
@@ -90,7 +90,7 @@
                        <div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
-
                        {{if $profile.music}}
                        <div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                        <hr class="profile-separator">
                        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1}}</div>
+                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1 nofilter}}</div>
                        </div>
                        {{/if}}
 
                        <div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
                                <hr class="profile-separator">
                                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
-                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1}}</div>
+                               <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1 nofilter}}</div>
                        </div>
                        {{/if}}
                </div>
index 89353e1a6c23923a13596eddc15b88000319c8a9..946443cf1134524f90f5fb101c0b5494038a7b5e 100644 (file)
                                        <i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
                                </button>
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
-                                       <li role="presentation"><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
-                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" title="{{$lbl_profile_photo|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$lbl_profile_photo}}</button></li>
+                                       <li role="presentation"><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
+                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" title="{{$lbl_profile_photo}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$lbl_profile_photo}}</button></li>
                                        {{if ! $is_default}}
                                        <li role="presentation" class="nav-item"><a role="menuitem" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil" aria-hidden="true"></i>&nbsp;{{$editvis}}</a>
                                        </li>
                                        {{/if}}
                                        <li role="presentation" class="divider"></li>
-                                       <li role="presentation"><a role="menuitem" href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof|escape:'html'}}">{{$viewprof}}</a></li>
-                                       <li role="presentation"><a role="menuitem" href="profiles" id="profile-edit-view-link" title="{{$viewallprof|escape:'html'}}">{{$viewallprof}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="profiles" id="profile-edit-view-link" title="{{$viewallprof}}">{{$viewallprof}}</a></li>
                                        {{if $profile_clone_link}}
                                        <li role="presentation" class="divider"></li>
-                                       <li role="presentation"><a role="menuitem" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof|escape:'html'}}">{{$cl_prof}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
                                        {{/if}}
                                        {{if !$is_default}}
                                        <li role="presentation" class="divider"></li>
-                                       <li role="presentation"><a role="menuitem" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof|escape:'html'}}"><i class="fa fa-trash" aria-hidden="true"></i>&nbsp;{{$del_prof}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}"><i class="fa fa-trash" aria-hidden="true"></i>&nbsp;{{$del_prof}}</a></li>
                                        {{/if}}
                                </ul>
                        </li>
@@ -65,7 +65,7 @@
 
                {{* Some hints to characteristics of the current profile (if available) *}}
                {{if $is_default}}
-               <div class="section-content-info-wrapper">{{$default}}</div>
+               <div class="section-content-info-wrapper">{{$default nofilter}}</div>
                {{/if}}
 
                {{* friendica differs in $detailled_profile (all fields available and a short Version if this is variable false *}}
 
                                                {{include file="field_input.tpl" field=$pdesc}}
 
-
                                                <div id="profile-edit-gender-wrapper" class="form-group field select">
                                                        <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-                                                       {{$gender}}
+                                                       {{$gender nofilter}}
                                                </div>
                                                <div class="clear"></div>
 
-                                               {{$dob}}
+                                               {{$dob nofilter}}
 
-                                               {{$hide_friends}}
+                                               {{$hide_friends nofilter}}
 
                                                <div class="form-group pull-right" >
                                                        <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                <div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
                                        <div class="section-content-tools-wrapper">
                                                <div id="profile-edit-marital-wrapper" class="form-group field select" >
-                                                               <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}}</label>
-                                                               {{$marital.selector}}
+                                                               <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital nofilter}}</label>
+                                                               {{$marital.selector nofilter}}
                                                </div>
                                                <div class="clear"></div>
 
 
                                                <div id="profile-edit-sexual-wrapper" class="form-group field select" >
                                                        <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label>
-                                                       {{$sexual.selector}}
+                                                       {{$sexual.selector nofilter}}
                                                </div>
                                                <div class="clear"></div>
 
                {{if $personal_account}}
                <div id="profile-edit-gender-wrapper" class="form-group field select">
                        <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-                       {{$gender}}
+                       {{$gender nofilter}}
                </div>
                <div class="clear"></div>
 
-               {{$dob}}
+               {{$dob nofilter}}
 
                {{/if}}
 
 
                {{include file="field_input.tpl" field=$xmpp}}
 
-               {{$hide_friends}}
+               {{$hide_friends nofilter}}
 
                {{include file="field_input.tpl" field=$address}}
 
index 1ee9eda85ccca5ef4306e83edeeeca5ad8de27fb..fb5436fb52bacd80de9331f53bddf1f617394da7 100644 (file)
@@ -1,7 +1,7 @@
 
 <div class="profile-listing-row" >
        <div class="profile-listing-cell" >
-               <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt|escape}}" /></a>
+               <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
        </div>
        <div class="profile-listing-photo-end"></div>
        <div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
index 1e6ae0dbf9c0e0e9349ae861ca25422092fbf78e..3419c410493c396612d4ddc10af607258ff912c1 100644 (file)
@@ -10,7 +10,7 @@
 
        <div class="section-content-wrapper">
                <div id="profile-listing-profiles" class="profile-listing-table">
-                       {{$profiles}}
+                       {{$profiles nofilter}}
                </div>
        </div>
 </div>
index 793fec753af80935358308c177c95d6aef913a88..0649f8a551bc03056a4850037b142af95bf2bd8c 100644 (file)
@@ -2,19 +2,19 @@
 
        <div id="profile-photo-wrapper">
                {{if $profile.picdate}}
-               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}" /></a>
+               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
                {{else}}
-               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name|escape}}" /></a>
+               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
                {{/if}}
 
                <div class="tool visible-lg visible-md">
                        {{if $profile.edit}}
                        <div class="action">
-                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3|escape}}"><i class="fa fa-pencil-square-o"></i></a>
+                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
                        </div>
                        {{else}}
                                {{if $profile.menu}}
-                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile|escape}}" href="profiles" ></a></div>
+                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
                                {{/if}}
                        {{/if}}
                </div>
        <div id="vcard-short-info-wrapper" style="display: none;">
                <div id="vcard-short-info" class="media" style="display: none">
                        <div id="vcard-short-photo-wrapper" class="pull-left">
-                               <img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name|escape}}" />
+                               <img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}" />
                        </div>
 
                        <div id="vcard-short-desc" class="media-body">
-                               <h4 class="media-heading">{{$profile.name|escape}}</h4>
-                               {{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr|escape}}</div>{{/if}}
+                               <h4 class="media-heading">{{$profile.name}}</h4>
+                               {{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr}}</div>{{/if}}
                        </div>
                </div>
        </div>
 
        <div class="panel-body">
                <div class="profile-header">
-                       <h3 class="fn p-name">{{$profile.name|escape}}</h3>
+                       <h3 class="fn p-name">{{$profile.name}}</h3>
 
-                       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+                       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
-                       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc|escape}}</div>{{/if}}
+                       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
                </div>
 
                <div id="profile-extra-links">
@@ -62,7 +62,7 @@
                        {{/if}}
                        {{if $wallmessage}}
                        <div id="wallmessage-link-botton">
-                               <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link|escape}}')">
+                               <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
                                        <span class=""><i class="fa fa-envelope"></i></span>
                                        <span class="">{{$wallmessage}}</span>
                                </button>
                        <span class="adr">
                                {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address}}</span>{{/if}}
                                <span class="city-state-zip">
-                                       <span class="locality p-locality">{{$profile.locality|escape}}</span>{{if $profile.locality}}, {{/if}}
-                                       <span class="region p-region">{{$profile.region|escape}}</span>
-                                       <span class="postal-code p-postal-code">{{$profile.postal_code|escape}}</span>
+                                       <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                                       <span class="region p-region">{{$profile.region}}</span>
+                                       <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                                </span>
-                               {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name|escape}}</span>{{/if}}
+                               {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                        </span>
                </div>
                {{/if}}
                {{if $profile.xmpp}}
                <div class="xmpp">
                        <span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
-                       <span class="xmpp-data">{{$profile.xmpp|escape}}</span>
+                       <span class="xmpp-data">{{$profile.xmpp}}</span>
                </div>
                {{/if}}
 
                {{if $gender}}
                <div class="mf detail">
                        <span class="gender-label icon"><i class="fa fa-venus-mars"></i></span>
-                       <span class="p-gender">{{$profile.gender|escape}}</span>
+                       <span class="p-gender">{{$profile.gender}}</span>
                </div>
                {{/if}}
 
-               {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey|escape}}</div>{{/if}}
+               {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
 
-               {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts|escape}}</div>{{/if}}
+               {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
 
-               {{if $updated}}<div class="updated" style="display:none;">{{$updated|escape}}</div>{{/if}}
+               {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
                {{if $marital}}
                <div class="marital detail">
                        <span class="marital-label icon"><i class="fa fa-heart"></i></span>
-                       <span class="marital-text icon">{{$profile.marital|escape}}</span>
+                       <span class="marital-text icon">{{$profile.marital}}</span>
                </div>
                {{/if}}
 
                {{if $homepage}}
                <div class="homepage detail">
                        <span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
-                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage|escape}}</a></span>
+                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></span>
                </div>
                {{/if}}
 
-               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about|escape}}</dt><dd class="x-network">{{$profile.about}}</dd></dl>{{/if}}
+               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
                {{include file="diaspora_vcard.tpl"}}
        </div>
 
 {{if $contact_block}}
 <div class="widget" id="widget-contacts">
-       {{$contact_block}}
+       {{$contact_block nofilter}}
 </div>
 {{/if}}
index 9077c4d4c1e274433c0ed846694de64261df7152..68db2568a27883e9c2df09b55738f01d54a44664 100644 (file)
@@ -6,7 +6,7 @@
        <h3>{{$header}}</h3>
        *}}
 
-       {{$parent}}
+       {{$parent nofilter}}
 
        {{* The To: form-group which contains the message recipient *}}
        <div id="prvmail-to-label" class="form-group">
@@ -15,7 +15,7 @@
                <input type="text" id="recip" class="form-control" name="messagerecip" value="{{$prefill}}" tabindex="10" {{if $prefill}}disabled{{else}}aria-required="true"{{/if}} />
                <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
                {{else}}
-               {{$select}}
+               {{$select nofilter}}
                {{/if}}
        </div>
 
 
        <ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                <li>
-                                       <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="imgprv" data-id="input">
+                                       <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="imgprv" data-id="input">
                                                <i class="fa fa-picture-o" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
+                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
                                                <i class="fa fa-link" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
+                                       <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
                                                <i class="fa fa-video-camera" aria-hidden="true"></i>
                                        </button>
                                </li>
 
                                <li>
-                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
+                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
                                                <i class="fa fa-underline" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
+                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
                                                <i class="fa fa-italic" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
+                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
                                                <i class="fa fa-bold" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
+                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
                                                <i class="fa fa-quote-left" aria-hidden="true"></i>
                                        </button>
                                </li>
@@ -74,9 +74,9 @@
 
        {{* The submit button *}}
        <div id="prvmail-submit-wrapper">
-               <button type="submit" id="prvmail-submit" name="submit" value="{{$submit|escape:'html'}}" class="btn btn-primary pull-right"  tabindex="13">
+               <button type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" class="btn btn-primary pull-right"  tabindex="13">
                        <i class="fa fa-slideshare fa-fw" aria-hidden="true"></i>
-                       {{$submit|escape:'html'}}
+                       {{$submit}}
                </button>
        </div>
 
index c148b6063fd101fcd3af6d91dafdff3e42714bda..ab79e7d38cea74dac4cdc76636b91527000588a9 100644 (file)
@@ -1,4 +1,3 @@
-
 <div class="generic-page-wrapper">
 
        <form action="register" method="post" id="register-form">
@@ -8,15 +7,14 @@
 
                <h3 class="heading">{{$regtitle}}</h3>
 
-               {{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
+               {{if $registertext != ""}}<div class="error-message">{{$registertext nofilter}}</div>{{/if}}
 
                {{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
 
-
                {{if $oidlabel}}
                <div id="register-openid-wrapper" class="form-group">
                        <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="openid_url" class="openid form-control" id="register-openid" value="{{$openid|escape:'html'}}">
+                       <input type="text" maxlength="60" size="32" name="openid_url" class="openid form-control" id="register-openid" value="{{$openid}}">
                        <span class="help-block" id="openid_url_tip">{{$fillwith}}&nbsp;{{$fillext}}</span>
                </div>
                <div id="register-openid-end" ></div>
 
                <div id="register-name-wrapper" class="form-group">
                        <label for="register-name" id="label-register-name" >{{$namelabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username|escape:'html'}}">
+                       <input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username}}">
                </div>
                <div id="register-name-end" ></div>
 
 
                <div id="register-email-wrapper" class="form-group">
                        <label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="email" id="register-email" class="form-control" value="{{$email|escape:'html'}}">
+                       <input type="text" maxlength="60" size="32" name="email" id="register-email" class="form-control" value="{{$email}}">
                </div>
                <div id="register-email-end" ></div>
 
@@ -51,7 +49,7 @@
 
                <div id="register-nickname-wrapper" class="form-group">
                        <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" class="form-control" value="{{$nickname|escape:'html'}}">
+                       <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" class="form-control" value="{{$nickname}}">
                        <span class="help-block" id="nickname_tip">{{$nickdesc}}</span>
                </div>
                <div id="register-nickname-end" ></div>
@@ -60,7 +58,7 @@
                {{include file="field_textarea.tpl" field=$permonlybox}}
                {{/if}}
 
-               {{$publish}}
+               {{$publish nofilter}}
 
                {{if $showtoslink}}
                <p><a href="{{$baseurl}}/tos">{{$tostext}}</a></p>
                {{if $showprivstatement}}
                <h4>{{$privstatement.0}}</h4>
                {{for $i=1 to 3}}
-               <p>{{$privstatement[$i]}}</p>
+               <p>{{$privstatement[$i] nofilter}}</p>
                {{/for}}
                {{/if}}
 
                <div id="register-submit-wrapper" class="pull-right">
-                       <button type="submit" name="submit" id="register-submit-button" class="btn btn-primary" value="{{$regbutt|escape:'html'}}">{{$regbutt|escape:'html'}}</button>
+                       <button type="submit" name="submit" id="register-submit-button" class="btn btn-primary" value="{{$regbutt}}">{{$regbutt}}</button>
                </div>
                <div id="register-submit-end" class="clear"></div>
 
@@ -82,6 +80,4 @@
                        <a href="uimport">{{$importt}}</a>
                </div>
        </form>
-
-       {{$license}}
 </div>
index 2e599a0dab1245d968f732fc37c2583e28d6d447..2410363d5e8edcc2602a33d61e0b4fd6e8ba24bf 100644 (file)
@@ -3,7 +3,7 @@
        {{include file="section_title.tpl" title=$title }}
 
        <div id="remove-account-wrapper">
-               <div id="remove-account-desc">{{$desc}}</div>
+               <div id="remove-account-desc">{{$desc nofilter}}</div>
 
                <form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
                        <input type="hidden" name="verify" value="{{$hash}}" />
@@ -15,7 +15,7 @@
                        <div id="remove-account-pass-end"></div>
 
                        <div class="form-group pull-right settings-submit-wrapper" >
-                               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}"><i class="fa fa-trash fa-fw"></i>&nbsp;{{$submit}}</button>
+                               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}"><i class="fa fa-trash fa-fw"></i>&nbsp;{{$submit}}</button>
                        </div>
                        <div class="clear"></div>
                </form>
index f31b7b7a44787336c343d9f9daca0eb37729e2b5..b668229e8af5ebb2b71017475cafabd905c8ab12 100644 (file)
@@ -1,7 +1,7 @@
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">
-       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred|escape}}">{{$item.star.starred}}</span>
-       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, {{$item.id}});" title="{{$item.lock|escape}}"></span><span class="fa fa-lock" aria-hidden="true"></span>{{/if}}
+       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, {{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock" aria-hidden="true"></span>{{/if}}
 </div>
 <!-- ./TODO => Unknow block -->
 
@@ -12,7 +12,7 @@
                        {{* Put additional actions in a top-right dropdown menu *}}
 
                        <ul class="nav nav-pills preferences">
-                               <li><span class="wall-item-network" title="{{$item.app|escape}}">{{$item.network_name|escape}}</span></li>
+                               <li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
 
                                {{if $item.plink || $item.star || $item.drop.dropping || $item.edpost || $item.subthread}}
                                <li class="dropdown">
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                                {{if $item.plink}}      {{*link to the original source of the item *}}
                                                <li role="menuitem">
-                                                       <a title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title|escape}}</a>
+                                                       <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title}}</a>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.edpost}} {{* edit the posting *}}
                                                <li role="menuitem">
-                                                       <button type="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>
+                                                       <button type="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.tagger}} {{* tag the post *}}
                                                <li role="menuitem">
-                                                       <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add|escape}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>
+                                                       <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.filer}}
                                                <li role="menuitem">
-                                                       <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer|escape}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>
+                                                       <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.star}}
                                                <li role="menuitem">
-                                                       <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do|escape}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
-                                                       <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo|escape}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
+                                                       <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
+                                                       <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.subthread}}
                                                <li role="menuitem">
-                                                       <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title|escape}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title|escape}}</button>
+                                                       <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.drop.dropping}}
                                                <li role="separator" class="divider"></li>
                                                <li role="menuitem">
-                                                       <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete|escape}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
+                                                       <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
                                                </li>
                                                {{/if}}
                                        </ul>
                                <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
                                        <a href="{{$item.profile_url}}" class="userinfo u-url" id="wall-item-photo-menu-{{$item.id}}">
                                                <div class="contact-photo-image-wrapper">
-                                                       <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                                       <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                                </div>
                                        </a>
                                </div>
                                <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
                                        <a href="{{$item.profile_url}}" class="userinfo u-url" id="wall-item-photo-menu-xs-{{$item.id}}">
                                                <div class="contact-photo-image-wrapper">
-                                                       <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                                       <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}" />
                                                </div>
                                        </a>
                                </div>
 
                        {{* contact info header*}}
                        <div role="heading " class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-                               <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name|escape}}</span></a>
-                                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a>{{/if}}
-                                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock|escape}}">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}
+                               <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+                                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+                                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock}}">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}
 
                                        <div class="additional-info text-muted">
                                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-                                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime|escape}}" data-toggle="tooltip">{{$item.ago}}</span></a></small>
+                                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></a></small>
                                                </div>
 
                                                {{if $item.location}}
                                                <div id="wall-item-location-{{$item.id}}" class="wall-item-location">
-                                                       <small><span class="location">({{$item.location}})</span></small>
+                                                       <small><span class="location">({{$item.location nofilter}})</span></small>
                                                </div>
                                                {{/if}}
                                        </div>
                        {{* contact info header for smartphones *}}
                        <div role="heading " class="contact-info-xs hidden-lg hidden-md">
                                <h5 class="media-heading">
-                                       <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span>{{$item.name|escape}}</span></a>
+                                       <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a>
                                        <p class="text-muted"><small>
-                                               <span class="wall-item-ago">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
+                                               <span class="wall-item-ago">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}</small>
                                        </p>
                                </h5>
                        </div>
                                {{/if}}
 
                                {{if $item.title}}
-                               <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title|escape}}</a></h4><br /></span>
+                               <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h4><br /></span>
                                {{/if}}
 
-                               <div class="wall-item-body" id="wall-item-body-{{$item.id}}">{{$item.body}}</div>
+                               <div class="wall-item-body" id="wall-item-body-{{$item.id}}">{{$item.body nofilter}}</div>
                        </div>
 
                        <!-- TODO -->
                                <div class="wall-item-tags">
                        {{if !$item.suppress_tags}}
                                {{foreach $item.hashtags as $tag}}
-                                       <span class="tag label btn-info sm">{{$tag}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
+                                       <span class="tag label btn-info sm">{{$tag nofilter}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
                                {{/foreach}}
 
                                {{foreach $item.mentions as $tag}}
-                                       <span class="mention label btn-warning sm">{{$tag}} <i class="fa fa-user" aria-hidden="true"></i></span>
+                                       <span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
                                {{/foreach}}
                        {{/if}}
 
                                {{foreach $item.folders as $cat}}
-                                       <span class="folder label btn-danger sm">{{$cat.name|escape}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                                       <span class="folder label btn-danger sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                {{/foreach}}
 
                                {{foreach $item.categories as $cat}}
-                                       <span class="category label btn-success sm">{{$cat.name|escape}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                                       <span class="category label btn-success sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                {{/foreach}}
                                </div>
-                               {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']|escape}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
+                               {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
                        </div>
                        <!-- ./TODO -->
 
                                <div class="wall-item-actions-left pull-left">
                                        <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
                                        <div id="button-reply" class="pull-left">
-                                               <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment|escape}}"></i> </span>
+                                               <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
                                        </div>
                                        {{/if}}{{/if}}-->
 
                                        {{* Buttons for like and dislike *}}
                                        {{if $item.vote}}
                                                {{if $item.vote.like}}
-                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0|escape}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
                                                {{/if}}
                                                {{if $item.vote.like AND $item.vote.dislike}}
                                        <span role="presentation" class="separator">•</span>
                                                {{/if}}
 
                                                {{if $item.vote.dislike}}
-                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0|escape}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
                                                {{/if}}
                                                {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
                                        <span role="presentation" class="separator">•</span>
 
                                        {{* Button to open the comment text field *}}
                                        {{if $item.comment}}
-                                               <button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment|escape}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
+                                               <button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
                                        {{/if}}
 
                                        {{* Button for sharing the item *}}
                                                        {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
                                        <span role="presentation" class="separator">•</span>
                                                        {{/if}}
-                                       <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.0}}</button>
+                                       <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.0}}</button>
                                                {{/if}}
                                        {{/if}}
-                                       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+                                       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                                </div>
 
 
                                        {{* Event attendance buttons *}}
                                        {{if $item.isevent}}
                                        <div class="vote-event">
-                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0|escape}}" onclick="doLikeAction({{$item.id}}, 'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1|escape}}" onclick="doLikeAction({{$item.id}}, 'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2|escape}}" onclick="doLikeAction({{$item.id}}, 'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}}, 'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}}, 'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}}, 'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
                                        </div>
                                        {{/if}}
 
                                        <div class="pull-right checkbox">
                                                {{if $item.drop.pagedrop}}
-                                               <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
+                                               <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
                                                <label for="checkbox-{{$item.id}}"></label>
                                                {{/if}}
                                        </div>
                        {{if $item.responses}}
                        <div class="wall-item-responses">
                                {{foreach $item.responses as $verb=>$response}}
-                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
                                {{/foreach}}
                        </div>
                        {{/if}}
 
                        <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
                        {{if $item.conv}}
-                               <a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title|escape}}">{{$item.conv.title|escape}}</a>
+                               <a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title}}">{{$item.conv.title}}</a>
                        {{/if}}
                        </div>
                </div><!--./media>-->
index e8824b91a44ba47c73f3f5dc2f43498002ee4b79..b14552381dd0d70682210f890a61aa7691f17c87 100644 (file)
@@ -3,9 +3,9 @@
        {{include file="section_title.tpl" title=$title}}
 
        <form action="settings/addon" method="post" autocomplete="off">
-       <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+       <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 
-       {{$settings_addons}}
+       {{$settings_addons nofilter}}
 
        </form>
 
index 7a18c46f778b7e8be5d7084ffa4989352b7c019e..bf8de450c46a703a279671b74a95c86b1db1fb6e 100644 (file)
                                        <div class="section-content-wrapper">
 
                                                {{include file="field_checkbox.tpl" field=$disable_cw}}
+
                                                {{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
+
                                                {{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
-                                               {{$default_group}}
+
+                                               {{$default_group nofilter}}
+
                                                {{include file="field_input.tpl" field=$legacy_contact}}
 
                                                <p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
                        </div>
                </div>
 
-               {{$settings_connectors}}
-
-{{if $mail_disabled}}
+               {{$settings_connectors nofilter}}
 
-{{else}}
+{{if !$mail_disabled}}
                <span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
                        <img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
                </span>
                <div id="settings_mail_expanded" class="settings-block" style="display: none;">
-               <span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
-                       <img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
-               </span>
-               <p>{{$imap_desc}}</p>
-               {{include file="field_custom.tpl" field=$imap_lastcheck}}
-               {{include file="field_input.tpl" field=$mail_server}}
-               {{include file="field_input.tpl" field=$mail_port}}
-               {{include file="field_select.tpl" field=$mail_ssl}}
-               {{include file="field_input.tpl" field=$mail_user}}
-               {{include file="field_password.tpl" field=$mail_pass}}
-               {{include file="field_input.tpl" field=$mail_replyto}}
-               {{include file="field_checkbox.tpl" field=$mail_pubmail}}
-               {{include file="field_select.tpl" field=$mail_action}}
-               {{include file="field_input.tpl" field=$mail_movetofolder}}
+                       <span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
+                               <img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
+                       </span>
+                       <p>{{$imap_desc nofilter}}</p>
 
-               <div class="settings-submit-wrapper" >
-                       <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
-               </div>
+                       {{include file="field_custom.tpl" field=$imap_lastcheck}}
+                       {{include file="field_input.tpl" field=$mail_server}}
+                       {{include file="field_input.tpl" field=$mail_port}}
+                       {{include file="field_select.tpl" field=$mail_ssl}}
+                       {{include file="field_input.tpl" field=$mail_user}}
+                       {{include file="field_password.tpl" field=$mail_pass}}
+                       {{include file="field_input.tpl" field=$mail_replyto}}
+                       {{include file="field_checkbox.tpl" field=$mail_pubmail}}
+                       {{include file="field_select.tpl" field=$mail_action}}
+                       {{include file="field_input.tpl" field=$mail_movetofolder}}
+
+                       <div class="settings-submit-wrapper" >
+                               <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
+                       </div>
                </div>
 {{/if}}
 
index 70307c440c0daeddad23f49c779c3f8104096829..6e2bc9089c734d7525852ddc6bdc0148341a37ce 100644 (file)
@@ -28,7 +28,7 @@
                                                {{/if}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
 
@@ -47,9 +47,9 @@
                                <div id="custom-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
                                        <div class="section-content-tools-wrapper">
 
-                                               {{if $theme_config}}
-                                               {{$theme_config}}
-                                               {{/if}}
+                                       {{if $theme_config}}
+                                               {{$theme_config nofilter}}
+                                       {{/if}}
 
                                        </div>
                                </div>
@@ -78,7 +78,7 @@
                                                {{include file="field_checkbox.tpl" field=$smart_threading}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -89,7 +89,7 @@
                                <div class="section-subtitle-wrapper" role="tab" id="calendar-settings-title">
                                        <h4>
                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#calendar-settings-content" aria-expanded="false" aria-controls="calendar-settings-content">
-                                                       {{$calendar_title|escape}}
+                                                       {{$calendar_title}}
                                                </a>
                                        </h4>
                                </div>
@@ -99,7 +99,7 @@
                                                {{include file="field_select.tpl" field=$first_day_of_week}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
index c811b8cf3e24ed3f6538b19f619e9cb2dd97ab32..e5f8ce065a68a127f57cfe187332ec8cd1239b6a 100644 (file)
@@ -23,7 +23,7 @@
                                                {{/foreach}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
index ffd40f2ab67c00af9dda77d83733f8f8963f4888..c6103cbc82a1749adf93585a322dca89c85ba4ac 100644 (file)
@@ -34,8 +34,8 @@
                                {{/if}}
                        {{/if}}
                        {{if $app.my}}
-                       <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="btn" title="{{$edit|escape:'html'}}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;</a>
-                       <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="btn" title="{{$delete|escape:'html'}}"><i class="fa fa-trash" aria-hidden="true"></i></a>
+                       <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="btn" title="{{$edit}}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;</a>
+                       <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="btn" title="{{$delete}}"><i class="fa fa-trash" aria-hidden="true"></i></a>
                        {{/if}}
                </div>
                {{/foreach}}
index 91dfa045516efd53e4a1851bba27a68a1031aff2..419e1b203fe2b2c1bf387a76bee27c78ac9d9dd4 100644 (file)
@@ -1,4 +1,4 @@
-
+<div class="generic-page-wrapper">
 <h2 class="heading">{{$title}}</h2>
 
 <form method="POST">
@@ -11,8 +11,9 @@
        {{include file="field_input.tpl" field=$icon}}
 
        <div class="form-group pull-right settings-submit-wrapper" >
-               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
        </div>
        <div class="clear"></div>
 
 </form>
+</div>
\ No newline at end of file
index 40b0497a0813058374c87ac175b25d4297ecf69b..81db6a0af85d6079e99afdf2c54f4ee47c4ff28d 100644 (file)
@@ -2,7 +2,7 @@
        {{* include the title template for the settings title *}}
        {{include file="section_title.tpl" title=$ptitle }}
 
-       {{$nickname_block}}
+       {{$nickname_block nofilter}}
 
        <form action="settings" id="settings-form" method="post" autocomplete="off" >
                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@@ -29,7 +29,7 @@
                                                {{/if}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -57,7 +57,7 @@
                                                {{include file="field_checkbox.tpl" field=$allowloc}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
 
                                                {{include file="field_input.tpl" field=$maxreq}}
 
-                                               {{$profile_in_dir}}
+                                               {{$profile_in_dir nofilter}}
 
-                                               {{$profile_in_net_dir}}
+                                               {{$profile_in_net_dir nofilter}}
 
-                                               {{$hide_friends}}
+                                               {{$hide_friends nofilter}}
 
-                                               {{$hide_wall}}
+                                               {{$hide_wall nofilter}}
 
-                                               {{$blockwall}}
+                                               {{$blockwall nofilter}}
 
-                                               {{$blocktags}}
+                                               {{$blocktags nofilter}}
 
-                                               {{$suggestme}}
-
-                                               {{$unkmail}}
+                                               {{$suggestme nofilter}}
 
+                                               {{$unkmail nofilter}}
 
                                                {{include file="field_input.tpl" field=$cntunkmail}}
 
                                                {{include file="field_input.tpl" field=$expire.days}}
 
-
                                                <div id="settings-advanced-expire">
                                                        <a id="advanced-expire-menu" title="{{$expire.advanced}}" data-toggle="modal" data-target="#aeModal">{{$expire.label}}</a>
 
                                                                                        <h4 class="modal-title">{{$permissions}}</h4>
                                                                                </div>
                                                                                <div class="modal-body">
-                                                                                       {{$aclselect}}
+                                                                                       {{$aclselect nofilter}}
                                                                                </div>
                                                                        </div>
                                                                </div>
                                                <br/>
                                                <div class="clear"></div>
 
-                                               {{$group_select}}
-
+                                               {{$group_select nofilter}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
                                                </div>
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
 
                                                <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
 
-                                               {{$pagetype}}
+                                               {{$pagetype nofilter}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
 
                                                <br/>
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="resend_relocate" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}">{{$relocate_button|escape:'html'}}</button>
+                                                       <button type="submit" name="resend_relocate" class="btn btn-primary" value="{{$relocate_button}}">{{$relocate_button}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
index 9b8322a85d429ee9ec538223ed14f2d51c3a0ce2..50a8934d1ba1cacd519a92a4e5d36a74c2f32880 100644 (file)
@@ -25,7 +25,7 @@
 {{if $background_image}}{{include file="field_fileinput.tpl" field=$background_image}}{{/if}}
 
 <div id="frio_bg_image_options" style="display: none;">
-       <label>{{$bg_image_options_title|escape}}:</label>
+       <label>{{$bg_image_options_title}}:</label>
 {{foreach $bg_image_options as $options}}
        {{include file="field_radio.tpl" field=$options}}
 {{/foreach}}
index fc0e2558d7f579b3815159028ecb3332daf888e5..f8e2222902226612230ab3fe0df1308f1d4885e6 100644 (file)
@@ -1,7 +1,7 @@
 <script type="text/javascript" src="view/theme/frio/frameworks/jquery-color/jquery.color.js"></script>
 {{if $mode == display}}<script type="text/javascript" src="view/theme/frio/js/mod_display.js"></script>{{/if}}
 
-{{$live_update}}
+{{$live_update nofilter}}
 
 {{foreach $threads as $thread}}
 <hr class="sr-only" />
index ab6f52f472e66caa40ad0ff0a9933bae40cbad0e..0eae2841bd3e200d19e06e5ca96017f7e5284c77 100644 (file)
@@ -2,9 +2,9 @@
 
        <div id="profile-photo-wrapper">
                {{if $url}}
-               <a href="{{$url}}"><img class="photo u-photo" src="{{$photo}}" alt="{{$name|escape}}" /></a>
+               <a href="{{$url}}"><img class="photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a>
                {{else}}
-               <img class="photo u-photo" src="{{$photo}}" alt="{{$name|escape}}" />
+               <img class="photo u-photo" src="{{$photo}}" alt="{{$name}}" />
                {{/if}}
        </div>
 
        <div id="vcard-short-info-wrapper" style="display: none;">
                <div id="vcard-short-info" class="media" style="display: none">
                        <div id="vcard-short-photo-wrapper" class="pull-left">
-                               <img class="media-object" src="{{$photo}}" alt="{{$name|escape}}" />
+                               <img class="media-object" src="{{$photo}}" alt="{{$name}}" />
                        </div>
 
                        <div id="vcard-short-desc" class="media-body">
-                               <h4 class="media-heading">{{$name|escape}}</h4>
+                               <h4 class="media-heading">{{$name}}</h4>
                                {{if $addr}}<div class="vcard-short-addr">{{$addr}}</div>{{/if}}
                        </div>
                </div>
@@ -24,7 +24,7 @@
 
        <div class="panel-body">
                <div class="profile-header">
-                       <h3 class="fn p-name">{{$name|escape}}</h3>
+                       <h3 class="fn p-name">{{$name}}</h3>
 
                        {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
 
@@ -32,7 +32,7 @@
 
                        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 
-                       {{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
+                       {{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
                </div>
        </div>
 </div>
index 4af3a9c28aaece65e9fc2b0b547f5d76a4aa5eb4..90f286558db1581f72e85b6cd45559bdc31cc69a 100644 (file)
@@ -4,7 +4,7 @@ at the suggest page and also at many other places *}}
 
 {{include file="section_title.tpl"}}
 
-{{$tab_str}}
+{{$tab_str nofilter}}
 
 <ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
 {{foreach $contacts as $contact}}
@@ -14,4 +14,4 @@ at the suggest page and also at many other places *}}
 <div class="clear"></div>
 <div id="view-contact-end"></div>
 
-{{$paginate}}
+{{$paginate nofilter}}
index 77fdf8dae53977809a5ffffb849cf36b80f0e931..af3e27228b3e9f4d563dcc285c58fdddc5b24da8 100644 (file)
@@ -58,9 +58,9 @@ as the value of $top_child_total (this is done at the end of this file)
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">
        {{if $item.star}}
-       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred|escape}}">{{$item.star.starred}}</span>
+       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
        {{/if}}
-       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}"></span><span class="fa fa-lock"></span>{{/if}}
+       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
 </div>
 <!-- ./TODO => Unknow block -->
 
@@ -82,7 +82,7 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* Put addional actions in a top-right dropdown menu *}}
 
                <ul class="nav nav-pills preferences">
-                       <li><span class="wall-item-network" title="{{$item.app|escape}}">{{$item.network_name|escape}}</span></li>
+                       <li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
 
                        {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer || $item.subthread}}
                        <li class="dropdown">
@@ -91,38 +91,38 @@ as the value of $top_child_total (this is done at the end of this file)
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                        {{if $item.plink}}      {{*link to the original source of the item *}}
                                        <li role="menuitem">
-                                               <a title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}" class="navicon plink u-url"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title|escape}}</a>
+                                               <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink u-url"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title}}</a>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.edpost}} {{* edit the posting *}}
                                        <li role="menuitem">
-                                               <button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1|escape}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>
+                                               <button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.tagger}} {{* tag the post *}}
                                        <li role="menuitem">
-                                               <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add|escape}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>
+                                               <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.filer}}
                                        <li role="menuitem">
-                                               <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer|escape}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>
+                                               <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.star}}
                                        <li role="menuitem">
-                                               <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do|escape}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
-                                               <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo|escape}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
+                                               <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
+                                               <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.subthread}}
                                        <li role="menuitem">
-                                               <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title|escape}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</button>
+                                               <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</button>
                                        </li>
                                        {{/if}}
 
@@ -132,16 +132,16 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                        {{if $item.ignore}}
                                                <li role="menuitem">
-                                                       <button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do|escape}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</button>
+                                                       <button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</button>
                                                </li>
                                                <li role="menuitem">
-                                                       <button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo|escape}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</button>
+                                                       <button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</button>
                                                </li>
                                        {{/if}}
 
                                        {{if $item.drop.dropping}}
                                        <li role="menuitem">
-                                               <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete|escape}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
+                                               <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
                                        </li>
                                        {{/if}}
                                </ul>
@@ -156,14 +156,14 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
                                <a class="userinfo  u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
                        <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
                                <a class="userinfo u-url" id="wall-item-photo-menu-xs-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
@@ -171,8 +171,8 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{* The litle overlay avatar picture if someone is posting directly to a wall or a forum *}}
                        {{if $item.owner_url}}
                        <div aria-hidden="true" class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name|escape}}" />
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
                                </a>
                        </div>
                        {{/if}}
@@ -184,7 +184,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
                                <a class="userinfo u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-comment-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-comment-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
@@ -196,19 +196,19 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* contact info header*}}
                {{if $item.thread_level==1}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-                       <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name|escape}}</span></a>
-                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a>{{/if}}
-                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}" data-toggle="tooltip">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}
+                       <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}
                        </h4>
 
                        <div class="additional-info text-muted">
                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime|escape}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
+                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
                                </div>
 
                                {{if $item.location}}
                                <div id="wall-item-location-{{$item.id}}" class="wall-item-location">
-                                       <small><span class="location">({{$item.location}})</span></small>
+                                       <small><span class="location">({{$item.location nofilter}})</span></small>
                                </div>
                                {{/if}}
                        </div>
@@ -218,9 +218,9 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* contact info header for smartphones *}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-xs hidden-lg hidden-md"><!-- <= For smartphone (responsive) -->
                        <h5 class="media-heading">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span>{{$item.name|escape}}</span></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a>
                                <p class="text-muted">
-                                       <small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
+                                       <small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}</small>
                                </p>
                        </h5>
                </div>
@@ -231,9 +231,9 @@ as the value of $top_child_total (this is done at the end of this file)
                <div class="media-body">{{*this is the media body for comments - this div must be closed at the end of the file *}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-comment">
                        <h5 class="media-heading">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name|escape}}</span></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>
                                <span class="text-muted">
-                                       <small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime|escape}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
+                                       <small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}</small>
                                </span>
                        </h5>
                </div>
@@ -252,10 +252,10 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{/if}}
 
                        {{if $item.title}}
-                       <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title|escape}}</a></h4><br /></span>
+                       <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h4><br /></span>
                        {{/if}}
 
-                       <div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}">{{$item.body}}</div>
+                       <div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}">{{$item.body nofilter}}</div>
                </div>
 
                <!-- TODO -->
@@ -264,23 +264,23 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="wall-item-tags">
                {{if !$item.suppress_tags}}
                        {{foreach $item.hashtags as $tag}}
-                               <span class="tag label btn-info sm">{{$tag}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
+                               <span class="tag label btn-info sm">{{$tag nofilter}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
                        {{/foreach}}
 
                        {{foreach $item.mentions as $tag}}
-                               <span class="mention label btn-warning sm">{{$tag}} <i class="fa fa-user" aria-hidden="true"></i></span>
+                               <span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
                        {{/foreach}}
                {{/if}}
 
                        {{foreach $item.folders as $cat}}
-                               <span class="folder label btn-danger sm"><span class="p-category">{{$cat.name|escape}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                               <span class="folder label btn-danger sm"><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
 
                        {{foreach $item.categories as $cat}}
-                               <span class="category label btn-success sm"><span class="p-category">{{$cat.name|escape}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                               <span class="category label btn-success sm"><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
                        </div>
-                       {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']|escape}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
+                       {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
                </div>
                <!-- ./TODO -->
 
@@ -290,7 +290,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="wall-item-actions-left pull-left">
                                <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
                                <div id="button-reply" class="pull-left">
-                                       <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment|escape}}"></i> </span>
+                                       <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
                                </div>
                                {{/if}}{{/if}}-->
 
@@ -299,13 +299,13 @@ as the value of $top_child_total (this is done at the end of this file)
                                {{* Buttons for like and dislike *}}
                                {{if $item.vote}}
                                        {{if $item.vote.like}}
-                                       <button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0|escape}}" onclick="doLikeAction({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i>&nbsp;{{$item.vote.like.1}}</button>
+                                       <button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i>&nbsp;{{$item.vote.like.1}}</button>
                                        {{/if}}
                                        {{if $item.vote.like AND $item.vote.dislike}}
                                        <span role="presentation" class="separator">•</span>
                                        {{/if}}
                                        {{if $item.vote.dislike}}
-                                       <button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0|escape}}" onclick="doLikeAction({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;{{$item.vote.dislike.1}}</button>
+                                       <button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;{{$item.vote.dislike.1}}</button>
                                        {{/if}}
 
                                        {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
@@ -315,7 +315,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                {{* Button to open the comment text field *}}
                                {{if $item.comment}}
-                               <button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment|escape}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
+                               <button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
                                {{/if}}
 
                                {{* Button for sharing the item *}}
@@ -324,25 +324,25 @@ as the value of $top_child_total (this is done at the end of this file)
                                                {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
                                        <span role="presentation" class="separator">•</span>
                                                {{/if}}
-                                       <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</button>
+                                       <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</button>
                                        {{/if}}
                                {{/if}}
-                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                        </div>
 
                        <div class="wall-item-actions-right pull-right">
                                {{* Event attendance buttons *}}
                                {{if $item.isevent}}
                                <div class="vote-event">
-                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0|escape}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1|escape}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2|escape}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
                                </div>
                                {{/if}}
 
                                <div class="pull-right checkbox">
                                        {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
                                        <label for="checkbox-{{$item.id}}"></label>
                                {{/if}}
                                </div>
@@ -356,7 +356,7 @@ as the value of $top_child_total (this is done at the end of this file)
                {{if $item.responses}}
                        <div class="wall-item-responses">
                                {{foreach $item.responses as $verb=>$response}}
-                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
                                {{/foreach}}
                        </div>
                {{/if}}
@@ -370,7 +370,7 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* Insert comment box of threaded children *}}
                {{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
                <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
-                       {{$item.comment}}
+                       {{$item.comment nofilter}}
                </div>
                {{/if}}{{/if}}{{/if}}
 
@@ -391,19 +391,19 @@ as the value of $top_child_total (this is done at the end of this file)
                        case it could be opend with the "comment" button *}}
                {{if $item.total_comments_num}}
                        {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
                        {{/if}}{{/if}}{{/if}}
 
                        {{if $item.flatten}}
-                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
                        {{/if}}
                {{else}}
                        {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment}}</div>
+                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
                        {{/if}}{{/if}}{{/if}}
 
                        {{if $item.flatten}}
-                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment}}</div>
+                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
                        {{/if}}
                {{/if}}
        </div><!-- /media -->
index aa59081d91969cad9eebec4e9541466c78ef8486..a61810f99e4196b9387ab5be4c9852d8a866ea43 100644 (file)
@@ -301,7 +301,7 @@ function frio_remote_nav($a, &$nav)
  */
 function frio_acl_lookup(App $a, &$results)
 {
-       $nets = x($_GET, 'nets') ? Strings::escapeTags(trim($_GET['nets'])) : '';
+       $nets = !empty($_GET['nets']) ? Strings::escapeTags(trim($_GET['nets'])) : '';
 
        // we introduce a new search type, r should do the same query like it's
        // done in /src/Module/Contact.php for connections
index bc7bd595572a9758f4288ef9972953a63e2d0eea..2d59a8a256a4008e7e658aede46b8cf9f192c65c 100644 (file)
@@ -1,12 +1,12 @@
 
 <div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}" >
-       {{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore|escape}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>{{/if}}
+       {{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>{{/if}}
        <div class="contact-photo-wrapper" >
                <div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
                onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
                onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
 
-                       <a href="{{$contact.url}}" title="{{$contact.img_hover|escape}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" /></a>
+                       <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
                        {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
@@ -27,7 +27,7 @@
                        
        </div>
        <div class="contact-name" id="contact-entry-name-{{$contact.id}}" >
-               {{$contact.name|escape}}
+               {{$contact.name}}
                {{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
        </div>
        {{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
@@ -37,7 +37,7 @@
        {{if $contact.network}}<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
 
        {{if $contact.connlnk}}
-       <div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt|escape}}">{{$contact.conntxt|escape}}</a></div>
+       <div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt}}">{{$contact.conntxt}}</a></div>
        {{/if}}
 
 
index 9e19fdfe13c3245b89692bf3996ef0ab78be0c93..ce89d579ead49e867d09aa7f01dd40c304d64c98 100644 (file)
@@ -1,4 +1,4 @@
-{{$live_update}}
+{{$live_update nofilter}}
 
 {{foreach $threads as $thread}}
 <div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
index 484fe6744b09a27d651a357cbfa827d3504f38d4..9cb0bdc4ed2139d6e207c380ae0b2b24d4af1e71 100644 (file)
@@ -1,7 +1,7 @@
 
 <h3>{{$title}}</h3>
 
-<p>{{$desc}}</p>
+<p>{{$desc nofilter}}</p>
 
 <form id="event-edit-form" action="{{$post}}" method="post" >
 
@@ -10,9 +10,9 @@
        <input type="hidden" name="uri" value="{{$uri}}" />
        <input type="hidden" name="preview" id="event-edit-preview" value="0" />
 
-       {{$s_dsel}}
+       {{$s_dsel nofilter}}
 
-       {{$f_dsel}}
+       {{$f_dsel nofilter}}
 
        {{include file="field_checkbox.tpl" field=$nofinish}}
 
        {{include file="field_checkbox.tpl" field=$share}}
        {{/if}}
 
-       {{$acl}}
+       {{$acl nofilter}}
 
        <div class="settings-submit-wrapper" >
-               <input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
-               <input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+               <input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+               <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
        </div>
 </form>
 
index ec8aa586ccaa9eda63fa2a73558719d477960457..bfe446f9fdcda813e41ff1d0562ae83573366ca2 100644 (file)
@@ -1,5 +1,5 @@
 
-{{$tabs}}
+{{$tabs nofilter}}
 <h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}" ><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
 
 <div id="new-event-link"></div>
index 0d3db22671f2be39a85d429b20d6db11c3bbf706..32b2725bac7bd12027723a96769cfbc9721c9271 100644 (file)
@@ -1,4 +1,4 @@
-{{$tabs}}
+{{$tabs nofilter}}
 <h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}" ><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
 
 <div id="event-calendar-wrapper">
@@ -11,8 +11,8 @@
 {{foreach $events as $event}}
        <div class="event">
        {{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-       {{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name|escape}}</a>{{/if}}
-       {{$event.html}}
+       {{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+       {{$event.html nofilter}}
        {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" class="plink-event-link icon s22 remote-link"></a>{{/if}}
        {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
        </div>
index 23d001d46277b2db33374abb7bd841f00a4eb9b1..7946e8f833b98d8f0a542665755bbddd223678d8 100644 (file)
@@ -1,6 +1,6 @@
 <div id="fileas-sidebar" class="widget">
        <h3>{{$title}}</h3>
-       <div id="nets-desc">{{$desc}}</div>
+       <div id="nets-desc">{{$desc nofilter}}</div>
        
        <ul class="fileas-ul">
                <li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}" class="fileas-link fileas-all">{{$all}}</a></li>
index 1a26c9741da682daf9192901eabfae04aa07a5b7..999f3c29c8240d742f11889dc2a410aac0ee82bd 100644 (file)
@@ -1,6 +1,6 @@
 <div class="widget">
        {{if $title}}<h3>{{$title}}</h3>{{/if}}
-       {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
+       {{if $desc}}<div class="desc">{{$desc nofilter}}</div>{{/if}}
 
        <ul role="menu">
                {{foreach $items as $item}}
index bdf21b8f74a1cf044fac1a912984bbb4b0d9536b..d4aff2cb2c9694f8cedba5a0959095257b73b7c9 100644 (file)
@@ -19,7 +19,7 @@
                <input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
                {{/if}}
 
-               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea>
+               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content nofilter}}{{/if}}</textarea>
 
                <ul id="jot-tools" class="jothidden" style="display:none">
                        <li><a href="#" onclick="return false;" id="wall-image-upload" title="{{$upload}}">{{$shortupload}}</a></a></li>
@@ -32,7 +32,7 @@
                        <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
                        -->
                        <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="{{$preview}}">{{$preview}}</a></li>
-                       {{$jotplugins}}
+                       {{$jotplugins nofilter}}
 
                        {{if !$is_edit}}
                        <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 {{$lockstate}} {{$bang}}"  title="{{$permset}}" ></a></li>
@@ -46,7 +46,7 @@
 
        <div style="display: none;">
                <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                       {{$acl}}
+                       {{$acl nofilter}}
                </div>
        </div>
 
index f06d1cbcfb05da8d6b8b4fd9cc2544fbce87d858..1e791f6185df62509d88e9e8efd2279e57b1f842 100644 (file)
@@ -2,13 +2,13 @@
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper"
-                               <a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name|escape}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
-                                       <img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name|escape}}" />
+                               <a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
+                                       <img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name}}" />
                                </a>
                        </div>
                </div>
                <div class="wall-item-content">
-                       {{$mail.body}}
+                       {{$mail.body nofilter}}
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
                                <a href="{{$mail.from_url}}" target="redir"
-                                class="wall-item-name-link" title="{{$mail.from_addr|escape}}"><span
-                                class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name|escape}}</span></a>
-                                <span class="wall-item-ago" title="{{$mail.date|escape}}">{{$mail.ago|escape}}</span>
+                                class="wall-item-name-link" title="{{$mail.from_addr}}"><span
+                                class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a>
+                                <span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span>
                        </div>
                        
                        <div class="wall-item-actions-social">
                        </div>
                        
                        <div class="wall-item-actions-tools">
-                               <a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete|escape}}">{{$mail.delete|escape}}</a>
+                               <a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete}}">{{$mail.delete}}</a>
                        </div>
                        
                </div>
 
 <div class="mail-conv-outside-wrapper">
        <div class="mail-conv-sender" >
-               <a href="{{$mail.from_url}}" title="{{$mail.from_addr|escape}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name|escape}}" title="{{$mail.from_addr|escape}}" /></a>
+               <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" /></a>
        </div>
        <div class="mail-conv-detail" >
-               <div class="mail-conv-sender-name" >{{$mail.from_name|escape}}</div>
+               <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
                <div class="mail-conv-date">{{$mail.date}}</div>
                <div class="mail-conv-subject">{{$mail.subject}}</div>
-               <div class="mail-conv-body">{{$mail.body}}</div>
-       <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete|escape}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+               <div class="mail-conv-body">{{$mail.body nofilter}}</div>
+       <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
        <div class="mail-conv-outside-wrapper-end"></div>
 </div>
 </div>
index bd32f74335b965d3cd9e29c176e18633b04dc3dc..9dfbdef237a74bdc5c4fb0e5805aabcbb3b14635 100644 (file)
@@ -3,7 +3,7 @@
 
  {{if $tabs}}
        <div id="message-preview">
-               {{$tabs}}
+               {{$tabs nofilter}}
        </div>
   {{/if}}
 
index c021f977ab1aa44c30bfcd6f8d5edbebfaab394f..f002e72feb01d78cb6f2a60a7bd16afbecdd3d93 100644 (file)
                                <a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
                                <ul id="nav-apps-menu" class="menu-popup">
                                        {{foreach $apps as $ap}}
-                                       <li>{{$ap}}</li>
+                                       <li>{{$ap nofilter}}</li>
                                        {{/foreach}}
                                </ul>
                        </li>
index 981bd8d2c8d2bf726527b9bb851331e20f1510e4..2d488dc4fac02ec24b8b8a2b8e45d74c73691282 100644 (file)
@@ -1,9 +1,9 @@
 <div id="nets-sidebar" class="widget">
        <h3>{{$title}}</h3>
-       <div id="nets-desc">{{$desc}}</div>
+       <div id="nets-desc">{{$desc nofilter}}</div>
        
        <ul class="nets-ul">
-               <li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}?nets=all" class="nets-link nets-all">{{$all}}</a>
+               <li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}" class="nets-link nets-all">{{$all}}</a>
                {{foreach $nets as $net}}
                        <li class="tool {{if $net.selected}}selected{{/if}}"><a href="{{$base}}?f=&nets={{$net.ref}}" class="nets-link">{{$net.name}}</a></li>
                {{/foreach}}
index e37a7242cbe9c8d8a3169048269c3690e7088e97..b196824c0296f29fd67b8b8c71271769b7b4d59f 100644 (file)
                </div>
                <div class="wall-item-tags">
                        {{foreach $tags as $tag}}
-                               <span class='tag'>{{$tag}}</span>
+                               <span class='tag'>{{$tag nofilter}}</span>
                        {{/foreach}}
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       {{if $plink}}<a class="icon s16 link" title="{{$plink.title|escape}}" href="{{$plink.href}}">{{$plink.title|escape}}</a>{{/if}}
+                       {{if $plink}}<a class="icon s16 link" title="{{$plink.title}}" href="{{$plink.href}}">{{$plink.title}}</a>{{/if}}
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-{{$id}}">{{$like}}</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-{{$id}}">{{$dislike}}</div>
+               <div class="wall-item-like" id="wall-item-like-{{$id}}">{{$like nofilter}}</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-{{$id}}">{{$dislike nofilter}}</div>
                {{if $conv}}
                <div class="wall-item-conv" id="wall-item-conv-{{$id}}" >
-                       <a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title|escape}}'>{{$conv.title|escape}}</a>
+                       <a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title}}'>{{$conv.title}}</a>
                </div>
                {{/if}}
        </div>
index f41fd9a96d86807f81dcbc225ab570b049c881b3..0b65c2c5352f5d87f03901a05992581f067df1ea 100644 (file)
 {{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
 </div>
 
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
-<div id="photo-caption">{{$desc}}</div>
+<div id="photo-caption">{{$desc nofilter}}</div>
 {{if $tags}}
 <div id="in-this-photo-text">{{$tags.0}}</div>
 <div id="in-this-photo">{{$tags.1}}</div>
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-       {{$likebuttons}}
-       {{$like}}
-       {{$dislike}}    
+       {{$likebuttons nofilter}}
+       {{$like nofilter}}
+       {{$dislike nofilter}}
 </div>
 {{/if}}
 
 <div class="wall-item-comment-wrapper photo">
-    {{$comments}}
+    {{$comments nofilter}}
 </div>
 
-{{$paginate}}
+{{$paginate nofilter}}
 
index a316f58aa52787f7f19ea256172da6263e1991d0..68028fe91e97f100d46fa8732886059645eddb84 100644 (file)
@@ -1,15 +1,15 @@
 <div class="vcard h-card">
 
        <div class="tool">
-               <div class="fn label p-name">{{$profile.name|escape}}</div>
+               <div class="fn label p-name">{{$profile.name}}</div>
                {{if $profile.edit}}
                        <div class="action">
-                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3|escape}}"><span>{{$profile.edit.1}}</span></a>
+                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
                        <ul id="profiles-menu" class="menu-popup">
                        {{if $profile.menu.entries}}
                                {{foreach $profile.menu.entries as $e}}
                                <li>
-                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name|escape}}</a>
+                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
                                </li>
                                {{/foreach}}
                        {{else}}
                {{/if}}
        </div>
 
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}" /></div>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
 
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 
-       {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
+       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
 
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
@@ -89,6 +89,6 @@
        </div>
 </div>
 
-{{$contact_block}}
+{{$contact_block nofilter}}
 
 
index 45ba137439438bd6ac0107003ec7362781449b1e..c956fbf726b81db1978ea284fd52cbc010af93ef 100644 (file)
@@ -3,14 +3,14 @@
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
-{{$parent}}
+{{$parent nofilter}}
 
 <div id="prvmail-to-label">{{$to}}</div>
 {{if $showinputs}}
 <input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
 <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
 {{else}}
-{{$select}}
+{{$select nofilter}}
 {{/if}}
 
 <div id="prvmail-subject-label">{{$subject}}</div>
index c310d98ca7fa0396dd2a898eb2b0c455ecc2e861..b1a945bc8380d534b9838a6e6b14598086a6be9c 100644 (file)
@@ -10,6 +10,6 @@
                {{/foreach}}
        </ul>
        
-       {{$searchbox}}
+       {{$searchbox nofilter}}
        
 </div>
index 8e7b9ee2807219638ccc2f2caa7ea8eaa28a3ef5..75d5ef566f9ca6955df2f58acb910c47afc3e5d0 100644 (file)
@@ -1,7 +1,7 @@
 <div class="wall-item-decor">
-       {{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred|escape}}">{{$item.star.starred|escape}}</span>{{/if}}
-       {{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}">{{$item.lock|escape}}</span>{{/if}}
-       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+       {{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
+       {{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
+       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 </div>
 
 <div class="wall-item-container {{$item.indent}}">
                        <div class="contact-photo-wrapper"
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                </a>
                                <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu}}
+                               {{$item.item_photo_menu nofilter}}
                                </ul>
 
                        </div>
-                       <div class="wall-item-location">{{$item.location}}</div>
+                       <div class="wall-item-location">{{$item.location nofilter}}</div>
                </div>
                <div class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title|escape}}</a></h2>{{/if}}
-                       <div class="wall-item-body">{{$item.body}}</div>
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+                       <div class="wall-item-body">{{$item.body nofilter}}</div>
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-tags">
                {{if !$item.suppress_tags}}
                        {{foreach $item.tags as $tag}}
-                               <span class="tag">{{$tag}}</span>
+                               <span class="tag">{{$tag nofilter}}</span>
                        {{/foreach}}
                {{/if}}
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       {{if $item.plink}}<a class="icon s16 link" title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}">{{$item.plink.title|escape}}</a>{{/if}}
+                       {{if $item.plink}}<a class="icon s16 link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name|escape}}</span></a> <span class="wall-item-ago" title="{{$item.localtime|escape}}">{{$item.ago}}</span>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
                        </div>
 
                        <div class="wall-item-actions-social">
                        {{if $item.star}}
-                               <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do|escape}}">{{$item.star.do}}</a>
-                               <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo|escape}}">{{$item.star.undo}}</a>
-                               <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger|escape}}">{{$item.star.tagger}}</a>
+                               <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+                               <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+                               <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
                        {{/if}}
 
                        {{if $item.vote}}
-                               <a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active{{/if}}" title="{{$item.vote.like.0|escape}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-                               <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active{{/if}}" title="{{$item.vote.dislike.0|escape}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+                               <a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+                               <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
                        {{/if}}
 
                        {{if $item.vote.share}}
-                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
                        {{/if}}
                        </div>
 
                        <div class="wall-item-actions-tools">
 
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete|escape}}">{{$item.drop.delete}}</a>
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                                {{if $item.edpost}}
-                                       <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape}}"></a>
+                                       <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
                                {{/if}}
                        </div>
 
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+               <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like nofilter}}</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike nofilter}}</div>
                {{if $item.conv}}
                <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title|escape}}'>{{$item.conv.title|escape}}</a>
+                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
                </div>
                {{/if}}
        </div>
index a257a2904346a97c1eaf608b6e2e1d59f49cf7bb..0d90db1860c06a704c9c8e947d511e08499c9494 100644 (file)
@@ -1,4 +1,4 @@
-{{$live_update}}
+{{$live_update nofilter}}
 
 {{foreach $threads as $thread}}
 
index d9510da438fe687f0be06ce60a361edae1c12e16..cb4b890153df66f963de62c4000af81653be701a 100644 (file)
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                </a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu}}
+                               {{$item.item_photo_menu nofilter}}
                                </ul>
                                
                        </div>
-                       <div class="wall-item-location">{{$item.location}}</div>        
+                       <div class="wall-item-location">{{$item.location nofilter}}</div>
                </div>
                <div class="wall-item-content">
-                       {{$item.ago}} {{$item.body}} 
+                       {{$item.ago}} {{$item.body nofilter}}
                </div>
                        <div class="wall-item-tools">
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete|escape}}">{{$item.drop.delete}}</a>
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                        </div>
        </div>
@@ -59,9 +59,9 @@
 
 {{* top thread comment box *}}
 {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
 {{/if}}{{/if}}{{/if}}
 
 {{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
 {{/if}}
index cc6ab7d623944f34a95934c7779e575bd6ba7244..1d2295278b91f2dad1a8c8c82c4e69d53f063e70 100644 (file)
                        <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card"
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
-                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                </a>
                                <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu}}
+                               {{$item.item_photo_menu nofilter}}
                                </ul>
 
                        </div>
                        {{if $item.owner_url}}
                        <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name|escape}}" />
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
                                </a>
                        </div>
                        {{/if}}
-                       <div class="wall-item-location">{{$item.location}}</div>
+                       <div class="wall-item-location">{{$item.location nofilter}}</div>
                </div>
                <div class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title|escape}}</a></h2>{{/if}}
-                       <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
+                       <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body nofilter}}</span>
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-tags">
                {{if !$item.suppress_tags}}
                        {{foreach $item.hashtags as $tag}}
-                               <span class="tag">{{$tag}}</span>
+                               <span class="tag">{{$tag nofilter}}</span>
                        {{/foreach}}
                        {{foreach $item.mentions as $tag}}
-                               <span class="mention">{{$tag}}</span>
+                               <span class="mention">{{$tag nofilter}}</span>
                        {{/foreach}}
                        {{foreach $item.folders as $cat}}
                                <span class="folder p-category">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links">
-                       {{if $item.plink}}<a class="icon s16 link{{$item.sparkle}} u-url" title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}">{{$item.plink.title|escape}}</a>{{/if}}
+                       {{if $item.plink}}<a class="icon s16 link{{$item.sparkle}} u-url" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
                                <a href="{{$item.profile_url}}" target="redir"
-                                title="{{$item.linktitle|escape}}"
+                                title="{{$item.linktitle}}"
                                 class="wall-item-name-link"><span
-                                class="wall-item-name{{$item.sparkle}}">{{$item.name|escape}}</span></a>
+                                class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
                                 <span class="wall-item-ago" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span>
-                                {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a> {{$item.vwall}}
+                                {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}
                                 {{/if}}
                        </div>
 
                <div class="wall-item-links"></div>
                {{if $item.responses}}
                        {{foreach $item.responses as $verb=>$response}}
-                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
                        {{/foreach}}
                {{/if}}
        </div>
        <div class="wall-item-bottom commentbox">
                <div class="wall-item-links"></div>
                <div class="wall-item-comment-wrapper">
-                                       {{$item.comment}}
+                                       {{$item.comment nofilter}}
                </div>
        </div>
        {{/if}}{{/if}}{{/if}}
 
 {{* top thread comment box *}}
 {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
 {{/if}}{{/if}}{{/if}}
 
 
 {{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
 {{/if}}
index 050c991cfefc921f0b588e9e9a0141dc0dcc731a..35c54bc690192633d8a68ad12abe0eb76712dc7f 100644 (file)
@@ -24,7 +24,7 @@ function showHideForumlist() {
                        <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name|escape}}</a>
+                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
        
@@ -34,7 +34,7 @@ function showHideForumlist() {
                        <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name|escape}}</a>
+                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
                {{/foreach}}
index 1bbd32cc170fef63bb171f475f7b1e8681bf5f4c..b0d8a7e31f58f291b5333671033feab76cec5e3f 100644 (file)
@@ -1,38 +1,38 @@
 <!DOCTYPE html >
 <html>
 <head>
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
   <script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
   <script type="text/javascript">
        function ScrollToBottom(){
        window.scrollTo(0,document.body.scrollHeight);
        }
   </script>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+  <?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
 </head>
 <body>
        <header>
-               <?php if(x($page, 'header')) echo $page['header']; ?>
+               <?php if(!empty($page['header'])) echo $page['header']; ?>
        </header>
 
-       <?php if(x($page,'nav')) echo $page['nav']; ?>
+       <?php if(!empty($page['nav'])) echo $page['nav']; ?>
 
-       <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+       <aside><?php if(!empty($page['aside'])) echo $page['aside']; ?></aside>
 
        <section>
-               <?php if(x($page,'content')) echo $page['content']; ?>
+               <?php if(!empty($page['content'])) echo $page['content']; ?>
                <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
                <div id="page-footer"></div>
        </section>
 
-       <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
+       <right_aside><?php if(!empty($page['right_aside'])) echo $page['right_aside']; ?></right_aside>
 
        <footer id="footer">
-       <?php if(x($page, 'footer')) echo $page['footer']; ?>
+       <?php if(!empty($page['footer'])) echo $page['footer']; ?>
        </footer>
 
        <tools id="tools">
-       <?php if (x($page, 'tools')) echo $page['tools']; ?>
+       <?php if (!empty($page['tools'])) echo $page['tools']; ?>
        <div id="scrollup" >
        <a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
        <a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
@@ -40,6 +40,6 @@
        </div>
        </tools>
 
-       <?php if (x($page, 'bottom')) echo $page['bottom']; ?>
+       <?php if (!empty($page['bottom'])) echo $page['bottom']; ?>
 </body>
 </html>
index 0907237871ffbc3ad3ce954171ebdfe415793c53..9866bc362a3b2b82d06db8bc67ccb4bfd912bd20 100644 (file)
@@ -20,7 +20,7 @@ Orange - #fec01d
 /* For general iPad layouts */
 #body {
        -moz-background-clip: border;
-       -moz-background-origin: pdading;
+       -moz-background-origin: padding;
        -moz-background-size: auto auto;
        background-attachment: scroll;
        background-color: transparent;
index 1d110da8ab0c2643d68d9a6f39726d1a58725a4b..4d5248530e23c386b3d2366df0ad19e2e64e3f93 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="follow-sidebar" class="widget">
        <h3>{{$connect}}</h3>
-       <div id="connect-desc">{{$desc}}</div>
+       <div id="connect-desc">{{$desc nofilter}}</div>
        <form action="follow" method="post" >
                <input id="side-follow-url" type="text-sidebar" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
        </form>
index 34c0b1a2bb3700e9d494a9e6f3dc530c933c7a93..c690cdf18014b7a26589a05981413e25e4934dec 100644 (file)
@@ -26,7 +26,7 @@
                <div id="jot-text-wrap">
                        <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /><br>
                        <textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">
-                       {{if $content}}{{$content}}{{/if}}
+                       {{if $content}}{{$content nofilter}}{{/if}}
                        </textarea>
                </div>
 
@@ -61,7 +61,7 @@
        </div>
 
        <div id="profile-jot-plugin-wrapper" style="display: none;">
-       {{$jotplugins}}
+       {{$jotplugins nofilter}}
        </div>
        <div id="profile-jot-tools-end"></div>
 
 
         <div style="display: none;">
             <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                {{$acl}}
+                {{$acl nofilter}}
                 <hr style="clear:both"/>
                 <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
                 <div id="profile-jot-email-end"></div>
-                {{$jotnets}}
+                {{$jotnets nofilter}}
             </div>
         </div>
 
index 2c9e621935f254fbfa725ff2ecf17634f1aeca3b..23af1b794b18f71acf9b7b63cca542601fb242f1 100644 (file)
@@ -5,17 +5,17 @@
                        <div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
                                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name|escape}}" /></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                                        <ul>
-                                               {{$item.item_photo_menu}}
+                                               {{$item.item_photo_menu nofilter}}
                                        </ul>
                                </div>
                        </div>
                        <div class="wall-item-photo-end"></div> 
-                       <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+                       <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location nofilter}} {{/if}}</div>
                </div>
                <div class="wall-item-lock-wrapper">
                                {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
                        <div class="wall-item-delete-end"></div>
                </div>
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title|escape}}</div>
+                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                        <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body nofilter}}</div>
                </div>
                <div class="wall-item-author">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</span></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
                                <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
                                
                </div>                  
@@ -45,7 +45,7 @@
 
        <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
        {{if $item.conv}}
-                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title|escape}}'>{{$item.conv.title|escape}}</a>
+                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
        {{/if}}
        </div>
        <div class="wall-item-wrapper-end"></div>
index 616c20f4dc9b03a528401fbacf93297beb421284..a7e0f201090ac62858420ffe51029320a6654021 100644 (file)
                <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
                        {{if $item.owner_url}}
                        <div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" title="{{$item.olinktitle|escape}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                               <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name|escape}}" /></a>
+                               <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+                               <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
                        </div>
                        <div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
                        {{/if}}
                        <div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}"
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name|escape}}" /></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul>
-                        {{$item.item_photo_menu}}
+                        {{$item.item_photo_menu nofilter}}
                     </ul>
                 </div>
 
                        </div>
                        <div class="wall-item-photo-end"></div>
-                       <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+                       <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location nofilter}} {{/if}}</div>
                </div>
                <div class="wall-item-lock-wrapper">
                        {{if $item.lock}}
@@ -46,8 +46,8 @@
                </div>
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
                <div class="wall-item-author">
-                       <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link">
-                       <span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</span>
+                       <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link">
+                       <span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span>
                        </a>
                        <div class="wall-item-ago">&bull;</div>
                        <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
@@ -56,9 +56,9 @@
                <div>
                <hr class="line-dots">
                </div>
-                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title|escape}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                        <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}</span>
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body nofilter}}</span>
                                <div class="body-tag">
                                {{if !$item.suppress_tags}}
                                        {{foreach $item.tags as $tag}}
@@ -99,7 +99,7 @@
 
                        {{if $item.plink}}
                        <div class="wall-item-links-wrapper">
-                               <a href="{{$item.plink.href}}" title="{{$item.plink.title|escape}}" target="external-link" class="icon remote-link u-url"></a>
+                               <a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link u-url"></a>
                        </div>
                        {{/if}}
 
 
        </div>
        <div class="wall-item-wrapper-end"></div>
-       <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-       <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+       <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like nofilter}}</div>
+       <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike nofilter}}</div>
 
        {{if $item.threaded}}
        {{if $item.comment}}
         <div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
-               {{$item.comment}}
+               {{$item.comment nofilter}}
        </div>
        {{/if}}
        {{/if}}
 
 {{if $item.flatten}}
 <div class="wall-item-comment-wrapper" >
-       {{$item.comment}}
+       {{$item.comment nofilter}}
 </div>
 {{/if}}
 </div>
index 9aa81740b98bbd2346fee8c0d88d6d86b1580b03..2ca114807beeedf9c3aefa23122cef47aeac4292 100644 (file)
@@ -1,2 +1,2 @@
-<a href="{{$url}}/settings/connectors"><img alt="{{$alt_text|escape}}" src="{{$photo}}" title="{{$alt_text|escape}}"></a>
+<a href="{{$url}}/settings/connectors"><img alt="{{$alt_text}}" src="{{$photo}}" title="{{$alt_text}}"></a>
 
index 9d25b3294b8e4a47b7356f6100f5ddd083827d29..6813e1186e1df1e3f66c0dff4922286c8e2fe1d8 100644 (file)
@@ -4,7 +4,7 @@
        <div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
                <div class="directory-photo" id="directory-photo-{{$id}}" >
                        <a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
-                               <img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text|escape}}" title="{{$alt_text|escape}}" />
+                               <img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
                        </a>
                </div>
        </div>
index af8fa4c9d1fc269fcb1c1101c3a2308b42c4c3b8..3e72df6dc6cf40d61640195dfa3902202b816af2 100644 (file)
@@ -14,7 +14,7 @@
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
                                <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}">
-                                       <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle|escape}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle|escape}}" title="{{$mytitle|escape}}" /></a>
+                                       <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
                                </div>
                                <div class="comment-edit-photo-end"></div>
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});"></textarea>
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
 
                                <div class="comment-edit-bb">
-                                       <a title="{{$edimg|escape}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>
-                                       <a title="{{$edurl|escape}}" data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
-                                       <a title="{{$edvideo|escape}}" data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
-
-                                       <a title="{{$eduline|escape}}" data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
-                                       <a title="{{$editalic|escape}}" data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
-                                       <a title="{{$edbold|escape}}" data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
-                                       <a title="{{$edquote|escape}}" data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
+                                       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>
+                                       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
+                                       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
+
+                                       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
+                                       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
+                                       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
+                                       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
 
                                 </div>
                                        <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
index 94e2312d094f7bccd78860ef922019eba362db4a..618ba8e1e574838d7a30e474057c26e70104f4b7 100644 (file)
@@ -1,15 +1,15 @@
 {{if $page}}
 <div id="right_pages" class="widget">
-<div>{{$page}}</div>
+<div>{{$page nofilter}}</div>
 </div>
 {{/if}}
 
 {{if $comunity_profiles_title}}
 <div id="right_profiles" class="widget">
-<h3>{{$comunity_profiles_title|escape}}</h3>
+<h3>{{$comunity_profiles_title}}</h3>
 <div id='lastusers-wrapper' class='items-wrapper'>
 {{foreach $comunity_profiles_items as $i}}
-       {{$i}}
+       {{$i nofilter}}
 {{/foreach}}
 </div>
 <div class="clear"></div>
@@ -21,7 +21,7 @@
 <h3>{{$helpers.title.1}}</h3>
 <ul role="menu">
 {{foreach $helpers_items as $i}}
-       {{$i}}
+       {{$i nofilter}}
 {{/foreach}}
 </ul>
 </div>
@@ -32,7 +32,7 @@
 <h3>{{$con_services.title.1}}</h3>
 <div id="right_services_icons">
 {{foreach $connector_items as $i}}
-       {{$i}}
+       {{$i nofilter}}
 {{/foreach}}
 </div>
 </div>
 
 {{if $lastusers_title}}
 <div id="right_lastusers" class="widget">
-<h3>{{$lastusers_title|escape}}</h3>
+<h3>{{$lastusers_title}}</h3>
 <div id='lastusers-wrapper' class='items-wrapper'>
 {{foreach $lastusers_items as $i}}
-       {{$i}}
+       {{$i nofilter}}
 {{/foreach}}
 </div>
 <div class="clear"></div>
 {{/if}}
 
 {{if $activeusers_title}}
-<h3>{{$activeusers_title|escape}}</h3>
+<h3>{{$activeusers_title}}</h3>
 <div class='items-wrapper'>
 {{foreach $activeusers_items as $i}}
-       {{$i}}
+       {{$i nofilter}}
 {{/foreach}}
 </div>
 {{/if}}
index 9014be1d252356f5ee5d435ec8548d3cb98fbf6b..2f52f82f81cfb3e6473b0dab85296053ba9a54cc 100644 (file)
@@ -2,7 +2,7 @@
 <div id="contact-edit-wrapper" >
 
        {{* Insert Tab-Nav *}}
-       {{$tab_str}}
+       {{$tab_str nofilter}}
 
 
        <div id="contact-edit-nav-wrapper" >
@@ -33,7 +33,7 @@
                                                {{if $poll_enabled}}
                                                        <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
-                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
+                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
                                                        {{/if}}
                                                        </li>
                                                {{/if}}
@@ -47,7 +47,7 @@
                                        </ul>
 
                                        <ul>
-                                               <!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
+                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
                                                {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
                                        </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}
@@ -57,7 +57,7 @@
                                {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
                                {{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
                                {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-                               {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+                               {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
                        </div>{{* End of contact-edit-links *}}
 
                        <div id="contact-edit-links-end"></div>
                                        <div id="contact-edit-profile-select-end"></div>
                                {{/if}}
                        </div>
-                       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+                       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
                        {{/if}}
 
                        <div class="contact-edit-submit-end clearfix"></div>
index f36995e9c2918a472d11275db0c3407c1528296f..c4ed99caa479293649e86358167e996f69f98252 100644 (file)
@@ -5,8 +5,8 @@
                <!-- onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
                onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" > -->
 
-                       <!-- <a href="{{$contact.url}}" title="{{$contact.img_hover|escape}}" /></a> -->
-                       <img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" />
+                       <!-- <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /></a> -->
+                       <img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
 
                        {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
@@ -32,7 +32,7 @@
        
        <div class="contact-entry-desc">
                <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >
-                       {{$contact.name|escape}}
+                       {{$contact.name}}
                        {{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
                </div>
                {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
index 35e05c02d502fac307eae582b4c0cae88943fc38..e2090e3c6566e9799e5f988a35de8209a60e4bc1 100644 (file)
@@ -3,7 +3,7 @@
 <h3>{{$title}}</h3>
 
 <p>
-{{$desc}}
+{{$desc nofilter}}
 </p>
 
 <form id="event-edit-form" action="{{$post}}" method="post" >
@@ -13,9 +13,9 @@
 <input type="hidden" name="uri" value="{{$uri}}" />
 <input type="hidden" name="preview" id="event-edit-preview" value="0" />
 
-{{$s_dsel}}
+{{$s_dsel nofilter}}
 
-{{$f_dsel}}
+{{$f_dsel nofilter}}
 
 {{include file="field_checkbox.tpl" field=$nofinish}}
 
 {{include file="field_checkbox.tpl" field=$share}}
 {{/if}}
 
-{{$acl}}
+{{$acl nofilter}}
 
 <div class="clear"></div>
-<input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
-<input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>
-
-
index 70dee37550d5fb37d23a11ebdf8395d29d4b8402..777df44cd2e0bca81ae17f3946926945b2d94784 100644 (file)
@@ -3,7 +3,7 @@
        {{* {{$langselector}} *}}
 
        <div id="site-location">{{$sitelocation}}</div>
-       <div id="banner">{{$banner}}</div>
+       <div id="banner">{{$banner nofilter}}</div>
 </header>
 <nav role="menubar">
        <ul>
                </li>
                {{if $nav.home}}
                        <li role="menuitem" id="nav-home-link" class="nav-menu {{$sel.home}}">
-                               <a accesskey="p" class="{{$nav.home.2}} desktop-view" href="{{$nav.home.0}}" title="{{$nav.home.3|escape}}" >{{$nav.home.1}}</a>
-                               <a class="{{$nav.home.2}} mobile-view" href="{{$nav.home.0}}" title="{{$nav.home.3|escape}}" ><i class="icon s22 icon-home"></i></a>
+                               <a accesskey="p" class="{{$nav.home.2}} desktop-view" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+                               <a class="{{$nav.home.2}} mobile-view" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon s22 icon-home"></i></a>
                                <span id="home-update" class="nav-notify"></span>
                        </li>
                {{/if}}
                {{if $nav.network}}
                        <li role="menuitem" id="nav-network-link" class="nav-menu {{$sel.network}}">
-                               <a accesskey="n" class="{{$nav.network.2}} desktop-view" href="{{$nav.network.0}}" title="{{$nav.network.3|escape}}" >{{$nav.network.1}}</a>
-                               <a class="{{$nav.network.2}} mobile-view" href="{{$nav.network.0}}" title="{{$nav.network.3|escape}}" ><i class="icon s22 icon-th"></i></a>
+                               <a accesskey="n" class="{{$nav.network.2}} desktop-view" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+                               <a class="{{$nav.network.2}} mobile-view" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon s22 icon-th"></i></a>
                                <span id="net-update" class="nav-notify"></span>
                        </li>
                {{/if}}
                {{if $nav.events}}
                        <li role="menuitem" id="nav-events-link" class="nav-menu {{$sel.events}}">
-                               <a accesskey="e" class="{{$nav.events.2}} desktop-view" href="{{$nav.events.0}}" title="{{$nav.events.3|escape}}" >{{$nav.events.1}}</a>
-                               <a class="{{$nav.events.2}} mobile-view" href="{{$nav.events.0}}" title="{{$nav.events.3|escape}}" ><i class="icon s22 icon-calendar"></i></a>
+                               <a accesskey="e" class="{{$nav.events.2}} desktop-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}" >{{$nav.events.1}}</a>
+                               <a class="{{$nav.events.2}} mobile-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}" ><i class="icon s22 icon-calendar"></i></a>
                        </li>
                {{/if}}
                {{if $nav.community}}
                        <li role="menuitem" id="nav-community-link" class="nav-menu {{$sel.community}}">
-                               <a accesskey="c" class="{{$nav.community.2}} desktop-view" href="{{$nav.community.0}}" title="{{$nav.community.3|escape}}" >{{$nav.community.1}}</a>
-                               <a class="{{$nav.community.2}} mobile-view" href="{{$nav.community.0}}" title="{{$nav.community.3|escape}}" ><i class="icon s22 icon-bullseye"></i></a>
+                               <a accesskey="c" class="{{$nav.community.2}} desktop-view" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+                               <a class="{{$nav.community.2}} mobile-view" href="{{$nav.community.0}}" title="{{$nav.community.3}}" ><i class="icon s22 icon-bullseye"></i></a>
                        </li>
                {{/if}}
 
                <li role="menu" aria-haspopup="true" id="nav-site-linkmenu" class="nav-menu-icon"><a><span class="icon s22 icon-question"><span class="sr-only">{{$nav.help.3}}</span></span></a>
                        <ul id="nav-site-menu" class="menu-popup">
-                               {{if $nav.help}} <li role="menuitem"><a class="{{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3|escape}}" >{{$nav.help.1}}</a></li>{{/if}}
-                               <li role="menuitem"><a class="{{$nav.about.2}}" href="{{$nav.about.0}}" title="{{$nav.about.3|escape}}" >{{$nav.about.1}}</a></li>
-                               {{if $nav.tos}}<a class="{{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3|escape}}" >{{$nav.tos.1}}</a></li>{{/if}}
-                               <li role="menuitem"><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3|escape}}" >{{$nav.directory.1}}</a></li>
+                               {{if $nav.help}} <li role="menuitem"><a class="{{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
+                               <li role="menuitem"><a class="{{$nav.about.2}}" href="{{$nav.about.0}}" title="{{$nav.about.3}}" >{{$nav.about.1}}</a></li>
+                               {{if $nav.tos}}<a class="{{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}" >{{$nav.tos.1}}</a></li>{{/if}}
+                               <li role="menuitem"><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
                        </ul>
                </li>
 
                {{if $nav.notifications}}
-                       <li role="menu" aria-haspopup="true" id="nav-notifications-linkmenu" class="nav-menu-icon"><a title="{{$nav.notifications.1|escape}}"><span class="icon s22 icon-bell tilted-icon"><span class="sr-only">{{$nav.notifications.1}}</span></span></a>
+                       <li role="menu" aria-haspopup="true" id="nav-notifications-linkmenu" class="nav-menu-icon"><a title="{{$nav.notifications.1}}"><span class="icon s22 icon-bell tilted-icon"><span class="sr-only">{{$nav.notifications.1}}</span></span></a>
                                <span id="notify-update" class="nav-notify"></span>
                                <ul id="nav-notifications-menu" class="menu-popup">
                                        <li role="menuitem" id="nav-notifications-mark-all"><a onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
 
                {{if $userinfo}}
                        <li role="menu" aria-haspopup="true" id="nav-user-linkmenu" class="nav-menu">
-                               <a accesskey="u" title="{{$sitelocation|escape}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name|escape}}"><span id="nav-user-linklabel">{{$userinfo.name|escape}}</span><span id="intro-update" class="nav-notify"></span></a>
+                               <a accesskey="u" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span id="nav-user-linklabel">{{$userinfo.name}}</span><span id="intro-update" class="nav-notify"></span></a>
                                <ul id="nav-user-menu" class="menu-popup">
-                                       {{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3|escape}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>{{/if}}
-                                       {{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3|escape}}" >{{$nav.contacts.1}}</a></li>{{/if}}
-                                       {{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3|escape}}" >{{$nav.messages.1}}</a><span id="mail-update" class="nav-notify"></span></a></li>{{/if}}
-                                       {{if $nav.manage}}<li role="menuitem"><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3|escape}}">{{$nav.manage.1}}</a></li>{{/if}}
-                                       {{if $nav.usermenu.1}}<li role="menuitem"><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3|escape}}">{{$nav.usermenu.1.1}}</a></li>{{/if}}
-                                       {{if $nav.settings}}<li role="menuitem"><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3|escape}}">{{$nav.settings.1}}</a></li>{{/if}}
-                                       {{if $nav.logout}}<li role="menuitem"><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3|escape}}" >{{$nav.logout.1}}</a></li>{{/if}}
+                                       {{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>{{/if}}
+                                       {{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
+                                       {{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a><span id="mail-update" class="nav-notify"></span></a></li>{{/if}}
+                                       {{if $nav.manage}}<li role="menuitem"><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
+                                       {{if $nav.usermenu.1}}<li role="menuitem"><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3}}">{{$nav.usermenu.1.1}}</a></li>{{/if}}
+                                       {{if $nav.settings}}<li role="menuitem"><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
+                                       {{if $nav.logout}}<li role="menuitem"><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
                                </ul>
                        </li>
                {{/if}}
 
                {{if $nav.login}}
                        <li role="menuitem" id="nav-login-link" class="nav-menu">
-                               <a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3|escape}}" >{{$nav.login.1}}</a>
+                               <a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
                        </li>
                {{/if}}
 
 
                {{if $nav.admin}}
                        <li role="menuitem" id="nav-admin-link" class="nav-menu">
-                               <a accesskey="a" class="{{$nav.admin.2}} icon-sliders" href="{{$nav.admin.0}}" title="{{$nav.admin.3|escape}}" ><span class="sr-only">{{$nav.admin.3|escape}}</span></a>
+                               <a accesskey="a" class="{{$nav.admin.2}} icon-sliders" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><span class="sr-only">{{$nav.admin.3}}</span></a>
                        </li>
                {{/if}}
 
                {{if $nav.apps}}
                        <li role="menu" aria-haspopup="true" id="nav-apps-link" class="nav-menu {{$sel.apps}}">
-                               <a class=" {{$nav.apps.2}}" title="{{$nav.apps.3|escape}}" >{{$nav.apps.1}}</a>
+                               <a class=" {{$nav.apps.2}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
                                <ul id="nav-apps-menu" class="menu-popup">
                                        {{foreach $apps as $ap}}
-                                       <li role="menuitem">{{$ap}}</li>
+                                       <li role="menuitem">{{$ap nofilter}}</li>
                                        {{/foreach}}
                                </ul>
                        </li>
index f696a683a6d5a7e74bd21d4ef362ed9ea9a213ea..b65f7edd6ed503d1bc90ff40ac50abad1e6263f4 100644 (file)
@@ -2,15 +2,15 @@
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper">
-                               <a href="{{$profile_url}}" target="redir" title="{{$linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
-                                       <img src="{{$thumb}}" class="contact-photo{{$sparkle}}" id="wall-item-photo-{{$id}}" alt="{{$name|escape}}" />
+                               <a href="{{$profile_url}}" target="redir" title="{{$linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
+                                       <img src="{{$thumb}}" class="contact-photo{{$sparkle}}" id="wall-item-photo-{{$id}}" alt="{{$name}}" />
                                </a>
                        </div>
                </div>
                <div class="wall-item-actions-author">
-                       <a href="{{$profile_url}}" target="redir" title="{{$linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$sparkle}}">{{$name|escape}}</span></a>
+                       <a href="{{$profile_url}}" target="redir" title="{{$linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$sparkle}}">{{$name}}</span></a>
                        <span class="wall-item-ago">
-                               {{if $plink}}<a class="link" title="{{$plink.title|escape}}" href="{{$plink.href}}" style="color: #999">{{$ago}}</a>{{else}} {{$ago}} {{/if}}
+                               {{if $plink}}<a class="link" title="{{$plink.title}}" href="{{$plink.href}}" style="color: #999">{{$ago}}</a>{{else}} {{$ago}} {{/if}}
                                {{if $lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$id}});">{{$lock}}</span> {{/if}}
                        </span>
                </div>
                </div>
                <div class="wall-item-tags">
                        {{foreach $tags as $tag}}
-                               <span class='tag'>{{$tag}}</span>
+                               <span class='tag'>{{$tag nofilter}}</span>
                        {{/foreach}}
 
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       <!-- {{if $plink}}<a title="{{$plink.title|escape}}" href="{{$plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
-                       {{if $conv}}<a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title|escape}}'><i class="icon-link icon-large"></i></a>{{/if}}
+                       <!-- {{if $plink}}<a title="{{$plink.title}}" href="{{$plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
+                       {{if $conv}}<a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
                </div>
                <div class="wall-item-actions">
 
 
                        <div class="wall-item-actions-social">
                        {{if $star}}
-                               <a href="#" id="star-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classdo}}"  title="{{$star.do|escape}}">{{$star.do}}</a>
-                               <a href="#" id="unstar-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classundo}}"  title="{{$star.undo|escape}}">{{$star.undo}}</a>
-                               <a href="#" id="tagger-{{$id}}" onclick="itemTag({{$id}}); return false;" class="{{$star.classtagger}}" title="{{$star.tagger|escape}}">{{$star.tagger}}</a>
+                               <a href="#" id="star-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classdo}}"  title="{{$star.do}}">{{$star.do}}</a>
+                               <a href="#" id="unstar-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classundo}}"  title="{{$star.undo}}">{{$star.undo}}</a>
+                               <a href="#" id="tagger-{{$id}}" onclick="itemTag({{$id}}); return false;" class="{{$star.classtagger}}" title="{{$star.tagger}}">{{$star.tagger}}</a>
                        {{/if}}
 
                        {{if $vote}}
-                               <a href="#" id="like-{{$id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$vote.like.0|escape}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
-                               <a href="#" id="dislike-{{$id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$vote.dislike.0|escape}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
+                               <a href="#" id="like-{{$id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$vote.like.0}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
+                               <a href="#" id="dislike-{{$id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$vote.dislike.0}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
                        {{/if}}
 
                        {{if $vote.share}}
-                               <a href="#" id="share-{{$id}}" title="{{$vote.share.0|escape}}" onclick="jotShare({{$id}}); return false">{{$vote.share.1}}</a>
+                               <a href="#" id="share-{{$id}}" title="{{$vote.share.0}}" onclick="jotShare({{$id}}); return false">{{$vote.share.1}}</a>
                        {{/if}}
                        </div>
 
                        <div class="wall-item-actions-tools">
 
                                {{if $drop.pagedrop}}
-                                       <input type="checkbox" title="{{$drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$id}}" />
+                                       <input type="checkbox" title="{{$drop.select}}" name="itemselected[]" class="item-select" value="{{$id}}" />
                                {{/if}}
                                {{if $drop.dropping}}
-                                       <a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$drop.delete|escape}}">{{$drop.delete}}</a>
+                                       <a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$drop.delete}}">{{$drop.delete}}</a>
                                {{/if}}
                                {{if $edpost}}
-                                       <a class="icon edit s16" href="{{$edpost.0}}" title="{{$edpost.1|escape}}"></a>
+                                       <a class="icon edit s16" href="{{$edpost.0}}" title="{{$edpost.1}}"></a>
                                {{/if}}
                        </div>
 
@@ -72,7 +72,7 @@
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-{{$id}}">{{$like}}</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-{{$id}}">{{$dislike}}</div>
+               <div class="wall-item-like" id="wall-item-like-{{$id}}">{{$like nofilter}}</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-{{$id}}">{{$dislike nofilter}}</div>
        </div>
 </div>
index 5a6613dd1eb9ec0023bf831b5b3dacff579d495d..aa3f7aadd5d03f99fdf634a40f77eeb39b27f629 100644 (file)
@@ -8,33 +8,33 @@
 |
 <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
 {{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock|escape}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
 </div>
 
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
 <div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
+<div id="photo-caption">{{$desc nofilter}}</div>
 {{if $tags}}
 <div id="in-this-photo-text">{{$tags.0}}</div>
 <div id="in-this-photo">{{$tags.1}}</div>
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-       {{$likebuttons}}
-       {{$like}}
-       {{$dislike}}    
+       {{$likebuttons nofilter}}
+       {{$like nofilter}}
+       {{$dislike nofilter}}
 </div>
 {{/if}}
 
 <div class="wall-item-comment-wrapper photo">
-{{$comments}}
+       {{$comments nofilter}}
 </div>
 
-{{$paginate}}
+{{$paginate nofilter}}
 
index 702fba8f2631a261fb917a5bc221ee44380e4799..20c4e84b137b24ebd41ae8b9a6a62f39909c4b87 100644 (file)
@@ -63,7 +63,7 @@
 {{if $profile.homepage}}
 <dl id="aprofile-homepage" class="aprofile">
  <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1}}</dd>
+ <dd>{{$profile.homepage.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.about}}
 <dl id="aprofile-about" class="aprofile">
  <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1}}</dd>
+ <dd>{{$profile.about.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.interest}}
 <dl id="aprofile-interest" class="aprofile">
  <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1}}</dd>
+ <dd>{{$profile.interest.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.likes}}
 <dl id="aprofile-likes" class="aprofile">
  <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1}}</dd>
+ <dd>{{$profile.likes.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.dislikes}}
 <dl id="aprofile-dislikes" class="aprofile">
  <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1}}</dd>
+ <dd>{{$profile.dislikes.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.contact}}
 <dl id="aprofile-contact" class="aprofile">
  <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1}}</dd>
+ <dd>{{$profile.contact.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.music}}
 <dl id="aprofile-music" class="aprofile">
  <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1}}</dd>
+ <dd>{{$profile.music.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.book}}
 <dl id="aprofile-book" class="aprofile">
  <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1}}</dd>
+ <dd>{{$profile.book.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.tv}}
 <dl id="aprofile-tv" class="aprofile">
  <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1}}</dd>
+ <dd>{{$profile.tv.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.film}}
 <dl id="aprofile-film" class="aprofile">
  <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1}}</dd>
+ <dd>{{$profile.film.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.romance}}
 <dl id="aprofile-romance" class="aprofile">
  <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1}}</dd>
+ <dd>{{$profile.romance.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.work}}
 <dl id="aprofile-work" class="aprofile">
  <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1}}</dd>
+ <dd>{{$profile.work.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.education}}
 <dl id="aprofile-education" class="aprofile">
  <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1}}</dd>
+ <dd>{{$profile.education.1 nofilter}}</dd>
 </dl>
 {{/if}}
 
 {{if $profile.forumlist}}
 <dl id="aprofile-forumlist" class="aprofile">
  <dt>{{$profile.forumlist.0}}</dt>
- <dd>{{$profile.forumlist.1}}</dd>
+ <dd>{{$profile.forumlist.1 nofilter}}</dd>
 </dl>
 {{/if}}
index 0951847b0a018321e72d9e2061eb2ef0159f67ec..066b2566f6480fae2f9ba546627b8bd153d7075e 100644 (file)
@@ -23,7 +23,7 @@
 </div>
 <div id="profile-edit-links-end"></div>
 
-{{$default}}
+{{$default nofilter}}
 
 <div id="profile-edit-wrapper" >
 
@@ -83,7 +83,7 @@
       
       <div id="profile-edit-gender-wrapper" >
         <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-        {{$gender}}
+        {{$gender nofilter}}
       </div>
       <div id="profile-edit-gender-end"></div>
       
       <div id="profile-edit-homepage-end"></div>
       
       <div id="profile-edit-dob-wrapper" >
-        {{$dob}}
+        {{$dob nofilter}}
       </div>
       <div id="profile-edit-dob-end"></div>
       
-      {{$hide_friends}}
+      {{$hide_friends nofilter}}
       
       <div id="about-jot-wrapper">
         <div id="about-jot-desc">{{$about.1}}</div>
       
       <div id="profile-edit-sexual-wrapper" >
         <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
-        {{$sexual}}
+        {{$sexual nofilter}}
       </div>
       <div id="profile-edit-sexual-end"></div>
       
     <div class="js-section toggle-section-content hidden">
       
       <div id="profile-edit-marital-wrapper" >
-        <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
-        {{$marital}}
+        <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital nofilter}} </label>
+        {{$marital nofilter}}
       </div>
       <label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
       <input type="text" size="32" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
 {{/if}}
 <div id="profile-edit-profile-name-wrapper" >
 <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
+<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
 </div>
 <div id="profile-edit-profile-name-end"></div>
 
 <div id="profile-edit-name-wrapper" >
 <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
+<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
 </div>
 <div id="profile-edit-name-end"></div>
 
 {{if $personal_account}}
 <div id="profile-edit-gender-wrapper" >
 <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
-{{$gender}}
+{{$gender nofilter}}
 </div>
 <div id="profile-edit-gender-end"></div>
 
 <div id="profile-edit-dob-wrapper" >
-{{$dob}}
+{{$dob nofilter}}
 </div>
 <div id="profile-edit-dob-end"></div>
 {{/if}}
       </div>
       <div id="profile-edit-homepage-end"></div>
 
-{{$hide_friends}}
+{{$hide_friends nofilter}}
 
 <div id="profile-edit-address-wrapper" >
 <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
+<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
 </div>
 <div id="profile-edit-address-end"></div>
 
 <div id="profile-edit-locality-wrapper" >
 <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
 </div>
 <div id="profile-edit-locality-end"></div>
 
 
 <div id="profile-edit-postal-code-wrapper" >
 <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
+<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
 
 
 <div id="profile-edit-pubkeywords-wrapper" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
 </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div id="profile-edit-prvkeywords-wrapper" >
 <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
 </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
 <div id="profile-edit-prvkeywords-end"></div>
 
index a464416959b9971c9e00286435bb55f0b2d2789b..b37f5d25916b34cb69b23a3328f2d12b82c6d1b9 100644 (file)
@@ -1,7 +1,7 @@
 <div class="vcard h-card">
 
        <div class="tool">
-               <div class="fn label p-name">{{$profile.name|escape}}</div>
+               <div class="fn label p-name">{{$profile.name}}</div>
                {{if $profile.edit}}
                        <div class="action">
                                <a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
                {{/if}}
        </div>
 
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
        {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}"></a></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
        {{else}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name|escape}}"></a></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
        {{/if}}
 
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-       {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
+       {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
                <dd class="adr h-adr">
@@ -58,7 +58,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about}}</dd></dl>{{/if}}
+       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
        {{include file="diaspora_vcard.tpl"}}
        
@@ -81,4 +81,4 @@
        </div>
 </div>
 
-{{$contact_block}}
+{{$contact_block nofilter}}
index c274ca3e38f3ee37419f2dc7b9191686e0b67965..bce28962ec436446fea820d90ce6ad488566627d 100644 (file)
@@ -1,9 +1,9 @@
 
 
 <div class="wall-item-decor">
-       {{if $item.star}}<span class="icon star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred|escape}}">{{$item.star.starred|escape}}</span>{{/if}}
-       {{if $item.lock}}<span class="icon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}">{{$item.lock|escape}}</span>{{/if}}
-       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+       {{if $item.star}}<span class="icon star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
+       {{if $item.lock}}<span class="icon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
+       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 </div>
 
 <div class="wall-item-container {{$item.indent}} {{$item.shiny}} ">
                        <div class="contact-photo-wrapper">
                                <!-- onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)"> -->
-                               <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
-                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
+                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <!-- <a rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a> -->
                                <ul role="menu" aria-haspopup="true" class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu}}
+                               {{$item.item_photo_menu nofilter}}
                                </ul>
 
                        </div>
                </div>
                <div class="wall-item-actions-author">
-                       <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name|escape}}</span></a>
+                       <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
                        <span class="wall-item-ago">
-                               {{if $item.plink}}<a class="link" title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+                               {{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
                                {{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
                        </span>
                </div>
                <div class="wall-item-content">
                        {{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
-                       <div class="wall-item-body">{{$item.body}}</div>
+                       <div class="wall-item-body">{{$item.body nofilter}}</div>
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-tags">
                {{if !$item.suppress_tags}}
                        {{foreach $item.tags as $tag}}
-                               <span class="tag">{{$tag}}</span>
+                               <span class="tag">{{$tag nofilter}}</span>
                        {{/foreach}}
                {{/if}}
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       <!-- {{if $item.plink}}<a title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
-                       {{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title|escape}}'><i class="icon-link icon-large"></i></a>{{/if}}
+                       <!-- {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
+                       {{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
                </div>
                <div class="wall-item-actions">
 
-                       <div class="wall-item-location">{{$item.location}}&nbsp;</div>
+                       <div class="wall-item-location">{{$item.location nofilter}}&nbsp;</div>
 
                        <div class="wall-item-actions-social">
                        {{if $item.star}}
-                               <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do|escape}}">{{$item.star.do}}</a>
-                               <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo|escape}}">{{$item.star.undo}}</a>
-                               <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger|escape}}">{{$item.star.tagger}}</a>
+                               <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+                               <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+                               <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
                        {{/if}}
 
                        {{if $item.vote}}
-                               <a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0|escape}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-                               <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0|escape}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+                               <a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+                               <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
                        {{/if}}
 
                        {{if $item.vote.share}}
-                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
                        {{/if}}
                        </div>
 
                        <div class="wall-item-actions-tools">
 
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete|escape}}">{{$item.drop.delete|escape}}</a>
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                                {{if $item.edpost}}
-                                       <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape}}"></a>
+                                       <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
                                {{/if}}
                        </div>
 
@@ -87,7 +87,7 @@
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+               <div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like nofilter}}</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike nofilter}}</div>
        </div>
 </div>
index 3553a5dcbc4f9e83dfe24d1ff735806b892115f9..885a508fa9ea01e6be7a9e6f772f3e44f679c452 100644 (file)
@@ -1,4 +1,4 @@
-{{$live_update}}
+{{$live_update nofilter}}
 
 {{foreach $threads as $thread}}
 <hr class="sr-only" />
index 2c02036a0ef4e40706290beb52a40c7d2b6718de..49fb26a83c6e70f2d6e36b0628e8f0cd4d1ea6eb 100644 (file)
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper">
-                               <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
-                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
+                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu}}
+                               {{$item.item_photo_menu nofilter}}
                                </ul>
                                
                        </div>
-                       <div class="wall-item-location">{{$item.location}}</div>        
+                       <div class="wall-item-location">{{$item.location nofilter}}</div>
                </div>
                <div class="wall-item-content">
-                       {{$item.ago}} {{$item.body}} 
+                       {{$item.ago}} {{$item.body nofilter}}
                </div>
                        <div class="wall-item-tools">
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete|escape}}">{{$item.drop.delete}}</a>
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                        </div>
        </div>
@@ -59,9 +59,9 @@
 
 {{* top thread comment box *}}
 {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
 {{/if}}{{/if}}{{/if}}
 
 {{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
 {{/if}}
index d99061798accb1ed11d58e9d0b2f703ac2fc40b8..8a857bcb7d6fe84214a9e5bbe6000a25a43ebb84 100644 (file)
@@ -19,7 +19,7 @@
 {{if $item.thread_level!=1}}<div class="children u-comment h-cite">{{/if}}
 
 <div aria-hidden="true" class="wall-item-decor">
-       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 </div>
 
 {{if $item.thread_level<7}}
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
-                               <!-- <a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"></a> -->
-                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <!-- <a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"></a> -->
+                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu}}
+                               {{$item.item_photo_menu nofilter}}
                                </ul>
 
                        </div>
                        {{if $item.owner_url}}
                        <div aria-hidden="true" class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="contact-photo-link u-url" id="wall-item-ownerphoto-link-{{$item.id}}">
-                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}} p-name u-photo" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name|escape}}" />
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link u-url" id="wall-item-ownerphoto-link-{{$item.id}}">
+                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}} p-name u-photo" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
                                </a>
                        </div>
                        {{/if}}
                </div>
                <div role="heading" aria-level="{{$item.thread_level}}" class="wall-item-actions-author">
-                       <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name|escape}}</span></a>
-                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a>{{/if}}
+                       <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
+                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
                        <span class="wall-item-ago">
-                               {{if $item.plink}}<a title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
+                               {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
                        </span>
-                       {{if $item.lock}}<span class="icon s10 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}">{{$item.lock}}</span>{{/if}}
-                       <span class="wall-item-network" title="{{$item.app|escape}}">
+                       {{if $item.lock}}<span class="icon s10 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
+                       <span class="wall-item-network" title="{{$item.app}}">
                                {{$item.network_name}}
                        </span>
                        <div class="wall-item-network-end"></div>
                </div>
 
                <div itemprop="description" class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title|escape}}</a></h2>{{/if}}
-                       <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
+                       <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body nofilter}}</span>
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-tags">
                {{if !$item.suppress_tags}}
                        {{foreach $item.hashtags as $tag}}
-                               <span class="tag">{{$tag}}</span>
+                               <span class="tag">{{$tag nofilter}}</span>
                        {{/foreach}}
                        {{foreach $item.mentions as $tag}}
-                               <span class="mention">{{$tag}}</span>
+                               <span class="mention">{{$tag nofilter}}</span>
                        {{/foreach}}
                {{/if}}
                        {{foreach $item.folders as $cat}}
-                               <span class="folder p-category">{{$cat.name|escape}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                               <span class="folder p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
                        {{foreach $item.categories as $cat}}
-                               <span class="category p-category">{{$cat.name|escape}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                               <span class="category p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links">
-                       {{if $item.plink}}<a role="button" title="{{$item.plink.orig_title|escape}}" href="{{$item.plink.orig}}"><i class="icon-link icon-large"><span class="sr-only">{{$item.plink.orig_title|escape}}</span></i></a>{{/if}}
+                       {{if $item.plink}}<a role="button" title="{{$item.plink.orig_title}}" href="{{$item.plink.orig}}"><i class="icon-link icon-large"><span class="sr-only">{{$item.plink.orig_title}}</span></i></a>{{/if}}
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-social">
                        {{if $item.threaded}}
                        {{/if}}
                        {{if $item.comment}}
-                               <a role="button" id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment|escape}}"><i class="icon-commenting"><span class="sr-only">{{$item.switchcomment}}</span></i></a>
+                               <a role="button" id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment}}"><i class="icon-commenting"><span class="sr-only">{{$item.switchcomment}}</span></i></a>
                        {{/if}}
 
                        {{if $item.isevent}}
-                               <a role="button" id="attendyes-{{$item.id}}"{{if $item.responses.attendyes.self}} class="active"{{/if}} title="{{$item.attend.0|escape}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="icon-ok icon-large"><span class="sr-only">{{$item.attend.0}}</span></i></a>
-                               <a role="button" id="attendno-{{$item.id}}"{{if $item.responses.attendno.self}} class="active"{{/if}} title="{{$item.attend.1|escape}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="icon-remove icon-large"><span class="sr-only">{{$item.attend.1}}</span></i></a>
-                               <a role="button" id="attendmaybe-{{$item.id}}"{{if $item.responses.attendmaybe.self}} class="active"{{/if}} title="{{$item.attend.2|escape}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="icon-question icon-large"><span class="sr-only">{{$item.attend.2}}</span></i></a>
+                               <a role="button" id="attendyes-{{$item.id}}"{{if $item.responses.attendyes.self}} class="active"{{/if}} title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="icon-ok icon-large"><span class="sr-only">{{$item.attend.0}}</span></i></a>
+                               <a role="button" id="attendno-{{$item.id}}"{{if $item.responses.attendno.self}} class="active"{{/if}} title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="icon-remove icon-large"><span class="sr-only">{{$item.attend.1}}</span></i></a>
+                               <a role="button" id="attendmaybe-{{$item.id}}"{{if $item.responses.attendmaybe.self}} class="active"{{/if}} title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="icon-question icon-large"><span class="sr-only">{{$item.attend.2}}</span></i></a>
                        {{/if}}
 
                        {{if $item.vote}}
                                {{if $item.vote.like}}
-                               <a role="button" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0|escape}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"><span class="sr-only">{{$item.vote.like.0}}</span></i></a>
+                               <a role="button" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"><span class="sr-only">{{$item.vote.like.0}}</span></i></a>
                                {{/if}}{{if $item.vote.dislike}}
-                               <a role="button" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0|escape}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"><span class="sr-only">{{$item.vote.dislike.0}}</span></i></a>
+                               <a role="button" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"><span class="sr-only">{{$item.vote.dislike.0}}</span></i></a>
                                {{/if}}
                            {{if $item.vote.share}}
-                                   <a role="button" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"><span class="sr-only">{{$item.vote.share.0}}</span></i></a>
+                                   <a role="button" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"><span class="sr-only">{{$item.vote.share.0}}</span></i></a>
                            {{/if}}
                        {{/if}}
 
                        {{if $item.star}}
-                               <a role="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}" title="{{$item.star.do|escape}}"><i class="icon-star icon-large"><span class="sr-only">{{$item.star.do}}</span></i></a>
-                               <a role="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo|escape}}"><i class="icon-star-empty icon-large"><span class="sr-only">{{$item.star.undo}}</span></i></a>
+                               <a role="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="icon-star icon-large"><span class="sr-only">{{$item.star.do}}</span></i></a>
+                               <a role="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}"><i class="icon-star-empty icon-large"><span class="sr-only">{{$item.star.undo}}</span></i></a>
                        {{/if}}
                        {{if $item.ignore}}
-                               <a role="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classdo}}"  title="{{$item.ignore.do|escape}}"><i class="icon-bell-slash icon-large"><span class="sr-only">{{$item.ignore.do}}</span></i></a>
-                               <a role="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classundo}}"  title="{{$item.ignore.undo|escape}}"><i class="icon-bell-slash-o icon-large"><span class="sr-only">{{$item.ignore.undo}}</span></i></a>
+                               <a role="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classdo}}"  title="{{$item.ignore.do}}"><i class="icon-bell-slash icon-large"><span class="sr-only">{{$item.ignore.do}}</span></i></a>
+                               <a role="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="icon-bell-slash-o icon-large"><span class="sr-only">{{$item.ignore.undo}}</span></i></a>
                        {{/if}}
                        {{if $item.tagger}}
-                               <a role="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add|escape}}"><i class="icon-tags icon-large"><span class="sr-only">{{$item.tagger.add}}</span></i></a>
+                               <a role="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="icon-tags icon-large"><span class="sr-only">{{$item.tagger.add}}</span></i></a>
                        {{/if}}
                        {{if $item.filer}}
-                                <a role="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer|escape}}"><i class="icon-folder-close icon-large"><span class="sr-only">{{$item.filer}}</span></i></a>
+                                <a role="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="icon-folder-close icon-large"><span class="sr-only">{{$item.filer}}</span></i></a>
                        {{/if}}
                        </div>
 
-                       <div class="wall-item-location">{{$item.location}} {{$item.postopts}}</div>
+                       <div class="wall-item-location">{{$item.location nofilter}} {{$item.postopts}}</div>
 
                        <div class="wall-item-actions-isevent">
                        </div>
                        <div class="wall-item-actions-tools">
 
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a role="button" href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" title="{{$item.drop.delete|escape}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.delete}}</span></i></a>
+                                       <a role="button" href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.delete}}</span></i></a>
                                {{/if}}
                                {{if $item.edpost}}
-                                       <a role="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape}}"><i class="icon-edit icon-large"><span class="sr-only">{{$item.edpost.1}}</span></i></a>
+                                       <a role="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="icon-edit icon-large"><span class="sr-only">{{$item.edpost.1}}</span></i></a>
                                {{/if}}
                        </div>
 
                </div>
                {{if $item.responses}}
                        {{foreach $item.responses as $verb=>$response}}
-                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
                        {{/foreach}}
                {{/if}}
 
                <div class="wall-item-links">
                </div>
                <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
-                                       {{$item.comment}}
+                                       {{$item.comment nofilter}}
                </div>
        </div>
        {{/if}}{{/if}}
 
 {{if $item.total_comments_num}}
        {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
        {{/if}}{{/if}}{{/if}}
 
        {{if $item.flatten}}
-               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
        {{/if}}
 {{else}}
        {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment}}</div>
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
        {{/if}}{{/if}}{{/if}}
 
        {{if $item.flatten}}
-               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment}}</div>
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
        {{/if}}
 {{/if}}
index 8b2700e01bd59ef6b0e9e9473455522b0cf0261f..fe72ffcaf6b7009abb3264f2cbbae099daeae724 100644 (file)
@@ -21,20 +21,20 @@ function showHideForumlist() {
                {{if $forum.id <= $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc|escape}}" class="label sparkle" target="_blank">
-                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc|escape}}" />
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name|escape}}</a>
+                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
        
                {{if $forum.id > $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc|escape}}" class="label sparkle" target="_blank">
-                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc|escape}}" />
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name|escape}}</a>
+                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
                {{/foreach}}
index 9427f1f23b5038739327dc23f362a9b8ed874427..89fea650bac1b6b2c531d09b9885d52f0703ad40 100644 (file)
@@ -214,10 +214,7 @@ function vier_community_info()
 
        //Community_Pages at right_aside
        if ($show_pages && local_user()) {
-               $cid = null;
-               if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
-                       $cid = $_GET['cid'];
-               }
+               $cid = defaults($_GET, 'cid', null);
 
                //sort by last updated item
                $lastitem = true;