[svn r18425] logic changes - changed language variable and added to DLTT - (partial FS#3619)

skala
Isaac Flores 16 years ago
parent 1c51ee607f
commit 018334c6a0
  1. 2
      main/auth/generate_api_key.inc.php
  2. 4
      main/auth/profile.php
  3. 2
      main/messages/outbox.php
  4. 6
      main/social/contacts.inc.php
  5. 4
      main/social/data_personal.inc.php
  6. 4
      main/social/group_contact.inc.php
  7. 14
      main/social/index.php
  8. 2
      main/social/qualify_contact.inc.php
  9. 6
      main/social/register_friend.php
  10. 8
      main/social/select_friend_response.php
  11. 4
      whoisonline.php

@ -8,7 +8,7 @@ $num=UserManager::update_api_key($user_id,$api_service);
$array_list_key=UserManager::get_api_keys($user_id,$api_service);
?>
<div class="row">
<div class="label"><?php echo get_lang('MyApiKeyGenerate') ?></div>
<div class="label"><?php echo get_lang('MyApiKey') ?></div>
<div class="formw">
<input type="text" name="api_key_generate" id="id_api_key_generate" size="40" value="<?php echo $array_list_key[$num]?>"/>
</div>

@ -1,4 +1,4 @@
<?php // $Id: profile.php 18300 2009-02-06 21:06:34Z iflorespaz $
<?php // $Id: profile.php 18425 2009-02-10 22:29:20Z iflorespaz $
/* For licensing terms, see /dokeos_license.txt */
/**
==============================================================================
@ -405,7 +405,7 @@ foreach($extra as $id => $field_details)
}
if (api_get_setting('profile', 'apikeys') == 'true') {
$form->addElement('html','<div id="div_api_key">');
$form->addElement('text', 'api_key_generate', get_lang('MyApiKeyGenerate'), array('size' => 40,'id' => 'id_api_key_generate'));
$form->addElement('text', 'api_key_generate', get_lang('MyApiKey'), array('size' => 40,'id' => 'id_api_key_generate'));
$form->addElement('html','</div>');
$form->addElement('button', 'generate_api_key', get_lang('GenerateApiKey'),array('id' => 'id_generate_api_key','onclick' => 'generate_open_id_form()'));//generate_open_id_form()
}

@ -94,7 +94,7 @@ api_display_tool_title(get_lang('Outbox'));
$table_message = Database::get_main_table(TABLE_MESSAGE);
echo '<div class=actions>';
echo get_lang('ShowMessageOutbox');
echo get_lang('MessageOutboxComment');
echo '</div>';
$user_sender_id=api_get_user_id();

@ -13,7 +13,7 @@ require_once '../inc/lib/social.lib.php';
//$list_path_friends=array();
?>
<div id="id" class="actions">
<?php echo get_lang('MessageInformationContacts') ?>
<?php echo get_lang('SocialInformationComment') ?>
</div>
<?php
$user_id=api_get_user_id();
@ -85,7 +85,7 @@ $image_path = UserManager::get_user_picture_path_by_id ($user_id,'web',false,tru
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-content-description">
<tr>
<td width="430" height="180" valign="top" class="social-align-box">
<div align="center" class="social-qualify"><?php echo get_lang('GroupingMyContactsPersonal') ?><input type="hidden" class="" name="user_cod_qualify" id="user_cod_qualify" value="0" /></div>
<div align="center" class="social-qualify"><?php echo get_lang('AttachContactsToGroup') ?><input type="hidden" class="" name="user_cod_qualify" id="user_cod_qualify" value="0" /></div>
<div align="center" class="social-qualify-display" id="div_info_user"></div>
<div id="div_qualify">
<?php
@ -115,7 +115,7 @@ $image_path = UserManager::get_user_picture_path_by_id ($user_id,'web',false,tru
<td width="750" height="22" valign="top">
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-align-box">
<tr>
<td width="750" height="22" valign="top" class="social-title">&nbsp;&nbsp;<?php echo get_lang('ListContacts'); ?></td>
<td width="750" height="22" valign="top" class="social-title">&nbsp;&nbsp;<?php echo get_lang('ContactsList'); ?></td>
</tr>
</table></td>
</tr>

@ -4,10 +4,10 @@ $language_file = array('registration','messages');
?>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td><div class="actions"><?php echo utf8_encode(get_lang('MyDataPersonal')) ?></div></td>
<td><div class="actions"><?php echo utf8_encode(get_lang('MyPersonalData')) ?></div></td>
</tr>
<tr>
<td><a href="../auth/profile.php?show=1"><?php echo utf8_encode(get_lang("AlterDataPersonal"));?></a>
<td><a href="../auth/profile.php?show=1"><?php echo utf8_encode(get_lang("AlterPersonalData"));?></a>
</td>
</tr>
</table>

@ -16,7 +16,7 @@ $list_path_friends=array();
$list_groups=array();
?>
<div id="id" class="actions">
<?php echo '&nbsp;&nbsp;'.get_lang('MessageInformationGroupsContacts') ?>
<?php echo '&nbsp;&nbsp;'.get_lang('ContactsGroupsComment') ?>
</div>
<?php
$user_id=api_get_user_id();
@ -75,7 +75,7 @@ if (count($list_path_friends)!=0) {
echo $friend_html;
} else {
$friend_html.= '<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#FFFFFC" style="border-left:1px #B8C8DC solid;border-bottom:1px #B8C8DC solid;border-right:1px #B8C8DC solid;">';
$friend_html.='<tr><td valign="top">&nbsp;&nbsp;&nbsp;'.get_lang('NoHaveContactsInThisGroup');
$friend_html.='<tr><td valign="top">&nbsp;&nbsp;&nbsp;'.get_lang('YouDontHaveContactsInThisGroup');
$friend_html.='<br/><br/></td></tr>';
$friend_html.='</table>&nbsp;';//</div>
echo $friend_html;

@ -87,14 +87,14 @@ function set_qualify_friend() {
user_id_friend = $("#user_cod_qualify").attr("value");
type_friend = $("input[@name=list_type_friend]:checked").val();
if (user_id_friend==0) {
alert("'.get_lang('SelectedOneOption').'");
alert("'.get_lang('SelectOneContact').'");
return false;
}
if (type_friend==null) {
alert("'.get_lang('SelectedOneOption').'");
alert("'.get_lang('SelectOneGroup').'");
return false;
}
if (confirm("'.get_lang('QualifyContactsPersonal').'")) {
if (confirm("'.get_lang('AttachContactsPersonal').' ?")) {
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(objeto) {
@ -175,7 +175,7 @@ function submit_form (path_submit) {
$("#form_send").submit();
}
} else {
alert("'.get_lang('SelectedCheckbox').'");
alert("'.get_lang('SelectTheCheckbox').'");
}
} else {
@ -250,13 +250,13 @@ $interbreadcrumb[]= array (
);
$interbreadcrumb[]= array (
'url' => $_SESSION['social_dest'],
'name' => get_lang('Social')
'name' => get_lang('SocialNetwork')
);
Display :: display_header('');
?>
<div id="container-9">
<ul>
<li><a href="data_personal.inc.php"><span><?php echo get_lang('DataPersonals') ?></span></a></li>
<li><a href="data_personal.inc.php"><span><?php echo get_lang('PersonalData') ?></span></a></li>
<?php
if (api_get_setting('allow_message_tool')=='true') {
?>
@ -265,7 +265,7 @@ Display :: display_header('');
<?php }
if (api_get_setting('allow_social_tool')=='true') {
?>
<li><a href="select_friend_response.php"><span><?php echo get_lang('Invitation') ?></span></a></li>
<li><a href="select_friend_response.php"><span><?php echo get_lang('Invites') ?></span></a></li>
<li><a href="contacts.inc.php"><span><?php echo get_lang('Contacts') ?></span></a></li>
<li><a href="group_contact.inc.php"><span><?php echo get_lang('ContactsGroups') ?></span></a></li>
<?php

@ -26,6 +26,6 @@ for ($k=0;$k<$number_list;$k++) {
</td>
</tr>
<tr>
<td><input type="button" value="<?php echo get_lang('GroupContact') ?>" onclick="set_qualify_friend()"/></td>
<td><input type="button" value="<?php echo get_lang('AttachToGroup') ?>" onclick="set_qualify_friend()"/></td>
</tr>
</table>

@ -19,12 +19,12 @@ $my_denied_current_friend= $_POST['denied_friend_id'];
$my_delete_friend = $_POST['delete_friend_id'];
$friend_id_qualify = $_POST['user_id_friend_q'];
$type_friend_qualify = $_POST['type_friend_q'];
$relation_type='3';//is my friend
$relation_type='1';//Contact unknow
if (isset($my_current_friend)) {
UserFriend::register_friend ($the_current_user_id,$my_current_friend,$relation_type);
UserFriend::register_friend ($my_current_friend,$the_current_user_id,$relation_type);
UserFriend::invitation_accepted ($my_current_friend,$the_current_user_id);
Display::display_normal_message(get_lang('AddedFriendToList'));
Display::display_normal_message(get_lang('AddedContactToList'));
}
if (isset($my_denied_current_friend)) {
UserFriend::invitation_denied($my_denied_current_friend,$the_current_user_id);
@ -35,6 +35,6 @@ if (isset($my_delete_friend)) {
}
if(isset($friend_id_qualify) && isset($type_friend_qualify)) {
UserFriend::qualify_friend($friend_id_qualify,$type_friend_qualify);
echo get_lang('UserGroupingSuccesfuly');
echo get_lang('AttachContactsToGroupSuccesfuly');
}
?>

@ -10,7 +10,7 @@ $_SESSION['this_section']=$this_section;
api_block_anonymous_users();
?>
<div class="actions">
<?php echo get_lang('ShowMessageInvitation'); ?>
<?php echo get_lang('SocialInvitesComment'); ?>
</div>
<div id="id_response" align="center"></div>
<?php
@ -21,7 +21,7 @@ $list_get_invitation=UserFriend::get_list_invitation_of_friends_by_user_id($user
$list_get_path_web=UserFriend::get_list_web_path_user_invitation_by_user_id($user_id);
$number_loop=count($list_get_invitation);
if ($number_loop==0) {
echo Display::display_normal_message(get_lang('YouNotHaveInvitations '));
echo Display::display_normal_message(get_lang('YouDontHaveInvites '));
}
for ($i=0;$i<$number_loop;$i++) {
@ -32,7 +32,7 @@ for ($i=0;$i<$number_loop;$i++) {
<td width="600" height="20" valign="top"><table width="100%" border="0"
cellpadding="0" cellspacing="0" bgcolor="#9DACBF">
<tr>
<td width="600" height="20" valign="top"><div align="left"><?php echo get_lang('RequestFriend'); ?></div></td>
<td width="600" height="20" valign="top"><div align="left"><?php echo get_lang('RequestContact'); ?></div></td>
</tr>
</table></td>
</tr>
@ -94,7 +94,7 @@ border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="61" valign="top"><?php
$date=$list_get_invitation[$i]['send_date'];
echo get_lang('DateSent').' : '.$date;
echo get_lang('DateSend').' : '.$date;
?></td>
</tr>
</table></td>

@ -1,4 +1,4 @@
<?php // $Id: whoisonline.php 18324 2009-02-07 16:20:34Z iflorespaz $
<?php // $Id: whoisonline.php 18425 2009-02-10 22:29:20Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -133,7 +133,7 @@ function display_user_list($user_list, $_plugins)
$sorting_options['column'] = (isset ($_GET['column']) ? (int)$_GET['column'] : 2);
if (api_get_setting('allow_social_tool')=='true') {
send_invitation_friend_user();
echo '<div align="right"><input type="button" name="id_btn_send_invitation" id="id_btn_send_invitation" value="'.get_lang('SendInvitationToFriends').'"/></div>';
echo '<div align="right"><input type="button" name="id_btn_send_invitation" id="id_btn_send_invitation" value="'.get_lang('SendInviteMessage').'"/></div>';
echo '<form action="whoisonline.php" name="form_register_friend" id="form_register_friend" method="post">';
}

Loading…
Cancel
Save