From a99a621a66d36e510735f677b7239c8cd49c2f39 Mon Sep 17 00:00:00 2001 From: Evgeny Gryaznov Date: Sun, 2 May 2010 12:28:16 +0000 Subject: [PATCH] getcode refactoring started: rename view file, move generate_button method git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@800 c66351dc-e62f-0410-b875-e3a5c0b9693f --- src/messenger/webim/libs/operator.php | 16 ---------------- src/messenger/webim/operator/getcode.php | 18 +++++++++++++++++- .../view/{gen_button.php => getcode_image.php} | 0 3 files changed, 17 insertions(+), 17 deletions(-) rename src/messenger/webim/view/{gen_button.php => getcode_image.php} (100%) diff --git a/src/messenger/webim/libs/operator.php b/src/messenger/webim/libs/operator.php index 0bdeaa20..f8cb905b 100644 --- a/src/messenger/webim/libs/operator.php +++ b/src/messenger/webim/libs/operator.php @@ -185,22 +185,6 @@ function append_query($link,$pv) { return "$link$infix$pv"; } -function generate_button($title,$locale,$style,$group,$inner,$showhost,$forcesecure,$modsecurity) { - $link = get_app_location($showhost,$forcesecure)."/client.php"; - if($locale) - $link = append_query($link, "locale=$locale"); - if($style) - $link = append_query($link, "style=$style"); - if($group) - $link = append_query($link, "group=$group"); - - $modsecfix = $modsecurity ? ".replace('http://','').replace('https://','')" : ""; - $jslink = append_query("'".$link,"url='+escape(document.location.href$modsecfix)+'&referrer='+escape(document.referrer$modsecfix)"); - $temp = get_popup($link, "$jslink", - $inner, $title, "webim", "toolbar=0,scrollbars=0,location=0,status=1,menubar=0,width=640,height=480,resizable=1" ); - return "".$temp.""; -} - function check_login($redirect=true) { global $webimroot; if( !isset( $_SESSION['operator'] ) ) { diff --git a/src/messenger/webim/operator/getcode.php b/src/messenger/webim/operator/getcode.php index 2ea2256c..c96c9ff2 100644 --- a/src/messenger/webim/operator/getcode.php +++ b/src/messenger/webim/operator/getcode.php @@ -23,6 +23,22 @@ require_once('../libs/common.php'); require_once('../libs/operator.php'); require_once('../libs/groups.php'); +function generate_button($title,$locale,$style,$group,$inner,$showhost,$forcesecure,$modsecurity) { + $link = get_app_location($showhost,$forcesecure)."/client.php"; + if($locale) + $link = append_query($link, "locale=$locale"); + if($style) + $link = append_query($link, "style=$style"); + if($group) + $link = append_query($link, "group=$group"); + + $modsecfix = $modsecurity ? ".replace('http://','').replace('https://','')" : ""; + $jslink = append_query("'".$link,"url='+escape(document.location.href$modsecfix)+'&referrer='+escape(document.referrer$modsecfix)"); + $temp = get_popup($link, "$jslink", + $inner, $title, "webim", "toolbar=0,scrollbars=0,location=0,status=1,menubar=0,width=640,height=480,resizable=1" ); + return "".$temp.""; +} + $operator = check_login(); loadsettings(); @@ -120,5 +136,5 @@ $page['formmodsecurity'] = $modsecurity; prepare_menu($operator); start_html_output(); -require('../view/gen_button.php'); +require('../view/getcode_image.php'); ?> \ No newline at end of file diff --git a/src/messenger/webim/view/gen_button.php b/src/messenger/webim/view/getcode_image.php similarity index 100% rename from src/messenger/webim/view/gen_button.php rename to src/messenger/webim/view/getcode_image.php