From 8c395f96deb3d9bc9c24e3c62b3709de12d44f39 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 15 Nov 2010 21:02:59 -0800 Subject: view directory cleanup --- include/acl_selectors.php | 138 ++++++++++++++++++++++++++++++++++++++++++++++ mod/group.php | 2 +- mod/message.php | 2 +- mod/network.php | 2 +- mod/photos.php | 4 +- mod/profile.php | 2 +- mod/settings.php | 2 +- view/about.tpl | 14 ----- view/acl_selectors.php | 138 ---------------------------------------------- view/atom_cmnt.tpl | 21 ------- view/atom_item.tpl | 28 ---------- view/atom_tomb.tpl | 3 - 12 files changed, 145 insertions(+), 211 deletions(-) create mode 100644 include/acl_selectors.php delete mode 100644 view/about.tpl delete mode 100644 view/acl_selectors.php delete mode 100644 view/atom_cmnt.tpl delete mode 100644 view/atom_item.tpl delete mode 100644 view/atom_tomb.tpl diff --git a/include/acl_selectors.php b/include/acl_selectors.php new file mode 100644 index 000000000..9bbd6bcb4 --- /dev/null +++ b/include/acl_selectors.php @@ -0,0 +1,138 @@ +\r\n"; + + $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC", + $_SESSION['uid'] + ); + + if(count($r)) { + foreach($r as $rr) { + if((is_array($preselected)) && in_array($rr['id'], $preselected)) + $selected = " selected=\"selected\" "; + else + $selected = ''; + + $o .= "\r\n"; + } + + } + $o .= "\r\n"; + + + return $o; +} + + + +function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false) { + + $o = ''; + + // When used for private messages, we limit correspondence to mutual friends and the selector + // to one recipient. By default our selector allows multiple selects amongst all contacts. + + $sql_extra = ''; + + if($privmail || $celeb) { + $sql_extra = sprintf(" AND `rel` = %d ", intval(REL_BUD)); + } + + if($privmail) + $o .= "\r\n"; + + $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` + WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 + $sql_extra + ORDER BY `name` ASC ", + intval(local_user()) + ); + + if(count($r)) { + foreach($r as $rr) { + if((is_array($preselected)) && in_array($rr['id'], $preselected)) + $selected = " selected=\"selected\" "; + else + $selected = ''; + if(($privmail) && ($rr['network'] === 'stat')) + $disabled = ' disabled="true" ' ; + else + $disabled = ''; + $o .= "\r\n"; + } + + } + $o .= "\r\n"; + + + return $o; +} + +function fixacl(&$item) { + $item = intval(str_replace(array('<','>'),array('',''),$item)); +} + +function populate_acl($user = null,$celeb = false) { + + $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; + + if(is_array($user)) { + $allow_cid = ((strlen($user['allow_cid'])) + ? explode('><', $user['allow_cid']) : array() ); + $allow_gid = ((strlen($user['allow_gid'])) + ? explode('><', $user['allow_gid']) : array() ); + $deny_cid = ((strlen($user['deny_cid'])) + ? explode('><', $user['deny_cid']) : array() ); + $deny_gid = ((strlen($user['deny_gid'])) + ? explode('><', $user['deny_gid']) : array() ); + array_walk($allow_cid,'fixacl'); + array_walk($allow_gid,'fixacl'); + array_walk($deny_cid,'fixacl'); + array_walk($deny_gid,'fixacl'); + } + + $o = ''; + $o .= '
'; + $o .= '
'; + $o .= '
' . t('Visible To:') . '
'; + $o .= '
'; + $o .= '
'; + $o .= '
'; + $o .= ''; + $o .= group_select('group_allow','group_allow',$allow_gid); + $o .= '
'; + $o .= '
'; + $o .= ''; + $o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb); + $o .= '
'; + $o .= '
' . "\r\n"; + $o .= '
' . "\r\n"; + $o .= '
'; + $o .= '
'; + $o .= '
' . t('Except For:') . '
'; + $o .= '
'; + $o .= '
'; + $o .= '
'; + $o .= ''; + $o .= group_select('group_deny','group_deny', $deny_gid); + $o .= '
'; + $o .= '
'; + $o .= ''; + $o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb); + $o .= '
'; + $o .= '
' . "\r\n"; + $o .= '
' . "\r\n"; + $o .= '
'; + $o .= '
' . "\r\n"; + $o .= '
' . "\r\n"; + return $o; + +} + diff --git a/mod/group.php b/mod/group.php index e5c6b92ae..01875d01f 100644 --- a/mod/group.php +++ b/mod/group.php @@ -113,7 +113,7 @@ function group_content(&$a) { if(($a->argc == 2) && (intval($a->argv[1]))) { - require_once('view/acl_selectors.php'); + require_once('include/acl_selectors.php'); $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($a->argv[1]), intval(local_user()) diff --git a/mod/message.php b/mod/message.php index 9d7a86d55..3f5b71cc2 100644 --- a/mod/message.php +++ b/mod/message.php @@ -1,6 +1,6 @@ $geotag )); - require_once('view/acl_selectors.php'); + require_once('include/acl_selectors.php'); $tpl = load_view_file("view/jot.tpl"); diff --git a/mod/photos.php b/mod/photos.php index addc04d76..f570d5b13 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1,8 +1,8 @@ $geotag )); - require_once('view/acl_selectors.php'); + require_once('include/acl_selectors.php'); $tpl = load_view_file("view/jot.tpl"); if(is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) diff --git a/mod/settings.php b/mod/settings.php index 0687a498f..a40354c86 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -163,7 +163,7 @@ function settings_content(&$a) { return; } - require_once('view/acl_selectors.php'); + require_once('include/acl_selectors.php'); $p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", intval($_SESSION['uid']) diff --git a/view/about.tpl b/view/about.tpl deleted file mode 100644 index fa3d49cb7..000000000 --- a/view/about.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -
-

-Tell us about yourself. -

- - - -
-
- -
-
- diff --git a/view/acl_selectors.php b/view/acl_selectors.php deleted file mode 100644 index 9bbd6bcb4..000000000 --- a/view/acl_selectors.php +++ /dev/null @@ -1,138 +0,0 @@ -\r\n"; - - $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC", - $_SESSION['uid'] - ); - - if(count($r)) { - foreach($r as $rr) { - if((is_array($preselected)) && in_array($rr['id'], $preselected)) - $selected = " selected=\"selected\" "; - else - $selected = ''; - - $o .= "\r\n"; - } - - } - $o .= "\r\n"; - - - return $o; -} - - - -function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false) { - - $o = ''; - - // When used for private messages, we limit correspondence to mutual friends and the selector - // to one recipient. By default our selector allows multiple selects amongst all contacts. - - $sql_extra = ''; - - if($privmail || $celeb) { - $sql_extra = sprintf(" AND `rel` = %d ", intval(REL_BUD)); - } - - if($privmail) - $o .= "\r\n"; - - $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` - WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 - $sql_extra - ORDER BY `name` ASC ", - intval(local_user()) - ); - - if(count($r)) { - foreach($r as $rr) { - if((is_array($preselected)) && in_array($rr['id'], $preselected)) - $selected = " selected=\"selected\" "; - else - $selected = ''; - if(($privmail) && ($rr['network'] === 'stat')) - $disabled = ' disabled="true" ' ; - else - $disabled = ''; - $o .= "\r\n"; - } - - } - $o .= "\r\n"; - - - return $o; -} - -function fixacl(&$item) { - $item = intval(str_replace(array('<','>'),array('',''),$item)); -} - -function populate_acl($user = null,$celeb = false) { - - $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; - - if(is_array($user)) { - $allow_cid = ((strlen($user['allow_cid'])) - ? explode('><', $user['allow_cid']) : array() ); - $allow_gid = ((strlen($user['allow_gid'])) - ? explode('><', $user['allow_gid']) : array() ); - $deny_cid = ((strlen($user['deny_cid'])) - ? explode('><', $user['deny_cid']) : array() ); - $deny_gid = ((strlen($user['deny_gid'])) - ? explode('><', $user['deny_gid']) : array() ); - array_walk($allow_cid,'fixacl'); - array_walk($allow_gid,'fixacl'); - array_walk($deny_cid,'fixacl'); - array_walk($deny_gid,'fixacl'); - } - - $o = ''; - $o .= '
'; - $o .= '
'; - $o .= '
' . t('Visible To:') . '
'; - $o .= '
'; - $o .= '
'; - $o .= '
'; - $o .= ''; - $o .= group_select('group_allow','group_allow',$allow_gid); - $o .= '
'; - $o .= '
'; - $o .= ''; - $o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb); - $o .= '
'; - $o .= '
' . "\r\n"; - $o .= '
' . "\r\n"; - $o .= '
'; - $o .= '
'; - $o .= '
' . t('Except For:') . '
'; - $o .= '
'; - $o .= '
'; - $o .= '
'; - $o .= ''; - $o .= group_select('group_deny','group_deny', $deny_gid); - $o .= '
'; - $o .= '
'; - $o .= ''; - $o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb); - $o .= '
'; - $o .= '
' . "\r\n"; - $o .= '
' . "\r\n"; - $o .= '
'; - $o .= '
' . "\r\n"; - $o .= '
' . "\r\n"; - return $o; - -} - diff --git a/view/atom_cmnt.tpl b/view/atom_cmnt.tpl deleted file mode 100644 index b70a6dc4e..000000000 --- a/view/atom_cmnt.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - $name - $profile_page - - - - - - $item_id - $title - $published - $updated - $content - - $comment_allow - $verb - $actobj - $mentioned - - diff --git a/view/atom_item.tpl b/view/atom_item.tpl deleted file mode 100644 index 0d36b579d..000000000 --- a/view/atom_item.tpl +++ /dev/null @@ -1,28 +0,0 @@ - - - $name - $profile_page - - - - - $owner_name - $owner_profile_page - - - - - $item_id - $title - $published - $updated - $content - - $location - $coord - $comment_allow - $verb - $actobj - $mentioned - - diff --git a/view/atom_tomb.tpl b/view/atom_tomb.tpl deleted file mode 100644 index 99e1b943a..000000000 --- a/view/atom_tomb.tpl +++ /dev/null @@ -1,3 +0,0 @@ - - - -- cgit v1.2.3