aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-27 14:46:39 -0800
committerfriendica <info@friendica.com>2014-01-27 14:46:39 -0800
commitd6a9497e4a3839d9fb4dba4634167f006bb3fe87 (patch)
tree724c43f7a1b7deead876ca3499c60982ecc0e2f7
parentd67fdd129921549b6a1e7cb5e5ebea7bdc38bf0e (diff)
downloadvolse-hubzilla-d6a9497e4a3839d9fb4dba4634167f006bb3fe87.tar.gz
volse-hubzilla-d6a9497e4a3839d9fb4dba4634167f006bb3fe87.tar.bz2
volse-hubzilla-d6a9497e4a3839d9fb4dba4634167f006bb3fe87.zip
cleanup include/menu in preparation for the next phase of bookmarking
-rw-r--r--include/menu.php50
-rw-r--r--version.inc2
-rw-r--r--view/php/theme_init.php1
3 files changed, 11 insertions, 42 deletions
diff --git a/include/menu.php b/include/menu.php
index 515f47758..d69c5d0d3 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -23,29 +23,6 @@ function menu_fetch($name,$uid,$observer_xchan) {
return null;
}
-function bookmarks_menu_fetch($uid,$observer_xchan,$flags = MENU_BOOKMARK) {
-
- $sel_option = (($flags) ? ' and menu_flags = ' . intval($menu_flags) . ' ' : '');
-
- $sql_options = permissions_sql($uid);
-
- $r = q("select * from menu where menu_channel_id = %d $sel_option limit 1",
- intval($uid)
- );
- if($r) {
- $x = q("select * from menu_item where mitem_menu_id = %d and mitem_channel_id = %d
- $sql_options
- order by mitem_order asc, mitem_desc asc",
- intval($r[0]['menu_id']),
- intval($uid)
- );
- return array('menu' => $r[0], 'items' => $x );
- }
-
- return null;
-}
-
-
function menu_render($menu) {
if(! $menu)
return '';
@@ -95,7 +72,7 @@ function menu_create($arr) {
$menu_channel_id = intval($arr['menu_channel_id']);
- $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d and menu_flags = %d limit 1",
+ $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
dbesc($menu_name),
intval($menu_channel_id),
intval($menu_flags)
@@ -124,8 +101,11 @@ function menu_create($arr) {
}
-function menu_list($channel_id) {
- $r = q("select * from menu where menu_channel_id = %d order by menu_name",
+function menu_list($channel_id, $flags = 0) {
+
+ $sel_options = (($flags) ? " and ( menu_flags & " . intval($flags) . " ) " : '');
+
+ $r = q("select * from menu where menu_channel_id = %d $sel_options order by menu_name",
intval($channel_id)
);
return $r;
@@ -153,9 +133,8 @@ function menu_edit($arr) {
$menu_channel_id = intval($arr['menu_channel_id']);
- $r = q("select menu_id from menu where menu_name = '%s' and menu_flags = %d and menu_channel_id = %d limit 1",
+ $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
dbesc($menu_name),
- intval($menu_flags),
intval($menu_channel_id)
);
if(($r) && ($r[0]['menu_id'] != $menu_id)) {
@@ -173,22 +152,11 @@ function menu_edit($arr) {
return false;
}
-
- $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d and menu_desc = '%s' and menu_flags = %d limit 1",
- dbesc($menu_name),
- intval($menu_channel_id),
- dbesc($menu_desc),
- intval($menu_flags)
- );
-
- if($r)
- return false;
-
-
- return q("update menu set menu_name = '%s', menu_desc = '%s',
+ return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d,
where menu_id = %d and menu_channel_id = %d limit 1",
dbesc($menu_name),
dbesc($menu_desc),
+ intval($menu_flags),
intval($menu_id),
intval($menu_channel_id)
);
diff --git a/version.inc b/version.inc
index d85ee0ed2..d1638dd7d 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-26.569
+2014-01-27.570
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 0e473f728..b6aa5de0f 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -44,6 +44,7 @@ head_add_js('docready.js');
head_add_js('library/colorbox/jquery.colorbox-min.js');
head_add_js('library/bootstrap-datetimepicker/js/moment.js');
head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
+
/**
* Those who require this feature will know what to do with it.
* Those who don't, won't.