[geeklog-cvs] geeklog-1.3/public_html links.php,1.36,1.37
dhaun at iowaoutdoors.org
dhaun at iowaoutdoors.org
Tue Dec 14 17:34:37 EST 2004
Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv1128
Modified Files:
links.php
Log Message:
Fixed over-zealous filtering of the link category (broke categories with an apostrophe)
Index: links.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/links.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** links.php 28 Aug 2004 19:17:58 -0000 1.36
--- links.php 14 Dec 2004 22:34:35 -0000 1.37
***************
*** 45,50 ****
$display .= COM_startBlock ($LANG_LOGIN[1], '',
COM_getBlockTemplate ('_msg_block', 'header'));
! $login = new Template($_CONF['path_layout'] . 'submit');
! $login->set_file (array ('login'=>'submitloginrequired.thtml'));
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
--- 45,50 ----
$display .= COM_startBlock ($LANG_LOGIN[1], '',
COM_getBlockTemplate ('_msg_block', 'header'));
! $login = new Template ($_CONF['path_layout'] . 'submit');
! $login->set_file (array ('login' => 'submitloginrequired.thtml'));
$login->set_var ('login_message', $LANG_LOGIN[2]);
$login->set_var ('site_url', $_CONF['site_url']);
***************
*** 52,64 ****
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
$login->parse ('output', 'login');
! $display .= $login->finish ($login->get_var('output'));
$display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
! $category = COM_applyFilter ($HTTP_GET_VARS['category']);
! $page = COM_applyFilter ($HTTP_GET_VARS['page'], true);
! $display .= COM_startBlock($LANG06[1]);
! $linklist = new Template($_CONF['path_layout'] . 'links');
$linklist->set_file (array ('linklist' => 'links.thtml',
'catlinks' => 'categorylinks.thtml',
--- 52,64 ----
$login->set_var ('lang_newuser', $LANG_LOGIN[4]);
$login->parse ('output', 'login');
! $display .= $login->finish ($login->get_var ('output'));
$display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
} else {
! $category = strip_tags (COM_stripslashes ($_GET['category']));
! $page = COM_applyFilter ($_GET['page'], true);
! $display .= COM_startBlock ($LANG06[1]);
! $linklist = new Template ($_CONF['path_layout'] . 'links');
$linklist->set_file (array ('linklist' => 'links.thtml',
'catlinks' => 'categorylinks.thtml',
***************
*** 71,76 ****
if ($_CONF['linkcols'] > 0) {
! $result = DB_query("SELECT DISTINCT category FROM {$_TABLES['links']}" . COM_getPermSQL () . " ORDER BY category");
! $nrows = DB_numRows($result);
if ($nrows > 0) {
$linklist->set_var ('lang_categories', $LANG23[14]);
--- 71,76 ----
if ($_CONF['linkcols'] > 0) {
! $result = DB_query ("SELECT DISTINCT category FROM {$_TABLES['links']}" . COM_getPermSQL () . " ORDER BY category");
! $nrows = DB_numRows ($result);
if ($nrows > 0) {
$linklist->set_var ('lang_categories', $LANG23[14]);
***************
*** 79,83 ****
$cat = addslashes ($C['category']);
$result1 = DB_query ("SELECT COUNT(*) AS count FROM {$_TABLES['links']} WHERE category = '{$cat}'" . COM_getPermSQL ('AND'));
! $D = DB_fetchArray($result1);
if (empty ($C['category'])) {
$linklist->set_var ('category_name', $LANG23[7]);
--- 79,83 ----
$cat = addslashes ($C['category']);
$result1 = DB_query ("SELECT COUNT(*) AS count FROM {$_TABLES['links']} WHERE category = '{$cat}'" . COM_getPermSQL ('AND'));
! $D = DB_fetchArray ($result1);
if (empty ($C['category'])) {
$linklist->set_var ('category_name', $LANG23[7]);
***************
*** 110,120 ****
}
! $linklist->set_var('site_url', $_CONF['site_url']);
! $linklist->set_var('lang_addalink', $LANG06[3]);
$sql = "SELECT lid,category,url,description,title,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['links']}";
if ($_CONF['linkcols'] > 0) {
if (!empty ($category)) {
! $sql .= " WHERE category = '$category'";
} else {
$sql .= " WHERE category = ''";
--- 110,120 ----
}
! $linklist->set_var ('site_url', $_CONF['site_url']);
! $linklist->set_var ('lang_addalink', $LANG06[3]);
$sql = "SELECT lid,category,url,description,title,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['links']}";
if ($_CONF['linkcols'] > 0) {
if (!empty ($category)) {
! $sql .= " WHERE category = '" . addslashes ($category) . "'";
} else {
$sql .= " WHERE category = ''";
***************
*** 124,130 ****
$sql .= COM_getPermSQL ();
}
! $sql .= ' ORDER BY category asc,title';
! $result = DB_query($sql);
! $nrows = DB_numRows($result);
if ($nrows == 0) {
$page = 0;
--- 124,130 ----
$sql .= COM_getPermSQL ();
}
! $sql .= ' ORDER BY category ASC,title';
! $result = DB_query ($sql);
! $nrows = DB_numRows ($result);
if ($nrows == 0) {
$page = 0;
***************
*** 132,147 ****
$result = DB_query ("SELECT lid,url,title,description,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits DESC LIMIT 10");
! $nrows = DB_numRows($result);
if ($nrows > 0) {
! $linklist->set_var('link_details','');
! $linklist->set_var('link_category',$LANG10[18]);
for ($i = 0; $i < $nrows; $i++) {
! $A = DB_fetchArray($result);
! $linklist->set_var('link_url', COM_buildUrl ($_CONF['site_url']
. '/portal.php?what=link&item=' . $A['lid']));
$linklist->set_var ('link_actual_url', $A['url']);
! $linklist->set_var('link_name', stripslashes($A['title']));
! $linklist->set_var('link_hits', $A['hits']);
! $linklist->set_var('link_description',
nl2br (stripslashes ($A['description'])));
if ((SEC_hasAccess ($A['owner_id'], $A['group_id'],
--- 132,147 ----
$result = DB_query ("SELECT lid,url,title,description,hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM {$_TABLES['links']} WHERE (hits > 0)" . COM_getPermSQL ('AND') . " ORDER BY hits DESC LIMIT 10");
! $nrows = DB_numRows ($result);
if ($nrows > 0) {
! $linklist->set_var ('link_details', '');
! $linklist->set_var ('link_category', $LANG10[18]);
for ($i = 0; $i < $nrows; $i++) {
! $A = DB_fetchArray ($result);
! $linklist->set_var ('link_url', COM_buildUrl ($_CONF['site_url']
. '/portal.php?what=link&item=' . $A['lid']));
$linklist->set_var ('link_actual_url', $A['url']);
! $linklist->set_var ('link_name', stripslashes($A['title']));
! $linklist->set_var ('link_hits', $A['hits']);
! $linklist->set_var ('link_description',
nl2br (stripslashes ($A['description'])));
if ((SEC_hasAccess ($A['owner_id'], $A['group_id'],
***************
*** 160,166 ****
$linklist->set_var ('edit_icon', '');
}
! $linklist->parse('link_details', 'link', true);
}
! $linklist->parse('category_links','catlinks',true);
}
} else {
--- 160,166 ----
$linklist->set_var ('edit_icon', '');
}
! $linklist->parse ('link_details', 'link', true);
}
! $linklist->parse ('category_links', 'catlinks', true);
}
} else {
***************
*** 183,204 ****
$currentcategory = '';
for ($i = 1; $i < $end; $i++) {
! $A = DB_fetchArray($result);
if ($i >= $start) {
if ((strcasecmp ($A['category'], $currentcategory) != 0) AND ($i > $start)) {
// print the category and link
! $linklist->parse('category_links','catlinks',true);
! $linklist->set_var('link_details','');
$currentcategory = $A['category'];
! $linklist->set_var('link_category',$currentcategory);
} else if (strcasecmp ($A['category'], $currentcategory) != 0) {
$currentcategory = $A['category'];
! $linklist->set_var('link_category',$currentcategory);
}
! $linklist->set_var('link_url', COM_buildUrl ($_CONF['site_url']
. '/portal.php?what=link&item=' . $A['lid']));
$linklist->set_var ('link_actual_url', $A['url']);
! $linklist->set_var('link_name', stripslashes($A['title']));
! $linklist->set_var('link_hits', $A['hits']);
! $linklist->set_var('link_description',
nl2br (stripslashes ($A['description'])));
if ((SEC_hasAccess ($A['owner_id'], $A['group_id'],
--- 183,204 ----
$currentcategory = '';
for ($i = 1; $i < $end; $i++) {
! $A = DB_fetchArray ($result);
if ($i >= $start) {
if ((strcasecmp ($A['category'], $currentcategory) != 0) AND ($i > $start)) {
// print the category and link
! $linklist->parse ('category_links', 'catlinks', true);
! $linklist->set_var ('link_details','');
$currentcategory = $A['category'];
! $linklist->set_var ('link_category', $currentcategory);
} else if (strcasecmp ($A['category'], $currentcategory) != 0) {
$currentcategory = $A['category'];
! $linklist->set_var ('link_category',$currentcategory);
}
! $linklist->set_var ('link_url', COM_buildUrl ($_CONF['site_url']
. '/portal.php?what=link&item=' . $A['lid']));
$linklist->set_var ('link_actual_url', $A['url']);
! $linklist->set_var ('link_name', stripslashes ($A['title']));
! $linklist->set_var ('link_hits', $A['hits']);
! $linklist->set_var ('link_description',
nl2br (stripslashes ($A['description'])));
if ((SEC_hasAccess ($A['owner_id'], $A['group_id'],
***************
*** 217,224 ****
$linklist->set_var ('edit_icon', '');
}
! $linklist->parse('link_details', 'link', true);
}
}
! $linklist->parse('category_links','catlinks',true);
}
--- 217,224 ----
$linklist->set_var ('edit_icon', '');
}
! $linklist->parse ('link_details', 'link', true);
}
}
! $linklist->parse ('category_links', 'catlinks', true);
}
***************
*** 237,250 ****
$linklist->set_var ('page_navigation',
COM_printPageNavigation ($_CONF['site_url'] . '/links.php' .
! $catlink, $page, $pages));
} else {
$linklist->set_var ('page_navigation', '');
}
! $linklist->parse('output', 'linklist');
! $display .= $linklist->finish($linklist->get_var('output'));
$display .= COM_endBlock ();
}
! $display .= COM_siteFooter();
echo $display;
--- 237,251 ----
$linklist->set_var ('page_navigation',
COM_printPageNavigation ($_CONF['site_url'] . '/links.php' .
! $catlink, $page, $pages));
} else {
$linklist->set_var ('page_navigation', '');
}
! $linklist->parse ('output', 'linklist');
! $display .= $linklist->finish ($linklist->get_var ('output'));
$display .= COM_endBlock ();
}
!
! $display .= COM_siteFooter ();
echo $display;
More information about the geeklog-cvs
mailing list