diff options
| -rw-r--r-- | boot.php | 4 | ||||
| -rw-r--r-- | include/main.js | 2 | ||||
| -rw-r--r-- | include/salmon.php | 2 | ||||
| -rw-r--r-- | mod/community.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 10 | ||||
| -rw-r--r-- | mod/profile.php | 2 | ||||
| -rw-r--r-- | mod/receive.php | 1 | ||||
| -rw-r--r-- | mod/salmon.php | 2 | ||||
| -rw-r--r-- | view/photo_edit.tpl | 21 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 1 | ||||
| -rw-r--r-- | view/theme/loozah/style.css | 1 |
11 files changed, 29 insertions, 19 deletions
@@ -1,6 +1,6 @@ <?php -define ( 'FRIENDIKA_VERSION', '2.2.1047' ); +define ( 'FRIENDIKA_VERSION', '2.2.1048' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1076 ); @@ -135,7 +135,7 @@ define ( 'NAMESPACE_POCO', 'http://portablecontacts.net/spec/1.0' ); define ( 'NAMESPACE_FEED', 'http://schemas.google.com/g/2010#updates-from' ); define ( 'NAMESPACE_OSTATUS', 'http://ostatus.org/schema/1.0' ); define ( 'NAMESPACE_STATUSNET', 'http://status.net/schema/api/1/' ); - +define ( 'NAMESPACE_ATOM1', 'http://www.w3.org/2005/Atom' ); /** * activity stream defines */ diff --git a/include/main.js b/include/main.js index 288fd6f01..d17d923e4 100644 --- a/include/main.js +++ b/include/main.js @@ -150,7 +150,7 @@ in_progress = true; var udargs = ((netargs.length) ? '/' + netargs : ''); - var update_url = 'update_' + src + udargs + '?p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); + var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); $.get(update_url,function(data) { in_progress = false; diff --git a/include/salmon.php b/include/salmon.php index c1af1a852..473432f25 100644 --- a/include/salmon.php +++ b/include/salmon.php @@ -145,7 +145,7 @@ EOT; // Setup RSA stuff to PKCS#1 sign the data - set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec'); + set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec'); require_once('library/phpsec/Crypt/RSA.php'); diff --git a/mod/community.php b/mod/community.php index 73feaabc6..cf43598b5 100644 --- a/mod/community.php +++ b/mod/community.php @@ -27,7 +27,7 @@ function community_content(&$a, $update = 0) { if(! $update) { $o .= '<script> $(document).ready(function() { $(\'#nav-community-link\').addClass(\'nav-selected\'); });</script>'; $o .= '<div id="live-community"></div>' . "\r\n"; - $o .= "<script> var profile_uid = -1; var netargs = ''; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; + $o .= "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; } if(x($a->data,'search')) diff --git a/mod/network.php b/mod/network.php index 28e540283..7bdd3f3f1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -125,10 +125,11 @@ function network_content(&$a, $update = 0) { $o .= '<div id="live-network"></div>' . "\r\n"; $o .= "<script> var profile_uid = " . $_SESSION['uid'] - . "; var netargs = '" . substr($a->cmd,8) - . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') - . ((x($_GET,'search')) ? '?search=' . $_GET['search'] : '') - . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') + . "; var netargs = '" . substr($a->cmd,8) + . '?f=' + . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') + . ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') + . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; } @@ -208,7 +209,6 @@ function network_content(&$a, $update = 0) { $sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' "; - $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 diff --git a/mod/profile.php b/mod/profile.php index e9b144ffd..f4b6bfaf1 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -160,7 +160,7 @@ function profile_content(&$a, $update = 0) { if($tab === 'posts') { $o .= '<div id="live-profile"></div>' . "\r\n"; $o .= "<script> var profile_uid = " . $a->profile['profile_uid'] - . "; var netargs = ''; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; + . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; } } diff --git a/mod/receive.php b/mod/receive.php index 6e36109b3..6fb68e154 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -5,7 +5,6 @@ */ - require_once('include/salmon.php'); require_once('library/simplepie/simplepie.inc'); diff --git a/mod/salmon.php b/mod/salmon.php index 721eae437..56ac071b0 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -130,7 +130,7 @@ function salmon_post(&$a) { // Setup RSA stuff to verify the signature - set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec'); + set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec'); require_once('library/phpsec/Crypt/RSA.php'); diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index ceb1ddca3..839e41ee7 100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl @@ -19,13 +19,15 @@ <div id="photo-edit-tags-end"></div> <div id="photo-edit-perms" class="photo-edit-perms" > - <div id="photo-edit-perms-menu" class="fakelink" onClick="openClose('photo-edit-perms-select');" >$permissions</div> + <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" title="$permissions"/> + <span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions + </a> <div id="photo-edit-perms-menu-end"></div> - - <div id="photo-edit-perms-select" style="display: none;" > - - $aclselect - + + <div style="display: none;"> + <div id="photo-edit-perms-select" > + $aclselect + </div> </div> </div> <div id="photo-edit-perms-end"></div> @@ -35,3 +37,10 @@ <div id="photo-edit-end"></div> </form> + +<script> + $("a#photo-edit-perms-menu").fancybox({ + 'transitionIn' : 'none', + 'transitionOut' : 'none' + }); +</script> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 6a909bc7d..e2b1a57dc 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1491,6 +1491,7 @@ input#dfrn-url { /** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper{ display:block!important; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 96702d320..c58bda5bb 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -1569,6 +1569,7 @@ padding: 5px 10px 0px; /** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper{ display:block!important; |