update to use styles folder

git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@184 c66351dc-e62f-0410-b875-e3a5c0b9693f
This commit is contained in:
Evgeny Gryaznov 2008-10-14 20:21:25 +00:00
parent c51bcad83b
commit 3e4e6802fe
8 changed files with 39 additions and 26 deletions

View File

@ -26,7 +26,7 @@ if( !isset($_GET['token']) || !isset($_GET['thread']) ) {
if( !$thread ) { if( !$thread ) {
if(!has_online_operators()) { if(!has_online_operators()) {
expand("design/default/leavemessage.tpl"); expand("styles", getchatstyle(), "leavemessage.tpl");
exit; exit;
} }
@ -66,13 +66,13 @@ setup_chatview_for_user($thread, $level);
$pparam = verifyparam( "act", "/^(mailthread)$/", "default"); $pparam = verifyparam( "act", "/^(mailthread)$/", "default");
if( $pparam == "mailthread" ) { if( $pparam == "mailthread" ) {
expand("design/default/mail.tpl"); expand("styles", getchatstyle(), "mail.tpl");
} else if( $level == "ajaxed" ) { } else if( $level == "ajaxed" ) {
expand("design/default/chat.tpl"); expand("styles", getchatstyle(), "chat.tpl");
} else if( $level == "simple" ) { } else if( $level == "simple" ) {
expand("design/default/chatsimple.tpl"); expand("styles", getchatstyle(), "chatsimple.tpl");
} else if( $level == "old" ) { } else if( $level == "old" ) {
expand("design/default/nochat.tpl"); expand("styles", getchatstyle(), "nochat.tpl");
} }
?> ?>

View File

@ -39,7 +39,7 @@ if( count($errors) > 0 ) {
$page['formname'] = topage($visitor_name); $page['formname'] = topage($visitor_name);
$page['formemail'] = $email; $page['formemail'] = $email;
$page['formmessage'] = topage($message); $page['formmessage'] = topage($message);
expand("design/default/leavemessage.tpl"); expand("styles", getchatstyle(), "leavemessage.tpl");
exit; exit;
} }
@ -53,5 +53,5 @@ if($inbox_mail) {
webim_mail($inbox_mail, $email, $subject, $body); webim_mail($inbox_mail, $email, $subject, $body);
} }
expand("design/default/leavemessagesent.tpl"); expand("styles", getchatstyle(), "leavemessagesent.tpl");
?> ?>

View File

@ -433,7 +433,8 @@ $settings = array(
'logo' => '', 'logo' => '',
'enableban' => '0', 'enableban' => '0',
'usernamepattern' => '{name}', 'usernamepattern' => '{name}',
'usercanchangename' => '1' 'usercanchangename' => '1',
'chatstyle' => 'default'
); );
$settingsloaded = false; $settingsloaded = false;
$settings_in_db = array(); $settings_in_db = array();
@ -457,4 +458,10 @@ function loadsettings() {
mysql_close($link); mysql_close($link);
} }
function getchatstyle() {
global $settings;
loadsettings();
return $settings['chatstyle'];
}
?> ?>

View File

@ -80,9 +80,15 @@ function expandtext($text) {
return preg_replace_callback("/\\\${(\w+:)?([\w\.,]+)}/", "expand_var", $text); return preg_replace_callback("/\\\${(\w+:)?([\w\.,]+)}/", "expand_var", $text);
} }
function expand($filename) { function expand($basedir,$style,$filename) {
start_html_output(); start_html_output();
$contents = @file_get_contents($filename) or die("illegal template"); if(!is_dir("$basedir/$style")) {
$style = "default";
}
$contents = @file_get_contents("$basedir/$style/$filename");
if($contents === false) {
$contents = @file_get_contents("$basedir/default/$filename") or die("cannot load template");
}
echo expandtext($contents); echo expandtext($contents);
} }

View File

@ -41,7 +41,7 @@ if( count($errors) > 0 ) {
$page['ct.chatThreadId'] = $thread['threadid']; $page['ct.chatThreadId'] = $thread['threadid'];
$page['ct.token'] = $thread['ltoken']; $page['ct.token'] = $thread['ltoken'];
$page['level'] = ""; $page['level'] = "";
expand("design/default/mail.tpl"); expand("styles", getchatstyle(), "mail.tpl");
exit; exit;
} }
@ -57,5 +57,5 @@ $body = getstring2("mail.user.history.body", array($thread['userName'],$history)
webim_mail($email, $webim_from_email, $subject, $body); webim_mail($email, $webim_from_email, $subject, $body);
expand("design/default/mailsent.tpl"); expand("styles", getchatstyle(), "mailsent.tpl");
?> ?>

View File

@ -79,9 +79,9 @@ if( $pparam == "redirect" ) {
} }
$page['pagination_list'] = $agent_list; $page['pagination_list'] = $agent_list;
expand("../design/default/redirect.tpl"); expand("../styles", getchatstyle(), "redirect.tpl");
} else { } else {
expand("../design/default/chat.tpl"); expand("../styles", getchatstyle(), "chat.tpl");
} }
?> ?>

View File

@ -19,20 +19,20 @@ require_once('../libs/expand.php');
$operator = check_login(); $operator = check_login();
$designlist = array(); $stylelist = array();
$designfolder = "../design"; $stylesfolder = "../styles";
if($handle = opendir($designfolder)) { if($handle = opendir($stylesfolder)) {
while (false !== ($file = readdir($handle))) { while (false !== ($file = readdir($handle))) {
if (preg_match("/^\w+$/", $file) && is_dir("$designfolder/$file")) { if (preg_match("/^\w+$/", $file) && is_dir("$stylesfolder/$file")) {
$designlist[] = $file; $stylelist[] = $file;
} }
} }
closedir($handle); closedir($handle);
} }
$preview = verifyparam("preview","/^\w+$/", "default"); $preview = verifyparam("preview","/^\w+$/", "default");
if(!in_array($preview, $designlist)) { if(!in_array($preview, $stylelist)) {
$preview = $designlist[0]; $preview = $stylelist[0];
} }
$show = verifyparam("show", "/^(chat|chatsimple|nochat|mail|mailsent|leavemessage|leavemessagesent)$/", ""); $show = verifyparam("show", "/^(chat|chatsimple|nochat|mail|mailsent|leavemessage|leavemessagesent)$/", "");
@ -40,12 +40,12 @@ $show = verifyparam("show", "/^(chat|chatsimple|nochat|mail|mailsent|leavemessag
if($show == 'chat' || $show == 'mail' || $show == 'leavemessage' || $show == 'leavemessagesent' || $show == 'chatsimple' || $show == 'nochat') { if($show == 'chat' || $show == 'mail' || $show == 'leavemessage' || $show == 'leavemessagesent' || $show == 'chatsimple' || $show == 'nochat') {
setup_chatview_for_user(array('threadid' => 0,'userName' => getstring("chat.default.username"), 'ltoken' => 123), "ajaxed"); setup_chatview_for_user(array('threadid' => 0,'userName' => getstring("chat.default.username"), 'ltoken' => 123), "ajaxed");
$page['mailLink'] = "$webimroot/operator/preview.php?preview=$preview&show=mail"; $page['mailLink'] = "$webimroot/operator/preview.php?preview=$preview&show=mail";
expand("../design/$preview/$show.tpl"); expand("../styles", "$preview", "$show.tpl");
exit; exit;
} }
if($show == 'mailsent') { if($show == 'mailsent') {
$page['email'] = "admin@yourdomain.com"; $page['email'] = "admin@yourdomain.com";
expand("../design/$preview/$show.tpl"); expand("../styles", "$preview", "$show.tpl");
exit; exit;
} }
@ -63,7 +63,7 @@ $template = verifyparam("template", "/^\w+$/", "chat");
$page['formpreview'] = $preview; $page['formpreview'] = $preview;
$page['formtemplate'] = $template; $page['formtemplate'] = $template;
$page['availablePreviews'] = $designlist; $page['availablePreviews'] = $stylelist;
$page['availableTemplates'] = array("chat", "chatsimple", "nochat", "leavemessage", "leavemessagesent", "mail", "mailsent", "all"); $page['availableTemplates'] = array("chat", "chatsimple", "nochat", "leavemessage", "leavemessagesent", "mail", "mailsent", "all");
$page['operator'] = topage(get_operator_name($operator)); $page['operator'] = topage(get_operator_name($operator));
$page['showlink'] = "$webimroot/operator/preview.php?preview=$preview&show="; $page['showlink'] = "$webimroot/operator/preview.php?preview=$preview&show=";

View File

@ -51,9 +51,9 @@ if( $nextOperator ) {
} }
if( count($errors) > 0 ) { if( count($errors) > 0 ) {
expand("../design/default/error.tpl"); expand("../styles", getchatstyle(), "error.tpl");
} else { } else {
expand("../design/default/redirected.tpl"); expand("../styles", getchatstyle(), "redirected.tpl");
} }
?> ?>