chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

First Chamilo fixes (groups, installation files, partial documentation updated)

Browse Source
skala
Julio Montoya 15 years ago
parent 6e56cf4298
commit a37b60ec76
33 changed files with 398 additions and 440 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      chamilo_license.txt
  2. 6
      documentation/changelog.html
  3. 6
      documentation/credits.html
  4. 2
      documentation/dependencies.html
  5. 8
      documentation/index.html
  6. 122
      documentation/installation_guide.html
  7. 31
      documentation/installation_guide_es_ES.html
  8. 4
      documentation/license.html
  9. 26
      documentation/readme.html
  10. 8
      main/inc/banner.inc.php
  11. 9
      main/inc/lib/social.lib.php
  12. 23
      main/inc/lib/usermanager.lib.php
  13. 9
      main/install/dokeos_main.sql
  14. 91
      main/install/index.php
  15. 38
      main/install/install_functions.inc.php
  16. 7
      main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql
  17. 2
      main/messages/download.php
  18. 29
      main/messages/inbox.php
  19. 4
      main/messages/index.php
  20. 26
      main/messages/new_message.php
  21. 2
      main/messages/notify.php
  22. 25
      main/messages/outbox.php
  23. 1
      main/messages/plugin.php
  24. 2
      main/messages/send_message.php
  25. 2
      main/messages/send_message_to_userfriend.inc.php
  26. 31
      main/messages/view_message.php
  27. 2
      main/social/contacts.inc.php
  28. 99
      main/social/groups.php
  29. 25
      main/social/invitations.php
  30. 17
      main/social/profile.php
  31. 11
      main/social/show_search_image.inc.php
  32. 49
      user_portal.php
  33. 95
      whoisonline.php

26
chamilo_license.txt
Unescape View File

@ -0,0 +1,26 @@
===============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2009 Dokeos SPRL
Copyright (c) 2009 Dokeos Latinoamérica SAC
Copyright (c) 2003-2007 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) 2003-2008 Vrije Universiteit Brussel (VUB)
Copyright (c) 2004-2008 Hoogeschool Gent (HoGent)
Copyright (c) Facultad de Matematicas, UADY (México) (Message plugin)
For a full list of contributors detaining copyrights over parts of
the Dokeos software, see "documentation/credits.html".
The full license can be read in "documentation/license.html".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, Rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
===============================================================================
This license is referenced throughout the code using the following header line:

6
documentation/changelog.html
Unescape View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Dokeos Changelog</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<title>Chamilo Changelog</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<style type="text/css">
<!--
@ -14,12 +14,12 @@
<body>
<div id="header1">
<h1>Dokeos&nbsp;Changelog</h1>
<h1>Chamilo&nbsp;Changelog</h1>
</div>
<a href="index.html">Documentation</a> &gt; Changelog
<div id="outerframe">
<div id="main">
<h1>Dokeos 1.8.6.2 - .............</h1>
<h1>Chamilo 1.8.6.2 - .............</h1>
<h3>Release notes - summary</h3>
<h3>New Features</h3>
<ul>

6
documentation/credits.html
Unescape View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Dokeos Credits</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<title>Chamilo Credits</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<style type="text/css">
<!--
@ -14,12 +14,12 @@
<body>
<div id="header1">
<h1>Dokeos Credits</h1>
<h1>Chamilo Credits</h1>
</div>
<a href="index.html">Documentation</a> &gt; Credits
<h1>Creator</h1>
Thomas De Praetere (thomas.depraetere@dokeos.com)
Thomas De Praetere (thomas.depraetere@dokeos.com)
<h1>Core developers</h1>
<ol>

2
documentation/dependencies.html
Unescape View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Dokeos 1.8.6 Server Dependencies</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<title>Chamilo 1.8.6.2 Server Dependencies</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<style type="text/css">
<!--

8
documentation/index.html
Unescape View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Dokeos 1.8.6.1</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<title>Chamilo 1.8.6.2</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<style type="text/css">
<!--
@ -14,13 +14,13 @@
<body>
<div id="header1">
<h1>Dokeos FREE 1.8.6.1 <span style="font-style: italic;">Babel</span> - Documentation</h1>
<h1>Chamilo 1.8.6.2 <span style="font-style: italic;"></span> - Documentation</h1>
</div>
<div id="outerframe">
<div id="main">
<h1>About Dokeos</h1>
<p><a href="readme.html">About Dokeos</a> </p>
<h1>About Chamilo</h1>
<p><a href="readme.html">About Chamilo</a> </p>
<h1>Installing and upgrading</h1>
<a href="installation_guide.html">English installation guide</a>
<a href="installation_guide_es_ES.html">Spanish installation guide</a>

122
documentation/installation_guide.html
Unescape View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Dokeos 1.8.6.2 Installation Guide</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<title>Chamilo 1.8.6.2 Installation Guide</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<style type="text/css">
<!--
@ -10,13 +10,13 @@
pre { font-family: "Courier New", monospace }
p { margin-bottom: 0.21cm }
.code {margin: 1em 1em 1em 2em; padding: 0.5em; background-color: rgb(229, 229, 229); vertical-align: top; border: 1px solid #999999;}
--></style>
-->
</style>
</head>
<body>
<div id="header1">
<h1>Dokeos 1.8.6.2 FREE : Installation Guide</h1>
<h1>Chamilo 1.8.6.2 : Installation Guide</h1>
</div>
<a href="index.html">Documentation</a> &gt; Installation Guide
@ -24,12 +24,8 @@
<div id="main">
<p></p>
<p>Thank you for downloading Dokeos Babel FREE.</p>
<p>Thank you for downloading Chamilo 1.8.6.2.</p>
<ul>
<li>Quick preview of <a href="http://www.dokeos.com/en/node/58">Dokeos features&nbsp;</a></li>
<li>Test Dokeos on <a href="http://campus.dokeos.com">Free Campus</a></li>
@ -44,35 +40,26 @@
<ol>
<li><a href="#1._Pre-requisites">Pre-requisites</a></li>
<li><a href="#2._Installation_of_Dokeos_LMS">Installation of Dokeos LMS</a></li>
<li><a href="#3._Upgrade_from_a_previous_version_of">Upgrade from a previous version of Dokeos</a></li>
<li><a href="#4._Troubleshooting">Troubleshooting</a></li>
<li><a href="#5._Administration_section">Administration section</a></li>
<li><a href="#6._LDAP">LDAP&nbsp;</a></li>
<li><a href="#7._Mathematical_formulas">Mathematical formulas with LaTeX</a></li>
</ol>
<br />
<hr style="width: 100%; height: 2px;" />
<h2><a name="1._Pre-requisites"></a>1. Pre-requisites</h2>
Dokeos
Chamilo
can be installed on Windows, Linux, Mac OS X and UNIX servers
indifferently. However, we recommend the use of Linux server for
optimal flexibility, remote control and scalability. <br />
<br />
Dokeos is mainly a LMS running <span style="font-weight: bold;">Apache 1.3, 2.0</span>, <span style="font-weight: bold;">MySQL 5.1</span> and <span style="font-weight: bold;">PHP 5.1</span> (the so called <span style="font-weight: bold;">AMP</span> trilogy). <br />
Chamilo is mainly a LMS running <span style="font-weight: bold;">Apache 1.3, 2.0</span>, <span style="font-weight: bold;">MySQL 5.1</span> and <span style="font-weight: bold;">PHP 5.1</span> (the so called <span style="font-weight: bold;">AMP</span> trilogy). <br />
<br />
@ -81,7 +68,7 @@ All these software are open source and freely available. <br />
<br />
To run Dokeos <span style="font-weight: bold;">LMS</span> on your server, you need to install WAMP, LAMP or MAMP:
To run Chamilo <span style="font-weight: bold;">LMS</span> on your server, you need to install WAMP, LAMP or MAMP:
<ul>
<li>To install <span style="font-weight: bold;">WAMP</span> (AMP on Windows), we recommend the <a href="http://www.apachefriends.org/en/xampp.html">XAMPP</a> .exe installer<a href="http://www.apachefriends.org/en/xampp.html"></a></li>
@ -109,21 +96,21 @@ the installation.<span style="font-weight: bold;"><br />
</span>
<hr style="width: 100%; height: 2px;" />
<h2><a name="2._Installation_of_Dokeos_LMS"></a><span style="font-weight: bold;">2. Installation of Dokeos LMS</span></h2>
<h2><a name="2._Installation_of_Dokeos_LMS"></a><span style="font-weight: bold;">2. Installation of Chamilo LMS</span></h2>
<a href="http://www.dokeos.com/download.php"></a>
<a href="http://www.chamilo.org/download.php"></a>
<ul>
<li><a href="http://www.dokeos.com/node/33">Download Dokeos LMS</a></li>
<li>Unzip it</li>
<li>Copy the dokeos directory in your Apache web directory. This can be
<li>Copy the Chamilo directory in your Apache web directory. This can be
<span style="font-weight: bold;">C:\xampp\htdocs\</span> on a Windows server or <span style="font-weight: bold;">/var/www/html/</span> on a Linux server</li>
<li>Open your web browser (Internet Explorer, Firefox...) and type
<span style="font-weight: bold;">http://localhost/dokeos/</span> if you install locally or
<span style="font-weight: bold;">http://www.domain.com/dokeos/</span> if you install remotely</li>
<span style="font-weight: bold;">http://localhost/chamilo/</span> if you install locally or
<span style="font-weight: bold;">http://www.domain.com/chamilo/</span> if you install remotely</li>
<li>Follow the web installation process. You can accept all default
values. Consider changing the admin password to remember it.&nbsp;</li>
@ -135,15 +122,15 @@ values. Consider changing the admin password to remember it.&nbsp;</li>
The following directories need to be readable, writeable and executable for everyone:
<ul>
<li>dokeos/main/inc/conf/</li>
<li>dokeos/main/upload/users/</li>
<li>dokeos/main/default_course_document/</li>
<li>dokeos/archive/</li>
<li>dokeos/courses/</li>
<li>dokeos/home/</li>
<li>chamilo/main/inc/conf/</li>
<li>chamilo/main/upload/users/</li>
<li>chamilo/main/default_course_document/</li>
<li>chamilo/archive/</li>
<li>chamilo/courses/</li>
<li>chamilo/home/</li>
</ul>
(where 'dokeos' is the directory in which you installed Dokeos)
(where 'chamilo' is the directory in which you installed Chamilo)
<p>On Linux, Mac OS X and BSD operating systems you can use the CHMOD
777 command for this (although we recommend you seek advice from an
experienced system administrator).
@ -156,7 +143,7 @@ only during the installation process:</p>
<ul>
<li>dokeos/main/inc/conf/configuration.php (if present)</li>
<li>chamilo/main/inc/conf/configuration.php (if present)</li>
</ul>
@ -173,7 +160,7 @@ folders (by right-clicking on them).</p>
<b>NOTES:</b><br />
Do not modify the home_*.html files directly. Instead,
choose "Configure the homepage" in the Dokeos administration section.</p>
choose "Configure the homepage" in the Chamilo administration section.</p>
<p><span style="font-weight: bold;">Windows</span> : with combination packages like XAMPP, out of the box, login and password
for MySQL should probably remain empty.</p>
@ -186,14 +173,14 @@ choose "Configure the homepage" in the Dokeos administration section.</p>
<ul>
<li><strong>Protect your configuration file: </strong>
make sure no one can overwrite it. You can find the config file in <em>(dokeos folder)</em>/main/inc/conf/configuration.php.
make sure no one can overwrite it. You can find the config file in <em>(chamilo folder)</em>/main/inc/conf/configuration.php.
Make it read-only (windows/xwindows: right-click the file to edit the
properties. linux/bsd/macosx: use the chmod 444 command). The config
file is created by Apache so you may need to be root user to change its
permissions.</li>
<li><strong>Protect your installation folder: </strong>
if the <em>(dokeos folder)</em>/main/install
if the <em>(chamilo folder)</em>/main/install
folder is still accessible, someone could install over your existing
version (you could lose your data that way). Move the folder somewhere
out of the web directories so it is not accessible, change its name, or
@ -203,17 +190,17 @@ edit its properties so no one can read or execute it.</li>
making the files world-writable will help you install, and solves many
issues for people without much admin experience. However, it's better
security to make the owner of the apache process (often called apache
or www-data) also owner of all the dokeos files and folders. Ths way,
or www-data) also owner of all the chamilo files and folders. Ths way,
these files need only be readable and writable by the Apache process
owner, not by the entire world.</li>
<li><strong>Configure your Dokeos installation: </strong>
in the administration section of Dokeos, you can use the Dokeos Config Settings to adjust the behavior of your installation.</li>
<li><strong>Configure your Chamilo installation: </strong>
in the administration section of Chamilo, you can use the Chamilo Config Settings to adjust the behavior of your installation.</li>
<li><strong>Configure Dokeos mail: </strong>
most of Dokeos uses the mail settings from the php.ini file. However,
<li><strong>Configure Chamilo mail: </strong>
most of Chamilo uses the mail settings from the php.ini file. However,
the announcements tool uses phpMailer (another free software project)
and the settings for this tool can be adjusted in <em>(dokeos folder)</em>/main/inc/conf/mail.conf.php.</li>
and the settings for this tool can be adjusted in <em>(chamilo folder)</em>/main/inc/conf/mail.conf.php.</li>
</ul>
<br />
@ -222,7 +209,7 @@ and the settings for this tool can be adjusted in <em>(dokeos folder)</em>/main/
<h3>PHP configuration</h3>
To get the best of Dokeos, you need to finetune PHP settings. Consider : <br />
To get the best of Chamilo, you need to finetune PHP settings. Consider : <br />
<ul>
@ -236,37 +223,27 @@ To get the best of Dokeos, you need to finetune PHP settings. Consider : <br />
<div class="code">
max_execution_time = 300&nbsp;&nbsp;&nbsp; ; Maximum execution time of each script, in seconds<br />
max_input_time = 600 ; Maximum amount of time each script may spend parsing request data<br />
memory_limit = 256M&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ; Maximum amount of memory a script may consume (128MB)<br />
post_max_size = 64M<br />
upload_max_filesize = 100M</div>
max_execution_time = 300&nbsp;&nbsp;&nbsp; ; Maximum execution time of each script, in seconds<br />
max_input_time = 600 ; Maximum amount of time each script may spend parsing request data<br />
memory_limit = 256M&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ; Maximum amount of memory a script may consume (128MB)<br />
post_max_size = 64M<br />
upload_max_filesize = 100M
</div>
<p>
Some users could meet problems if their PHP settings don't fit
<p>Some users could meet problems if their PHP settings don't fit
these ones:</p>
<ul>
<li>short_open_tag = On</li>
<li>safe_mode = Off</li>
<li>magic_quotes_gpc = On</li>
<li>magic_quotes_runtime = Off</li>
</ul>
<p>
Past Dokeos versions required register_globals to be set to On. This is
Past Chamilo versions required register_globals to be set to On. This is
no longer necessary, this can be set to Off and Dokeos will work fine.</p>
@ -274,26 +251,21 @@ no longer necessary, this can be set to Off and Dokeos will work fine.</p>
<ul>
<li>php-mysql The mysql shared extension for php</li>
<li>php-pcre The pcre shared extension for php</li>
<li>php-session The session shared extension for php</li>
<li>php-zlib The zlib shared extension for php</li>
<li>php-zlib The zlib shared extension for php</li>
<li>(optional) php-ldap if you want to be able to use LDAP authentication</li>
</ul>
<p>You might also add the following php modules and packages:</p>
<ul>
<li>php-ctype</li>
<li>php-gd</li>
<li>php-iconv</li>
<li>php-json</li>
<li>php-mbstring</li>
<ul>
<p><a href="http://dev.mysql.com/doc/mysql/en/index.html"></a><br />
</p>
<li>php-ctype</li>
<li>php-gd</li>
<li>php-iconv</li>
<li>php-json</li>
<li>php-mbstring</li>
</ul>
<p><a href="http://dev.mysql.com/doc/mysql/en/index.html"></a><br /></p>
<hr />

31
documentation/installation_guide_es_ES.html
Unescape View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Guia de Instalación de Dokeos 1.8.6.2 Babel</title>
<title>Guia de Instalación de Chamilo 1.8.6.2</title>
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<style type="text/css">
@ -19,7 +19,7 @@
<div id="header1">
<h1>Guía de Instalación de Dokeos 1.8.6.2 Babel</h1>
<h1>Guía de Instalación de Chamilo 1.8.6.2</h1>
</div>
@ -29,15 +29,10 @@
<p></p>
<p>Gracias por descargar Dokeos, la suite de aprendizaje de código abierto profesional.</p>
<p>Gracias por descargar Chamilo, la suite de aprendizaje de código abierto profesional.</p>
<ul>
<li>Vista rápida de las <a href="http://www.dokeos.com/en/node/58">Características de Dokeos&nbsp;</a></li>
<li>Prueba Dokeos en <a href="http://campus.dokeos.com">Free Campus</a></li>
<li>Prueba Chamilo en <a href="http://campus.dokeos.com">Free Campus</a></li>
</ul>
@ -54,19 +49,12 @@ Si desea ahorrar tiempo, problemas y dinero, alternativamente puede tener su Por
<ol>
<li><a href="#1._Pre-requisites">Prerrequisitos</a></li>
<li><a href="#2._Installation_of_Dokeos_LMS">Instalación de Dokeos LMS</a></li>
<li><a href="#2._Installation_of_Dokeos_LMS">Instalación de Chamilo LMS</a></li>
<li><a href="#3._Upgrade_from_a_previous_version_of">Actualizar desde una versión previa de Dokeos</a></li>
<li><a href="#4._Troubleshooting">Solución de Problemas</a></li>
<li><a href="#5._Administration_section">Sección de administración</a></li>
<li><a href="#6._LDAP">LDAP&nbsp;</a></li>
<li><a href="#7._Mathematical_formulas">Fórmulas Matemáticas con LaTeX</a></li>
</ol>
@ -76,14 +64,13 @@ Si desea ahorrar tiempo, problemas y dinero, alternativamente puede tener su Por
<h2><a name="1._Pre-requisites"></a>1. Prerrequisitos</h2>
Dokeos
puede ser instalado indiferentemente en servidores Windows, Linux, Mac OS X y UNIX.
Chamilo puede ser instalado indiferentemente en servidores Windows, Linux, Mac OS X y UNIX.
Sin embargo, nosotros recomendamos el uso de un servidor Linux para una óptima flexibilidad,
control remoto y escalabilidad. <br />
<br />
Dokeos es un LMS que se ejecuta con <span style="font-weight: bold;">Apache 1.3, 2.0</span>, <span style="font-weight: bold;">MySQL 5.1</span> y <span style="font-weight: bold;">PHP 5.1</span> (trilogía también llamada <span style="font-weight: bold;">AMP</span>).<br />
Chamilo es un LMS que se ejecuta con <span style="font-weight: bold;">Apache 1.3, 2.0</span>, <span style="font-weight: bold;">MySQL 5.1</span> y <span style="font-weight: bold;">PHP 5.1</span> (trilogía también llamada <span style="font-weight: bold;">AMP</span>).<br />
<br />
@ -99,7 +86,7 @@ Todo este software es software de código abierto y está disponible libremente.
<br />
Para ejecutar Dokeos <span style="font-weight: bold;">LMS</span> en su servidor, necesita instalar WAMP, LAMP o MAMP:
Para ejecutar Chamilo <span style="font-weight: bold;">LMS</span> en su servidor, necesita instalar WAMP, LAMP o MAMP:
<ul>
<li>Para instalar <span style="font-weight: bold;">WAMP</span> (AMP en Windows), recomendamos el instalador <a href="http://www.apachefriends.org/en/xampp.html">XAMPP</a> .exe<a href="http://www.apachefriends.org/en/xampp.html"></a></li>
@ -352,7 +339,7 @@ necesario, puede estar configurado en Off y Dokeos funcionará bien.
<li>php-iconv</li>
<li>php-json</li>
<li>php-mbstring</li>
<ul>
</ul>
<p><a href="http://dev.mysql.com/doc/mysql/en/index.html"></a><br />

4
documentation/license.html
Unescape View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Dokeos License</title>
<title>Chamilo License</title>
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<style type="text/css">
@ -15,7 +15,7 @@
</head>
<body>
<div id="header1">
<h1>Dokeos License</h1>
<h1>Chamilo License</h1>
</div>
<a href="index.html">Documentation</a> &gt; Gnu General Public License
<div id="outerframe">

26
documentation/readme.html
Unescape View File

@ -1,18 +1,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Dokeos Information</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<title>Chamilo Information</title><link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<style type="text/css">
<!--
@page { size: 21cm 29.7cm; margin: 2cm }
@ -20,25 +10,23 @@
p { margin-bottom: 0.21cm }
.code {margin: 1em 1em 1em 2em; padding: 0.5em; background-color: rgb(229, 229, 229); vertical-align: top; border: 1px solid #999999;}
--></style></head>
<body>
<div id="header1">
<h1>About Dokeos</h1>
<h1>About Chamilo</h1>
</div>
<a href="index.html">Documentation</a> &gt; About Dokeos
<a href="index.html">Documentation</a> &gt; About Chamilo
<div id="outerframe">
<div id="main">
<p>Dokeos is an elearning and course management web application,<br />
<p>Chamilo is an elearning and course management web application,<br />
and is free software (GNU GPL). It's translated into 30 languages,<br />
SCORM compliant, and light and flexible.</p>
<p>Dokeos supports many different kinds of learning and collaboration activities.<br />
<p>Chamilo supports many different kinds of learning and collaboration activities.<br />
Teachers/trainers can create, manage and publish their courses through the web.<br />
@ -130,9 +118,9 @@
Mozilla (1.2+), Safari, Opera, ...</p>
<h1>Dokeos.com</h1>
<h1>Chamilo.org</h1>
<p>Dokeos is also a consulting company helping companies in their e-learning projects and selling Dokeos PRO and Dokeos MEDICAL.<br />
<p>Chamilo is also a consulting company helping companies in their e-learning projects and selling Dokeos PRO and Dokeos MEDICAL.<br />
<br />

8
main/inc/banner.inc.php
Unescape View File

@ -234,18 +234,14 @@ if ($_user['user_id'] && !api_is_anonymous()) {
} else {
$menu_navigation['session_my_space'] = $possible_tabs['session_my_progress'];
}
}
}
// Social Networking
//if (api_get_setting('show_tabs', 'social') == 'true') {
if (1) {
if (api_get_setting('show_tabs', 'social') == 'true') {
$navigation['social'] = $possible_tabs['social'];
} else{
$menu_navigation['social'] = $possible_tabs['social'];
}
if(api_is_platform_admin(true)) {
if (api_get_setting('show_tabs', 'platform_administration') == 'true') {

9
main/inc/lib/social.lib.php
Unescape View File

@ -632,8 +632,7 @@ class SocialManager extends UserManager {
}
public static function show_social_menu() {
/*
echo '<div class="actions">';
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png').' '.get_lang('ViewMySharedProfile').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png').' '.get_lang('Friends').'</a>';
@ -641,11 +640,11 @@ class SocialManager extends UserManager {
echo '<a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif').' '.get_lang('Groups').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif').' '.get_lang('Search').'</a>';
echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('EditProfile').'</a>';
/*
echo '<span style="float:right; padding-top:7px;">'.
'<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
'</span>';
echo '</div>';*/
*/
echo '</div>';
}
}

23
main/inc/lib/usermanager.lib.php
Unescape View File

@ -2648,8 +2648,22 @@ class UserManager
*
*/
public function get_search_form($query) {
//Not available yet
return '';
echo'<form method="get" action="'.api_get_path(WEB_PATH).'main/social/search.php">
<table cellspacing="0" cellpadding="0" id="SearchTable">
<tbody><tr>
<td>
<div id="SearchQueryChunk">
<div id="SearchQueryNav">
<b>Search</b > (Users, Groups)
</div>
<div>
<input type="text" size="30" value="'.Security::remove_XSS($query).'" tabindex="1" id="standard_q" name="q"/>
<button class="search" value="search"/>'.get_lang('Search').'</button>
</div>
</td>
</tr>
</tbody></table></form>';
}
//deprecated
public function get_public_users($keyword, $from = 0, $number_of_items= 20, $column=2, $direction='ASC') {
@ -2722,8 +2736,7 @@ class UserManager
}
return $users;
}
function show_menu() {
/*
function show_menu(){
echo '<div class="actions">';
echo '<a href="/main/auth/profile.php">'.Display::return_icon('profile.png').' '.get_lang('PersonalData').'</a>';
echo '<a href="/main/messages/inbox.php">'.Display::return_icon('inbox.png').' '. get_lang('Inbox').'</a>';
@ -2731,6 +2744,6 @@ class UserManager
echo '<span style="float:right; padding-top:7px;">'.
'<a href="/main/auth/profile.php?show=1">'.Display::return_icon('edit.gif').' '.get_lang('Configuration').'</a>';
'</span>';
echo '</div>';*/
echo '</div>';
}
}

9
main/install/dokeos_main.sql
Unescape View File

@ -666,6 +666,7 @@ VALUES
('show_tabs', 'platform_administration', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsPlatformAdministration', 1),
('show_tabs', 'my_agenda', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsMyAgenda', 1),
('show_tabs', 'my_profile', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsMyProfile', 1),
('show_tabs', 'social', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsSocial', 0),
('default_forum_view', NULL, 'radio', 'Course', 'flat', 'DefaultForumViewTitle','DefaultForumViewComment',NULL,NULL, 0),
('platform_charset',NULL,'textfield','Platform','iso-8859-15','PlatformCharsetTitle','PlatformCharsetComment','platform',NULL, 0),
('noreply_email_address', '', 'textfield', 'Platform', '', 'NoReplyEmailAddress', 'NoReplyEmailAddressComment', NULL, NULL, 0),
@ -2273,7 +2274,6 @@ CREATE TABLE session_category (
-- Table structure for table user tag
--
CREATE TABLE tag (
id int NOT NULL auto_increment,
tag varchar(255) NOT NULL,
@ -2333,9 +2333,8 @@ CREATE TABLE IF NOT EXISTS message_attachment (
message_id int NOT NULL,
filename varchar(255) NOT NULL,
PRIMARY KEY (id)
)
);
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (10, 'tags','tags',0,0);
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (9, 'rssfeeds','RSS',0,0);
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (1, 'rssfeeds','RSS',0,0);
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (10,'tags','tags',0,0);

91
main/install/index.php
Unescape View File

@ -1,8 +1,8 @@
<?php //$id: $
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /chamilo_license.txt */
/**
==============================================================================
* GOAL : Dokeos installation
* GOAL : Chamilo installation
* As seen from the user, the installation proceeds in 6 steps.
* The user is presented with several webpages where he/she has to make choices
* and/or fill in data.
@ -37,7 +37,7 @@ if ( !function_exists('version_compare') || version_compare( phpversion(), '5',
<body>
<div id="wrapper">
<div id="header">
<div id="header1"><a href="http://www.dokeos.com" target="_blank">Dokeos Homepage</a></div>
<div id="header1"><a href="http://www.chamilo.org" target="_blank">Chamilo Homepage</a></div>
<div class="clear"></div>
<div id="header2">&nbsp;</div>
<div id="header3">
@ -60,7 +60,7 @@ if ( !function_exists('version_compare') || version_compare( phpversion(), '5',
</div>
<div id="footer">
<div class="copyright">Platform <a href="http://www.dokeos.com" target="_blank"> Dokeos </a> &copy; 2009 </div>
<div class="copyright">Platform <a href="http://www.chamilo.org" target="_blank"> Chamilo </a> &copy; 2009 </div>
&nbsp;
</div>
@ -285,16 +285,17 @@ if($installType=='update' && in_array($my_old_version,$update_from_version_8))
}
if(!isset($_GET['running'])) {
$dbHostForm='localhost';
$dbUsernameForm='root';
$dbPassForm='';
$dbPrefixForm='';
$dbNameForm='dokeos_main';
$dbStatsForm='dokeos_stats';
$dbScormForm='dokeos_scorm';
$dbUserForm='dokeos_user';
// extract the path to append to the url if Dokeos is not installed on the web root directory
$dbHostForm ='localhost';
$dbUsernameForm ='root';
$dbPassForm ='';
$dbPrefixForm ='';
$dbNameForm ='chamilo_main';
$dbStatsForm ='chamilo_stats';
$dbScormForm ='chamilo_scorm';
$dbUserForm ='chamilo_user';
// extract the path to append to the url if Chamilo is not installed on the web root directory
$urlAppendPath=str_replace('/main/install/index.php','',api_get_self());
$urlForm='http://'.$_SERVER['HTTP_HOST'].$urlAppendPath.'/';
$pathForm=str_replace('\\','/',realpath('../..')).'/';
@ -305,18 +306,17 @@ if(!isset($_GET['running'])) {
{
$emailForm .= '.localdomain';
}
$adminLastName='Doe';
$adminFirstName='John';
$loginForm='admin';
$passForm=api_generate_password();
$campusForm='My campus';
$educationForm='Albert Einstein';
$adminPhoneForm='(000) 001 02 03';
$institutionForm='My Organisation';
$institutionUrlForm='http://www.dokeos.com';
$languageForm='english';
$adminLastName = 'Doe';
$adminFirstName = 'John';
$loginForm = 'admin';
$passForm = api_generate_password();
$campusForm = 'My campus';
$educationForm = 'Albert Einstein';
$adminPhoneForm = '(000) 001 02 03';
$institutionForm= 'My Organisation';
$institutionUrlForm= 'http://www.chamilo.org';
$languageForm = 'english';
$checkEmailByHashSent=0;
$ShowEmailnotcheckedToStudent=1;
@ -327,9 +327,7 @@ if(!isset($_GET['running'])) {
$singleDbForm=0;
$encryptPassForm='md5';
$session_lifetime=360000;
}
else
{
} else {
foreach($_POST as $key=>$val)
{
$magic_quotes_gpc=ini_get('magic_quotes_gpc')?true:false;
@ -405,7 +403,7 @@ if ($encryptPassForm=='1' ) {
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>&mdash; <?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
<title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
<style type="text/css" media="screen, projection">
/*<![CDATA[*/
@import "../css/dokeos_blue/default.css";
@ -418,15 +416,15 @@ if ($encryptPassForm=='1' ) {
if ($('#singleDb1').attr('checked')==false) {
$('#dbStatsForm').removeAttr('disabled');
$('#dbUserForm').removeAttr('disabled');
$('#dbStatsForm').attr('value','dokeos_stats');
$('#dbUserForm').attr('value','dokeos_user');
$('#dbStatsForm').attr('value','chamilo_stats');
$('#dbUserForm').attr('value','chamilo_user');
} else if($('#singleDb1').attr('checked')==true){
$('#dbStatsForm').attr('disabled','disabled');
$('#dbUserForm').attr('disabled','disabled');
$('#dbStatsForm').attr('value','dokeos_main');
$('#dbUserForm').attr('value','dokeos_main');
$('#dbStatsForm').attr('value','chamilo_main');
$('#dbUserForm').attr('value','chamilo_main');
}
//Allow dokeos install in IE
//Allow Chamilo install in IE
$("button").click(function() {
$("#is_executable").attr("value",$(this).attr("name"));
});
@ -439,13 +437,13 @@ if ($encryptPassForm=='1' ) {
if (my_option=='singleDb1') {
$('#dbStatsForm').attr('disabled','true');
$('#dbUserForm').attr('disabled','true');
$('#dbStatsForm').attr('value','dokeos_main');
$('#dbUserForm').attr('value','dokeos_main');
$('#dbStatsForm').attr('value','chamilo_main');
$('#dbUserForm').attr('value','chamilo_main');
} else if (my_option=='singleDb0') {
$('#dbStatsForm').removeAttr('disabled');
$('#dbUserForm').removeAttr('disabled');
$('#dbStatsForm').attr('value','dokeos_stats');
$('#dbUserForm').attr('value','dokeos_user');
$('#dbStatsForm').attr('value','chamilo_stats');
$('#dbUserForm').attr('value','chamilo_user');
}
}
</script>
@ -487,7 +485,7 @@ if ($encryptPassForm=='1' ) {
<div id="wrapper">
<div id="header">
<div id="header1"><?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?><?php if($installType == 'new') echo ' &ndash; '.get_lang('NewInstallation'); else if($installType == 'update') echo ' &ndash; '.get_lang('UpdateFromDokeosVersion').(is_array($update_from_version)?implode('|',$update_from_version):''); ?></div>
<div id="header1"><?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?><?php if($installType == 'new') echo ' &ndash; '.get_lang('NewInstallation'); else if($installType == 'update') echo ' &ndash; '.get_lang('UpdateFromDokeosVersion').(is_array($update_from_version)?implode('|',$update_from_version):''); ?></div>
<div id="header2">&nbsp;</div>
<div id="header3">
<ul>
@ -500,7 +498,7 @@ if ($encryptPassForm=='1' ) {
<form style="padding: 0px; margin: 0px;" method="post" action="<?php echo api_get_self(); ?>?running=1&amp;installType=<?php echo $installType; ?>&amp;updateFromConfigFile=<?php echo urlencode($updateFromConfigFile); ?>">
<div id="installation_steps" style="width:240px">
<img src="../img/bluelogo.gif" hspace="10" vspace="10" alt="Dokeos logo" />
<img src="../img/bluelogo.gif" hspace="10" vspace="10" alt="Chamilo logo" />
<ol>
<li <?php step_active('1'); ?>><?php echo get_lang('InstallationLanguage'); ?></li>
<li <?php step_active('2'); ?>><?php echo get_lang('Requirements'); ?></li>
@ -579,9 +577,8 @@ if($_POST['step2'])
{
//STEP 3 : LICENSE
display_license_agreement();
}
elseif($_POST['step3'])
{
} elseif($_POST['step3']) {
//STEP 4 : MYSQL DATABASE SETTINGS
display_database_settings_form($installType, $dbHostForm, $dbUsernameForm, $dbPassForm, $dbPrefixForm, $enableTrackingForm, $singleDbForm, $dbNameForm, $dbStatsForm, $dbScormForm, $dbUserForm);
}
@ -710,7 +707,7 @@ elseif($_POST['step5'])
<?php echo get_lang('CampusName').' : '.$campusForm; ?><br />
<?php echo get_lang('InstituteShortName').' : '.$institutionForm; ?><br />
<?php echo get_lang('InstituteURL').' : '.$institutionUrlForm; ?><br />
<?php echo get_lang('DokeosURL').' : '.$urlForm; ?><br />
<?php echo get_lang('ChamiloURL').' : '.$urlForm; ?><br />
</blockquote>
@ -726,7 +723,7 @@ elseif($_POST['step5'])
<table width="100%">
<tr>
<td><button type="submit" class="back" name="step4" value="&lt; <?php echo get_lang('Previous'); ?>" /><?php echo get_lang('Previous'); ?></button></td>
<td align="right"><input type="hidden" name="is_executable" id="is_executable" value="-" /><button class="save" type="submit" name="step6" value="<?php echo get_lang('InstallDokeos'); ?> &gt;" onclick="javascript:if(this.value == '<?php $msg = get_lang('PleaseWait');?>...') return false; else this.value='<?php $msg = get_lang('InstallDokeos');?>...';" ><?php echo $msg; ?></button></td>
<td align="right"><input type="hidden" name="is_executable" id="is_executable" value="-" /><button class="save" type="submit" name="step6" value="<?php echo get_lang('InstallDokeos'); ?> &gt;" onclick="javascript:if(this.value == '<?php $msg = get_lang('PleaseWait');?>...') return false; else this.value='<?php $msg = get_lang('InstallChamilo');?>...';" ><?php echo $msg; ?></button></td>
</tr>
</table>
@ -808,7 +805,7 @@ elseif($_POST['step6'])
<div class="push"></div>
</div><!-- wrapper end-->
<div id="footer">
<div class="copyright"><?php echo get_lang('Platform');?> <a href="http://www.dokeos.com" target="_blank"> Dokeos <?php echo $new_version ?></a> &copy; <?php echo date('Y'); ?> </div>
<div class="copyright"><?php echo get_lang('Platform');?> <a href="http://www.chamilo.org" target="_blank"> Chamilo <?php echo $new_version ?></a> &copy; <?php echo date('Y'); ?> </div>
&nbsp;
</div>
</body>

38
main/install/install_functions.inc.php
Unescape View File

@ -574,7 +574,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd
{ ?>
<div style="color:red; background-color:white; font-weight:bold; text-align:center;">
<?php echo get_lang('Error');?>!<br />
Dokeos <?php echo (isset($_POST['step2_update_6'])?implode('|',$update_from_version_6):implode('|',$update_from_version_8)).' '.get_lang('HasNotBeenFoundInThatDir'); ?>.
Chamilo <?php echo (isset($_POST['step2_update_6'])?implode('|',$update_from_version_6):implode('|',$update_from_version_8)).' '.get_lang('HasNotBeenFoundInThatDir'); ?>.
</div>
<?php }
else
@ -781,21 +781,19 @@ function display_database_parameter($install_type, $parameter_name, $form_field_
*/
function display_database_settings_form($installType, $dbHostForm, $dbUsernameForm, $dbPassForm, $dbPrefixForm, $enableTrackingForm, $singleDbForm, $dbNameForm, $dbStatsForm, $dbScormForm, $dbUserForm)
{
if($installType == 'update')
{
if($installType == 'update') {
global $_configuration, $update_from_version_6;
if(in_array($_POST['old_version'],$update_from_version_6))
{
$dbHostForm=get_config_param('dbHost');
$dbUsernameForm=get_config_param('dbLogin');
$dbPassForm=get_config_param('dbPass');
$dbPrefixForm=get_config_param('dbNamePrefix');
if(in_array($_POST['old_version'],$update_from_version_6)) {
$dbHostForm = get_config_param('dbHost');
$dbUsernameForm = get_config_param('dbLogin');
$dbPassForm = get_config_param('dbPass');
$dbPrefixForm = get_config_param('dbNamePrefix');
$enableTrackingForm=get_config_param('is_trackingEnabled');
$singleDbForm=get_config_param('singleDbEnabled');
$dbNameForm=get_config_param('mainDbName');
$dbStatsForm=get_config_param('statsDbName');
$dbScormForm=get_config_param('scormDbName');
$dbUserForm=get_config_param('user_personal_database');
$singleDbForm =get_config_param('singleDbEnabled');
$dbNameForm =get_config_param('mainDbName');
$dbStatsForm =get_config_param('statsDbName');
$dbScormForm =get_config_param('scormDbName');
$dbUserForm =get_config_param('user_personal_database');
$dbScormExists=true;
}
else
@ -835,7 +833,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
}
else
{
$dbUserForm=$dbPrefixForm.'dokeos_user';
$dbUserForm=$dbPrefixForm.'chamilo_user';
}
}
echo "<h2>" . display_step_sequence() .get_lang("DBSetting") . "</h2>";
@ -843,7 +841,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
}else{
if(empty($dbPrefixForm)) //make sure there is a default value for db prefix
{
$dbPrefixForm = 'dokeos_';
$dbPrefixForm = 'chamilo_';
}
echo "<h2>" . display_step_sequence() .get_lang("DBSetting") . "</h2>";
echo get_lang("DBSettingIntro");
@ -877,7 +875,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
display_database_parameter($installType, get_lang('DBPassword'), 'dbPassForm', $dbPassForm, $example_password);
//database prefix
display_database_parameter($installType, get_lang('DbPrefixForm'), 'dbPrefixForm', $dbPrefixForm, get_lang('DbPrefixCom'));
//fields for the four standard Dokeos databases
//fields for the four standard Chamilo databases
echo '<tr><td colspan="3"><a href="" onclick="javascript: show_hide_option();return false;" id="optionalparameters"><img style="vertical-align:middle;" src="../img/div_show.gif" alt="show-hide" /> '.get_lang('OptionalParameters','').'</a></td></tr>';
display_database_parameter($installType, get_lang('MainDB'), 'dbNameForm', $dbNameForm, '&nbsp;',null,'id="optional_param1" style="display:none;"');
display_database_parameter($installType, get_lang('StatDB'), 'dbStatsForm', $dbStatsForm, '&nbsp;',null,'id="optional_param2" style="display:none;"');
@ -979,7 +977,7 @@ function display_configuration_parameter($install_type, $parameter_name, $form_f
}
/**
* Displays step 4 of the installation - configuration settings about Dokeos itself.
* Displays step 4 of the installation - configuration settings about Chamilo itself.
*/
function display_configuration_settings_form($installType, $urlForm, $languageForm, $emailForm, $adminFirstName, $adminLastName, $adminPhoneForm, $campusForm, $institutionForm, $institutionUrlForm, $encryptPassForm, $allowSelfReg, $allowSelfRegProf, $loginForm, $passForm)
{
@ -1049,9 +1047,9 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
}
echo "</tr>\n";
//Second parameter: Dokeos URL
//Second parameter: Chamilo URL
echo "<tr>\n";
echo '<td>'.get_lang('DokeosURL').' (<font color="red">'.get_lang('ThisFieldIsRequired')."</font>)&nbsp;&nbsp;</td>\n";
echo '<td>'.get_lang('ChamiloURL').' (<font color="red">'.get_lang('ThisFieldIsRequired')."</font>)&nbsp;&nbsp;</td>\n";
if($installType == 'update') echo '<td>'.api_htmlentities($urlForm, ENT_QUOTES, $charset)."</td>\n";
else echo '<td><input type="text" size="40" maxlength="100" name="urlForm" value="'.api_htmlentities($urlForm, ENT_QUOTES, $charset).'" />'."</td>\n";

7
main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql
Unescape View File

@ -59,8 +59,11 @@ ALTER TABLE message ADD COLUMN parent_id INT NOT NULL DEFAULT 0;
ALTER TABLE message ADD INDEX idx_message_group(group_id);
ALTER TABLE message ADD INDEX idx_message_parent(parent_id);
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (10, 'tags','tags',0,0);
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (9, 'rssfeeds','RSS',0,0);
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (1, 'rssfeeds','RSS',0,0);
INSERT INTO user_field (field_type, field_variable, field_display_text, field_visible, field_changeable) values (10,'tags','tags',0,0);
INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('send_email_to_admin_when_create_course',NULL,'radio','Platform','false','SendEmailToAdminTitle','SendEmailToAdminComment',NULL,NULL, 1);
INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('show_tabs', 'social', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsSocial', 0);
UPDATE TABLE settings_current SET selected_value = '1.8.6.2.9070' WHERE variable = 'dokeos_database_version';

2
main/messages/download.php
Unescape View File

@ -1,5 +1,5 @@
<?php
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /chamilo_license.txt */
/**
==============================================================================
* This file is responsible for passing requested file attachments from messages

29
main/messages/inbox.php
Unescape View File

@ -1,33 +1,6 @@
<?php
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2009 Dokeos SPRL
Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
Copyright (c) Facultad de Matematicas, UADY (México)
Copyright (c) Evie, Free University of Brussels (Belgium)
Copyright (c) 2009 Isaac Flores Paz <isaac.flores@dokeos.com>
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
/* For licensing terms, see /chamilo_license.txt */
Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/*
==============================================================================
INIT SECTION
==============================================================================
*/
// name of the language file that needs to be included
$language_file = array('registration','messages','userInfo','admin','index');
$cidReset=true;

4
main/messages/index.php
Unescape View File

@ -1,5 +1,5 @@
<?php // $Id: index.php 20962 2009-05-25 03:15:53Z iflorespaz $
/* For licensing terms, see /dokeos_license.txt */
<?php
/* For licensing terms, see /chamilo_license.txt */
$language_file= 'messages';
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'message.lib.php';

26
main/messages/new_message.php
Unescape View File

@ -1,27 +1,5 @@
<?php // $Id: new_message.php 22097 2009-07-15 04:30:05Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2009 Dokeos SPRL
Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
Copyright (c) Facultad de Matematicas, UADY (M<EFBFBD>xico)
Copyright (c) Evie, Free University of Brussels (Belgium)
Copyright (c) 2009 Isaac Flores Paz <isaac.flores.paz@gmail.com>
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
<?php
/* For licensing terms, see /chamilo_license.txt */
/**
* This script shows a compose area (wysiwyg editor if supported, otherwise
* a simple textarea) where the user can type a message.

2
main/messages/notify.php
Unescape View File

@ -1,5 +1,5 @@
<?php // $Id: notify.php 20962 2009-05-25 03:15:53Z iflorespaz $
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /chamilo_license.txt */
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
header("Cache-Control: no-cache, must-revalidate");

25
main/messages/outbox.php
Unescape View File

@ -1,28 +1,5 @@
<?php
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2009 Dokeos SPRL
Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
Copyright (c) 2009 Isaac Flores Paz <florespaz@bidsoftperu.com>
Copyright (c) Facultad de Matematicas, UADY (México)
Copyright (c) Evie, Free University of Brussels (Belgium)
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /chamilo_license.txt */
/*
==============================================================================
INIT SECTION

1
main/messages/plugin.php
Unescape View File

@ -1,4 +1,5 @@
<?php
/* For licensing terms, see /chamilo_license.txt */
/**
* This script is a configuration file for the messages plugin. You can use it as a master for other plugins.
* These settings will be used in the administration interface for plugins (Dokeos configuration settings->Plugins)

2
main/messages/send_message.php
Unescape View File

@ -1,5 +1,5 @@
<?php
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /chamilo_license.txt */
$language_file = array('registration','messages','userInfo','admin');
$cidReset=true;

2
main/messages/send_message_to_userfriend.inc.php
Unescape View File

@ -1,5 +1,5 @@
<?php
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /chamilo_license.txt */
$language_file = array('registration','messages','userInfo','admin');
$cidReset=true;
require_once '../inc/global.inc.php';

31
main/messages/view_message.php
Unescape View File

@ -1,33 +1,6 @@
<?php // $Id: view_message.php 20962 2009-05-25 03:15:53Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2009 Dokeos SPRL
Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
Copyright (c) Facultad de Matematicas, UADY (México)
Copyright (c) Evie, Free University of Brussels (Belgium)
Copyright (c) 2009 Isaac Flores Paz <isaac.flores.paz@gmail.com>
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
<?php
/* For licensing terms, see /chamilo_license.txt */
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/*
==============================================================================
INIT SECTION
=========================================================================5====
*/
// name of the language file that needs to be included
$language_file= 'messages';
$cidReset= true;

2
main/social/contacts.inc.php
Unescape View File

@ -1,5 +1,5 @@
<?php
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /chamilo_license.txt */
$language_file = array('registration','messages','userInfo','admin');
require '../inc/global.inc.php';

99
main/social/groups.php
Unescape View File

@ -56,8 +56,27 @@ if ($group_id != 0 ) {
$picture = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
$tags = GroupPortalManager::get_group_tags($group_id, true);
$users = GroupPortalManager::get_users_by_group($group_id, true);
//my relation with the group is set here
if (is_array($users[api_get_user_id()]) && count($users[api_get_user_id()]) > 0) {
//im a member
if ($users[api_get_user_id()]['relation_type'] != '' ) {
$my_group_role = $users[api_get_user_id()]['relation_type'];
} else {
$my_group_role = GROUP_USER_PERMISSION_ANONYMOUS;
}
} else {
//im not a member
$my_group_role = GROUP_USER_PERMISSION_ANONYMOUS;
}
//@todo this must be move to default.css for dev use only
echo '<style>
#group_members { width:233px; height:300px; overflow-x:none; overflow-y: auto;}
.group_member_item { width:98px; height:86px; float:left; margin:5px 5px 15px 5px; }
.group_member_picture { height:65px; };
</style>';
echo '<div id="layout-left" style="float: left; width: 280px; height: 100%;">';
//Group's title
@ -89,62 +108,58 @@ if ($group_id != 0 ) {
echo get_lang('Tags').' : '.$tags;
echo '</div>';
}
if (in_array($my_group_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
echo '<div id="actions" style="margin:10px">';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).api_xml_http_response_encode(get_lang('ComposeMessage')).'</a>';
echo '</div>';
}
echo '<div id="actions" style="margin:10px">';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).api_xml_http_response_encode(get_lang('ComposeMessage')).'</a>';
echo '</div>';
echo get_lang('Members').' : ';
echo get_lang('Members').' : ';
echo '<div id="group_members">';
foreach($users as $user) {
if ($user['relation_type'] != GROUP_USER_PERMISSION_PENDING_INVITATION) {
foreach($users as $user) {
if (in_array($user['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
if ($user['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$user['lastname'].= Display::return_icon('admin_star.png', get_lang('Admin'));
}
echo '<div class="group_member_item"><a href="profile.php?u='.$user['user_id'].'">'.$user['picture_uri'].$user['firstname'].$user['lastname'].'</a></div>';
echo '<div class="group_member_item"><a href="profile.php?u='.$user['user_id'].'"><div class="group_member_picture">'.$user['picture_uri'].'</div>'.$user['firstname'].$user['lastname'].'</a></div>';
}
}
echo '</div>';
echo '<div id="group_permissions">';
if (is_array($users[api_get_user_id()]) && count($users[api_get_user_id()]) > 0) {
//im a member
if ($users[api_get_user_id()]['relation_type'] !='' ) {
$my_group_role = $users[api_get_user_id()]['relation_type'];
echo '<div id="group_permissions">';
switch ($my_group_role) {
case GROUP_USER_PERMISSION_READER:
// I'm just a reader
if ($my_group_role == GROUP_USER_PERMISSION_READER) {
echo '<a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.get_lang('LeaveGroup').'</a>';
echo 'Invite others/';
//the main admin
} elseif ($my_group_role == GROUP_USER_PERMISSION_ADMIN) {
echo 'Im the admin/';
echo '<a href="group_edit.php?id='.$group_id.'">'.get_lang('EditGroup').'</a>';
echo '<a href="group_members.php?id='.$group_id.'">'.get_lang('MemberList').'</a>';
echo '<a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a>';
} elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
echo get_lang('PendingApproval');
}
} else {
if ($group_info['visibility']!= GROUP_PERMISSION_CLOSED ) {
//im not a member
echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
}
}
} else {
//im not a member
echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
}
echo '<a href="groups.php?id='.$group_id.'&action=leave&u='.api_get_user_id().'">'.get_lang('LeaveGroup').'</a>';
echo 'Invite others/';
break;
case GROUP_USER_PERMISSION_ADMIN:
echo 'Im the admin/';
echo '<a href="group_edit.php?id='.$group_id.'">'.get_lang('EditGroup').'</a>';
echo '<a href="group_members.php?id='.$group_id.'">'.get_lang('MemberList').'</a>';
echo '<a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a>';
break;
case GROUP_USER_PERMISSION_PENDING_INVITATION:
echo get_lang('PendingApproval');
break;
case GROUP_USER_PERMISSION_MODERATOR:
echo '<a href="group_members.php?id='.$group_id.'">'.get_lang('MemberList').'</a>';
echo '<a href="group_invitation.php?id='.$group_id.'">'.get_lang('InviteFriends').'</a>';
break;
case GROUP_USER_PERMISSION_ANONYMOUS:
echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
}
echo '</div>'; // end layout permissions
echo '</div>'; // end layout left
echo '<div id="layout_right" style="margin-left: 282px;">';
echo '<div class="messages">';
MessageManager::display_messages_for_group($group_id);
echo '</div>'; // end layout messages
echo '<div class="messages">';
MessageManager::display_messages_for_group($group_id);
echo '</div>'; // end layout messages
echo '</div>'; // end layout right

25
main/social/invitations.php
Unescape View File

@ -80,15 +80,24 @@ $pending_invitations = GroupPortalManager::get_groups_by_user($user_id, GROUP_US
$number_loop=count($list_get_invitation);
//@todo move this to default.css
echo '<style>
.invitation_confirm {
border-top:1px solid #D8DFEA;
}
.invitation_image {
width:110px;
}
</style>';
if ($number_loop==0) {
Display::display_normal_message(get_lang('NoPendingInvitations'));
} else {
echo get_lang('InvitationReceived');
echo '<h2>'.get_lang('InvitationReceived').'</h2>';
foreach ($list_get_invitation as $invitation) {
$sender_user_id = $invitation['user_sender_id']
?>
<div id="<?php echo 'id_'.$sender_user_id ?>" class="confirm">
<div id="<?php echo 'id_'.$sender_user_id ?>" class="invitation_confirm">
<?php
$picture = UserManager::get_user_picture_path_by_id($sender_user_id,'web',false,true);
$friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
@ -128,11 +137,11 @@ if ($number_loop==0) {
}
echo '<div class="clear"></div>';
if (count($list_get_invitation_sent) > 0 ){
echo get_lang('InvitationSent');
if (count($list_get_invitation_sent) > 0 ){
echo '<h2>'.get_lang('InvitationSent').'</h2>';
foreach ($list_get_invitation_sent as $invitation) {
$sender_user_id = $invitation['user_receiver_id'];?>
<div id="<?php echo 'id_'.$sender_user_id ?>" class="confirm">
<div id="<?php echo 'id_'.$sender_user_id ?>" class="invitation_confirm">
<?php
$picture = UserManager::get_user_picture_path_by_id($sender_user_id,'web',false,true);
$friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
@ -145,7 +154,7 @@ if (count($list_get_invitation_sent) > 0 ){
<table cellspacing="0" border="0">
<tbody>
<tr>
<td class="image">
<td class="invitation_image">
<a href="profile.php?u=<?=$sender_user_id?>">
<img src="<?php echo $friends_profile['file']; ?>" <?php echo $friends_profile['style']; ?> /></a>
</td>
@ -166,8 +175,8 @@ if (count($list_get_invitation_sent) > 0 ){
}
}
if (count($pending_invitations) > 0) {
echo get_lang('GroupsWaitingApproval');
if (count($pending_invitations) > 0) {
echo '<h2>'.get_lang('GroupsWaitingApproval').'</h2>';
Display::display_sortable_grid('search_users', array(), $pending_invitations, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
}

17
main/social/profile.php
Unescape View File

@ -330,6 +330,7 @@ echo '<div id="social-profile-wrapper">';
}
}
} else {
// No friends!! :(
$friend_html .= '<div class="sectiontitle">'.get_lang('Friends').'</div>';
$friend_html.= '<div id="friend-container" class="social-friend-container">';
$friend_html.= '<div id="friend-header">';
@ -560,15 +561,17 @@ echo '<div id="social-profile-container">';
foreach ($results as $result) {
$id = $result['id'];
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$result['name'].= Display::return_icon('admin_star.png', get_lang('Admin'));
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$result['name'].= Display::return_icon('admin_star.png', get_lang('Admin'));
}
$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close);
}
$groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close);
if (count($groups)> 0) {
echo '<h2>'.get_lang('MyGroups').'</h2>';
Display::display_sortable_grid('groups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
}
echo '<h2>'.get_lang('MyGroups').'</h2>';
Display::display_sortable_grid('groups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
// ---- My Agenda Items

11
main/social/show_search_image.inc.php
Unescape View File

@ -46,9 +46,14 @@ if (count($list_path_friends)!=0) {
$user_info=api_get_user_info($list_friends_id[$j]);
$user_name=api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName']));
$friends_profile = SocialManager::get_picture_user($list_friends_id[$j], $list_friends_file[$j], 92);
$friend_html.='<div onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$list_friends_id[$j].' >
<span><center><img src="'.$friends_profile['file'].'" '.$friends_profile['style'].' id="imgfriend_'.$list_friends_id[$j].'" title="'.$user_name.'" onclick=load_thick(\'qualify_contact.inc.php?path_user="'.urlencode($list_friends_dir[$j].$list_friends_file[$j]).'&amp;id_user="'.$list_friends_id[$j].'"\',"") /></center></span>
<img onclick="delete_friend (this)" id=img_'.$list_friends_id[$j].' src="../img/blank.gif" alt="" title="" class="image-delete" /> <center class="friend">'.$user_name.'</center></div>';
$friend_html.='<div onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$list_friends_id[$j].'>';
$friend_html.='<span><a href="profile.php?u='.$list_friends_id[$j].'"><center><img src="'.$friends_profile['file'].'" '.$friends_profile['style'].' id="imgfriend_'.$list_friends_id[$j].'" title="'.$user_name.'" /></center></a></span>';
$friend_html.='<img onclick="delete_friend (this)" id=img_'.$list_friends_id[$j].' src="../img/blank.gif" alt="" title="" class="image-delete" /> <center class="friend">'.$user_name.'</center></div>';
/*
* $friend_html.='&nbsp;<div onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$list_friends_id[$j].' style="float:left" >
* <img src="'.$list_friends_dir[$j]."/".$list_friends_file[$j].'" width="90" height="110" style="margin-left:3px ;margin-rigth:3px;margin-top:10px;margin-bottom:3px;" id="imgfriend_'.$list_friends_id[$j].'" title="'.$user_name.'" onclick="qualify_friend(this)"/>
* <img onclick="delete_friend (this)" id=img_'.$list_friends_id[$j].' src="../img/blank.gif" alt="" title="" class="image-delete" /></div>&nbsp;';
*/
}
$j++;
}

49
user_portal.php
Unescape View File

@ -1212,7 +1212,56 @@ if (isset($toolsList) and is_array($toolsList) and isset($digest)) {
if ($show_menu) {
echo '<div class="menusection">';
echo '<span class="menusectioncaption">'.get_lang('MenuUser').'</span>';
//user image
// @todo add a platform setting to add the user image
if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool') == 'true') {
$img_array= UserManager::get_user_picture_path_by_id(api_get_user_id(),'web',true,true);
$no_image =false;
if ($img_array['file'] == 'unknown.jpg') {
$no_image =true;
}
$img_array = UserManager::get_picture_user(api_get_user_id(), $img_array['file'], 92, 'medium_', ' width="90" height="90" ');
echo '<div id="social_widget" style="">';
if ($no_image == false)
echo '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php"><img src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
else
echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
$number_of_new_messages = MessageManager::get_new_messages();
$number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id(api_get_user_id());
$cant_msg = '';
if ($number_of_new_messages > 0)
$cant_msg = ' ('.$number_of_new_messages.')';
echo '<div class="message-content">
<h2 class="message-title">'.get_lang('Messages').'</h2>
<p>';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php" class="message-body">'.get_lang('Inbox').$cant_msg.' </a><br />';
echo '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php" class="message-body">'.get_lang('Comppose').' </a><br />';
if ($number_of_new_messages_of_friend > 0) {
echo '<a href="'.api_get_path(WEB_PATH).'main/social/invitations.php" class="message-body">'.get_lang('PendingInvitations').' ('.$number_of_new_messages_of_friend.') </a><br />';
}
echo '</p>';
//echo '<img src="'.api_get_path(WEB_IMG_PATH).'delete.gif" alt="'.get_lang('Close').'" title="'.get_lang('Close').'" class="message-delete" />';
echo '</div>';
echo '</div><br />';
}
echo '<ul class="menulist">';
if ($show_create_link) {
display_create_course_link();

95
whoisonline.php
Unescape View File

@ -119,71 +119,66 @@ if ($_GET['chatid'] != '') {
*/
function display_user_list($user_list, $_plugins) {
global $charset;
if ($_GET["id"]=='') {
if ($_GET['id'] == '') {
$extra_params = array();
$course_url = '';
if(strlen($_GET['cidReq']) > 0) {
if (strlen($_GET['cidReq']) > 0) {
$extra_params['cidReq'] = Security::remove_XSS($_GET['cidReq']);
$course_url = '&amp;cidReq='.Security::remove_XSS($_GET['cidReq']);
}
}
foreach ($user_list as $user) {
$uid=$user[0];
$uid = $user[0];
$user_info = api_get_user_info($uid);
$table_row = array();
$url = '?id='.$uid.$course_url;
$image_array=UserManager::get_user_picture_path_by_id($uid,'system',false,true);
$friends_profile = SocialManager::get_picture_user($uid, $image_array['file'], 92, 'medium_', ' width="90" height="90" ');
//reduce image
$table_row[] = '<center><a href="'.$url.'"><img src="'.$friends_profile['file'].'" '.$friends_profile['style'].' border="1"></a></center>';
$table_row[] = '<a href="'.$url.'">'.$user_info['firstName'].' '.$user_info['lastName'].'</a>';
if (api_get_setting('allow_social_tool')=='true') {
$url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$uid.$course_url;
} else {
$url = '?id='.$uid.$course_url;
}
$image_array = UserManager::get_user_picture_path_by_id($uid, 'system', false, true);
$friends_profile = SocialManager::get_picture_user($uid, $image_array['file'], 92, 'medium_', ' width="90" height="90" ');
// reduce image
$name = api_get_person_name($user_info['firstName'], $user_info['lastName']);
$table_row[] = '<a href="'.$url.'"><img title = "'.$name.'" alt="'.$name.'" src="'.$friends_profile['file'].'" '.$friends_profile['style'].' border="1"></a>';
$table_row[] = '<a href="'.$url.'" style="font-size:10px;">'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</a>';
//$table_row[] = '<a href="'.$url.'">'.$user_info['lastName'].'</a>';
if (api_get_setting('show_email_addresses') == 'true') {
$table_row[] = Display::encrypted_mailto_link($user_info['mail']);
}
$user_anonymous=api_get_anonymous_id();
if (api_get_setting('allow_social_tool')=='true' && api_get_user_id()<>$user_anonymous && api_get_user_id()<>0) {
if ($user_info['user_id'] != api_get_user_id() && !api_is_anonymous($user_info['user_id'])) {
$user_relation=SocialManager::get_relation_between_contacts(api_get_user_id(),$user_info['user_id']);
if ($user_relation==0 || $user_relation==6) {
$table_row[] = '<a href="main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=365&width=610&user_friend='.$user_info['user_id'].'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a><br />
<a href="main/messages/send_message_to_userfriend.inc.php?view_panel=1&height=365&width=610&user_friend='.$user_info['user_id'].'" class="thickbox" title="'.get_lang('SendAMessage').'">'.Display :: return_icon('mail_send.png', get_lang('SendAMessage')).'&nbsp;'.get_lang('SendAMessage').'</a>';
} else {
$table_row[] = '<a href="main/messages/send_message_to_userfriend.inc.php?view_panel=1&height=365&width=610&user_friend='.$user_info['user_id'].'" class="thickbox" title="'.get_lang('SendAMessage').'">'.Display :: return_icon('mail_send.png', get_lang('SendAMessage')).'&nbsp;'.get_lang('SendAMessage').'</a>';
}
}
}
$user_anonymous = api_get_anonymous_id();
$table_data[] = $table_row;
}
$table_header[] = array(get_lang('UserPicture'),false,'width="90"');
$table_header[] = array(get_lang('Name'),true);
//$table_header[] = array(get_lang('LastName'),true);
$table_header[] = array(get_lang('UserPicture'), false, 'width="90"');
///$table_header[] = array(get_lang('Name'), true);
//$table_header[] = array(get_lang('LastName'), true);
if (api_get_setting('show_email_addresses') == 'true') {
$table_header[] = array(get_lang('Email'),true);
$table_header[] = array(get_lang('Email'), true);
}
$user_anonymous=api_get_anonymous_id();
if (api_get_setting('allow_social_tool')=='true' && api_get_user_id()<>$user_anonymous && api_get_user_id()<>0) {
$table_header[] = array(get_lang('Friends'),false,'width="200"');
}
/*this feature is deprecated
if ( api_get_setting('allow_message_tool')=='true' && isset($_SESSION['_user'])) {
$table_header[] = array(get_lang('SendMessage'),true);
//$user_anonymous = api_get_anonymous_id();
/*
if (api_get_setting('allow_social_tool') == 'true' && api_get_user_id() <> $user_anonymous && api_get_user_id() <> 0) {
$table_header[] = array(get_lang('Friends'), false, 'width="200"');
}
*/
$sorting_options['column'] = (isset ($_GET['column']) ? (int)$_GET['column'] : 2);
/*if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_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('SendInviteMessage').'"/></div>';
echo '<form action="whoisonline.php" name="form_register_friend" id="form_register_friend" method="post">';
//this feature is deprecated
if (api_get_setting('allow_message_tool') == 'true' && isset($_SESSION['_user'])) {
$table_header[] = array(get_lang('SendMessage'), true);
}*/
Display::display_sortable_table($table_header,$table_data,$sorting_options,array('per_page_default'=>count($table_data)),$extra_params);
/*if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true' ) {
echo '</form>';
}*/
//$sorting_options['column'] = (isset($_GET['column']) ? (int)$_GET['column'] : 2);
//if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_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('SendInviteMessage').'"/></div>';
//echo '<form action="whoisonline.php" name="form_register_friend" id="form_register_friend" method="post">';
//}
Display::display_sortable_table($table_header, $table_data, $sorting_options, array('per_page' => 30), $extra_params,array(),'grid');
//if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true' ) {
// echo '</form>';
// }
}
}
/**
@ -362,7 +357,8 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
}
if ($user_list) {
if (!isset($_GET['id'])) {
if (!isset($_GET['id'])) {
echo UserManager::get_search_form($_GET['q']);
display_user_list($user_list, $_plugins);
} else {
//individual user information - also displays header info
@ -382,6 +378,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
$referer = empty($_GET['referer']) ? 'index.php' : api_htmlentities(strip_tags($_GET['referer']), ENT_QUOTES);
/*
if (isset($_GET['id'])) {
if ($_GET['origin'] == 'user_list') {
@ -393,7 +390,7 @@ if (isset($_GET['id'])) {
} else {
echo '<a href="'.$referer.'" class="fake_button_back">'.get_lang('BackHome').'</a>';
}
*/
/*
==============================================================================
FOOTER

Write Preview
Loading…
Cancel
Save