GIT.Harvie.CZ
/
mirrors
/
Kyberia-bloodline.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed vector in registrations
[mirrors/Kyberia-bloodline.git]
/
wwwroot
/
inc
/
nodes.inc
diff --git
a/wwwroot/inc/nodes.inc
b/wwwroot/inc/nodes.inc
index efd21bc4f11548ddf1d15b54218e68675f49d8da..008a527a0be424320be4325cb2d390d9d452dedb 100644
(file)
--- a/
wwwroot/inc/nodes.inc
+++ b/
wwwroot/inc/nodes.inc
@@
-13,9
+13,9
@@
}
}
}
}
-class nodes {
-
+require_once(INCLUDE_DIR.'base36.inc');
+class nodes {
function addNode($params) {
global $db,$node,$error,$error_messages;
function addNode($params) {
global $db,$node,$error,$error_messages;
@@
-28,7
+28,7
@@
function addNode($params) {
$parent_permissions=permissions::checkPermissions($parent_id);
if (!$parent_permissions['w']) {
$error=$error_messages['WRITE_PERMISSION_ERROR'];
$parent_permissions=permissions::checkPermissions($parent_id);
if (!$parent_permissions['w']) {
$error=$error_messages['WRITE_PERMISSION_ERROR'];
-
$logger->
log('add','error','WRITE_PERMISSION_ERROR');
+
logger::
log('add','error','WRITE_PERMISSION_ERROR');
return false;
}
return false;
}
@@
-61,10
+61,13
@@
function addNode($params) {
$template_id=$params['template_id'];
if (!is_numeric($template_id)) $template_id=DEFAULT_TEMPLATE_ID;
$template_id=$params['template_id'];
if (!is_numeric($template_id)) $template_id=DEFAULT_TEMPLATE_ID;
+ if(!isset($params['node_system_access'])) $params['node_system_access'] = $node['node_system_access'];
+ if(!isset($params['node_external_access'])) $params['node_external_access'] = $node['node_external_access'];
+
$q="insert into nodes set
node_name='".$params['node_name']."',
$q="insert into nodes set
node_name='".$params['node_name']."',
-node_external_access='".$
node
['node_external_access']."',
-node_system_access='".$
node
['node_system_access']."',
+node_external_access='".$
params
['node_external_access']."',
+node_system_access='".$
params
['node_system_access']."',
node_creator='".$params['node_creator']."',
template_id='".$template_id."',
external_link='".$external_link."',
node_creator='".$params['node_creator']."',
template_id='".$template_id."',
external_link='".$external_link."',
@@
-100,8
+103,7
@@
node_vector='".$params['node_vector']."'";
--$user_k;
$db->query("update users set user_k='$user_k' where user_id='$params[node_creator]'");
$db->query("commit");
--$user_k;
$db->query("update users set user_k='$user_k' where user_id='$params[node_creator]'");
$db->query("commit");
- global $logger;
- $logger->log('add','ok',$id);
+ logger::log('add','ok',$id);
if ($_POST['code']) {
$params['node_creator']=UBIK_ID;
if ($_POST['code']) {
$params['node_creator']=UBIK_ID;
@@
-149,7
+151,7
@@
function processContent($node_content) {
}
$node_content = eregi_Replace("((( )|(\n)|(^))+)(http://|ftp://|https://)([[:alnum:]][^,[:space:]]*)","\\2<a target='_blank' href=\"\\6\\7\">\\6\\7</a>",$node_content);
}
$node_content = eregi_Replace("((( )|(\n)|(^))+)(http://|ftp://|https://)([[:alnum:]][^,[:space:]]*)","\\2<a target='_blank' href=\"\\6\\7\">\\6\\7</a>",$node_content);
- $node_content = mysql_real_escape_string($node_content);
+ //$node_content = mysql_real_escape_string($node_content); once is enough
}
return $node_content;
}
return $node_content;
@@
-195,7
+197,7
@@
where $table_name.node_id='$node_handle'";
return false;
}
else {
return false;
}
else {
- $node=
$result->getRecord(
);
+ $node=
addBase36id($result->getRecord()
);
$node['node_vector']=trim($node['node_vector'],"z");
$ancestors=str_split($node['node_vector'],VECTOR_CHARS);
foreach ($ancestors as $ancestor) {
$node['node_vector']=trim($node['node_vector'],"z");
$ancestors=str_split($node['node_vector'],VECTOR_CHARS);
foreach ($ancestors as $ancestor) {
@@
-234,7
+236,7
@@
where $table_name.node_id='$node_handle'";
$result=$db->query($q);
while ($result->next()){
$result=$db->query($q);
while ($result->next()){
- $record[]=
$result->getRecord(
);
+ $record[]=
addBase36id($result->getRecord()
);
}
return $record;
}
return $record;
@@
-253,7
+255,7
@@
node_parent='$node_handle' order by node_created $orderby LIMIT $offset,$limit";
$result=$db->query($q);
while ($result->next()) {
$result=$db->query($q);
while ($result->next()) {
- $array[]=
$result->getRecord(
);
+ $array[]=
addBase36id($result->getRecord()
);
}
return $array;
}
return $array;
@@
-270,7
+272,7
@@
node_parent='$node_handle' order by node_created $orderby LIMIT $offset,$limit";
$result=$db->query($q);
while ($result->next()) {
$result=$db->query($q);
while ($result->next()) {
- $children_array[]=
$result->getRecord(
);
+ $children_array[]=
addBase36id($result->getRecord()
);
}
return $children_array;
}
return $children_array;
This page took
0.149207 seconds
and
4
git commands to generate.