Mibew/java
1
0
Fork 0
mirror of https://github.com/Mibew/java.git synced 2025-10-31 10:31:07 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix date_diff, profile

Browse Source 
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@467 c66351dc-e62f-0410-b875-e3a5c0b9693f
This commit is contained in:
Evgeny Gryaznov 2009-04-10 14:12:57 +00:00
parent ac78587e0b
commit 147beb3ed2
19 changed files with 101 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/messenger/webim/images/dash/profile.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2
src/messenger/webim/libs/chat.php
View File

@ -625,4 +625,4 @@ function visitor_from_request() {
return array( 'id' => $userId, 'name' => $userName );
}
?>
?>

2
src/messenger/webim/libs/common.php
View File

@ -436,7 +436,7 @@ function div($a,$b) {
return ($a-($a % $b)) / $b;
}
function date_diff($seconds) {
function date_diff_to_text($seconds) {
$minutes = div($seconds,60);
$seconds = $seconds % 60;
if( $minutes < 60 ) {

1
src/messenger/webim/libs/operator.php
View File

@ -271,6 +271,7 @@ function prepare_menu($operator,$hasright=true) {
$page['showgroups'] = $settings['enablegroups'] == "1";
$page['showstat'] = $settings['enablestatistics'] == "1";
$page['showadmin'] = is_capable($can_administrate, $operator);
$page['currentopid'] = $operator['operatorid'];
}
}

5
src/messenger/webim/locales/en/properties
View File

@ -94,7 +94,7 @@ clients.title=List of awaiting visitors
common.asterisk_explanation=<b><span style='font-size:8.0pt;color:red'>*</span></b> - mandatory fields
company.title=Web Messenger Community
confirm.take.head=Change operator
confirm.take.message=Visitor <span style="color:blue;">{0}</span> already assisted by <span style="color:green;">{1}</span>.<br/> Are your really sure you want to start chatting the visitor?
confirm.take.message=Visitor <span style="color:blue;">{0}</span> already assisted by <span style="color:green;">{1}</span>.<br/> Are you really sure you want to start chatting the visitor?
confirm.take.no=No, close the window
confirm.take.yes=Yes, I'm sure
content.blocked=Here you can defend from malicious visitors.
@ -205,6 +205,8 @@ menu.locale.content=Change locale.
menu.locale=Language
menu.main=Main
menu.operator=You are {0}
menu.profile.content=You can change your personal information on this page.
menu.profile=Profile
menu.translate=Localize
menu.updates.content=Check for news and updates.
menu.updates=Updates
@ -271,6 +273,7 @@ page.translate.descr=If you don't like the translation, please send us an update
page.translate.done=Your translation is saved.
page.translate.one=Enter you translation.
page.translate.title=Localization wizard
page_agent.cannot_modify=You are not allowed to change this person's profile.
page_agent.clear_avatar=Remove avatar
page_agent.create_new=Here you can create new operator
page_agent.error.duplicate_login=Please choose another login, because operator with entered login is already registered in the system.

3
src/messenger/webim/locales/ru/properties
View File

@ -205,6 +205,8 @@ menu.locale.content=
menu.locale=ßçûê
menu.main=Ãëàâíàÿ
menu.operator=Âû {0}
menu.profile.content=На этой странице вы можете отредактировать свою персональную информацию.
menu.profile=Профиль
menu.translate=Ëîêàëèçàöèÿ
menu.updates.content=Ïðîâåðèòü íàëè÷èå îáíîâëåíèé ìåññåíäæåðà.
menu.updates=Îáíîâëåíèÿ
@ -271,6 +273,7 @@ page.translate.descr=
page.translate.done=Âàø ïåðåâîä ñîõðàíåí.
page.translate.one=Ââåäèòå âàø âàðèàíò ïåðåâîäà.
page.translate.title=Ëîêàëèçàöèÿ
page_agent.cannot_modify=Вы не можете изменять профиль этого оператора.
page_agent.clear_avatar=Óäàëèòü àâàòàðêó
page_agent.create_new=Ñîçäàíèå íîâîãî îïåðàòîðà.
page_agent.error.duplicate_login=Âûáåðèòå äðóãîé ëîãèí, ò.ê. îïåðàòîð ñ ââåäåííûì ëîãèíîì óæå çàðåãèñòðèðîâàí â ñèñòåìå.

9
src/messenger/webim/operator/avatar.php
View File

@ -19,7 +19,7 @@ require_once('../libs/operator_settings.php');
$operator = check_login();
$opId = verifyparam( "op","/^\d{1,9}$/");
$page = array('op' => $opId, 'avatar' => '');
$page = array('opid' => $opId, 'avatar' => '');
$errors = array();
$op = operator_by_id($opId);
@ -30,7 +30,10 @@ if( !$op ) {
} else if( isset($_POST['op']) ) {
$avatar = $op['vcavatar'];
if( isset($_FILES['avatarFile']) && $_FILES['avatarFile']['name']) {
if($opId != $operator['operatorid'] && !is_capable($can_administrate, $operator)) {
$errors[] = getlocal('page_agent.cannot_modify');
} else if( isset($_FILES['avatarFile']) && $_FILES['avatarFile']['name']) {
$valid_types = array("gif","jpg", "png", "tif");
$orig_filename = $_FILES['avatarFile']['name'];
@ -82,7 +85,7 @@ if( !$op ) {
$page['avatar'] = topage($op['vcavatar']);
}
$page['currentop'] = topage(get_operator_name($op))." (".$op['vclogin'].")";
$page['currentop'] = $op ? topage(get_operator_name($op))." (".$op['vclogin'].")" : "-not found-";
prepare_menu($operator);
setup_operator_settings_tabs($opId,1);

7
src/messenger/webim/operator/operator.php
View File

@ -52,7 +52,12 @@ if( isset($_POST['login']) && isset($_POST['password']) ) {
if( (!$opId && $existing_operator) ||
( $opId && $existing_operator && $opId != $existing_operator['operatorid']) )
$errors[] = getlocal("page_agent.error.duplicate_login");
if($opId != $operator['operatorid'] && !is_capable($can_administrate, $operator)) {
$errors[] = getlocal('page_agent.cannot_modify');
}
if( count($errors) == 0 ) {
if (!$opId) {
$newop = create_operator($login,$password,$localname,$commonname,"");

28
src/messenger/webim/operator/opgroups.php
View File

@ -28,7 +28,7 @@ function update_operator_groups($operatorid,$newvalue) {
}
$opId = verifyparam( "op","/^\d{1,9}$/");
$page = array('op' => $opId);
$page = array('opid' => $opId);
$page['groups'] = get_groups(false);
$errors = array();
@ -39,22 +39,28 @@ if( !$op ) {
} else if( isset($_POST['op']) ) {
$new_groups = array();
foreach($page['groups'] as $group) {
if( verifyparam("group".$group['groupid'],"/^on$/", "") == "on") {
$new_groups[] = $group['groupid'];
}
if($opId != $operator['operatorid'] && !is_capable($can_administrate, $operator)) {
$errors[] = getlocal('page_agent.cannot_modify');
}
update_operator_groups($op['operatorid'],$new_groups);
header("Location: $webimroot/operator/opgroups.php?op=$opId&stored");
exit;
if(count($errors) == 0) {
$new_groups = array();
foreach($page['groups'] as $group) {
if( verifyparam("group".$group['groupid'],"/^on$/", "") == "on") {
$new_groups[] = $group['groupid'];
}
}
update_operator_groups($op['operatorid'],$new_groups);
header("Location: $webimroot/operator/opgroups.php?op=$opId&stored");
exit;
}
}
$page['formgroup'] = array();
$page['currentop'] = $opId ? topage(get_operator_name($op))." (".$op['vclogin'].")" : "";
$page['currentop'] = $op ? topage(get_operator_name($op))." (".$op['vclogin'].")" : "-not found-";
if($opId) {
if($op) {
foreach(get_operator_groupids($opId) as $rel) {
$page['formgroup'][] = $rel['groupid'];
}

16
src/messenger/webim/operator/permissions.php
View File

@ -27,7 +27,7 @@ function update_operator_permissions($operatorid,$newvalue) {
}
$opId = verifyparam( "op","/^\d{1,9}$/");
$page = array('op' => $opId);
$page = array('opid' => $opId, 'canmodify' => is_capable($can_administrate, $operator) ? "1" : "");
$errors = array();
$op = operator_by_id($opId);
@ -37,6 +37,10 @@ if( !$op ) {
} else if( isset($_POST['op']) ) {
if(!is_capable($can_administrate, $operator)) {
$errors[] = getlocal('page_agent.cannot_modify');
}
$new_permissions = isset($op['iperm']) ? $op['iperm'] : 0;
foreach($permission_ids as $perm => $id) {
@ -61,11 +65,13 @@ if( !$op ) {
$page['permissionsList'] = get_permission_list();
$page['formpermissions'] = array("");
$page['currentop'] = topage(get_operator_name($op))." (".$op['vclogin'].")";
$page['currentop'] = $op ? topage(get_operator_name($op))." (".$op['vclogin'].")" : "-not found-";
foreach($permission_ids as $perm => $id) {
if(is_capable($perm,$op)) {
$page['formpermissions'][] = $id;
if($op) {
foreach($permission_ids as $perm => $id) {
if(is_capable($perm,$op)) {
$page['formpermissions'][] = $id;
}
}
}

2
src/messenger/webim/view/agent.php
View File

@ -14,7 +14,7 @@
require_once("inc_menu.php");
$page['title'] = getlocal("page_agent.title");
$page['menuid'] = "operators";
$page['menuid'] = $page['opid'] == $page['currentopid'] ? "profile" : "operators";
function tpl_content() { global $page, $webimroot, $errors;
?>

6
src/messenger/webim/view/avatar.php
View File

@ -14,7 +14,7 @@
require_once("inc_menu.php");
$page['title'] = getlocal("page_avatar.title");
$page['menuid'] = "operators";
$page['menuid'] = $page['opid'] == $page['currentopid'] ? "profile" : "operators";
function tpl_content() { global $page, $webimroot, $errors;
?>
@ -27,7 +27,7 @@ require_once('inc_errors.php');
?>
<form name="avatarForm" method="post" action="<?php echo $webimroot ?>/operator/avatar.php" enctype="multipart/form-data">
<input type="hidden" name="op" value="<?php echo $page['op'] ?>"/>
<input type="hidden" name="op" value="<?php echo $page['opid'] ?>"/>
<div>
<?php if($page['tabs']) { ?>
<ul class="tabs">
@ -51,7 +51,7 @@ require_once('inc_errors.php');
<div class="flabel"><?php echo getlocal('form.field.avatar.current') ?></div>
<div class="fvalue">
<img src="<?php echo $page['avatar'] ?>" alt="cannot load avatar"/><br/>
<a class="formauth" href='<?php echo $webimroot ?>/operator/avatar.php?op=<?php echo $page['op'] ?>&amp;delete=true'>
<a class="formauth" href='<?php echo $webimroot ?>/operator/avatar.php?op=<?php echo $page['opid'] ?>&amp;delete=true'>
<?php echo getlocal("page_agent.clear_avatar") ?>
</a>
</div>

11
src/messenger/webim/view/inc_menu.php
View File

@ -23,22 +23,25 @@ function tpl_menu() { global $page, $webimroot, $errors;
<?php } ?>
</ul>
</li>
<?php if(isset($page['showadmin']) && $page['showadmin']) { ?>
<li>
<h2><?php echo getlocal('right.administration') ?></h2>
<ul class="submenu">
<li<?php menuli("canned")?>><a href='<?php echo $webimroot ?>/operator/canned.php'><?php echo getlocal('menu.canned') ?></a></li>
<?php if(isset($page['showadmin']) && $page['showadmin']) { ?>
<li<?php menuli("getcode")?>><a href='<?php echo $webimroot ?>/operator/getcode.php'><?php echo getlocal('leftMenu.client_gen_button') ?></a></li>
<li<?php menuli("operators")?>><a href='<?php echo $webimroot ?>/operator/operators.php'><?php echo getlocal('leftMenu.client_agents') ?></a></li>
<?php if(isset($page['showgroups']) && $page['showgroups']) { ?>
<li<?php menuli("groups")?>><a href='<?php echo $webimroot ?>/operator/groups.php'><?php echo getlocal('menu.groups') ?></a></li>
<?php } ?>
<li<?php menuli("canned")?>><a href='<?php echo $webimroot ?>/operator/canned.php'><?php echo getlocal('menu.canned') ?></a></li>
<li<?php menuli("getcode")?>><a href='<?php echo $webimroot ?>/operator/getcode.php'><?php echo getlocal('leftMenu.client_gen_button') ?></a></li>
<li<?php menuli("settings")?>><a href='<?php echo $webimroot ?>/operator/settings.php'><?php echo getlocal('leftMenu.client_settings') ?></a></li>
<li<?php menuli("translate")?>><a href='<?php echo $webimroot ?>/operator/translate.php'><?php echo getlocal('menu.translate') ?></a></li>
<li<?php menuli("updates")?>><a href='<?php echo $webimroot ?>/operator/updates.php'><?php echo getlocal('menu.updates') ?></a></li>
<?php } ?>
<?php if(isset($page['currentopid']) && $page['currentopid']) {?>
<li<?php menuli("profile")?>><a href='<?php echo $webimroot ?>/operator/operator.php?op=<?php echo $page['currentopid'] ?>'><?php echo getlocal('menu.profile') ?></a></li>
<?php } ?>
</ul>
</li>
<?php } ?>
<li>
<h2><?php echo getlocal('right.other') ?></h2>
<ul class="submenu">

50
src/messenger/webim/view/menu.php
View File

@ -57,7 +57,6 @@ function tpl_content() { global $page, $webimroot, $current_locale, $menuItemsCo
</td>
<?php
$menuItemsCount = 2;
if( $page['showban'] ) {
?>
<?php if($page['showstat']) { ?>
@ -69,7 +68,8 @@ if( $page['showban'] ) {
</td>
<?php menuseparator(); ?>
<?php } ?>
<?php if( $page['showban'] ) { ?>
<td class="dashitem">
<img src="/webim/images/dash/blocked.gif" alt=""/>
<a href='<?php echo $webimroot ?>/operator/blocked.php'>
@ -77,9 +77,24 @@ if( $page['showban'] ) {
<?php echo getlocal('content.blocked') ?>
</td>
<?php menuseparator(); ?>
<?php
}
if( $page['showadmin'] ) { ?>
<?php } ?>
<td class="dashitem">
<img src="/webim/images/dash/canned.gif" alt=""/>
<a href='<?php echo $webimroot ?>/operator/canned.php'>
<?php echo getlocal('menu.canned') ?></a>
<?php echo getlocal('canned.descr') ?>
</td>
<?php menuseparator(); ?>
<?php if( $page['showadmin'] ) { ?>
<td class="dashitem">
<img src="/webim/images/dash/getcode.gif" alt=""/>
<a href='<?php echo $webimroot ?>/operator/getcode.php'>
<?php echo getlocal('leftMenu.client_gen_button') ?></a>
<?php echo getlocal('admin.content.client_gen_button') ?>
</td>
<?php menuseparator(); ?>
<td class="dashitem">
<img src="/webim/images/dash/operators.gif" alt=""/>
@ -98,21 +113,6 @@ if( $page['showadmin'] ) { ?>
</td>
<?php menuseparator(); ?>
<?php } ?>
<td class="dashitem">
<img src="/webim/images/dash/canned.gif" alt=""/>
<a href='<?php echo $webimroot ?>/operator/canned.php'>
<?php echo getlocal('menu.canned') ?></a>
<?php echo getlocal('canned.descr') ?>
</td>
<?php menuseparator(); ?>
<td class="dashitem">
<img src="/webim/images/dash/getcode.gif" alt=""/>
<a href='<?php echo $webimroot ?>/operator/getcode.php'>
<?php echo getlocal('leftMenu.client_gen_button') ?></a>
<?php echo getlocal('admin.content.client_gen_button') ?>
</td>
<?php menuseparator(); ?>
<td class="dashitem">
<img src="/webim/images/dash/settings.gif" alt=""/>
@ -123,6 +123,16 @@ if( $page['showadmin'] ) { ?>
<?php menuseparator(); ?>
<?php } ?>
<?php if(isset($page['currentopid']) && $page['currentopid']) {?>
<td class="dashitem">
<img src="/webim/images/dash/profile.gif" alt=""/>
<a href='<?php echo $webimroot ?>/operator/operator.php?op=<?php echo $page['currentopid'] ?>'>
<?php echo getlocal('menu.profile') ?></a>
<?php echo getlocal('menu.profile.content') ?>
</td>
<?php menuseparator(); ?>
<?php } ?>
<?php if(isset($page) && isset($page['localeLinks'])) { ?>
<td class="dashitem">
<img src="/webim/images/dash/locale.gif" alt=""/>

4
src/messenger/webim/view/operator_groups.php
View File

@ -14,7 +14,7 @@
require_once("inc_menu.php");
$page['title'] = getlocal("operator.groups.title");
$page['menuid'] = "operators";
$page['menuid'] = $page['opid'] == $page['currentopid'] ? "profile" : "operators";
function tpl_content() { global $page, $webimroot, $errors;
?>
@ -30,7 +30,7 @@ require_once('inc_errors.php');
<?php } ?>
<form name="opgroupsForm" method="post" action="<?php echo $webimroot ?>/operator/opgroups.php">
<input type="hidden" name="op" value="<?php echo $page['op'] ?>"/>
<input type="hidden" name="op" value="<?php echo $page['opid'] ?>"/>
<div>
<?php if($page['tabs']) { ?>
<ul class="tabs">

9
src/messenger/webim/view/permissions.php
View File

@ -14,7 +14,7 @@
require_once("inc_menu.php");
$page['title'] = getlocal("permissions.title");
$page['menuid'] = "operators";
$page['menuid'] = $page['opid'] == $page['currentopid'] ? "profile" : "operators";
function tpl_content() { global $page, $webimroot, $errors;
?>
@ -30,7 +30,7 @@ require_once('inc_errors.php');
<?php } ?>
<form name="permissionsForm" method="post" action="<?php echo $webimroot ?>/operator/permissions.php">
<input type="hidden" name="op" value="<?php echo $page['op'] ?>"/>
<input type="hidden" name="op" value="<?php echo $page['opid'] ?>"/>
<div>
<?php if($page['tabs']) { ?>
<ul class="tabs">
@ -48,15 +48,16 @@ require_once('inc_errors.php');
</p>
<?php foreach( $page['permissionsList'] as $pm ) { ?>
<label>
<input type="checkbox" name="permissions<?php echo $pm['id'] ?>" value="on"<?php echo form_value_mb('permissions',$pm['id']) ? " checked=\"checked\"" : "" ?>/> <?php echo $pm['descr'] ?>
<input type="checkbox" name="permissions<?php echo $pm['id'] ?>" value="on"<?php echo form_value_mb('permissions',$pm['id']) ? " checked=\"checked\"" : "" ?><?php echo $page['canmodify'] ? "" : " disabled=\"disabled\"" ?>/> <?php echo $pm['descr'] ?>
</label>
<br/>
<?php } ?>
<?php if($page['canmodify']) { ?>
<div class="fbutton">
<input type="image" name="save" value="" src='<?php echo $webimroot.getlocal("image.button.save") ?>' alt='<?php echo getlocal("button.save") ?>'/>
</div>
<?php } ?>
</div><div class="formbottom"><div class="formbottomi"></div></div></div>
</div>
</form>

2
src/messenger/webim/view/thread_log.php
View File

@ -73,7 +73,7 @@ $chatthread = $page['thread'];
<?php echo getlocal("page.analysis.search.head_time") ?>:
</div>
<div class="wvalue">
<?php echo date_diff($chatthread['modified']-$chatthread['created']) ?>
<?php echo date_diff_to_text($chatthread['modified']-$chatthread['created']) ?>
(<?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>)
</div>
<br clear="all"/>

2
src/messenger/webim/view/thread_search.php
View File

@ -86,7 +86,7 @@ if( $page['pagination.items'] ) {
<?php echo topage(htmlspecialchars($chatthread['size'])) ?>
</td>
<td>
<?php echo date_diff($chatthread['modified']-$chatthread['created']) ?>, <?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>
<?php echo date_diff_to_text($chatthread['modified']-$chatthread['created']) ?>, <?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>
</td>
</tr>
<?php

2
src/messenger/webim/view/userhistory.php
View File

@ -52,7 +52,7 @@ if( $page['pagination.items'] ) {
<?php if( $chatthread['agentName'] ) { ?><?php echo topage(htmlspecialchars($chatthread['agentName'])) ?><?php } ?>
</td>
<td>
<?php echo date_diff($chatthread['modified']-$chatthread['created']) ?>, <?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>
<?php echo date_diff_to_text($chatthread['modified']-$chatthread['created']) ?>, <?php echo strftime("%B, %d %Y %H:%M:%S", $chatthread['created']) ?>
</td>
</tr>
<?php