diff --git a/src/messenger/webim/libs/chat.php b/src/messenger/webim/libs/chat.php index 969dc318..827063a0 100644 --- a/src/messenger/webim/libs/chat.php +++ b/src/messenger/webim/libs/chat.php @@ -82,7 +82,7 @@ function post_message($threadid, $kind, $message, $from = null, $agentid = null) function prepare_html_message($text) { - $escaped_text = htmlspecialchars($text); + $escaped_text = safe_htmlspecialchars($text); $text_w_links = preg_replace('/(http|ftp):\/\/\S*/', '$0', $escaped_text); $multiline = str_replace("\n", "
", $text_w_links); return $multiline; @@ -95,7 +95,7 @@ function message_to_html($msg) $message = "" . date("H:i:s", $msg['created']) . " "; $kind = $kind_to_string{$msg['ikind']}; if ($msg['tname']) - $message .= "" . htmlspecialchars($msg['tname']) . ": "; + $message .= "" . safe_htmlspecialchars($msg['tname']) . ": "; $message .= "" . prepare_html_message($msg['tmessage']) . "
"; return $message; } @@ -166,7 +166,7 @@ function print_thread_messages($thread, $token, $lastid, $isuser, $format, $agen $output = get_messages($threadid, "xml", $isuser, $lastid); start_xml_output(); - print(""); + print(""); foreach ($output as $msg) { print $msg; } @@ -176,13 +176,13 @@ function print_thread_messages($thread, $token, $lastid, $isuser, $format, $agen $output = get_messages($threadid, "html", $isuser, $lastid); start_html_output(); - $url = "$webimroot/thread.php?act=refresh&thread=" . htmlspecialchars($threadid) . "&token=" . htmlspecialchars($token) . "&html=on&user=" . ($isuser ? "true" : "false"); + $url = "$webimroot/thread.php?act=refresh&thread=" . safe_htmlspecialchars($threadid) . "&token=" . safe_htmlspecialchars($token) . "&html=on&user=" . ($isuser ? "true" : "false"); print( "" . "\n\n" . "\n" . - "\n" . + "\n" . "\n" . "chat\n" . "\n" . @@ -290,9 +290,9 @@ function setup_logo() { global $page, $settings; loadsettings(); - $page['ct.company.name'] = htmlspecialchars(topage($settings['title'])); - $page['ct.company.chatLogoURL'] = htmlspecialchars(topage($settings['logo'])); - $page['webimHost'] = htmlspecialchars(topage($settings['hosturl'])); + $page['ct.company.name'] = safe_htmlspecialchars(topage($settings['title'])); + $page['ct.company.chatLogoURL'] = safe_htmlspecialchars(topage($settings['logo'])); + $page['webimHost'] = safe_htmlspecialchars(topage($settings['hosturl'])); } function setup_leavemessage($name, $email, $message, $groupid, $groupname, $info, $referrer, $canshowcaptcha) @@ -337,7 +337,7 @@ function setup_survey($name, $email, $groupid, $info, $referrer, $canshowcaptcha $groupname .= " (offline)"; } $isselected = $k['groupid'] == $groupid; - $val .= ""; + $val .= ""; } $page['groups'] = $val; } @@ -359,11 +359,11 @@ function setup_chatview_for_user($thread, $level) $page['displ1'] = $nameisset ? "none" : "inline"; $page['displ2'] = $nameisset ? "inline" : "none"; $page['level'] = $level; - $page['ct.chatThreadId'] = htmlspecialchars($thread['threadid']); - $page['ct.token'] = htmlspecialchars($thread['ltoken']); - $page['ct.user.name'] = htmlspecialchars(topage($thread['userName'])); + $page['ct.chatThreadId'] = safe_htmlspecialchars($thread['threadid']); + $page['ct.token'] = safe_htmlspecialchars($thread['ltoken']); + $page['ct.user.name'] = safe_htmlspecialchars(topage($thread['userName'])); $page['canChangeName'] = $settings['usercanchangename'] == "1"; - $page['chat.title'] = htmlspecialchars(topage($settings['chattitle'])); + $page['chat.title'] = safe_htmlspecialchars(topage($settings['chattitle'])); setup_logo(); if ($settings['sendmessagekey'] == 'enter') { @@ -375,10 +375,10 @@ function setup_chatview_for_user($thread, $level) } $params = "thread=" . $thread['threadid'] . "&token=" . $thread['ltoken']; - $page['mailLink'] = htmlspecialchars("$webimroot/client.php?" . $params . "&level=$level&act=mailthread"); + $page['mailLink'] = safe_htmlspecialchars("$webimroot/client.php?" . $params . "&level=$level&act=mailthread"); if ($settings['enablessl'] == "1" && !is_secure_request()) { - $page['sslLink'] = htmlspecialchars(get_app_location(true, true) . "/client.php?" . $params . "&level=$level"); + $page['sslLink'] = safe_htmlspecialchars(get_app_location(true, true) . "/client.php?" . $params . "&level=$level"); } $page['isOpera95'] = is_agent_opera95(); @@ -420,10 +420,10 @@ function setup_chatview_for_operator($thread, $operator) $page['agent'] = true; $page['user'] = false; $page['canpost'] = $thread['agentId'] == $operator['operatorid']; - $page['ct.chatThreadId'] = htmlspecialchars($thread['threadid']); - $page['ct.token'] = htmlspecialchars($thread['ltoken']); - $page['ct.user.name'] = htmlspecialchars(topage(get_user_name($thread['userName'], $thread['remote'], $thread['userid']))); - $page['chat.title'] = htmlspecialchars(topage($settings['chattitle'])); + $page['ct.chatThreadId'] = safe_htmlspecialchars($thread['threadid']); + $page['ct.token'] = safe_htmlspecialchars($thread['ltoken']); + $page['ct.user.name'] = safe_htmlspecialchars(topage(get_user_name($thread['userName'], $thread['remote'], $thread['userid']))); + $page['chat.title'] = safe_htmlspecialchars(topage($settings['chattitle'])); setup_logo(); if ($settings['sendmessagekey'] == 'enter') { @@ -435,20 +435,20 @@ function setup_chatview_for_operator($thread, $operator) } if ($settings['enablessl'] == "1" && !is_secure_request()) { - $page['sslLink'] = htmlspecialchars(get_app_location(true, true) . "/operator/agent.php?thread=" . $thread['threadid'] . "&token=" . $thread['ltoken']); + $page['sslLink'] = safe_htmlspecialchars(get_app_location(true, true) . "/operator/agent.php?thread=" . $thread['threadid'] . "&token=" . $thread['ltoken']); } $page['isOpera95'] = is_agent_opera95(); $page['neediframesrc'] = needsFramesrc(); $page['historyParams'] = array("userid" => "" . $thread['userid']); - $page['historyParamsLink'] = htmlspecialchars(add_params($webimroot . "/operator/userhistory.php", $page['historyParams'])); + $page['historyParamsLink'] = safe_htmlspecialchars(add_params($webimroot . "/operator/userhistory.php", $page['historyParams'])); $predefinedres = ""; $canned_messages = load_canned_messages($thread['locale'], $thread['groupid']); foreach ($canned_messages as $answer) { - $predefinedres .= ""; + $predefinedres .= ""; } $page['predefinedAnswers'] = $predefinedres; $params = "thread=" . $thread['threadid'] . "&token=" . $thread['ltoken']; - $page['redirectLink'] = htmlspecialchars("$webimroot/operator/agent.php?" . $params . "&act=redirect"); + $page['redirectLink'] = safe_htmlspecialchars("$webimroot/operator/agent.php?" . $params . "&act=redirect"); $page['namePostfix'] = ""; $page['frequency'] = $settings['updatefrequency_chat']; diff --git a/src/messenger/webim/libs/common.php b/src/messenger/webim/libs/common.php index a325f694..c1d60f2c 100644 --- a/src/messenger/webim/libs/common.php +++ b/src/messenger/webim/libs/common.php @@ -59,7 +59,7 @@ function verifyparam($name, $regexp, $default = null) if (isset($default)) return $default; } - echo "Wrong parameter used or absent: " . htmlspecialchars($name) . ""; + echo "Wrong parameter used or absent: " . safe_htmlspecialchars($name) . ""; exit; } @@ -425,7 +425,7 @@ function form_value($key) { global $page; if (isset($page) && isset($page["form$key"])) - return htmlspecialchars($page["form$key"]); + return safe_htmlspecialchars($page["form$key"]); return ""; } @@ -454,7 +454,7 @@ function no_field($key) function failed_uploading_file($filename, $key) { return getlocal2("errors.failed.uploading.file", - array(htmlspecialchars($filename), getlocal($key))); + array(safe_htmlspecialchars($filename), getlocal($key))); } function wrong_field($key) @@ -473,8 +473,8 @@ function get_popup($href, $jshref, $message, $title, $wndName, $options) function get_image($href, $width, $height) { if ($width != 0 && $height != 0) - return "\"\"/"; - return "\"\"/"; + return "\"\"/"; + return "\"\"/"; } function get_gifimage_size($filename) @@ -780,7 +780,7 @@ function sanitize_string($string, $tags_level = 'high', $attr_level = 'high') } $replacement = '<' . $elements[1][$key] . $new_attributes . '>'; - $string = preg_replace( '/' . reg_escape($elements[0][$key]) . '/', $replacement, $string ); + $string = preg_replace( '/' . sanitize_reg_escape($elements[0][$key]) . '/', $replacement, $string ); } } @@ -790,7 +790,8 @@ function sanitize_string($string, $tags_level = 'high', $attr_level = 'high') return $string; } -function reg_escape ($string) { +function sanitize_reg_escape($string) +{ $conversions = array( "^" => "\^", "[" => "\[", @@ -812,4 +813,12 @@ function reg_escape ($string) { return strtr($string, $conversions); } +/* wrapper for htmlspecialchars with single quotes conversion enabled + by default */ + +function safe_htmlspecialchars($string) +{ + return htmlspecialchars($string, ENT_QUOTES); +} + ?> diff --git a/src/messenger/webim/libs/getcode.php b/src/messenger/webim/libs/getcode.php index 8104a96e..0d72fca8 100644 --- a/src/messenger/webim/libs/getcode.php +++ b/src/messenger/webim/libs/getcode.php @@ -36,9 +36,9 @@ function generate_button($title, $locale, $style, $group, $inner, $showhost, $fo $link = append_query($link, "group=$group"); $modsecfix = $modsecurity ? ".replace('http://','').replace('https://','')" : ""; - $jslink = htmlspecialchars(append_query("'" . $link, "url='+escape(document.location.href$modsecfix)+'&referrer='+escape(document.referrer$modsecfix)")); - $temp = get_popup(htmlspecialchars($link), "$jslink", - $inner, htmlspecialchars($title), "webim", "toolbar=0,scrollbars=0,location=0,status=1,menubar=0,width=640,height=480,resizable=1"); + $jslink = safe_htmlspecialchars(append_query("'" . $link, "url='+escape(document.location.href$modsecfix)+'&referrer='+escape(document.referrer$modsecfix)")); + $temp = get_popup(safe_htmlspecialchars($link), "$jslink", + $inner, safe_htmlspecialchars($title), "webim", "toolbar=0,scrollbars=0,location=0,status=1,menubar=0,width=640,height=480,resizable=1"); return "" . $temp . ""; } diff --git a/src/messenger/webim/libs/operator.php b/src/messenger/webim/libs/operator.php index 55ffd40c..1b38c824 100755 --- a/src/messenger/webim/libs/operator.php +++ b/src/messenger/webim/libs/operator.php @@ -305,8 +305,8 @@ function setup_redirect_links($threadid, $token) ) : ""; $agent_list .= "
  • " . - htmlspecialchars(topage(get_operator_name($agent))) . + "\" title=\"" . safe_htmlspecialchars(topage(get_operator_name($agent))) . "\">" . + safe_htmlspecialchars(topage(get_operator_name($agent))) . " $status
    • "; } $page['redirectToAgent'] = $agent_list; @@ -322,8 +322,8 @@ function setup_redirect_links($threadid, $token) ? getlocal("char.redirect.operator.away_suff") : ""); $group_list .= "
  • " . - htmlspecialchars(topage(get_group_name($group))) . + "\" title=\"" . safe_htmlspecialchars(topage(get_group_name($group))) . "\">" . + safe_htmlspecialchars(topage(get_group_name($group))) . " $status
    • "; } } diff --git a/src/messenger/webim/libs/pagination.php b/src/messenger/webim/libs/pagination.php index 46ef2b59..d2164863 100644 --- a/src/messenger/webim/libs/pagination.php +++ b/src/messenger/webim/libs/pagination.php @@ -23,13 +23,13 @@ function generate_pagination_link($page, $title, $raw = false) $lnk = $_SERVER['REQUEST_URI']; $href = preg_replace("/\?page=\d+\&/", "?", preg_replace("/\&page=\d+/", "", $lnk)); $href .= strstr($href, "?") ? "&page=$page" : "?page=$page"; - return "" . ($raw ? $title : htmlspecialchars($title)) . ""; + return "" . ($raw ? $title : safe_htmlspecialchars($title)) . ""; } function generate_pagination_image($id, $alt) { global $webimroot; - return "\"""; + return "\"""; } function prepare_pagination($items_count, $default_items_per_page = 15) diff --git a/src/messenger/webim/libs/userinfo.php b/src/messenger/webim/libs/userinfo.php index 2080b4c9..1836ef37 100644 --- a/src/messenger/webim/libs/userinfo.php +++ b/src/messenger/webim/libs/userinfo.php @@ -50,9 +50,9 @@ function get_user_addr($addr) global $settings; if ($settings['geolink'] && preg_match("/(\\d+\\.\\d+\\.\\d+\\.\\d+)/", $addr, $matches)) { $userip = $matches[1]; - return get_popup(htmlspecialchars(str_replace("{ip}", $userip, $settings['geolink'])), '', htmlspecialchars($addr), "GeoLocation", htmlspecialchars("ip$userip"), htmlspecialchars($settings['geolinkparams'])); + return get_popup(safe_htmlspecialchars(str_replace("{ip}", $userip, $settings['geolink'])), '', safe_htmlspecialchars($addr), "GeoLocation", safe_htmlspecialchars("ip$userip"), safe_htmlspecialchars($settings['geolinkparams'])); } - return htmlspecialchars($addr); + return safe_htmlspecialchars($addr); } ?> \ No newline at end of file diff --git a/src/messenger/webim/operator/ban.php b/src/messenger/webim/operator/ban.php index f8cb7a59..cb9a05d3 100644 --- a/src/messenger/webim/operator/ban.php +++ b/src/messenger/webim/operator/ban.php @@ -54,7 +54,7 @@ if (isset($_POST['address'])) { if ((!$banId && $existing_ban) || ($banId && $existing_ban && $banId != $existing_ban['banid'])) { - $errors[] = getlocal2("ban.error.duplicate", array(htmlspecialchars($address), htmlspecialchars($existing_ban['banid']))); + $errors[] = getlocal2("ban.error.duplicate", array(safe_htmlspecialchars($address), safe_htmlspecialchars($existing_ban['banid']))); } if (count($errors) == 0) { diff --git a/src/messenger/webim/operator/index.php b/src/messenger/webim/operator/index.php index 764d2c59..439fd97c 100644 --- a/src/messenger/webim/operator/index.php +++ b/src/messenger/webim/operator/index.php @@ -30,7 +30,7 @@ $page = array( 'localeLinks' => get_locale_links("$webimroot/operator/index.php"), 'needUpdate' => $settings['dbversion'] != $dbversion, 'needChangePassword' => $operator['vcpassword'] == md5(''), - 'profilePage' => "$webimroot/operator/operator.php?op=".htmlspecialchars($operator['operatorid']), + 'profilePage' => "$webimroot/operator/operator.php?op=".safe_htmlspecialchars($operator['operatorid']), 'updateWizard' => "$webimroot/install/", 'newFeatures' => $settings['featuresversion'] != $featuresversion, 'featuresPage' => "$webimroot/operator/features.php", diff --git a/src/messenger/webim/operator/redirect.php b/src/messenger/webim/operator/redirect.php index 51578081..d4807b03 100644 --- a/src/messenger/webim/operator/redirect.php +++ b/src/messenger/webim/operator/redirect.php @@ -39,7 +39,7 @@ if (isset($_GET['nextGroup'])) { $nextGroup = group_by_id($nextid); if ($nextGroup) { - $page['message'] = getlocal2("chat.redirected.group.content", array(htmlspecialchars(topage(get_group_name($nextGroup))))); + $page['message'] = getlocal2("chat.redirected.group.content", array(safe_htmlspecialchars(topage(get_group_name($nextGroup))))); if ($thread['istate'] == $state_chatting) { $link = connect(); commit_thread($threadid, @@ -60,7 +60,7 @@ if (isset($_GET['nextGroup'])) { $nextOperator = operator_by_id($nextid); if ($nextOperator) { - $page['message'] = getlocal2("chat.redirected.content", array(htmlspecialchars(topage(get_operator_name($nextOperator))))); + $page['message'] = getlocal2("chat.redirected.content", array(safe_htmlspecialchars(topage(get_operator_name($nextOperator))))); if ($thread['istate'] == $state_chatting) { $link = connect(); $threadupdate = array("istate" => $state_waiting, "nextagent" => $nextid, "agentId" => 0); diff --git a/src/messenger/webim/operator/settings.php b/src/messenger/webim/operator/settings.php index b6daca1c..0ec0cf1b 100644 --- a/src/messenger/webim/operator/settings.php +++ b/src/messenger/webim/operator/settings.php @@ -69,7 +69,7 @@ if (isset($_POST['email']) && isset($_POST['title']) && isset($_POST['logo'])) { if ($params['geolinkparams']) { foreach (preg_split("/,/", $params['geolinkparams']) as $oneparam) { if (!preg_match("/^\s*(toolbar|scrollbars|location|status|menubar|width|height|resizable)=\d{1,4}$/", $oneparam)) { - $errors[] = "Wrong link parameter: \"" . htmlspecialchars($oneparam) . "\", should be one of 'toolbar, scrollbars, location, status, menubar, width, height or resizable'"; + $errors[] = "Wrong link parameter: \"" . safe_htmlspecialchars($oneparam) . "\", should be one of 'toolbar, scrollbars, location, status, menubar, width, height or resizable'"; } } } diff --git a/src/messenger/webim/operator/translate.php b/src/messenger/webim/operator/translate.php index 203b3ef0..d724ff44 100644 --- a/src/messenger/webim/operator/translate.php +++ b/src/messenger/webim/operator/translate.php @@ -189,9 +189,9 @@ if ($show == 's1') { foreach ($allkeys as $key) { if ($key != 'output_charset') { - $tsource = htmlspecialchars($lang1[$key]); + $tsource = safe_htmlspecialchars($lang1[$key]); if (isset($lang2[$key])) { - $value = htmlspecialchars($lang2[$key]); + $value = safe_htmlspecialchars($lang2[$key]); if (get_auxiliary($lang2[$key]) != get_auxiliary($lang1[$key])) { $value = "$value (wrong formatting)"; } diff --git a/src/messenger/webim/operator/update.php b/src/messenger/webim/operator/update.php index 070b844c..c604212f 100644 --- a/src/messenger/webim/operator/update.php +++ b/src/messenger/webim/operator/update.php @@ -24,7 +24,7 @@ require_once('../libs/groups.php'); $operator = get_logged_in(); if (!$operator) { start_xml_output(); - echo "" . htmlspecialchars(htmlspecialchars(myiconv($webim_encoding, "utf-8", escape_with_cdata(getstring("agent.not_logged_in"))))) . ""; + echo "" . safe_htmlspecialchars(safe_htmlspecialchars(myiconv($webim_encoding, "utf-8", escape_with_cdata(getstring("agent.not_logged_in"))))) . ""; exit; } @@ -51,7 +51,7 @@ function thread_to_xml($thread, $link) $webim_encoding, $operator, $settings, $can_viewthreads, $can_takeover, $mysqlprefix; $state = $threadstate_to_string[$thread['istate']]; - $result = ""; @@ -77,32 +77,32 @@ $can_viewthreads, $can_takeover, $mysqlprefix; $banForThread = $settings['enableban'] == "1" ? ban_for_addr_($thread['remote'], $link) : false; if ($banForThread) { - $result .= " ban=\"blocked\" banid=\"" . htmlspecialchars(htmlspecialchars($banForThread['banid'])) . "\""; + $result .= " ban=\"blocked\" banid=\"" . safe_htmlspecialchars(safe_htmlspecialchars($banForThread['banid'])) . "\""; } - $result .= " state=\"$state\" typing=\"" . htmlspecialchars(htmlspecialchars($thread['userTyping'])) . "\">"; + $result .= " state=\"$state\" typing=\"" . safe_htmlspecialchars(safe_htmlspecialchars($thread['userTyping'])) . "\">"; $result .= ""; if ($banForThread) { - $result .= htmlspecialchars(getstring('chat.client.spam.prefix')); + $result .= safe_htmlspecialchars(getstring('chat.client.spam.prefix')); } - $result .= htmlspecialchars(htmlspecialchars(get_user_name($thread['userName'], $thread['remote'], $thread['userid']))) . ""; - $result .= "" . htmlspecialchars(get_user_addr($thread['remote'])) . ""; - $result .= "" . htmlspecialchars(htmlspecialchars($threadoperator)) . ""; - $result .= ""; - $result .= "" . htmlspecialchars(htmlspecialchars($thread['unix_timestamp(dtmmodified)'])) . "000"; + $result .= safe_htmlspecialchars(safe_htmlspecialchars(get_user_name($thread['userName'], $thread['remote'], $thread['userid']))) . ""; + $result .= "" . safe_htmlspecialchars(get_user_addr($thread['remote'])) . ""; + $result .= "" . safe_htmlspecialchars(safe_htmlspecialchars($threadoperator)) . ""; + $result .= ""; + $result .= "" . safe_htmlspecialchars(safe_htmlspecialchars($thread['unix_timestamp(dtmmodified)'])) . "000"; if ($banForThread) { - $result .= "" . htmlspecialchars(htmlspecialchars($banForThread['comment'])) . ""; + $result .= "" . safe_htmlspecialchars(safe_htmlspecialchars($banForThread['comment'])) . ""; } $userAgent = get_useragent_version($thread['userAgent']); - $result .= "" . htmlspecialchars(htmlspecialchars($userAgent)) . ""; + $result .= "" . safe_htmlspecialchars(safe_htmlspecialchars($userAgent)) . ""; if ($thread["shownmessageid"] != 0) { $query = "select tmessage from ${mysqlprefix}chatmessage where messageid = " . $thread["shownmessageid"]; $line = select_one_row($query, $link); if ($line) { $message = preg_replace("/[\r\n\t]+/", " ", $line["tmessage"]); - $result .= "" . htmlspecialchars(htmlspecialchars($message)) . ""; + $result .= "" . safe_htmlspecialchars(safe_htmlspecialchars($message)) . ""; } } $result .= ""; @@ -156,7 +156,7 @@ function print_operators() if (!operator_is_online($operator)) continue; - $name = myiconv($webim_encoding, "utf-8", htmlspecialchars(htmlspecialchars($operator['vclocalename']))); + $name = myiconv($webim_encoding, "utf-8", safe_htmlspecialchars(safe_htmlspecialchars($operator['vclocalename']))); $away = operator_is_away($operator) ? " away=\"1\"" : ""; echo ""; diff --git a/src/messenger/webim/view/agent.php b/src/messenger/webim/view/agent.php index 10f2df6f..19a98219 100644 --- a/src/messenger/webim/view/agent.php +++ b/src/messenger/webim/view/agent.php @@ -47,7 +47,7 @@ require_once('inc_errors.php');
    - + @@ -133,7 +133,7 @@ require_once('inc_errors.php');
    - " alt=""/> + " alt=""/>
    diff --git a/src/messenger/webim/view/agents.php b/src/messenger/webim/view/agents.php index 8c056786..b2e7f009 100644 --- a/src/messenger/webim/view/agents.php +++ b/src/messenger/webim/view/agents.php @@ -38,7 +38,7 @@ require_once('inc_errors.php');
    - "> + ">
    @@ -64,12 +64,12 @@ require_once('inc_errors.php'); - - + + - / + / @@ -82,7 +82,7 @@ require_once('inc_errors.php'); - + remove diff --git a/src/messenger/webim/view/avatar.php b/src/messenger/webim/view/avatar.php index 1149f251..a44e14b7 100644 --- a/src/messenger/webim/view/avatar.php +++ b/src/messenger/webim/view/avatar.php @@ -33,13 +33,13 @@ require_once('inc_errors.php'); - +

    - ‎ + ‎

    @@ -48,7 +48,7 @@ require_once('inc_errors.php');
    - cannot load avatar
    + cannot load avatar
    @@ -77,7 +77,7 @@ require_once('inc_errors.php');
    - " alt=""/> + " alt=""/>
    diff --git a/src/messenger/webim/view/ban.php b/src/messenger/webim/view/ban.php index 2355824f..c955a19b 100644 --- a/src/messenger/webim/view/ban.php +++ b/src/messenger/webim/view/ban.php @@ -21,7 +21,7 @@ function tpl_content() { global $page, $webimroot, $errors; ?> - +
    - " alt=""/> + " alt=""/>
    diff --git a/src/messenger/webim/view/permissions.php b/src/messenger/webim/view/permissions.php index 7ceda0e5..b2a5a4e7 100644 --- a/src/messenger/webim/view/permissions.php +++ b/src/messenger/webim/view/permissions.php @@ -36,24 +36,24 @@ require_once('inc_errors.php'); - +

    - ‎ + ‎


    - " alt=""/> + " alt=""/>
    diff --git a/src/messenger/webim/view/resetpwd.php b/src/messenger/webim/view/resetpwd.php index 50777eb2..d1998825 100644 --- a/src/messenger/webim/view/resetpwd.php +++ b/src/messenger/webim/view/resetpwd.php @@ -46,8 +46,8 @@ function tpl_content() { ?> - - + +
    diff --git a/src/messenger/webim/view/settings.php b/src/messenger/webim/view/settings.php index 914bb107..df3bcf41 100644 --- a/src/messenger/webim/view/settings.php +++ b/src/messenger/webim/view/settings.php @@ -116,7 +116,7 @@ require_once('inc_errors.php');
    - +
    —

    @@ -133,7 +133,7 @@ require_once('inc_errors.php');
    - " alt=""/> + " alt=""/>
    diff --git a/src/messenger/webim/view/statistics.php b/src/messenger/webim/view/statistics.php index 5e3ead84..e82ea643 100644 --- a/src/messenger/webim/view/statistics.php +++ b/src/messenger/webim/view/statistics.php @@ -39,18 +39,18 @@ require_once('inc_errors.php');
    - + - +
    - + - +
    - " alt=""/> + " alt=""/>

    @@ -84,17 +84,17 @@ require_once('inc_errors.php'); - - - - + + + + - - - + + + @@ -126,10 +126,10 @@ require_once('inc_errors.php'); - - - - + + + + diff --git a/src/messenger/webim/view/themes.php b/src/messenger/webim/view/themes.php index f0d42ebe..9b1a2895 100644 --- a/src/messenger/webim/view/themes.php +++ b/src/messenger/webim/view/themes.php @@ -37,13 +37,13 @@ function tpl_content() { global $page, $webimroot;
    - +
    - +
    @@ -57,11 +57,11 @@ function tpl_content() { global $page, $webimroot;
    - - link + + link
    -
    diff --git a/src/messenger/webim/view/thread_log.php b/src/messenger/webim/view/thread_log.php index 744a5737..95489ef7 100644 --- a/src/messenger/webim/view/thread_log.php +++ b/src/messenger/webim/view/thread_log.php @@ -32,7 +32,7 @@ $chatthread = $page['thread']; :
    - +

    @@ -57,7 +57,7 @@ $chatthread = $page['thread']; :
    - +

    @@ -67,7 +67,7 @@ $chatthread = $page['thread']; :
    - +

    diff --git a/src/messenger/webim/view/thread_search.php b/src/messenger/webim/view/thread_search.php index 55016e62..82a57e14 100644 --- a/src/messenger/webim/view/thread_search.php +++ b/src/messenger/webim/view/thread_search.php @@ -37,7 +37,7 @@ function tpl_content() { global $page, $webimroot;
    - " alt=""/> + " alt=""/>

    @@ -72,21 +72,21 @@ if( $page['pagination.items'] ) { foreach( $page['pagination.items'] as $chatthread ) { ?> - + - + , diff --git a/src/messenger/webim/view/translate.php b/src/messenger/webim/view/translate.php index 950f6348..73251759 100644 --- a/src/messenger/webim/view/translate.php +++ b/src/messenger/webim/view/translate.php @@ -41,27 +41,27 @@ require_once('inc_errors.php'); - - + +
    -
    +
    -
    +
    - " alt=""/> + " alt=""/>
    diff --git a/src/messenger/webim/view/translatelist.php b/src/messenger/webim/view/translatelist.php index 37d84e13..b360986c 100644 --- a/src/messenger/webim/view/translatelist.php +++ b/src/messenger/webim/view/translatelist.php @@ -34,12 +34,12 @@ function tpl_content() { global $page, $webimroot;
    =>
    @@ -47,7 +47,7 @@ function tpl_content() { global $page, $webimroot;
    @@ -55,7 +55,7 @@ function tpl_content() { global $page, $webimroot;
    @@ -78,9 +78,9 @@ if( $page['pagination'] ) { Key - + - + @@ -89,7 +89,7 @@ if( $page['pagination.items'] ) { foreach( $page['pagination.items'] as $localstr ) { ?> - + diff --git a/src/messenger/webim/view/updates.php b/src/messenger/webim/view/updates.php index 662083cb..6fe0ad2f 100644 --- a/src/messenger/webim/view/updates.php +++ b/src/messenger/webim/view/updates.php @@ -41,7 +41,7 @@ function tpl_content() { global $page, $webimroot;
    -
    +

    @@ -52,13 +52,13 @@ function tpl_content() { global $page, $webimroot;
    - +


    - PHP + PHP
    diff --git a/src/messenger/webim/view/userhistory.php b/src/messenger/webim/view/userhistory.php index fe2d363a..2c2a5eba 100644 --- a/src/messenger/webim/view/userhistory.php +++ b/src/messenger/webim/view/userhistory.php @@ -46,13 +46,13 @@ if( $page['pagination.items'] ) { foreach( $page['pagination.items'] as $chatthread ) { ?> - + - + ,