From f1115a103158fc22fd8983cb767f811f64810bc2 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 25 Jul 2011 00:17:46 -0700 Subject: revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d36512295..e8dccd5f3 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ Date: Mon, 25 Jul 2011 15:43:28 -0700 Subject: provide ability to use different port --- boot.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index e8dccd5f3..a72fbf673 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ hostname = $_SERVER['SERVER_NAME']; - + if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) + $this->hostname .= ':' . $_SERVER['SERVER_PORT']; /** * Figure out if we are running at the top of a domain * or in a sub-directory and adjust accordingly -- cgit v1.2.3 From 1441fce04eb0a95756661e54cbc22dff2e275c21 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 25 Jul 2011 20:21:16 -0700 Subject: ignore any fully numeric hash tag --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index a72fbf673..ae6c1bd09 100644 --- a/boot.php +++ b/boot.php @@ -2075,7 +2075,7 @@ function get_tags($s) { continue; } // ignore strictly numeric tags like #1 - if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1))) + if((strpos($mtch,'#') === 0) && ctype_digit($mtch)) continue; if(substr($mtch,-1,1) === '.') $ret[] = substr($mtch,0,-1); -- cgit v1.2.3 From 94e027af672cb641c70093e62f54356da0c05ccb Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 26 Jul 2011 19:20:29 -0700 Subject: deal with browser pre-fetch of the ACL img template '{0}' --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index ae6c1bd09..4c8c1c4d2 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ Date: Wed, 27 Jul 2011 21:48:02 -0700 Subject: installer text changes --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 4c8c1c4d2..7e46d92eb 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ Date: Thu, 28 Jul 2011 16:49:43 -0700 Subject: revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 7e46d92eb..f7a0b50bc 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ Date: Thu, 28 Jul 2011 21:05:56 -0700 Subject: one more try - do not link numeric hash tags --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index f7a0b50bc..956cb2ca6 100644 --- a/boot.php +++ b/boot.php @@ -2075,7 +2075,7 @@ function get_tags($s) { continue; } // ignore strictly numeric tags like #1 - if((strpos($mtch,'#') === 0) && ctype_digit($mtch)) + if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1))) continue; if(substr($mtch,-1,1) === '.') $ret[] = substr($mtch,0,-1); -- cgit v1.2.3 From ef47a1cf973a66bb22c1d72dc2a3130db9324e1f Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 29 Jul 2011 16:05:16 -0700 Subject: revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 956cb2ca6..68cda3bf2 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ Date: Sat, 30 Jul 2011 00:31:00 -0700 Subject: basic diaspora decryption --- boot.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 68cda3bf2..5d4f54769 100644 --- a/boot.php +++ b/boot.php @@ -2969,4 +2969,19 @@ function generate_guid() { $found = false; } while ($found == true ); return $guid; -} \ No newline at end of file +} + + +function pkcs5_pad ($text, $blocksize) +{ + $pad = $blocksize - (strlen($text) % $blocksize); + return $text . str_repeat(chr($pad), $pad); +} + +function pkcs5_unpad($text) +{ + $pad = ord($text{strlen($text)-1}); + if ($pad > strlen($text)) return false; + if (strspn($text, chr($pad), strlen($text) - $pad) != $pad) return false; + return substr($text, 0, -1 * $pad); +} -- cgit v1.2.3 From 149d52da8b49893426a584b14b2a48f81d32113b Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 30 Jul 2011 20:48:55 -0700 Subject: show correct self profile in api --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 5d4f54769..cdde7652c 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ Date: Sun, 31 Jul 2011 16:35:53 -0700 Subject: some api enhancements --- boot.php | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index cdde7652c..025f7ef87 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ contacts,'empty')) + return; + + $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ", + intval($uid) + ); + if(count($r)) { + foreach($r as $rr){ + $url = normalise_link($rr['url']); + $ret[$url] = $rr; + } + } + else + $ret['empty'] = true; + $a->contacts = $ret; + return; +}} -- cgit v1.2.3 From 326a873082cd9f31f70bfb703ad2c3e7fde19bb8 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 1 Aug 2011 05:13:59 -0700 Subject: merge diaspora/friendika vcard formats - not yet complete --- boot.php | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 025f7ef87..4d4b38512 100644 --- a/boot.php +++ b/boot.php @@ -2396,6 +2396,8 @@ function profile_load(&$a, $nickname, $profile = 0) { if(! function_exists('profile_sidebar')) { function profile_sidebar($profile) { + $a = get_app(); + $o = ''; $location = ''; $address = false; @@ -2454,6 +2456,41 @@ function profile_sidebar($profile) { $location = $gender = $marital = $homepage = ''; } + $podloc = $a->get_baseurl(); + $searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ); + $nickname = $profile['nick']; + $dphoto = $profile['photo']; + + $diaspora_vcard = <<< EOT + +
+
+
Nickname
+
+$nickname +
+
+
+
URL
+
+$podloc +
+
+
+
Photo
+
+ +
+
+
+
Searchable
+
+$searchable +
+
+
+EOT; + $tpl = get_markup_template('profile_vcard.tpl'); $o .= replace_macros($tpl, array( @@ -2466,7 +2503,8 @@ function profile_sidebar($profile) { '$gender' => $gender, '$pubkey' => $pubkey, '$marital' => $marital, - '$homepage' => $homepage + '$homepage' => $homepage, + '$diaspora' => $diaspora_vcard )); -- cgit v1.2.3 From e76990ae7bffdcc5f1c54146f54fc11729c537b7 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 1 Aug 2011 16:15:37 -0700 Subject: bug #111 - don't parse an @ address as a feed --- boot.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 4d4b38512..113f5d72c 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ Date: Mon, 1 Aug 2011 16:51:01 -0700 Subject: breaking up boot file (part of zot refactor) --- boot.php | 2156 +++----------------------------------------------------------- 1 file changed, 102 insertions(+), 2054 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 113f5d72c..35cb15239 100644 --- a/boot.php +++ b/boot.php @@ -1,5 +1,12 @@ replace) -// returns substituted string. -// WARNING: this is pretty basic, and doesn't properly handle search strings that are substrings of each other. -// For instance if 'test' => "foo" and 'testing' => "bar", testing could become either bar or fooing, -// depending on the order in which they were declared in the array. - -require_once("include/template_processor.php"); - -if(! function_exists('replace_macros')) { -function replace_macros($s,$r) { - global $t; - - return $t->replace($s,$r); - -}} - - -// curl wrapper. If binary flag is true, return binary -// results. - -if(! function_exists('fetch_url')) { -function fetch_url($url,$binary = false, &$redirects = 0) { - - $a = get_app(); - - $ch = curl_init($url); - if(($redirects > 8) || (! $ch)) - return false; - - curl_setopt($ch, CURLOPT_HEADER, true); - curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); - curl_setopt($ch, CURLOPT_USERAGENT, "Friendika"); - - $curl_time = intval(get_config('system','curl_timeout')); - curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); - - // by default we will allow self-signed certs - // but you can override this - - $check_cert = get_config('system','verifyssl'); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); - - $prx = get_config('system','proxy'); - if(strlen($prx)) { - curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); - curl_setopt($ch, CURLOPT_PROXY, $prx); - $prxusr = get_config('system','proxyuser'); - if(strlen($prxusr)) - curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr); - } - if($binary) - curl_setopt($ch, CURLOPT_BINARYTRANSFER,1); - - $a->set_curl_code(0); - - // don't let curl abort the entire application - // if it throws any errors. - - $s = @curl_exec($ch); - - $base = $s; - $curl_info = curl_getinfo($ch); - $http_code = $curl_info['http_code']; - - $header = ''; - - // Pull out multiple headers, e.g. proxy and continuation headers - // allow for HTTP/2.x without fixing code - - while(preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) { - $chunk = substr($base,0,strpos($base,"\r\n\r\n")+4); - $header .= $chunk; - $base = substr($base,strlen($chunk)); - } - - if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) { - $matches = array(); - preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); - $url = trim(array_pop($matches)); - $url_parsed = @parse_url($url); - if (isset($url_parsed)) { - $redirects++; - return fetch_url($url,$binary,$redirects); - } - } - - $a->set_curl_code($http_code); - - $body = substr($s,strlen($header)); - - $a->set_curl_headers($header); - - curl_close($ch); - return($body); -}} - -// post request to $url. $params is an array of post variables. - -if(! function_exists('post_url')) { -function post_url($url,$params, $headers = null, &$redirects = 0) { - $a = get_app(); - $ch = curl_init($url); - if(($redirects > 8) || (! $ch)) - return false; - - curl_setopt($ch, CURLOPT_HEADER, true); - curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); - curl_setopt($ch, CURLOPT_POST,1); - curl_setopt($ch, CURLOPT_POSTFIELDS,$params); - curl_setopt($ch, CURLOPT_USERAGENT, "Friendika"); - - $curl_time = intval(get_config('system','curl_timeout')); - curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); - - if(defined('LIGHTTPD')) { - if(!is_array($headers)) { - $headers = array('Expect:'); - } else { - if(!in_array('Expect:', $headers)) { - array_push($headers, 'Expect:'); - } - } - } - if($headers) - curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); - - $check_cert = get_config('system','verifyssl'); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); - $prx = get_config('system','proxy'); - if(strlen($prx)) { - curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); - curl_setopt($ch, CURLOPT_PROXY, $prx); - $prxusr = get_config('system','proxyuser'); - if(strlen($prxusr)) - curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr); - } - - $a->set_curl_code(0); - - // don't let curl abort the entire application - // if it throws any errors. - - $s = @curl_exec($ch); - - $base = $s; - $curl_info = curl_getinfo($ch); - $http_code = $curl_info['http_code']; - - $header = ''; - - // Pull out multiple headers, e.g. proxy and continuation headers - // allow for HTTP/2.x without fixing code - - while(preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/',$base)) { - $chunk = substr($base,0,strpos($base,"\r\n\r\n")+4); - $header .= $chunk; - $base = substr($base,strlen($chunk)); - } - - if($http_code == 301 || $http_code == 302 || $http_code == 303) { - $matches = array(); - preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); - $url = trim(array_pop($matches)); - $url_parsed = @parse_url($url); - if (isset($url_parsed)) { - $redirects++; - return post_url($url,$binary,$headers,$redirects); - } - } - $a->set_curl_code($http_code); - $body = substr($s,strlen($header)); - - $a->set_curl_headers($header); - - curl_close($ch); - return($body); -}} - -// random hash, 64 chars - -if(! function_exists('random_string')) { -function random_string() { - return(hash('sha256',uniqid(rand(),true))); -}} - -/** - * This is our primary input filter. - * - * The high bit hack only involved some old IE browser, forget which (IE5/Mac?) - * that had an XSS attack vector due to stripping the high-bit on an 8-bit character - * after cleansing, and angle chars with the high bit set could get through as markup. - * - * This is now disabled because it was interfering with some legitimate unicode sequences - * and hopefully there aren't a lot of those browsers left. - * - * Use this on any text input where angle chars are not valid or permitted - * They will be replaced with safer brackets. This may be filtered further - * if these are not allowed either. - * - */ - -if(! function_exists('notags')) { -function notags($string) { - - return(str_replace(array("<",">"), array('[',']'), $string)); - -// High-bit filter no longer used -// return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string)); -}} - -// use this on "body" or "content" input where angle chars shouldn't be removed, -// and allow them to be safely displayed. - -if(! function_exists('escape_tags')) { -function escape_tags($string) { - return(htmlspecialchars($string)); -}} // wrapper for adding a login box. If $register == true provide a registration // link. This will most always depend on the value of $a->config['register_policy']. @@ -931,77 +634,6 @@ function login($register = false) { return $o; }} -// generate a string that's random, but usually pronounceable. -// used to generate initial passwords - -if(! function_exists('autoname')) { -function autoname($len) { - - $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); - if(mt_rand(0,5) == 4) - $vowels[] = 'y'; - - $cons = array( - 'b','bl','br', - 'c','ch','cl','cr', - 'd','dr', - 'f','fl','fr', - 'g','gh','gl','gr', - 'h', - 'j', - 'k','kh','kl','kr', - 'l', - 'm', - 'n', - 'p','ph','pl','pr', - 'qu', - 'r','rh', - 's','sc','sh','sm','sp','st', - 't','th','tr', - 'v', - 'w','wh', - 'x', - 'z','zh' - ); - - $midcons = array('ck','ct','gn','ld','lf','lm','lt','mb','mm', 'mn','mp', - 'nd','ng','nk','nt','rn','rp','rt'); - - $noend = array('bl', 'br', 'cl','cr','dr','fl','fr','gl','gr', - 'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'); - - $start = mt_rand(0,2); - if($start == 0) - $table = $vowels; - else - $table = $cons; - - $word = ''; - - for ($x = 0; $x < $len; $x ++) { - $r = mt_rand(0,count($table) - 1); - $word .= $table[$r]; - - if($table == $vowels) - $table = array_merge($cons,$midcons); - else - $table = $vowels; - - } - - $word = substr($word,0,$len); - - foreach($noend as $noe) { - if((strlen($word) > 2) && (substr($word,-2) == $noe)) { - $word = substr($word,0,-1); - break; - } - } - if(substr($word,-1) == 'q') - $word = substr($word,0,-1); - return $word; -}} - // Used to end the current process, after saving session state. if(! function_exists('killme')) { @@ -1018,23 +650,6 @@ function goaway($s) { killme(); }} -// Generic XML return -// Outputs a basic dfrn XML status structure to STDOUT, with a variable -// of $st and an optional text of $message and terminates the current process. - -if(! function_exists('xml_status')) { -function xml_status($st, $message = '') { - - $xml_message = ((strlen($message)) ? "\t" . xmlify($message) . "\r\n" : ''); - - if($st) - logger('xml_status returning non_zero: ' . $st . " message=" . $message); - - header( "Content-type: text/xml" ); - echo ''."\r\n"; - echo "\r\n\t$st\r\n$xml_message\r\n"; - killme(); -}} // Returns the uid of locally logged in user or false. @@ -1080,1358 +695,131 @@ function get_max_import_size() { }} -// escape text ($str) for XML transport -// returns escaped text. - -if(! function_exists('xmlify')) { -function xmlify($str) { - $buffer = ''; - - for($x = 0; $x < strlen($str); $x ++) { - $char = $str[$x]; - - switch( $char ) { - - case "\r" : - break; - case "&" : - $buffer .= '&'; - break; - case "'" : - $buffer .= '''; - break; - case "\"" : - $buffer .= '"'; - break; - case '<' : - $buffer .= '<'; - break; - case '>' : - $buffer .= '>'; - break; - case "\n" : - $buffer .= "\n"; - break; - default : - $buffer .= $char; - break; - } - } - $buffer = trim($buffer); - return($buffer); -}} -// undo an xmlify -// pass xml escaped text ($s), returns unescaped text +/** + * + * Function : profile_load + * @parameter App $a + * @parameter string $nickname + * @parameter int $profile + * + * Summary: Loads a profile into the page sidebar. + * The function requires a writeable copy of the main App structure, and the nickname + * of a registered local account. + * + * If the viewer is an authenticated remote viewer, the profile displayed is the + * one that has been configured for his/her viewing in the Contact manager. + * Passing a non-zero profile ID can also allow a preview of a selected profile + * by the owner. + * + * Profile information is placed in the App structure for later retrieval. + * Honours the owner's chosen theme for display. + * + */ -if(! function_exists('unxmlify')) { -function unxmlify($s) { - $ret = str_replace('&','&', $s); - $ret = str_replace(array('<','>','"','''),array('<','>','"',"'"),$ret); - return $ret; -}} +if(! function_exists('profile_load')) { +function profile_load(&$a, $nickname, $profile = 0) { + if(remote_user()) { + $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1", + intval($_SESSION['visitor_id'])); + if(count($r)) + $profile = $r[0]['profile-id']; + } -// convenience wrapper, reverse the operation "bin2hex" + $r = null; -if(! function_exists('hex2bin')) { -function hex2bin($s) { - if(! ctype_xdigit($s)) { - logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true)); - return($s); + if($profile) { + $profile_int = intval($profile); + $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` + LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` + WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d LIMIT 1", + dbesc($nickname), + intval($profile_int) + ); + } + if(! count($r)) { + $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` + LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` + WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1", + dbesc($nickname) + ); } - return(pack("H*",$s)); -}} - -// Automatic pagination. -// To use, get the count of total items. -// Then call $a->set_pager_total($number_items); -// Optionally call $a->set_pager_itemspage($n) to the number of items to display on each page -// Then call paginate($a) after the end of the display loop to insert the pager block on the page -// (assuming there are enough items to paginate). -// When using with SQL, the setting LIMIT %d, %d => $a->pager['start'],$a->pager['itemspage'] -// will limit the results to the correct items for the current page. -// The actual page handling is then accomplished at the application layer. - -if(! function_exists('paginate')) { -function paginate(&$a) { - $o = ''; - $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); - $stripped = str_replace('q=','',$stripped); - $stripped = trim($stripped,'/'); - $pagenum = $a->pager['page']; - $url = $a->get_baseurl() . '/' . $stripped; - - - if($a->pager['total'] > $a->pager['itemspage']) { - $o .= '
'; - if($a->pager['page'] != 1) - $o .= ''."pager['page'] - 1).'">' . t('prev') . ' '; - - $o .= "" . t('first') . " "; + if(($r === false) || (! count($r))) { + notice( t('No profile') . EOL ); + $a->error = 404; + return; + } - $numpages = $a->pager['total'] / $a->pager['itemspage']; + $a->profile = $r[0]; - $numstart = 1; - $numstop = $numpages; - if($numpages > 14) { - $numstart = (($pagenum > 7) ? ($pagenum - 7) : 1); - $numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14)); - } - - for($i = $numstart; $i <= $numstop; $i++){ - if($i == $a->pager['page']) - $o .= ''.(($i < 10) ? ' '.$i : $i); - else - $o .= "".(($i < 10) ? ' '.$i : $i).""; - $o .= ' '; - } + $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename']; + $_SESSION['theme'] = $a->profile['theme']; - if(($a->pager['total'] % $a->pager['itemspage']) != 0) { - if($i == $a->pager['page']) - $o .= ''.(($i < 10) ? ' '.$i : $i); - else - $o .= "".(($i < 10) ? ' '.$i : $i).""; - $o .= ' '; - } + if(! (x($a->page,'aside'))) + $a->page['aside'] = ''; - $lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages); - $o .= "" . t('last') . " "; + $a->page['aside'] .= profile_sidebar($a->profile); + $a->page['aside'] .= contact_block(); - if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0) - $o .= ''."pager['page'] + 1).'">' . t('next') . ''; - $o .= '
'."\r\n"; - } - return $o; + return; }} -// Turn user/group ACLs stored as angle bracketed text into arrays -if(! function_exists('expand_acl')) { -function expand_acl($s) { - // turn string array of angle-bracketed elements into numeric array - // e.g. "<1><2><3>" => array(1,2,3); - $ret = array(); +/** + * + * Function: profile_sidebar + * + * Formats a profile for display in the sidebar. + * It is very difficult to templatise the HTML completely + * because of all the conditional logic. + * + * @parameter: array $profile + * + * Returns HTML string stuitable for sidebar inclusion + * Exceptions: Returns empty string if passed $profile is wrong type or not populated + * + */ - if(strlen($s)) { - $t = str_replace('<','',$s); - $a = explode('>',$t); - foreach($a as $aa) { - if(intval($aa)) - $ret[] = intval($aa); - } - } - return $ret; -}} -// Used to wrap ACL elements in angle brackets for storage +if(! function_exists('profile_sidebar')) { +function profile_sidebar($profile) { -if(! function_exists('sanitise_acl')) { -function sanitise_acl(&$item) { - if(intval($item)) - $item = '<' . intval(notags(trim($item))) . '>'; - else - unset($item); -}} + $a = get_app(); -// retrieve a "family" of config variables from database to cached storage + $o = ''; + $location = ''; + $address = false; -if(! function_exists('load_config')) { -function load_config($family) { - global $a; - $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", - dbesc($family) - ); - if(count($r)) { - foreach($r as $rr) { - $k = $rr['k']; - if ($rr['cat'] === 'config') { - $a->config[$k] = $rr['v']; - } else { - $a->config[$family][$k] = $rr['v']; - } - } - } -}} + if((! is_array($profile)) && (! count($profile))) + return $o; -// get a particular config variable given the family name -// and key. Returns false if not set. -// $instore is only used by the set_config function -// to determine if the key already exists in the DB -// If a key is found in the DB but doesn't exist in -// local config cache, pull it into the cache so we don't have -// to hit the DB again for this item. + call_hooks('profile_sidebar_enter', $profile); -if(! function_exists('get_config')) { -function get_config($family, $key, $instore = false) { + $fullname = '
' . $profile['name'] . '
'; - global $a; + $pdesc = '
' . $profile['pdesc'] . '
'; - if(! $instore) { - if(isset($a->config[$family][$key])) { - if($a->config[$family][$key] === '!!') { - return false; - } - return $a->config[$family][$key]; - } - } - $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($family), - dbesc($key) - ); - if(count($ret)) { - // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$family][$key] = $val; - return $val; - } - else { - $a->config[$family][$key] = '!!'; - } - return false; -}} + $tabs = ''; -// Store a config value ($value) in the category ($family) -// under the key ($key) -// Return the value, or false if the database update failed + $photo = '
' . $profile['name'] . '
'; -if(! function_exists('set_config')) { -function set_config($family,$key,$value) { - global $a; - - // manage array value - $dbvalue = (is_array($value)?serialize($value):$value); - - if(get_config($family,$key,true) === false) { - $a->config[$family][$key] = $value; - $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", - dbesc($family), - dbesc($key), - dbesc($dbvalue) - ); - if($ret) - return $value; - return $ret; - } + // don't show connect link to yourself - $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($dbvalue), - dbesc($family), - dbesc($key) - ); + $connect = (($profile['uid'] != local_user()) ? '
  • ' . t('Connect') . '
  • ' : ''); - $a->config[$family][$key] = $value; + // don't show connect link to authenticated visitors either - if($ret) - return $value; - return $ret; -}} + if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid'])) + $connect = ''; - -if(! function_exists('load_pconfig')) { -function load_pconfig($uid,$family) { - global $a; - $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", - dbesc($family), - intval($uid) - ); - if(count($r)) { - foreach($r as $rr) { - $k = $rr['k']; - $a->config[$uid][$family][$k] = $rr['v']; - } - } -}} - - - -if(! function_exists('get_pconfig')) { -function get_pconfig($uid,$family, $key, $instore = false) { - - global $a; - - if(! $instore) { - if(isset($a->config[$uid][$family][$key])) { - if($a->config[$uid][$family][$key] === '!!') { - return false; - } - return $a->config[$uid][$family][$key]; - } - } - - $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) - ); - - if(count($ret)) { - $a->config[$uid][$family][$key] = $ret[0]['v']; - return $ret[0]['v']; - } - else { - $a->config[$uid][$family][$key] = '!!'; - } - return false; -}} - -if(! function_exists('del_config')) { -function del_config($family,$key) { - - global $a; - if(x($a->config[$family],$key)) - unset($a->config[$family][$key]); - $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($cat), - dbesc($key) - ); - return $ret; -}} - - - -// Same as above functions except these are for personal config storage and take an -// additional $uid argument. - -if(! function_exists('set_pconfig')) { -function set_pconfig($uid,$family,$key,$value) { - - global $a; - - if(get_pconfig($uid,$family,$key,true) === false) { - $a->config[$uid][$family][$key] = $value; - $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", - intval($uid), - dbesc($family), - dbesc($key), - dbesc($value) - ); - if($ret) - return $value; - return $ret; - } - $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($value), - intval($uid), - dbesc($family), - dbesc($key) - ); - - $a->config[$uid][$family][$key] = $value; - - if($ret) - return $value; - return $ret; -}} - -if(! function_exists('del_pconfig')) { -function del_pconfig($uid,$family,$key) { - - global $a; - if(x($a->config[$uid][$family],$key)) - unset($a->config[$uid][$family][$key]); - $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) - ); - return $ret; -}} - - -// convert an XML document to a normalised, case-corrected array -// used by webfinger - -if(! function_exists('convert_xml_element_to_array')) { -function convert_xml_element_to_array($xml_element, &$recursion_depth=0) { - - // If we're getting too deep, bail out - if ($recursion_depth > 512) { - return(null); - } - - if (!is_string($xml_element) && - !is_array($xml_element) && - (get_class($xml_element) == 'SimpleXMLElement')) { - $xml_element_copy = $xml_element; - $xml_element = get_object_vars($xml_element); - } - - if (is_array($xml_element)) { - $result_array = array(); - if (count($xml_element) <= 0) { - return (trim(strval($xml_element_copy))); - } - - foreach($xml_element as $key=>$value) { - - $recursion_depth++; - $result_array[strtolower($key)] = - convert_xml_element_to_array($value, $recursion_depth); - $recursion_depth--; - } - if ($recursion_depth == 0) { - $temp_array = $result_array; - $result_array = array( - strtolower($xml_element_copy->getName()) => $temp_array, - ); - } - - return ($result_array); - - } else { - return (trim(strval($xml_element))); - } -}} - -// Given an email style address, perform webfinger lookup and -// return the resulting DFRN profile URL, or if no DFRN profile URL -// is located, returns an OStatus subscription template (prefixed -// with the string 'stat:' to identify it as on OStatus template). -// If this isn't an email style address just return $s. -// Return an empty string if email-style addresses but webfinger fails, -// or if the resultant personal XRD doesn't contain a supported -// subscription/friend-request attribute. - -if(! function_exists('webfinger_dfrn')) { -function webfinger_dfrn($s) { - if(! strstr($s,'@')) { - return $s; - } - $links = webfinger($s); - logger('webfinger_dfrn: ' . $s . ':' . print_r($links,true), LOGGER_DATA); - if(count($links)) { - foreach($links as $link) - if($link['@attributes']['rel'] === NAMESPACE_DFRN) - return $link['@attributes']['href']; - foreach($links as $link) - if($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) - return 'stat:' . $link['@attributes']['template']; - } - return ''; -}} - -// Given an email style address, perform webfinger lookup and -// return the array of link attributes from the personal XRD file. -// On error/failure return an empty array. - - -if(! function_exists('webfinger')) { -function webfinger($s) { - $host = ''; - if(strstr($s,'@')) { - $host = substr($s,strpos($s,'@') + 1); - } - if(strlen($host)) { - $tpl = fetch_lrdd_template($host); - logger('webfinger: lrdd template: ' . $tpl); - if(strlen($tpl)) { - $pxrd = str_replace('{uri}', urlencode('acct:' . $s), $tpl); - logger('webfinger: pxrd: ' . $pxrd); - $links = fetch_xrd_links($pxrd); - if(! count($links)) { - // try with double slashes - $pxrd = str_replace('{uri}', urlencode('acct://' . $s), $tpl); - logger('webfinger: pxrd: ' . $pxrd); - $links = fetch_xrd_links($pxrd); - } - return $links; - } - } - return array(); -}} - -if(! function_exists('lrdd')) { -function lrdd($uri) { - - $a = get_app(); - - // default priority is host priority, host-meta first - - $priority = 'host'; - - // All we have is an email address. Resource-priority is irrelevant - // because our URI isn't directly resolvable. - - if(strstr($uri,'@')) { - return(webfinger($uri)); - } - - // get the host meta file - - $host = @parse_url($uri); - - if($host) { - $url = ((x($host,'scheme')) ? $host['scheme'] : 'http') . '://'; - $url .= $host['host'] . '/.well-known/host-meta' ; - } - else - return array(); - - logger('lrdd: constructed url: ' . $url); - - $xml = fetch_url($url); - $headers = $a->get_curl_headers(); - - if (! $xml) - return array(); - - logger('lrdd: host_meta: ' . $xml, LOGGER_DATA); - - $h = parse_xml_string($xml); - if(! $h) - return array(); - - $arr = convert_xml_element_to_array($h); - - if(isset($arr['xrd']['property'])) { - $property = $arr['crd']['property']; - if(! isset($property[0])) - $properties = array($property); - else - $properties = $property; - foreach($properties as $prop) - if((string) $prop['@attributes'] === 'http://lrdd.net/priority/resource') - $priority = 'resource'; - } - - // save the links in case we need them - - $links = array(); - - if(isset($arr['xrd']['link'])) { - $link = $arr['xrd']['link']; - if(! isset($link[0])) - $links = array($link); - else - $links = $link; - } - - // do we have a template or href? - - if(count($links)) { - foreach($links as $link) { - if($link['@attributes']['rel'] && attribute_contains($link['@attributes']['rel'],'lrdd')) { - if(x($link['@attributes'],'template')) - $tpl = $link['@attributes']['template']; - elseif(x($link['@attributes'],'href')) - $href = $link['@attributes']['href']; - } - } - } - - if((! isset($tpl)) || (! strpos($tpl,'{uri}'))) - $tpl = ''; - - if($priority === 'host') { - if(strlen($tpl)) - $pxrd = str_replace('{uri}', urlencode($uri), $tpl); - elseif(isset($href)) - $pxrd = $href; - if(isset($pxrd)) { - logger('lrdd: (host priority) pxrd: ' . $pxrd); - $links = fetch_xrd_links($pxrd); - return $links; - } - - $lines = explode("\n",$headers); - if(count($lines)) { - foreach($lines as $line) { - if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) { - return(fetch_xrd_links($matches[1])); - break; - } - } - } - } - - - // priority 'resource' - - - $html = fetch_url($uri); - $headers = $a->get_curl_headers(); - logger('lrdd: headers=' . $headers, LOGGER_DEBUG); - - // don't try and parse raw xml as html - if(! strstr($html,'getElementsByTagName('link'); - foreach($items as $item) { - $x = $item->getAttribute('rel'); - if($x == "lrdd") { - $pagelink = $item->getAttribute('href'); - break; - } - } - } - } - - if(isset($pagelink)) - return(fetch_xrd_links($pagelink)); - - // next look in HTTP headers - - $lines = explode("\n",$headers); - if(count($lines)) { - foreach($lines as $line) { - // TODO alter the following regex to support multiple relations (space separated) - if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) { - $pagelink = $matches[1]; - break; - } - // don't try and run feeds through the html5 parser - if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml')))) - return array(); - if(stristr($html,' 'alias' , 'href' => $alias); - } - } - - logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA); - - return $links; - -}} - -// Convert an ACL array to a storable string - -if(! function_exists('perms2str')) { -function perms2str($p) { - $ret = ''; - $tmp = $p; - if(is_array($tmp)) { - array_walk($tmp,'sanitise_acl'); - $ret = implode('',$tmp); - } - return $ret; -}} - -// generate a guaranteed unique (for this domain) item ID for ATOM -// safe from birthday paradox - -if(! function_exists('item_new_uri')) { -function item_new_uri($hostname,$uid) { - - do { - $dups = false; - $hash = random_string(); - - $uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash; - - $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", - dbesc($uri)); - if(count($r)) - $dups = true; - } while($dups == true); - return $uri; -}} - -// Generate a guaranteed unique photo ID. -// safe from birthday paradox - -if(! function_exists('photo_new_resource')) { -function photo_new_resource() { - - do { - $found = false; - $resource = hash('md5',uniqid(mt_rand(),true)); - $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", - dbesc($resource) - ); - if(count($r)) - $found = true; - } while($found == true); - return $resource; -}} - - -// Take a URL from the wild, prepend http:// if necessary -// and check DNS to see if it's real -// return true if it's OK, false if something is wrong with it - -if(! function_exists('validate_url')) { -function validate_url(&$url) { - if(substr($url,0,4) != 'http') - $url = 'http://' . $url; - $h = @parse_url($url); - - if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) { - return true; - } - return false; -}} - -// checks that email is an actual resolvable internet address - -if(! function_exists('validate_email')) { -function validate_email($addr) { - - if(! strpos($addr,'@')) - return false; - $h = substr($addr,strpos($addr,'@') + 1); - - if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) { - return true; - } - return false; -}} - -// Check $url against our list of allowed sites, -// wildcards allowed. If allowed_sites is unset return true; -// If url is allowed, return true. -// otherwise, return false - -if(! function_exists('allowed_url')) { -function allowed_url($url) { - - $h = @parse_url($url); - - if(! $h) { - return false; - } - - $str_allowed = get_config('system','allowed_sites'); - if(! $str_allowed) - return true; - - $found = false; - - $host = strtolower($h['host']); - - // always allow our own site - - if($host == strtolower($_SERVER['SERVER_NAME'])) - return true; - - $fnmatch = function_exists('fnmatch'); - $allowed = explode(',',$str_allowed); - - if(count($allowed)) { - foreach($allowed as $a) { - $pat = strtolower(trim($a)); - if(($fnmatch && fnmatch($pat,$host)) || ($pat == $host)) { - $found = true; - break; - } - } - } - return $found; -}} - -// check if email address is allowed to register here. -// Compare against our list (wildcards allowed). -// Returns false if not allowed, true if allowed or if -// allowed list is not configured. - -if(! function_exists('allowed_email')) { -function allowed_email($email) { - - - $domain = strtolower(substr($email,strpos($email,'@') + 1)); - if(! $domain) - return false; - - $str_allowed = get_config('system','allowed_email'); - if(! $str_allowed) - return true; - - $found = false; - - $fnmatch = function_exists('fnmatch'); - $allowed = explode(',',$str_allowed); - - if(count($allowed)) { - foreach($allowed as $a) { - $pat = strtolower(trim($a)); - if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) { - $found = true; - break; - } - } - } - return $found; -}} - - - -// wrapper to load a view template, checking for alternate -// languages before falling back to the default - -// obsolete, deprecated. - -if(! function_exists('load_view_file')) { -function load_view_file($s) { - global $lang, $a; - if(! isset($lang)) - $lang = 'en'; - $b = basename($s); - $d = dirname($s); - if(file_exists("$d/$lang/$b")) - return file_get_contents("$d/$lang/$b"); - - $theme = current_theme(); - - if(file_exists("$d/theme/$theme/$b")) - return file_get_contents("$d/theme/$theme/$b"); - - return file_get_contents($s); -}} - -if(! function_exists('get_intltext_template')) { -function get_intltext_template($s) { - global $lang; - - if(! isset($lang)) - $lang = 'en'; - - if(file_exists("view/$lang/$s")) - return file_get_contents("view/$lang/$s"); - elseif(file_exists("view/en/$s")) - return file_get_contents("view/en/$s"); - else - return file_get_contents("view/$s"); -}} - -if(! function_exists('get_markup_template')) { -function get_markup_template($s) { - - $theme = current_theme(); - - if(file_exists("view/theme/$theme/$s")) - return file_get_contents("view/theme/$theme/$s"); - else - return file_get_contents("view/$s"); - -}} - - - - - -// for html,xml parsing - let's say you've got -// an attribute foobar="class1 class2 class3" -// and you want to find out if it contains 'class3'. -// you can't use a normal sub string search because you -// might match 'notclass3' and a regex to do the job is -// possible but a bit complicated. -// pass the attribute string as $attr and the attribute you -// are looking for as $s - returns true if found, otherwise false - -if(! function_exists('attribute_contains')) { -function attribute_contains($attr,$s) { - $a = explode(' ', $attr); - if(count($a) && in_array($s,$a)) - return true; - return false; -}} - -if(! function_exists('logger')) { -function logger($msg,$level = 0) { - $debugging = get_config('system','debugging'); - $loglevel = intval(get_config('system','loglevel')); - $logfile = get_config('system','logfile'); - - if((! $debugging) || (! $logfile) || ($level > $loglevel)) - return; - - @file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND); - return; -}} - - -if(! function_exists('activity_match')) { -function activity_match($haystack,$needle) { - if(($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA))) - return true; - return false; -}} - - -// Pull out all #hashtags and @person tags from $s; -// We also get @person@domain.com - which would make -// the regex quite complicated as tags can also -// end a sentence. So we'll run through our results -// and strip the period from any tags which end with one. -// Returns array of tags found, or empty array. - - -if(! function_exists('get_tags')) { -function get_tags($s) { - $ret = array(); - - // ignore anything in a code block - - $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); - - // Match full names against @tags including the space between first and last - // We will look these up afterward to see if they are full names or not recognisable. - - if(preg_match_all('/(@[^ \x0D\x0A,:?]+ [^ \x0D\x0A,:?]+)([ \x0D\x0A,:?]|$)/',$s,$match)) { - foreach($match[1] as $mtch) { - if(strstr($mtch,"]")) { - // we might be inside a bbcode color tag - leave it alone - continue; - } - if(substr($mtch,-1,1) === '.') - $ret[] = substr($mtch,0,-1); - else - $ret[] = $mtch; - } - } - - // Otherwise pull out single word tags. These can be @nickname, @first_last - // and #hash tags. - - if(preg_match_all('/([@#][^ \x0D\x0A,:?]+)([ \x0D\x0A,:?]|$)/',$s,$match)) { - foreach($match[1] as $mtch) { - if(strstr($mtch,"]")) { - // we might be inside a bbcode color tag - leave it alone - continue; - } - // ignore strictly numeric tags like #1 - if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1))) - continue; - if(substr($mtch,-1,1) === '.') - $ret[] = substr($mtch,0,-1); - else - $ret[] = $mtch; - } - } - return $ret; -}} - - -// quick and dirty quoted_printable encoding - -if(! function_exists('qp')) { -function qp($s) { -return str_replace ("%","=",rawurlencode($s)); -}} - - - -if(! function_exists('get_mentions')) { -function get_mentions($item) { - $o = ''; - if(! strlen($item['tag'])) - return $o; - - $arr = explode(',',$item['tag']); - foreach($arr as $x) { - $matches = null; - if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) { - $o .= "\t\t" . '' . "\r\n"; - $o .= "\t\t" . '' . "\r\n"; - } - } - return $o; -}} - -if(! function_exists('contact_block')) { -function contact_block() { - $o = ''; - $a = get_app(); - - $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); - if(! $shown) - $shown = 24; - - if((! is_array($a->profile)) || ($a->profile['hide-friends'])) - return $o; - $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0", - intval($a->profile['uid']) - ); - if(count($r)) { - $total = intval($r[0]['total']); - } - if(! $total) { - $o .= '

    ' . t('No contacts') . '

    '; - return $o; - } - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 ORDER BY RAND() LIMIT %d", - intval($a->profile['uid']), - intval($shown) - ); - if(count($r)) { - $o .= '

    ' . sprintf( tt('%d Contact','%d Contacts', $total),$total) . '

    '; - foreach($r as $rr) { - $o .= micropro($rr,true,'mpfriend'); - } - $o .= '
    '; - $o .= ''; - - } - - $arr = array('contacts' => $r, 'output' => $o); - - call_hooks('contact_block_end', $arr); - return $o; - -}} - -if(! function_exists('micropro')) { -function micropro($contact, $redirect = false, $class = '', $textmode = false) { - - if($class) - $class = ' ' . $class; - - $url = $contact['url']; - $sparkle = ''; - - if($redirect) { - $a = get_app(); - $redirect_url = $a->get_baseurl() . '/redir/' . $contact['id']; - if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === 'dfrn')) { - $url = $redirect_url; - $sparkle = ' sparkle'; - } - } - $click = ((x($contact,'click')) ? ' onclick="' . $contact['click'] . '" ' : ''); - if($click) - $url = ''; - if($textmode) { - return '' . "\r\n"; - } - else { - return '
    ' . $contact['name'] 
-			. '
    ' . "\r\n"; - } -}} - - - -if(! function_exists('search')) { -function search($s,$id='search-box',$url='/search') { - $a = get_app(); - $o = '
    '; - $o .= '
    '; - $o .= ''; - $o .= ''; - $o .= '
    '; - return $o; -}} - -if(! function_exists('valid_email')) { -function valid_email($x){ - if(preg_match('/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) - return true; - return false; -}} - - -if(! function_exists('gravatar_img')) { -function gravatar_img($email) { - $size = 175; - $opt = 'identicon'; // psuedo-random geometric pattern if not found - $rating = 'pg'; - $hash = md5(trim(strtolower($email))); - - $url = 'http://www.gravatar.com/avatar/' . $hash . '.jpg' - . '?s=' . $size . '&d=' . $opt . '&r=' . $rating; - - logger('gravatar: ' . $email . ' ' . $url); - return $url; -}} - -if(! function_exists('aes_decrypt')) { -function aes_decrypt($val,$ky) -{ - $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; - for($a=0;$a=0 and ord(substr($dec, strlen($dec)-1,1))<=16)? chr(ord( substr($dec,strlen($dec)-1,1))):null)); -}} - - -if(! function_exists('aes_encrypt')) { -function aes_encrypt($val,$ky) -{ - $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; - for($a=0;$a$1', $s); - return($s); -}} - - -/** - * - * Function: smilies - * - * Description: - * Replaces text emoticons with graphical images - * - * @Parameter: string $s - * - * Returns string - */ - -if(! function_exists('smilies')) { -function smilies($s) { - $a = get_app(); - - return str_replace( - array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), - array( - '<3', - '</3', - '<\\3', - ':-)', - ':)', - ';-)', - ':-(', - ':(', - ':-P', - ':P', - ':-\', - ':-x', - ':-X', - ':-D', - '8-|', - '8-O' - ), $s); -}} - - -/** - * - * Function : profile_load - * @parameter App $a - * @parameter string $nickname - * @parameter int $profile - * - * Summary: Loads a profile into the page sidebar. - * The function requires a writeable copy of the main App structure, and the nickname - * of a registered local account. - * - * If the viewer is an authenticated remote viewer, the profile displayed is the - * one that has been configured for his/her viewing in the Contact manager. - * Passing a non-zero profile ID can also allow a preview of a selected profile - * by the owner. - * - * Profile information is placed in the App structure for later retrieval. - * Honours the owner's chosen theme for display. - * - */ - -if(! function_exists('profile_load')) { -function profile_load(&$a, $nickname, $profile = 0) { - if(remote_user()) { - $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1", - intval($_SESSION['visitor_id'])); - if(count($r)) - $profile = $r[0]['profile-id']; - } - - $r = null; - - if($profile) { - $profile_int = intval($profile); - $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` - LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` - WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d LIMIT 1", - dbesc($nickname), - intval($profile_int) - ); - } - if(! count($r)) { - $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile` - LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` - WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1", - dbesc($nickname) - ); - } - - if(($r === false) || (! count($r))) { - notice( t('No profile') . EOL ); - $a->error = 404; - return; - } - - $a->profile = $r[0]; - - - $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename']; - $_SESSION['theme'] = $a->profile['theme']; - - if(! (x($a->page,'aside'))) - $a->page['aside'] = ''; - - $a->page['aside'] .= profile_sidebar($a->profile); - $a->page['aside'] .= contact_block(); - - return; -}} - - -/** - * - * Function: profile_sidebar - * - * Formats a profile for display in the sidebar. - * It is very difficult to templatise the HTML completely - * because of all the conditional logic. - * - * @parameter: array $profile - * - * Returns HTML string stuitable for sidebar inclusion - * Exceptions: Returns empty string if passed $profile is wrong type or not populated - * - */ - - -if(! function_exists('profile_sidebar')) { -function profile_sidebar($profile) { - - $a = get_app(); - - $o = ''; - $location = ''; - $address = false; - - if((! is_array($profile)) && (! count($profile))) - return $o; - - call_hooks('profile_sidebar_enter', $profile); - - $fullname = '
    ' . $profile['name'] . '
    '; - - $pdesc = '
    ' . $profile['pdesc'] . '
    '; - - $tabs = ''; - - $photo = '
    ' . $profile['name'] . '
    '; - - // don't show connect link to yourself - - $connect = (($profile['uid'] != local_user()) ? '
  • ' . t('Connect') . '
  • ' : ''); - - // don't show connect link to authenticated visitors either - - if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid'])) - $connect = ''; - - if((x($profile,'address') == 1) - || (x($profile,'locality') == 1) - || (x($profile,'region') == 1) - || (x($profile,'postal-code') == 1) - || (x($profile,'country-name') == 1)) - $address = true; + if((x($profile,'address') == 1) + || (x($profile,'locality') == 1) + || (x($profile,'region') == 1) + || (x($profile,'postal-code') == 1) + || (x($profile,'country-name') == 1)) + $address = true; if($address) { $location .= '
    ' . t('Location:') . '
    '; @@ -2518,81 +906,6 @@ EOT; }} -if(! function_exists('register_hook')) { -function register_hook($hook,$file,$function) { - - $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1", - dbesc($hook), - dbesc($file), - dbesc($function) - ); - if(count($r)) - return true; - - $r = q("INSERT INTO `hook` (`hook`, `file`, `function`) VALUES ( '%s', '%s', '%s' ) ", - dbesc($hook), - dbesc($file), - dbesc($function) - ); - return $r; -}} - -if(! function_exists('unregister_hook')) { -function unregister_hook($hook,$file,$function) { - - $r = q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1", - dbesc($hook), - dbesc($file), - dbesc($function) - ); - return $r; -}} - - -if(! function_exists('load_hooks')) { -function load_hooks() { - $a = get_app(); - $a->hooks = array(); - $r = q("SELECT * FROM `hook` WHERE 1"); - if(count($r)) { - foreach($r as $rr) { - $a->hooks[] = array($rr['hook'], $rr['file'], $rr['function']); - } - } -}} - - -if(! function_exists('call_hooks')) { -function call_hooks($name, &$data = null) { - $a = get_app(); - - if(count($a->hooks)) { - foreach($a->hooks as $hook) { - if($hook[HOOK_HOOK] === $name) { - @include_once($hook[HOOK_FILE]); - if(function_exists($hook[HOOK_FUNCTION])) { - $func = $hook[HOOK_FUNCTION]; - $func($a,$data); - } - } - } - } -}} - - -if(! function_exists('day_translate')) { -function day_translate($s) { - $ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'), - array( t('Monday'), t('Tuesday'), t('Wednesday'), t('Thursday'), t('Friday'), t('Saturday'), t('Sunday')), - $s); - - $ret = str_replace(array('January','February','March','April','May','June','July','August','September','October','November','December'), - array( t('January'), t('February'), t('March'), t('April'), t('May'), t('June'), t('July'), t('August'), t('September'), t('October'), t('November'), t('December')), - $ret); - - return $ret; -}} - if(! function_exists('get_birthdays')) { function get_birthdays() { @@ -2643,79 +956,6 @@ function get_birthdays() { }} -if(! function_exists('normalise_link')) { -function normalise_link($url) { - $ret = str_replace(array('https:','//www.'), array('http:','//'), $url); - return(rtrim($ret,'/')); -}} - -/** - * - * Compare two URLs to see if they are the same, but ignore - * slight but hopefully insignificant differences such as if one - * is https and the other isn't, or if one is www.something and - * the other isn't - and also ignore case differences. - * - * Return true if the URLs match, otherwise false. - * - */ - -if(! function_exists('link_compare')) { -function link_compare($a,$b) { - if(strcasecmp(normalise_link($a),normalise_link($b)) === 0) - return true; - return false; -}} - - -if(! function_exists('prepare_body')) { -function prepare_body($item,$attach = false) { - - $s = prepare_text($item['body']); - if(! $attach) - return $s; - - $arr = explode(',',$item['attach']); - if(count($arr)) { - $s .= '
    '; - foreach($arr as $r) { - $matches = false; - $icon = ''; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); - if($cnt) { - $icontype = strtolower(substr($matches[3],0,strpos($matches[3],'/'))); - switch($icontype) { - case 'video': - case 'audio': - case 'image': - case 'text': - $icon = '
    '; - break; - default: - $icon = '
    '; - break; - } - $title = ((strlen(trim($matches[4]))) ? escape_tags(trim($matches[4])) : escape_tags($matches[1])); - $title .= ' ' . $matches[2] . ' ' . t('bytes'); - - $s .= '' . $icon . ''; - } - } - $s .= '
    '; - } - return $s; -}} - -if(! function_exists('prepare_text')) { -function prepare_text($text) { - - require_once('include/bbcode.php'); - - $s = smilies(bbcode($text)); - - return $s; -}} - /** * * Wrap calls to proc_close(proc_open()) and call hook @@ -2826,106 +1066,6 @@ function feed_birthday($uid,$tz) { return $birthday; }} -/** - * return atom link elements for all of our hubs - */ - -if(! function_exists('feed_hublinks')) { -function feed_hublinks() { - - $hub = get_config('system','huburl'); - - $hubxml = ''; - if(strlen($hub)) { - $hubs = explode(',', $hub); - if(count($hubs)) { - foreach($hubs as $h) { - $h = trim($h); - if(! strlen($h)) - continue; - $hubxml .= '' . "\n" ; - } - } - } - return $hubxml; -}} - -/* return atom link elements for salmon endpoints */ - -if(! function_exists('feed_salmonlinks')) { -function feed_salmonlinks($nick) { - - $a = get_app(); - - $salmon = '' . "\n" ; - - // old style links that status.net still needed as of 12/2010 - - $salmon .= ' ' . "\n" ; - $salmon .= ' ' . "\n" ; - return $salmon; -}} - -if(! function_exists('get_plink')) { -function get_plink($item) { - $a = get_app(); - $plink = (((x($item,'plink')) && (! $item['private'])) ? '' : ''); - return $plink; -}} - -if(! function_exists('unamp')) { -function unamp($s) { - return str_replace('&', '&', $s); -}} - - - - -if(! function_exists('lang_selector')) { -function lang_selector() { - global $lang; - $o = '
    '; - $o .= ''; - return $o; -}} - - -if(! function_exists('parse_xml_string')) { -function parse_xml_string($s,$strict = true) { - if($strict) { - if(! strstr($s,'code." at ".$err->line.":".$err->column." : ".$err->message, LOGGER_DATA); - libxml_clear_errors(); - } - return $x; -}} - if(! function_exists('is_site_admin')) { function is_site_admin() { $a = get_app(); @@ -2934,98 +1074,6 @@ function is_site_admin() { return false; }} -/* - * parse plugin comment in search of plugin infos. - * like - * - * * Name: Plugin - * * Description: A plugin which plugs in - * * Version: 1.2.3 - * * Author: John - * * Author: Jane - * * - */ - -if (! function_exists('get_plugin_info')){ -function get_plugin_info($plugin){ - if (!is_file("addon/$plugin/$plugin.php")) return false; - - $f = file_get_contents("addon/$plugin/$plugin.php"); - $r = preg_match("|/\*.*\*/|msU", $f, $m); - - $info=Array( - 'name' => $plugin, - 'description' => "", - 'author' => array(), - 'version' => "" - ); - - if ($r){ - $ll = explode("\n", $m[0]); - foreach( $ll as $l ) { - $l = trim($l,"\t\n\r */"); - if ($l!=""){ - list($k,$v) = array_map("trim", explode(":",$l,2)); - $k= strtolower($k); - if ($k=="author"){ - $r=preg_match("|([^<]+)<([^>]+)>|", $v, $m); - if ($r) { - $info['author'][] = array('name'=>$m[1], 'link'=>$m[2]); - } else { - $info['author'][] = array('name'=>$v); - } - } else { - if (array_key_exists($k,$info)){ - $info[$k]=$v; - } - } - - } - } - - } - return $info; -}} - -if(! function_exists('return_bytes')) { -function return_bytes ($size_str) { - switch (substr ($size_str, -1)) - { - case 'M': case 'm': return (int)$size_str * 1048576; - case 'K': case 'k': return (int)$size_str * 1024; - case 'G': case 'g': return (int)$size_str * 1073741824; - default: return $size_str; - } -}} - -function generate_guid() { - $found = true; - do { - $guid = substr(random_string(),0,16); - $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1", - dbesc($guid) - ); - if(! count($x)) - $found = false; - } while ($found == true ); - return $guid; -} - - -function pkcs5_pad ($text, $blocksize) -{ - $pad = $blocksize - (strlen($text) % $blocksize); - return $text . str_repeat(chr($pad), $pad); -} - -function pkcs5_unpad($text) -{ - $pad = ord($text{strlen($text)-1}); - if ($pad > strlen($text)) return false; - if (strspn($text, chr($pad), strlen($text) - $pad) != $pad) return false; - return substr($text, 0, -1 * $pad); -} - if(! function_exists('load_contact_links')) { function load_contact_links($uid) { -- cgit v1.2.3 From 2637831d9056862f7c3db718702116ef4652629a Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 1 Aug 2011 21:02:25 -0700 Subject: some more zot changes migrating back to f9a mainline --- boot.php | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 35cb15239..fd5de0e94 100644 --- a/boot.php +++ b/boot.php @@ -325,7 +325,7 @@ class App { if($this->cmd === '.well-known/host-meta') { require_once('include/hostxrd.php'); - hostxrd($this->get_baseurl()); + hostxrd(); // NOTREACHED } @@ -402,7 +402,7 @@ class App { $this->page['title'] = $this->config['sitename']; $tpl = file_get_contents('view/head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( - '$baseurl' => $this->get_baseurl(), + '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! '$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION, '$delitem' => t('Delete this item?'), '$comment' => t('Comment') @@ -475,6 +475,34 @@ function system_unavailable() { }} + +function clean_urls() { + global $a; +// if($a->config['system']['clean_urls']) + return true; +// return false; +} + +function z_path() { + global $a; + $base = $a->get_baseurl(); + if(! clean_urls()) + $base .= '/?q='; + return $base; +} + +function z_root() { + global $a; + return $a->get_baseurl(); +} + +function absurl($path) { + if(strpos($path,'/') === 0) + return z_path() . $path; + return $path; +} + + // Primarily involved with database upgrade, but also sets the // base url for use in cmdline programs which don't have // $_SERVER variables, and synchronising the state of installed plugins. -- cgit v1.2.3 From b7741276162318b7c592cfce03c2bb7bd86d23a9 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 2 Aug 2011 17:04:03 -0700 Subject: bug #114, warn about linked Facebook item privacy --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index fd5de0e94..5f8402ecd 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1059' ); +define ( 'FRIENDIKA_VERSION', '2.2.1060' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1076 ); -- cgit v1.2.3 From d0b7723bbcd4e9a4fd5c97370bd1c738fdcdab28 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 3 Aug 2011 16:29:25 -0700 Subject: re-parent api post item with parent_id and no parent_uri --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 5f8402ecd..b306b1402 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1060' ); +define ( 'FRIENDIKA_VERSION', '2.2.1061' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1076 ); -- cgit v1.2.3 From d45a66e700a62626007b05ef1b78dff8f0931210 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 3 Aug 2011 21:05:39 -0700 Subject: allow custom avatar sizes - needed for Diaspora hcard/vcard --- boot.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index b306b1402..9ff17b466 100644 --- a/boot.php +++ b/boot.php @@ -877,7 +877,9 @@ function profile_sidebar($profile) { $podloc = $a->get_baseurl(); $searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ); $nickname = $profile['nick']; - $dphoto = $profile['photo']; + $photo300 = $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg'; + $photo100 = $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg'; + $photo50 = $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg'; $diaspora_vcard = <<< EOT @@ -897,7 +899,19 @@ function profile_sidebar($profile) {
    Photo
    - + +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Photo
    +
    +
    -- cgit v1.2.3 From 639204c2ec29ccd74fbc2cb1eb597cca86e84f27 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 3 Aug 2011 22:05:20 -0700 Subject: diaspora structures --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 9ff17b466..3d1d884e3 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once("include/pgettext.php"); define ( 'FRIENDIKA_VERSION', '2.2.1061' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1076 ); +define ( 'DB_UPDATE_VERSION', 1077 ); define ( 'EOL', "
    \r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From f0af4de4a795ed3914f0e8e8ae3417a315d3dcd3 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 4 Aug 2011 19:19:51 -0700 Subject: wrap text from imported link in [quote] --- boot.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 3d1d884e3..35f295d06 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1061' ); +define ( 'FRIENDIKA_VERSION', '2.2.1062' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1077 ); @@ -607,6 +607,18 @@ function check_config(&$a) { }} +function get_guid() { + $exists = true; + do { + $s = random_string(16); + $r = q("select id from guid where guid = '%s' limit 1", dbesc($s)); + if(! results($r)) + $exists = false; + } while($exists); + q("insert into guid ( guid ) values ( '%s' ) ", dbesc($s)); + return $s; +} + // wrapper for adding a login box. If $register == true provide a registration // link. This will most always depend on the value of $a->config['register_policy']. -- cgit v1.2.3 From 2abcf76ec17a9a7754c399cdde9a4449308a4b02 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 4 Aug 2011 22:37:45 -0700 Subject: salmon protocol changes magicsig draft-experimental, fixes to hostxrd --- boot.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 35f295d06..e1a1c5a50 100644 --- a/boot.php +++ b/boot.php @@ -320,13 +320,12 @@ class App { /** * Special handling for the webfinger/lrdd host XRD file - * Just spit out the contents and exit. */ if($this->cmd === '.well-known/host-meta') { - require_once('include/hostxrd.php'); - hostxrd(); - // NOTREACHED + $this->argc = 1; + $this->argv = array('hostxrd'); + $this->module = 'hostxrd'; } /** -- cgit v1.2.3 From aa3a14ec36db5f9df9d0ec27c607a994451fc845 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 5 Aug 2011 21:30:12 -0700 Subject: bug #117, use realname for screen_name in API if nickname missing --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index e1a1c5a50..17161f715 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1062' ); +define ( 'FRIENDIKA_VERSION', '2.2.1063' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1077 ); -- cgit v1.2.3 From 48ffa880f099b19052f18e399bf6af50780a24b0 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 7 Aug 2011 16:15:54 -0700 Subject: cleanup --- boot.php | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 17161f715..d5adbd7cf 100644 --- a/boot.php +++ b/boot.php @@ -7,9 +7,9 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1063' ); +define ( 'FRIENDIKA_VERSION', '2.2.1065' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1077 ); +define ( 'DB_UPDATE_VERSION', 1078 ); define ( 'EOL', "
    \r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -55,13 +55,12 @@ define ( 'REGISTER_OPEN', 2 ); /** * relationship types - * When used in contact records, this indicates that 'uid' has - * this relationship with contact['name'] */ -define ( 'REL_VIP', 1); // other person is 'following' us -define ( 'REL_FAN', 2); // we are 'following' other person -define ( 'REL_BUD', 3); // mutual relationship +define ( 'CONTACT_IS_FOLLOWER', 1); +define ( 'CONTACT_IS_SHARING', 2); +define ( 'CONTACT_IS_FRIEND', 3); + /** * Hook array order @@ -76,10 +75,10 @@ define ( 'HOOK_FUNCTION', 2); * page/profile types * * PAGE_NORMAL is a typical personal profile account - * PAGE_SOAPBOX automatically approves all friend requests as REL_FAN, (readonly) - * PAGE_COMMUNITY automatically approves all friend requests as REL_FAN, but with + * PAGE_SOAPBOX automatically approves all friend requests as CONTACT_IS_SHARING, (readonly) + * PAGE_COMMUNITY automatically approves all friend requests as CONTACT_IS_SHARING, but with * write access to wall and comments (no email and not included in page owner's ACL lists) - * PAGE_FREELOVE automatically approves all friend requests as full friends (REL_BUD). + * PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND). * */ @@ -283,7 +282,12 @@ class App { $this->path = $path; } - set_include_path("include/$this->hostname" . PATH_SEPARATOR . 'include' . PATH_SEPARATOR . '.' ); + set_include_path( + "include/$this->hostname" . PATH_SEPARATOR + . 'include' . PATH_SEPARATOR + . 'library' . PATH_SEPARATOR + . 'library/phpsec' . PATH_SEPARATOR + . '.' ); if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") $this->query_string = substr($_SERVER['QUERY_STRING'],2); -- cgit v1.2.3 From 1eec10329a4764f132b159e7b1bbf37added6c8a Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 7 Aug 2011 16:56:26 -0700 Subject: guid functions --- boot.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d5adbd7cf..3bdbe2db2 100644 --- a/boot.php +++ b/boot.php @@ -610,12 +610,12 @@ function check_config(&$a) { }} -function get_guid() { - $exists = true; +function get_guid($size=16) { + $exists = true; // assume by default that we don't have a unique guid do { - $s = random_string(16); + $s = random_string($size); $r = q("select id from guid where guid = '%s' limit 1", dbesc($s)); - if(! results($r)) + if(! count($r)) $exists = false; } while($exists); q("insert into guid ( guid ) values ( '%s' ) ", dbesc($s)); -- cgit v1.2.3 From 8812b7f4caa99d01ae0e082c0b29a2ee24aed67d Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 7 Aug 2011 17:29:26 -0700 Subject: item guids --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 3bdbe2db2..27adea086 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once("include/pgettext.php"); define ( 'FRIENDIKA_VERSION', '2.2.1065' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1078 ); +define ( 'DB_UPDATE_VERSION', 1079 ); define ( 'EOL', "
    \r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From 6be5da67b1a0290da3938b87bebc71fd429f4414 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 8 Aug 2011 19:10:36 -0700 Subject: reparenting imported item was only partially reparenting. --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 27adea086..b5768c796 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1065' ); +define ( 'FRIENDIKA_VERSION', '2.2.1066' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); -- cgit v1.2.3 From 1bfe1283aa38454369f29883411a6c012c88df59 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 9 Aug 2011 18:55:46 -0700 Subject: crypto stuff --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index b5768c796..3b8c27f60 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1066' ); +define ( 'FRIENDIKA_VERSION', '2.2.1067' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); -- cgit v1.2.3 From 684ebd2ed8a2b225860b59256bf81146b1867d6a Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 10 Aug 2011 21:06:35 -0700 Subject: enhance random_string, block public email replies --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 3b8c27f60..ea304b1e8 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1067' ); +define ( 'FRIENDIKA_VERSION', '2.2.1068' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); -- cgit v1.2.3 From fda593caeda997fbd97eed28f69107ce91c16242 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 12 Aug 2011 02:58:29 -0700 Subject: introduction fails if confirmation differs by http vs https --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index ea304b1e8..0a8a2fd84 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1068' ); +define ( 'FRIENDIKA_VERSION', '2.2.1069' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); -- cgit v1.2.3 From e15e18e0d1499a91f6e3d20553a09af534c471f7 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 12 Aug 2011 21:01:51 -0700 Subject: hopefully fix statusnet bug by altering our feed format slightly --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 0a8a2fd84..76b80ce04 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1069' ); +define ( 'FRIENDIKA_VERSION', '2.2.1070' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); -- cgit v1.2.3 From c9225a691b8e54c85f2f12f1d37ff4c2aa12e139 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 13 Aug 2011 16:05:03 -0700 Subject: js_upload reporting 43k file too big --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 76b80ce04..587e082b4 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1070' ); +define ( 'FRIENDIKA_VERSION', '2.2.1071' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); -- cgit v1.2.3 From 79529612226dc89b90df33ba066a530d0e716a69 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 14 Aug 2011 18:13:52 -0700 Subject: diaspora probe/scrape changes --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 587e082b4..9461f21ae 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1071' ); +define ( 'FRIENDIKA_VERSION', '2.2.1072' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); -- cgit v1.2.3 From 44918e27367d00d3625daaf751a05b166ecd2fc1 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 15 Aug 2011 17:14:51 -0700 Subject: turn diaspora posts into x-www-form-urlencoded --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 9461f21ae..7186ce7c6 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1072' ); +define ( 'FRIENDIKA_VERSION', '2.2.1073' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); -- cgit v1.2.3 From b28b468b2182493b958afecb388501fd66de230f Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 16 Aug 2011 20:05:02 -0700 Subject: cleanup --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 7186ce7c6..39bb6a9da 100644 --- a/boot.php +++ b/boot.php @@ -7,13 +7,13 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1073' ); +define ( 'FRIENDIKA_VERSION', '2.2.1074' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); define ( 'EOL', "
    \r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -define ( 'DOWN_ARROW', '⇩' ); + /** * -- cgit v1.2.3