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

[svn r22567] logic changes - improvements in terms and conditions - (partial FS#4320)

Browse Source
skala
Isaac Flores 16 years ago
parent 7c577f0d3e
commit 9f2406719c
3 changed files with 46 additions and 19 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. 5
      main/auth/inscription.php
  2. 36
      main/inc/lib/legal.lib.php
  3. 24
      main/inc/local.inc.php

5
main/auth/inscription.php
Unescape View File

@ -1,5 +1,5 @@
<?php
// $Id: inscription.php 22368 2009-07-24 23:25:57Z iflorespaz $
// $Id: inscription.php 22567 2009-08-02 23:10:29Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -317,9 +317,10 @@ if (get_setting('allow_terms_conditions')=='true') {
// Version and language //password
$form->addElement('hidden', 'legal_accept_type',$term_preview['version'].':'.$term_preview['language_id']);
$form->addElement('hidden', 'legal_info',$term_preview['legal_id'].':'.$term_preview['language_id']);
if (isset($_SESSION['info_current_user'][1]) && isset($_SESSION['info_current_user'][2])) {
$form->addElement('hidden', 'login',$_SESSION['info_current_user'][1]);
$form->addElement('hidden', 'password',$_SESSION['info_current_user'][2]);
$form->addElement('hidden', 'password',$_SESSION['info_current_user'][2]);
}
if($term_preview['type'] == 1) {
$form->addElement('checkbox', 'legal_accept', null, get_lang('IhaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>');

36
main/inc/lib/legal.lib.php
Unescape View File

@ -2,12 +2,11 @@
/*
==============================================================================
*/
class LegalManager
{
private function __construct() {
class LegalManager {
private function __construct () {
//void
}
function add($language, $content, $type, $changes) {
public function add ($language, $content, $type, $changes) {
$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
$last = self::get_last_condition($language);
$language = Database::escape_string($language);
@ -43,7 +42,7 @@ class LegalManager
}
}
function delete($id) {
public function delete ($id) {
/*
$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
$id = intval($id);
@ -51,7 +50,7 @@ class LegalManager
*/
}
function get_last_condition_version($language){
public function get_last_condition_version ($language) {
$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
$language= Database::escape_string($language);
$sql = "SELECT version FROM $legal_conditions_table WHERE language_id = '".$language."' ORDER BY legal_id DESC LIMIT 1 ";
@ -64,7 +63,7 @@ class LegalManager
}
}
function get_last_condition($language) {
public function get_last_condition ($language) {
$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
$language= Database::escape_string($language);
$sql = "SELECT * FROM $legal_conditions_table WHERE language_id = '".$language."' ORDER BY version DESC LIMIT 1 ";
@ -72,8 +71,7 @@ class LegalManager
return Database::fetch_array($result);
}
function show_last_condition($term_preview)
{
public function show_last_condition ($term_preview) {
$preview = '';
switch ($term_preview['type']) {
/*// scroll box
@ -124,7 +122,7 @@ class LegalManager
}
return $preview;
}
function get_last_version($language){
public function get_last_version ($language) {
$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
$language= Database::escape_string($language);
$sql = "SELECT version FROM $legal_conditions_table WHERE language_id = '".$language."' ORDER BY version DESC LIMIT 1 ";
@ -138,7 +136,7 @@ class LegalManager
}
}
function get_legal_data($from, $number_of_items, $column) {
public function get_legal_data ($from, $number_of_items, $column) {
$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
$lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
$from = intval($from);
@ -169,7 +167,7 @@ class LegalManager
return $legals;
}
function count() {
public function count() {
$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
$sql = "SELECT count(*) as count_result FROM $legal_conditions_table ORDER BY legal_id DESC ";
$result = Database::query($sql, __FILE__, __LINE__);
@ -177,4 +175,18 @@ class LegalManager
$result = $url['count_result'];
return $result;
}
/**
* Get type of terms and conditions
* @param int The legal id
* @param int The language id
* @return int The current type of terms and conditions
*/
public function get_type_of_terms_and_conditions ($legal_id,$language_id) {
$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
$legal_id=Database::escape_string($legal_id);
$language_id=Database::escape_string($language_id);
$sql='SELECT type FROM '.$legal_conditions_table.' WHERE legal_id="'.$legal_id.'" AND language_id="'.$language_id.'"';
$rs=Database::query($sql,__FILE__,__LINE__);
return Database::result($rs,0,'type');
}
}

24
main/inc/local.inc.php
Unescape View File

@ -10,7 +10,8 @@
Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
Copyright (c) Patrick Cool
Copyright (c) Julio Montoya Armas
Copyright (c) Isaac flores paz
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
@ -159,6 +160,7 @@ The course id is stored in $_cid session variable.
// verified if exists the username and password in session current
if (isset($_SESSION['info_current_user'][1]) && isset($_SESSION['info_current_user'][2])) {
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
require_once (api_get_path(LIBRARY_PATH).'legal.lib.php');
}
// parameters passed via GET
$logout = isset($_GET["logout"]) ? $_GET["logout"] : '';
@ -210,11 +212,23 @@ if (get_setting('allow_terms_conditions')=='true') {
$user_id=$_SESSION['update_term_and_condition'][1]; // user id
// update the terms & conditions
if ((isset($_POST['legal_accept']) && $_POST['legal_accept']=='1') || !isset($_POST['legal_accept'])) {
//verify type of terms and conditions
$info_legal = explode(':',$_POST['legal_info']);
$legal_type=LegalManager::get_type_of_terms_and_conditions($info_legal[0],$info_legal[1]);
//is necessary verify check
if ($legal_type==1) {
if ((isset($_POST['legal_accept']) && $_POST['legal_accept']=='1')) {
$legal_option=true;
} else {
$legal_option=false;
}
}
//no is check option
if ($legal_type==0) {
$legal_option=true;
} else {
$legal_option=false;
}
if (isset($_POST['legal_accept_type']) && $legal_option===true) {

Write Preview
Loading…
Cancel
Save