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 r22251] logic changes-added "target" in link tool - (partial FS#4412)

Browse Source
skala
Isaac Flores 16 years ago
parent ee2eecea04
commit 6c7fb00f92
2 changed files with 57 additions and 25 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. 49
      main/link/link.php
  2. 33
      main/link/linkfunctions.php

49
main/link/link.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: link.php 22248 2009-07-20 16:10:14Z iflorespaz $
<?php // $Id: link.php 22251 2009-07-20 16:56:54Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -62,8 +62,32 @@ $(document).ready( function() {
$(".actions:eq("+i+")").hide();
}
}
$("#div_target").attr("style","display:none;")//hide
$("#id_check_target").click(function () {
if($(this).attr("checked")==true) {
$("#div_target").attr("style","display:block;")//show
} else {
$("#div_target").attr("style","display:none;")//hide
}
});
$(window).load(function () {
if($("#id_check_target").attr("checked")==true) {
$("#div_target").attr("style","display:block;")//show
} else {
$("#div_target").attr("style","display:none;")//hide
}
});
} );
</script>';
// div_target
// @todo change the $_REQUEST into $_POST or $_GET
// @todo remove this code
$link_submitted = (isset($_POST['submitLink'])?true:false);
@ -265,9 +289,6 @@ if(api_get_setting('search_enabled')=='true') {
echo ' </div>
</div>';
}
echo ' <div class="row">
@ -275,10 +296,22 @@ if(api_get_setting('search_enabled')=='true') {
'.get_lang('OnHomepage').'?
</div>
<div class="formw">
<input class="checkbox" type="checkbox" name="onhomepage" id="onhomepage" value="1"'.$onhomepage.'><label for="onhomepage"> '.get_lang('Yes').'</label>
<input id="id_check_target" class="checkbox" type="checkbox" name="onhomepage" id="onhomepage" value="1"'.$onhomepage.'><label for="onhomepage"> '.get_lang('Yes').'</label>
</div>
</div>';
echo ' <div class="row" id="div_target">
<div class="label">
'.get_lang('AddTargetOfLinkOnHomepage').'
</div>
<div class="formw" >
<select name="target_link" id="target_link">
<option value="_self">_self</option>
<option value="_blank">_blank</option>
<option value="_parent">_parent</option>
<option value="_top">_top</option>
</select>
</div>
</div>';
if(api_get_setting('search_enabled')=='true')
{
@ -401,7 +434,9 @@ if (empty($_GET['action']) || ($_GET['action']!='editlink' && $_GET['action']!='
Action Links
-----------------------------------------------------------
*/
echo '<br/><br/><br/>';
if ((isset($_GET['action'] ) && $_GET['action']=='editcategory' && isset($_GET['id'])) || (isset($_GET['action']) && $_GET['action']=='addcategory')) {
echo '<br/><br/><br/>';
}
echo '<div class="actions">';
if(is_allowed_to_edit()) {
$urlview = Security::remove_XSS($urlview);

33
main/link/linkfunctions.php
Unescape View File

@ -67,13 +67,13 @@ function addlinkcategory($type)
$urllink = Security::remove_XSS($_POST['urllink']);
$description = Security::remove_XSS($_POST['description']);
$selectcategory = Security::remove_XSS($_POST['selectcategory']);
if ($_POST['onhomepage'] == '')
{
if ($_POST['onhomepage'] == '') {
$onhomepage = 0;
}
else
{
$target='_self';//default target
} else {
$onhomepage = Security::remove_XSS($_POST['onhomepage']);
$target = Security::remove_XSS($_POST['target_link']);
}
$urllink = trim($urllink);
@ -110,7 +110,7 @@ function addlinkcategory($type)
$order = $orderMax +1;
$sql = "INSERT INTO ".$tbl_link." (url, title, description, category_id,display_order, on_homepage) VALUES ('$urllink','$title','$description','$selectcategory','$order', '$onhomepage')";
$sql = "INSERT INTO ".$tbl_link." (url, title, description, category_id,display_order,on_homepage,target) VALUES ('$urllink','$title','$description','$selectcategory','$order', '$onhomepage','$target')";
$catlinkstatus = get_lang('LinkAdded');
api_sql_query($sql, __FILE__, __LINE__);
$link_id = Database::insert_id();
@ -354,13 +354,13 @@ function editlinkcategory($type)
// this is used to put the modified info of the link-form into the database
if ($_POST['submitLink'])
{
if ($_POST['onhomepage'] == '')
{
if ($_POST['onhomepage'] == '') {
$onhomepage = 0;
}
else
{
$mytarget='';
} else {
$onhomepage = Security::remove_XSS($_POST['onhomepage']);
$target = Security::remove_XSS($_POST['target_link']);
$mytarget=",target='".$target."'";
}
// finding the old category_id
@ -369,19 +369,16 @@ function editlinkcategory($type)
$row = Database::fetch_array($result);
$category_id = $row['category_id'];
if ($category_id <> $_POST['selectcategory'])
{
if ($category_id <> $_POST['selectcategory']) {
$sql = "SELECT MAX(display_order) FROM ".$tbl_link." WHERE category_id='".$_POST['selectcategory']."'";
$result = api_sql_query($sql);
list ($max_display_order) = Database::fetch_row($result);
$max_display_order ++;
}
else
{
} else {
$max_display_order = $row['display_order'];
}
$sql = "UPDATE ".$tbl_link." set url='".Database::escape_string(Security::remove_XSS($_POST['urllink']))."', title='".Database::escape_string(Security::remove_XSS($_POST['title']))."', description='".Database::escape_string(Security::remove_XSS($_POST['description']))."', category_id='".Database::escape_string(Security::remove_XSS($_POST['selectcategory']))."', display_order='".$max_display_order."', on_homepage='".Database::escape_string(Security::remove_XSS($_POST['onhomepage']))."' WHERE id='".Database::escape_string(Security::remove_XSS($_POST['id']))."'";
$sql = "UPDATE ".$tbl_link." set url='".Database::escape_string(Security::remove_XSS($_POST['urllink']))."', title='".Database::escape_string(Security::remove_XSS($_POST['title']))."', description='".Database::escape_string(Security::remove_XSS($_POST['description']))."', category_id='".Database::escape_string(Security::remove_XSS($_POST['selectcategory']))."', display_order='".$max_display_order."', on_homepage='".Database::escape_string(Security::remove_XSS($onhomepage))." ' $mytarget WHERE id='".Database::escape_string(Security::remove_XSS($_POST['id']))."'";
api_sql_query($sql, __FILE__, __LINE__);
// update search enchine and its values table if enabled
@ -629,7 +626,7 @@ function showcategoryadmintools($categoryid)
global $urlview;
global $aantalcategories;
global $catcounter;
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=editcategory&amp;id='.$categoryid.'&amp;urlview='.$urlview.' title='.get_lang('Modify').' "><img src="../img/edit.gif" border="0" alt="'.get_lang('Modify').' "/></a>';
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=editcategory&amp;id='.$categoryid.'&amp;urlview='.$urlview.'" title='.get_lang('Modify').' "><img src="../img/edit.gif" border="0" alt="'.get_lang('Modify').' "/></a>';
echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=deletecategory&amp;id=", $categoryid, "&amp;urlview=$urlview\" onclick=\"javascript:if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">", "<img src=\"../img/delete.gif\" border=\"0\" alt=\"", get_lang('Delete'), "\"/>", "</a>";
// DISPLAY MOVE UP COMMAND only if it is not the top link

Write Preview
Loading…
Cancel
Save