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

fixed ambiguous field inside sql querys with item_property table - partial CT#580

Browse Source
skala
Cristian Fasanando 16 years ago
parent 29831c11c7
commit 7cc0c912f4
4 changed files with 10 additions and 10 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. 6
      main/newscorm/resourcelinker.inc.php
  2. 4
      main/newscorm/resourcelinker.php
  3. 6
      main/resourcelinker/resourcelinker.inc.php
  4. 4
      main/resourcelinker/resourcelinker.php

6
main/newscorm/resourcelinker.inc.php
Unescape View File

@ -103,16 +103,16 @@ function show_documents($folder)
// other tools do not have this feature. This only counts
if (is_allowed_to_edit())
{
$visibility="visibility<>'2'";
$visibility="ip.visibility<>'2'";
}
else
{
$visibility="visibility='1'";
$visibility="ip.visibility='1'";
}
$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
$document_table = Database::get_course_table(TABLE_DOCUMENT);
$sql="SELECT * from $document_table, $item_property_table WHERE id=ref AND tool = '".TOOL_DOCUMENT."' AND $visibility AND to_group_id = 0 AND to_user_id IS NULL ORDER BY path ASC";
$sql="SELECT * from $document_table docs , $item_property_table ip WHERE docs.id=ip.ref AND ip.tool = '".TOOL_DOCUMENT."' AND $visibility AND ip.to_group_id = 0 AND ip.to_user_id IS NULL ORDER BY docs.path ASC";
$result=Database::query($sql,__FILE__,__LINE__);
while ($row=Database::fetch_array($result))
{

4
main/newscorm/resourcelinker.php
Unescape View File

@ -942,7 +942,7 @@ if ($content == "Link")
}
// showing the links that are in the root (having no category)
$sql = "SELECT * FROM ".$link_table.", ".$item_property_table." WHERE (category_id=0 or category_id IS NULL) AND tool = '".TOOL_LINK."' AND id=ref AND visibility='1'";
$sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
$result = Database::query($sql, __FILE__, __LINE__);
if (Database::num_rows($result) > 0)
{
@ -961,7 +961,7 @@ if ($content == "Link")
$resultcategories = Database::query($sqlcategories) or die;
while ($myrow = @ Database::fetch_array($resultcategories))
{
$sql_links = "SELECT * FROM ".$link_table.", ".$item_property_table." WHERE category_id='".$myrow["id"]."' AND tool = '".TOOL_LINK."' AND id=ref AND visibility='1' ORDER BY display_order DESC";
$sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
$result_links = Database::query($sql_links, __FILE__, __LINE__);
while ($myrow = Database::fetch_array($result_links))

6
main/resourcelinker/resourcelinker.inc.php
Unescape View File

@ -99,16 +99,16 @@ function show_documents($folder)
// other tools do not have this feature. This only counts
if (is_allowed_to_edit())
{
$visibility="visibility<>'2'";
$visibility="ip.visibility<>'2'";
}
else
{
$visibility="visibility='1'";
$visibility="ip.visibility='1'";
}
$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
$document_table = Database::get_course_table(TABLE_DOCUMENT);
$sql="SELECT * from $document_table, $item_property_table WHERE id=ref AND tool = '".TOOL_DOCUMENT."' AND $visibility AND to_group_id = 0 AND to_user_id IS NULL ORDER BY path ASC";
$sql="SELECT * from $document_table docs, $item_property_table ip WHERE docs.id=ip.ref AND ip.tool = '".TOOL_DOCUMENT."' AND $visibility AND ip.to_group_id = 0 AND ip.to_user_id IS NULL ORDER BY docs.path ASC";
$result=Database::query($sql,__FILE__,__LINE__);
while ($row=Database::fetch_array($result))
{

4
main/resourcelinker/resourcelinker.php
Unescape View File

@ -844,7 +844,7 @@ if ($content == "Link")
}
// showing the links that are in the root (having no category)
$sql = "SELECT * FROM ".$link_table.", ".$item_property_table." WHERE (category_id=0 or category_id IS NULL) AND tool = '".TOOL_LINK."' AND id=ref AND visibility='1'";
$sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
$result = Database::query($sql, __FILE__, __LINE__);
if (Database::num_rows($result) > 0)
{
@ -863,7 +863,7 @@ if ($content == "Link")
$resultcategories = Database::query($sqlcategories) or die;
while ($myrow = @ Database::fetch_array($resultcategories))
{
$sql_links = "SELECT * FROM ".$link_table.", ".$item_property_table." WHERE category_id='".$myrow["id"]."' AND tool = '".TOOL_LINK."' AND id=ref AND visibility='1' ORDER BY display_order DESC";
$sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
$result_links = Database::query($sql_links, __FILE__, __LINE__);
while ($myrow = Database::fetch_array($result_links))

Write Preview
Loading…
Cancel
Save