From 570ab4b6ea94d70dfd264c73317252dc18914a0d Mon Sep 17 00:00:00 2001 From: Harvie Date: Sun, 9 Jan 2011 04:45:27 +0100 Subject: [PATCH] Deleted 40% of nodes.php, 60% waiting to be deleted... --- wwwroot/inc/mail_rss.inc | 130 ++++++++++++++++++++++++++++++++++ wwwroot/nodes.php | 149 ++------------------------------------- 2 files changed, 135 insertions(+), 144 deletions(-) create mode 100644 wwwroot/inc/mail_rss.inc diff --git a/wwwroot/inc/mail_rss.inc b/wwwroot/inc/mail_rss.inc new file mode 100644 index 0000000..7e9ea6d --- /dev/null +++ b/wwwroot/inc/mail_rss.inc @@ -0,0 +1,130 @@ +title = "Kyberia mail"; + $rss->description = ""; + $rss->link = "https://". SYSTEM_URL . "/id/24"; + + //XXX into function + $query = "select date_format(mail.mail_timestamp,\"%e.%c. %k:%i:%s\") as cas, + userfrom.user_action as locationfrom_action, + userfrom.user_action_id as locationfrom_action_id, + userto.user_action as locationto_action, + userto.user_action_id as locationto_action_id, + userto.login as mail_to_name, userfrom.login as mail_from_name, + mail.* from mail left join users as userfrom on + mail_from=userfrom.user_id left join users as userto on mail_to=userto.user_id + where mail_user='$_SESSION[user_id]' and mail_to='$_SESSION[user_id]' order by mail_id desc limit 0,10"; + + $set = $db->query($query); + + while($set->next()) { + $m = $set->getRecord(); + if ($m['mail_to'] != $_SESSION['user_id']) + continue; + $item = new FeedItem(); + $item->title = $m['mail_from_name']; + $item->link = "https://".SYSTEM_URL."/id/24"; + $item->description = $m['mail_text']; + $rss->addItem($item); + } + } + // bookmarks + elseif ($_GET['node_id']=='19' && $permissions['r']) + { + require_once(INCLUDE_DIR.'/feedcreator.class.php'); + + $rss = new UniversalFeedCreator(); + $rss->title = "Kyberia bookmarks"; + $rss->link = "http://".SYSTEM_URL."/id/19"; //XXX https ? + + require_once(SMARTY_PLUGIN_DIR.'/function.get_bookmarks.php'); + smarty_function_get_bookmarks(array(), $smarty); + $_items = $smarty->get_template_vars('get_bookmarks'); + foreach ($_items as $_item) + { + if (is_array($_item['children'])) + foreach ($_item['children'] as $_b) + { + $item = new FeedItem(); + $item->title = $_b['node_name']; + $item->link = "http://".SYSTEM_URL."/id/".$_b['node_id']."/rss"; + $rss->addItem($item); + } + } + $_feedType = 'OPML'; + } + elseif ($permissions['r']) + { + require_once(INCLUDE_DIR.'/feedcreator.class.php'); + + $rss = new UniversalFeedCreator(); + $rss->title = $node['node_name']; + $rss->description = ""; + $rss->link = "http://".SYSTEM_URL."/id/".$node['node_id']; + + // K list + if ($_GET['node_id']=='15') + { + require_once(SMARTY_PLUGIN_DIR.'/function.get_k.php'); + smarty_function_get_k(array(), $smarty); + $_items = $smarty->get_template_vars('get_k'); + } + else + { + require_once(SMARTY_PLUGIN_DIR.'/function.get_children.php'); + smarty_function_get_children( + array('orderby' => 'desc', 'orderby_type' => 'time'), $smarty); + $_items = $smarty->get_template_vars('get_children'); + } + + foreach ($_items as $_item) + { + $item = new FeedItem(); + $item->title = $_item['node_name']; + $item->link = "http://".SYSTEM_URL."/id/".$_item['node_id']; + $item->description = $_item['node_content']; + $rss->addItem($item); + } + } + + if ($permissions['r']) $rss->showFeed($_feedType); + exit(); +} + +*/ diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php index f4924cc..7536898 100644 --- a/wwwroot/nodes.php +++ b/wwwroot/nodes.php @@ -80,14 +80,13 @@ if( if(isset($_GET['node_kid'])) $_GET['node_id'] = base_convert($_GET['node_kid'], 36, 10); if(isset($_GET['template_kid'])) $_GET['template_id'] = base_convert($_GET['template_kid'], 36, 10); -require_once(INCLUDE_DIR.'senate.inc'); - if (isset($_SERVER['HTTP_REFERER'])) { preg_match('/(k|id)\/([0-9]*)\//',$_SERVER['HTTP_REFERER'],$ref_match); $referer_id=$ref_match[1]; } //connecting to database and creating universal $db object +require_once(INCLUDE_DIR.'senate.inc'); require_once(INCLUDE_DIR.'log.inc'); require_once(INCLUDE_DIR.'ubik.inc'); require_once(INCLUDE_DIR.'nodes.inc'); @@ -173,166 +172,28 @@ if (empty($node)) { //} //smarty->assign('types',$types); - - //$node['node_type']=$types[$node['node_type']]; -/* This should NOT BE HANDLED HERE! This breaks things... -$node['node_content']= StripSlashes($node['node_content']); -$node['node_name']= StripSlashes($node['node_name']); -*/ + +@include_once(INCLUDE_DIR.'mail_rss.inc'); //haluz... //checking permissions function _checkPermissions() { global $permissions, $node; - require(INCLUDE_DIR.'permissions.inc'); $permissions=permissions::checkPermissions($node); $permissions['h']=permissions::isHierarch($node); } - -// mail rss -if ($template_id=='rss') //XXX WHAT? -{ - $_feedType = "RSS0.91"; - if (!is_numeric($_SESSION['user_id'])) - { - if (!isset($_SERVER['PHP_AUTH_USER'])) { - header('WWW-Authenticate: Basic realm="Kyberia"'); - header('HTTP/1.0 401 Unauthorized'); - echo 'Cancel button'; - exit; - } - else - { - require_once(EVENT_DIR.'/login.inc'); - $_POST['login'] = $_SERVER['PHP_AUTH_USER']; - $_POST['password'] = $_SERVER['PHP_AUTH_PW']; - $_POST['login_type'] = "name"; - if (!login()) - { - echo "Zle meno/heslo."; - exit(); - } - } - } - - _checkPermissions(); - - // Mail - if ($_GET['node_id']==='24' && $permissions['r']) - { - require_once(INCLUDE_DIR.'/feedcreator.class.php'); - - $rss = new UniversalFeedCreator(); - $rss->title = "Kyberia mail"; - $rss->description = ""; - $rss->link = "https://". SYSTEM_URL . "/id/24"; - - //XXX into function - $query = "select date_format(mail.mail_timestamp,\"%e.%c. %k:%i:%s\") as cas, - userfrom.user_action as locationfrom_action, - userfrom.user_action_id as locationfrom_action_id, - userto.user_action as locationto_action, - userto.user_action_id as locationto_action_id, - userto.login as mail_to_name, userfrom.login as mail_from_name, - mail.* from mail left join users as userfrom on - mail_from=userfrom.user_id left join users as userto on mail_to=userto.user_id - where mail_user='$_SESSION[user_id]' and mail_to='$_SESSION[user_id]' order by mail_id desc limit 0,10"; - - $set = $db->query($query); - - while($set->next()) { - $m = $set->getRecord(); - if ($m['mail_to'] != $_SESSION['user_id']) - continue; - $item = new FeedItem(); - $item->title = $m['mail_from_name']; - $item->link = "https://".SYSTEM_URL."/id/24"; - $item->description = $m['mail_text']; - $rss->addItem($item); - } - } - // bookmarks - elseif ($_GET['node_id']=='19' && $permissions['r']) - { - require_once(INCLUDE_DIR.'/feedcreator.class.php'); - - $rss = new UniversalFeedCreator(); - $rss->title = "Kyberia bookmarks"; - $rss->link = "http://".SYSTEM_URL."/id/19"; //XXX https ? - - require_once(SMARTY_PLUGIN_DIR.'/function.get_bookmarks.php'); - smarty_function_get_bookmarks(array(), $smarty); - $_items = $smarty->get_template_vars('get_bookmarks'); - foreach ($_items as $_item) - { - if (is_array($_item['children'])) - foreach ($_item['children'] as $_b) - { - $item = new FeedItem(); - $item->title = $_b['node_name']; - $item->link = "http://".SYSTEM_URL."/id/".$_b['node_id']."/rss"; - $rss->addItem($item); - } - } - $_feedType = 'OPML'; - } - elseif ($permissions['r']) - { - require_once(INCLUDE_DIR.'/feedcreator.class.php'); - - $rss = new UniversalFeedCreator(); - $rss->title = $node['node_name']; - $rss->description = ""; - $rss->link = "http://".SYSTEM_URL."/id/".$node['node_id']; - - // K list - if ($_GET['node_id']=='15') - { - require_once(SMARTY_PLUGIN_DIR.'/function.get_k.php'); - smarty_function_get_k(array(), $smarty); - $_items = $smarty->get_template_vars('get_k'); - } - else - { - require_once(SMARTY_PLUGIN_DIR.'/function.get_children.php'); - smarty_function_get_children( - array('orderby' => 'desc', 'orderby_type' => 'time'), $smarty); - $_items = $smarty->get_template_vars('get_children'); - } - - foreach ($_items as $_item) - { - $item = new FeedItem(); - $item->title = $_item['node_name']; - $item->link = "http://".SYSTEM_URL."/id/".$_item['node_id']; - $item->description = $_item['node_content']; - $rss->addItem($item); - } - } - - if ($permissions['r']) $rss->showFeed($_feedType); - exit(); -} - - _checkPermissions(); -//entering the node - +//entering the node (executing the eventz) if (($permissions['r']) || ($event != 'register')) { - //performing node_events (based on update/insert/delete db queries) if ($event) { require(INCLUDE_DIR.'eventz.inc'); } - - //end of performing node events } - -// output buffering forcing (mx) -if (!empty($_POST['FORCE_OB']) && $_POST['FORCE_OB'] == 'true') ob_end_flush(); +if (isset($_POST['FORCE_OB'])) ob_end_flush(); //output buffering forcing (mx) ?> -- 2.30.2