// Is the function called statically?
if (!is_object($this))
- return(self::$a->remove_baseurl($ssl));
+ return(self::$a->remove_baseurl($url));
$url = normalise_link($url);
$base = normalise_link($this->get_baseurl());
'like' => '',
'dislike' => '',
'comment' => '',
- //'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
- 'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/'.$item['guid'], 'title'=> t('View in context'))),
+ //'conv' => (($preview) ? '' : array('href'=> 'display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+ 'conv' => (($preview) ? '' : array('href'=> 'display/'.$item['guid'], 'title'=> t('View in context'))),
'previewing' => $previewing,
'wait' => t('Please wait'),
'thread_level' => 1,
$status_link = $profile_link . "?url=status";
$photos_link = $profile_link . "?url=photos";
$profile_link = $profile_link . "?url=profile";
- $pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
+ $pm_url = 'message/new/' . $cid;
$zurl = '';
}
else {
$cid = $r[0]["id"];
if ($r[0]["network"] == NETWORK_DIASPORA)
- $pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
+ $pm_url = 'message/new/' . $cid;
} else
$cid = 0;
}
}
if(($cid) && (! $item['self'])) {
- $poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
- $contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
- $posts_link = $a->get_baseurl($ssl_state) . '/contacts/' . $cid . '/posts';
+ $poke_link = 'poke/?f=&c=' . $cid;
+ $contact_url = 'contacts/' . $cid;
+ $posts_link = 'contacts/' . $cid . '/posts';
$clean_url = normalise_link($item['author-link']);
if((local_user()) && (local_user() == $item['uid'])) {
if(isset($a->contacts) && x($a->contacts,$clean_url)) {
if($a->contacts[$clean_url]['network'] === NETWORK_DIASPORA) {
- $pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
+ $pm_url = 'message/new/' . $cid;
}
}
}
if ((($cid == 0) OR ($a->contacts[$clean_url]['rel'] == CONTACT_IS_FOLLOWER)) AND
in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
- $menu[t("Connect/Follow")] = $a->get_baseurl($ssl_state)."/follow?url=".urlencode($item['author-link']);
+ $menu[t("Connect/Follow")] = "follow?url=".urlencode($item['author-link']);
} else
$menu = array(t("View Profile") => $item['author-link']);
if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
$url = $item['author-link'];
if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
- $url = z_root(true) . '/redir/' . $item['contact-id'];
+ $url = 'redir/' . $item['contact-id'];
$sparkle = ' class="sparkle" ';
}
else
$o .= replace_macros($tpl,array(
'$return_path' => $query_str,
- '$action' => $a->get_baseurl(true) . '/item',
+ '$action' => 'item',
'$share' => (x($x,'button') ? $x['button'] : t('Share')),
'$upload' => t('Upload photo'),
'$shortupload' => t('upload photo'),
if (($a->page_offset != "") AND !preg_match('/[?&].offset=/', $stripped))
$stripped .= "&offset=".urlencode($a->page_offset);
- $url = z_root() . '/' . $stripped;
+ $url = $stripped;
$data = array();
function _l(&$d, $name, $url, $text, $class="") {
if($redirect) {
$a = get_app();
- $redirect_url = z_root() . '/redir/' . $contact['id'];
+ $redirect_url = 'redir/' . $contact['id'];
if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) {
$redir = true;
$url = $redirect_url;
* @param string $url search url
* @param boolean $savedsearch show save search button
*/
-function search($s,$id='search-box',$url='/search',$save = false, $aside = true) {
+function search($s,$id='search-box',$url='search',$save = false, $aside = true) {
$a = get_app();
$values = array(
'$s' => $s,
'$id' => $id,
- '$action_url' => $a->get_baseurl((stristr($url,'network')) ? true : false) . $url,
+ '$action_url' => $url,
'$search_label' => t('Search'),
'$save_label' => t('Save'),
'$savedsearch' => feature_enabled(local_user(),'savedsearch'),
if((local_user() == $item['uid']) && ($item['private'] != 0) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) {
//logger("redir_private_images: redir");
- $img_url = z_root() . '/redir?f=1&quiet=1&url=' . $mtch[1] . '&conurl=' . $item['author-link'];
+ $img_url = 'redir?f=1&quiet=1&url=' . $mtch[1] . '&conurl=' . $item['author-link'];
$item['body'] = str_replace($mtch[0], "[img]".$img_url."[/img]", $item['body']);
}
}
$mime = $mtch[3];
if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
- $the_url = z_root() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
+ $the_url = 'redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
else
$the_url = $mtch[1];
$categories[] = array(
'name' => xmlify(file_tag_decode($mtch[1])),
'url' => "#",
- 'removeurl' => ((local_user() == $item['uid'])?z_root() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
+ 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
'first' => $first,
'last' => false
);
$folders[] = array(
'name' => xmlify(file_tag_decode($mtch[1])),
'url' => "#",
- 'removeurl' => ((local_user() == $item['uid'])?z_root() . '/filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""),
+ 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""),
'first' => $first,
'last' => false
);
if ($a->user['nickname'] != "") {
$ret = array(
- //'href' => z_root()."/display/".$a->user['nickname']."/".$item['id'],
- 'href' => z_root()."/display/".$item['guid'],
- 'orig' => z_root()."/display/".$item['guid'],
+ //'href' => "display/".$a->user['nickname']."/".$item['id'],
+ 'href' => "display/".$item['guid'],
+ 'orig' => "display/".$item['guid'],
'title' => t('View on separate page'),
'orig_title' => t('view on separate page'),
);
if (x($item,'plink')) {
- $ret["href"] = $item['plink'];
+ $ret["href"] = $a->remove_baseurl($item['plink']);
$ret["title"] = t('link to source');
}
$func($a);
}
}
- goaway($a->get_baseurl(true) . '/admin/plugins/' . $a->argv[2] );
+ goaway('admin/plugins/'.$a->argv[2]);
return; // NOTREACHED
break;
case 'themes':
if($a->argc < 2) {
if(is_ajax()) return;
- goaway($a->get_baseurl(true) . '/admin/' );
+ goaway('admin/');
return;
}
info(t('Theme settings updated.'));
if(is_ajax()) return;
- goaway($a->get_baseurl(true) . '/admin/themes/' . $theme );
+ goaway('admin/themes/'.$theme);
return;
break;
case 'features':
}
}
- goaway($a->get_baseurl(true) . '/admin' );
+ goaway('admin');
return; // NOTREACHED
}
* Side bar links
*/
$aside_tools = array();
- // array( url, name, extra css classes )
+ // array(url, name, extra css classes)
// not part of $aside to make the template more adjustable
$aside_sub = array(
- 'site' => array($a->get_baseurl(true)."/admin/site/", t("Site") , "site"),
- 'users' => array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"),
- 'plugins'=> array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
- 'themes' => array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
- 'features' => array($a->get_baseurl(true)."/admin/features/", t("Additional features") , "features"),
- 'dbsync' => array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
- 'queue' => array($a->get_baseurl(true)."/admin/queue/", t('Inspect Queue'), "queue"),
- 'federation' => array($a->get_baseurl(true)."/admin/federation/", t('Federation Statistics'), "federation"),
+ 'site' => array("admin/site/", t("Site") , "site"),
+ 'users' => array("admin/users/", t("Users") , "users"),
+ 'plugins'=> array("admin/plugins/", t("Plugins") , "plugins"),
+ 'themes' => array("admin/themes/", t("Themes") , "themes"),
+ 'features' => array("admin/features/", t("Additional features") , "features"),
+ 'dbsync' => array("admin/dbsync/", t('DB updates'), "dbsync"),
+ 'queue' => array("admin/queue/", t('Inspect Queue'), "queue"),
+ 'federation' => array("admin/federation/", t('Federation Statistics'), "federation"),
);
/* get plugins admin page */
$aside_tools['plugins_admin']=array();
foreach ($r as $h){
$plugin =$h['name'];
- $aside_tools['plugins_admin'][] = array($a->get_baseurl(true)."/admin/plugins/".$plugin, $plugin, "plugin");
+ $aside_tools['plugins_admin'][] = array("admin/plugins/".$plugin, $plugin, "plugin");
// temp plugins with admin
$a->plugins_admin[] = $plugin;
}
- $aside_tools['logs'] = array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
- $aside_tools['viewlogs'] = array($a->get_baseurl(true)."/admin/viewlogs/", t("View Logs"), 'viewlogs');
- $aside_tools['diagnostics_probe'] = array($a->get_baseurl(true).'/probe/', t('probe address'), 'probe');
- $aside_tools['diagnostics_webfinger'] = array($a->get_baseurl(true).'/webfinger/', t('check webfinger'), 'webfinger');
+ $aside_tools['logs'] = array("admin/logs/", t("Logs"), "logs");
+ $aside_tools['viewlogs'] = array("admin/viewlogs/", t("View Logs"), 'viewlogs');
+ $aside_tools['diagnostics_probe'] = array('probe/', t('probe address'), 'probe');
+ $aside_tools['diagnostics_webfinger'] = array('webfinger/', t('check webfinger'), 'webfinger');
$t = get_markup_template("admin_aside.tpl");
- $a->page['aside'] .= replace_macros( $t, array(
+ $a->page['aside'] .= replace_macros($t, array(
'$admin' => $aside_tools,
'$subpages' => $aside_sub,
'$admtxt' => t('Admin'),
'$logtxt' => t('Logs'),
'$diagnosticstxt' => t('diagnostics'),
'$h_pending' => t('User registrations waiting for confirmation'),
- '$admurl'=> $a->get_baseurl(true)."/admin/"
+ '$admurl'=> "admin/"
));
$o = admin_page_federation($a);
break;
default:
- notice( t("Item not found.") );
+ notice(t("Item not found."));
}
} else {
$o = admin_page_summary($a);
function admin_page_summary(&$a) {
$r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`");
$accounts = array(
- array( t('Normal Account'), 0),
- array( t('Soapbox Account'), 0),
- array( t('Community/Celebrity Account'), 0),
- array( t('Automatic Friend Account'), 0),
- array( t('Blog Account'), 0),
- array( t('Private Forum'), 0)
+ array(t('Normal Account'), 0),
+ array(t('Soapbox Account'), 0),
+ array(t('Community/Celebrity Account'), 0),
+ array(t('Automatic Friend Account'), 0),
+ array(t('Blog Account'), 0),
+ array(t('Private Forum'), 0)
);
$users=0;
foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
- logger('accounts: ' . print_r($accounts,true),LOGGER_DATA);
+ logger('accounts: '.print_r($accounts,true),LOGGER_DATA);
$r = q("SELECT COUNT(id) as `count` FROM `register`");
$pending = $r[0]['count'];
// We can do better, but this is a quick queue status
- $queues = array( 'label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue );
+ $queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue);
$t = get_markup_template("admin_summary.tpl");
'$title' => t('Administration'),
'$page' => t('Summary'),
'$queues' => $queues,
- '$users' => array( t('Registered users'), $users),
+ '$users' => array(t('Registered users'), $users),
'$accounts' => $accounts,
- '$pending' => array( t('Pending registrations'), $pending),
- '$version' => array( t('Version'), FRIENDICA_VERSION),
+ '$pending' => array(t('Pending registrations'), $pending),
+ '$version' => array(t('Version'), FRIENDICA_VERSION),
'$baseurl' => $a->get_baseurl(),
'$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME,
'$build' => get_config('system','build'),
- '$plugins' => array( t('Active plugins'), $a->plugins )
+ '$plugins' => array(t('Active plugins'), $a->plugins)
));
}
$parsed = @parse_url($new_url);
if(!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) {
notice(t("Can not parse base url. Must have at least <scheme>://<domain>"));
- goaway($a->get_baseurl(true) . '/admin/site' );
+ goaway('admin/site');
}
/* steps:
$q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
$r = q($q);
if(!$r) {
- notice( "Failed updating '$table_name': " . $db->error );
- goaway($a->get_baseurl(true) . '/admin/site' );
+ notice("Failed updating '$table_name': ".$db->error);
+ goaway('admin/site');
}
}
info("Relocation started. Could take a while to complete.");
- goaway($a->get_baseurl(true) . '/admin/site' );
+ goaway('admin/site');
}
// end relocate
set_config('system','language', $language);
set_config('system','theme', $theme);
- if( $theme_mobile === '---' ) {
+ if($theme_mobile === '---') {
del_config('system','mobile-theme');
} else {
set_config('system','mobile-theme', $theme_mobile);
}
- if( $singleuser === '---' ) {
+ if($singleuser === '---') {
del_config('system','singleuser');
} else {
set_config('system','singleuser', $singleuser);
set_config('system','embedly', $embedly);
- info( t('Site settings updated.') . EOL);
- goaway($a->get_baseurl(true) . '/admin/site' );
+ info(t('Site settings updated.').EOL);
+ goaway('admin/site');
return; // NOTREACHED
}
$files = glob('view/theme/*');
if($files) {
foreach($files as $file) {
- if(intval(file_exists($file . '/unsupported')))
+ if(intval(file_exists($file.'/unsupported')))
continue;
$f = basename($file);
- $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
- if(file_exists($file . '/mobile')) {
+ $theme_name = ((file_exists($file.'/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
+ if(file_exists($file.'/mobile')) {
$theme_choices_mobile[$f] = $theme_name;
} else {
$theme_choices[$f] = $theme_name;
$o = '';
if($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
- set_config('database', 'update_' . intval($a->argv[3]), 'success');
+ set_config('database', 'update_'.intval($a->argv[3]), 'success');
$curr = get_config('system','build');
if(intval($curr) == intval($a->argv[3]))
set_config('system','build',intval($curr) + 1);
- info( t('Update has been marked successful') . EOL);
- goaway($a->get_baseurl(true) . '/admin/dbsync');
+ info(t('Update has been marked successful').EOL);
+ goaway('admin/dbsync');
}
if(($a->argc > 2) AND (intval($a->argv[2]) OR ($a->argv[2] === 'check'))) {
if($a->argc > 2 && intval($a->argv[2])) {
require_once('update.php');
- $func = 'update_' . intval($a->argv[2]);
+ $func = 'update_'.intval($a->argv[2]);
if(function_exists($func)) {
$retval = $func();
if($retval === UPDATE_FAILED) {
* @param App $a
*/
function admin_page_users_post(&$a){
- $pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() );
- $users = ( x($_POST, 'user') ? $_POST['user'] : array() );
- $nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : '');
- $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
- $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
+ $pending = (x($_POST, 'pending') ? $_POST['pending'] : array());
+ $users = (x($_POST, 'user') ? $_POST['user'] : array());
+ $nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : '');
+ $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
+ $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
if(!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) {
require_once('include/user.php');
- $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1) );
+ $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1));
if(! $result['success']) {
notice($result['message']);
return;
notification(array(
'type' => "SYSTEM_EMAIL",
'to_email' => $nu['email'],
- 'subject'=> sprintf( t('Registration details for %s'), $a->config['sitename']),
+ 'subject'=> sprintf(t('Registration details for %s'), $a->config['sitename']),
'preamble'=> $preamble,
'body' => $body));
if(x($_POST,'page_users_block')) {
foreach($users as $uid){
q("UPDATE `user` SET `blocked`=1-`blocked` WHERE `uid`=%s",
- intval( $uid )
+ intval($uid)
);
}
- notice( sprintf( tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)) );
+ notice(sprintf(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)));
}
if(x($_POST,'page_users_delete')) {
require_once("include/Contact.php");
foreach($users as $uid){
user_remove($uid);
}
- notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) );
+ notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users)));
}
if(x($_POST,'page_users_approve')) {
user_deny($hash);
}
}
- goaway($a->get_baseurl(true) . '/admin/users' );
+ goaway('admin/users');
return; // NOTREACHED
}
$uid = $a->argv[3];
$user = q("SELECT username, blocked FROM `user` WHERE `uid`=%d", intval($uid));
if(count($user)==0) {
- notice( 'User not found' . EOL);
- goaway($a->get_baseurl(true) . '/admin/users' );
+ notice('User not found'.EOL);
+ goaway('admin/users');
return ''; // NOTREACHED
}
switch($a->argv[2]){
require_once("include/Contact.php");
user_remove($uid);
- notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL);
+ notice(sprintf(t("User '%s' deleted"), $user[0]['username']).EOL);
}; break;
case "block":{
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
q("UPDATE `user` SET `blocked`=%d WHERE `uid`=%s",
- intval( 1-$user[0]['blocked'] ),
- intval( $uid )
+ intval(1-$user[0]['blocked']),
+ intval($uid)
);
- notice( sprintf( ($user[0]['blocked']?t("User '%s' unblocked"):t("User '%s' blocked")) , $user[0]['username']) . EOL);
+ notice(sprintf(($user[0]['blocked']?t("User '%s' unblocked"):t("User '%s' blocked")) , $user[0]['username']).EOL);
}; break;
}
- goaway($a->get_baseurl(true) . '/admin/users' );
+ goaway('admin/users');
return ''; // NOTREACHED
}
$a->set_pager_itemspage(100);
}
- $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
+ $users = q("SELECT `user`.* , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
FROM
(SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
FROM `item`
while(count($users)) {
$new_user = array();
- foreach( array_pop($users) as $k => $v) {
+ foreach(array_pop($users) as $k => $v) {
$k = str_replace('-','_',$k);
$new_user[$k] = $v;
}
'$select_all' => t('select all'),
'$h_pending' => t('User registrations waiting for confirm'),
'$h_deleted' => t('User waiting for permanent deletion'),
- '$th_pending' => array( t('Request date'), t('Name'), t('Email') ),
+ '$th_pending' => array(t('Request date'), t('Name'), t('Email')),
'$no_pending' => t('No registrations.'),
'$approve' => t('Approve'),
'$deny' => t('Deny'),
'$h_users' => t('Users'),
'$h_newuser' => t('New User'),
- '$th_deleted' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Deleted since') ),
- '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ),
+ '$th_deleted' => array(t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Deleted since')),
+ '$th_users' => array(t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account')),
'$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
'$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
if($a->argc == 3) {
$plugin = $a->argv[2];
if(!is_file("addon/$plugin/$plugin.php")) {
- notice( t("Item not found.") );
+ notice(t("Item not found."));
return '';
}
if($idx !== false) {
unset($a->plugins[$idx]);
uninstall_plugin($plugin);
- info( sprintf( t("Plugin %s disabled."), $plugin ) );
+ info(sprintf(t("Plugin %s disabled."), $plugin));
} else {
$a->plugins[] = $plugin;
install_plugin($plugin);
- info( sprintf( t("Plugin %s enabled."), $plugin ) );
+ info(sprintf(t("Plugin %s enabled."), $plugin));
}
set_config("system","addon", implode(", ",$a->plugins));
- goaway($a->get_baseurl(true) . '/admin/plugins' );
+ goaway('admin/plugins');
return ''; // NOTREACHED
}
'$function' => 'plugins',
'$plugins' => $plugins,
'$pcount' => count($plugins),
- '$noplugshint' => sprintf( t('There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s'), 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'),
+ '$noplugshint' => sprintf(t('There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s'), 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'),
'$form_security_token' => get_form_security_token("admin_themes"),
));
}
if($files) {
foreach($files as $file) {
$f = basename($file);
- $is_experimental = intval(file_exists($file . '/experimental'));
- $is_supported = 1-(intval(file_exists($file . '/unsupported')));
+ $is_experimental = intval(file_exists($file.'/experimental'));
+ $is_supported = 1-(intval(file_exists($file.'/unsupported')));
$is_allowed = intval(in_array($f,$allowed_themes));
if($is_allowed OR $is_supported OR get_config("system", "show_unsupported_themes"))
}
if(! count($themes)) {
- notice( t('No themes found.'));
+ notice(t('No themes found.'));
return '';
}
if($a->argc == 3) {
$theme = $a->argv[2];
if(! is_dir("view/theme/$theme")) {
- notice( t("Item not found.") );
+ notice(t("Item not found."));
return '';
}
$s = rebuild_theme_table($themes);
if($result) {
install_theme($theme);
- info( sprintf('Theme %s enabled.',$theme));
+ info(sprintf('Theme %s enabled.',$theme));
}
else {
uninstall_theme($theme);
- info( sprintf('Theme %s disabled.',$theme));
+ info(sprintf('Theme %s disabled.',$theme));
}
set_config('system','allowed_themes',$s);
- goaway($a->get_baseurl(true) . '/admin/themes' );
+ goaway('admin/themes');
return ''; // NOTREACHED
}
$admin_form = __get_theme_admin_form($a, $theme);
}
- $screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
+ $screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
if(! stristr($screenshot[0],$theme))
$screenshot = null;
set_config('system','loglevel', $loglevel);
}
- info( t("Log settings updated.") );
- goaway($a->get_baseurl(true) . '/admin/logs' );
+ info(t("Log settings updated."));
+ goaway('admin/logs');
return; // NOTREACHED
}
'$form_security_token' => get_form_security_token("admin_logs"),
'$phpheader' => t("PHP logging"),
'$phphint' => t("To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."),
- '$phplogcode' => "error_reporting(E_ERROR | E_WARNING | E_PARSE );\nini_set('error_log','php.out');\nini_set('log_errors','1');\nini_set('display_errors', '1');",
+ '$phplogcode' => "error_reporting(E_ERROR | E_WARNING | E_PARSE);\nini_set('error_log','php.out');\nini_set('log_errors','1');\nini_set('display_errors', '1');",
));
}
check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
- logger('postvars: ' . print_r($_POST,true),LOGGER_DATA);
+ logger('postvars: '.print_r($_POST,true),LOGGER_DATA);
$arr = array();
$features = get_features(false);
foreach($features as $fname => $fdata) {
foreach(array_slice($fdata,1) as $f) {
$feature = $f[0];
- $feature_state = 'feature_' . $feature;
- $featurelock = 'featurelock_' . $feature;
+ $feature_state = 'feature_'.$feature;
+ $featurelock = 'featurelock_'.$feature;
if(x($_POST[$feature_state]))
- $val = intval($_POST['feature_' . $feature]);
+ $val = intval($_POST['feature_'.$feature]);
else
$val = 0;
set_config('feature',$feature,$val);
}
}
- goaway($a->get_baseurl(true) . '/admin/features' );
+ goaway('admin/features');
return; // NOTREACHED
}
$set = $f[3];
$arr[$fname][1][] = array(
array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'),t('On'))),
- array('featurelock_' .$f[0],sprintf( t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'),t('On')))
+ array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'),t('On')))
);
}
}
$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
'$name' => htmlentities($c[0]['name']),
'$photo' => $c[0]['photo'],
- 'url' => z_root() . '/contacts/' . $cid
+ 'url' => 'contacts/' . $cid
));
if(! x($a->page,'aside'))
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
'$name' => htmlentities($a->data['contact']['name']),
'$photo' => $a->data['contact']['photo'],
- '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
+ '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
'$network_name' => $networkname,
'$network' => t('Network:'),
}
if(x($_SESSION,'return_url'))
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway('' . $_SESSION['return_url']);
else
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
}
if(! count($orig_record)) {
notice( t('Could not access contact record.') . EOL);
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
return; // NOTREACHED
}
if(! count($orig_record)) {
notice( t('Could not access contact record.') . EOL);
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
return; // NOTREACHED
}
if($cmd === 'update') {
_contact_update($contact_id);
- goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+ goaway('contacts/' . $contact_id);
// NOTREACHED
}
if($cmd === 'updateprofile') {
_contact_update_profile($contact_id);
- goaway($a->get_baseurl(true) . '/crepair/' . $contact_id);
+ goaway('crepair/' . $contact_id);
// NOTREACHED
}
info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
}
- goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+ goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
}
- goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+ goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
}
- goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+ goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
// Now check how the user responded to the confirmation query
if($_REQUEST['canceled']) {
if(x($_SESSION,'return_url'))
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway('' . $_SESSION['return_url']);
else
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
}
_contact_drop($contact_id, $orig_record[0]);
info( t('Contact has been removed.') . EOL );
if(x($_SESSION,'return_url'))
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway('' . $_SESSION['return_url']);
else
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
return; // NOTREACHED
}
if($cmd === 'posts') {
'$lbl_info1' => t('Contact Information / Notes'),
'$infedit' => t('Edit contact notes'),
'$common_text' => $common_text,
- '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
+ '$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'],
'$all_friends' => $all_friends,
'$relation_text' => $relation_text,
'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
$tabs = array(
array(
'label' => t('Suggestions'),
- 'url' => $a->get_baseurl(true) . '/suggest',
+ 'url' => 'suggest',
'sel' => '',
'title' => t('Suggest potential friends'),
'id' => 'suggestions-tab',
),
array(
'label' => t('All Contacts'),
- 'url' => $a->get_baseurl(true) . '/contacts/all',
+ 'url' => 'contacts/all',
'sel' => ($all) ? 'active' : '',
'title' => t('Show all contacts'),
'id' => 'showall-tab',
),
array(
'label' => t('Unblocked'),
- 'url' => $a->get_baseurl(true) . '/contacts',
+ 'url' => 'contacts',
'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
'title' => t('Only show unblocked contacts'),
'id' => 'showunblocked-tab',
array(
'label' => t('Blocked'),
- 'url' => $a->get_baseurl(true) . '/contacts/blocked',
+ 'url' => 'contacts/blocked',
'sel' => ($blocked) ? 'active' : '',
'title' => t('Only show blocked contacts'),
'id' => 'showblocked-tab',
array(
'label' => t('Ignored'),
- 'url' => $a->get_baseurl(true) . '/contacts/ignored',
+ 'url' => 'contacts/ignored',
'sel' => ($ignored) ? 'active' : '',
'title' => t('Only show ignored contacts'),
'id' => 'showignored-tab',
array(
'label' => t('Archived'),
- 'url' => $a->get_baseurl(true) . '/contacts/archived',
+ 'url' => 'contacts/archived',
'sel' => ($archived) ? 'active' : '',
'title' => t('Only show archived contacts'),
'id' => 'showarchived-tab',
array(
'label' => t('Hidden'),
- 'url' => $a->get_baseurl(true) . '/contacts/hidden',
+ 'url' => 'contacts/hidden',
'sel' => ($hidden) ? 'active' : '',
'title' => t('Only show hidden contacts'),
'id' => 'showhidden-tab',
'accesskey' => 'd');
$tabs[] = array('label' => t('Repair'),
- 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
+ 'url' => 'crepair/' . $contact_id,
'sel' => (($active_tab == 5)?'active':''),
'title' => t('Advanced Contact Settings'),
'id' => 'repair-tab',
$tabs[] = array('label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
+ 'url' => 'contacts/' . $contact_id . '/block',
'sel' => '',
'title' => t('Toggle Blocked status'),
'id' => 'toggle-block-tab',
'accesskey' => 'b');
$tabs[] = array('label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
+ 'url' => 'contacts/' . $contact_id . '/ignore',
'sel' => '',
'title' => t('Toggle Ignored status'),
'id' => 'toggle-ignore-tab',
'accesskey' => 'i');
$tabs[] = array('label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
+ 'url' => 'contacts/' . $contact_id . '/archive',
'sel' => '',
'title' => t('Toggle Archive status'),
'id' => 'toggle-archive-tab',
$comment_lastcollapsed = true;
}
- $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
+ $redirect_url = 'redir/' . $item['cid'] ;
$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
- $profile_link = z_root() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+ $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
$new = array(
'label' => t('New Message'),
- 'url' => $a->get_baseurl(true) . '/message/new',
+ 'url' => 'message/new',
'sel'=> ($a->argv[1] == 'new'),
'accesskey' => 'm',
);
$a->argv[1] = 'new';
}
else
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
return;
}
- $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
+ $myprofile = 'profile/' . $a->user['nickname'];
$tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array(
}
// Now check how the user responded to the confirmation query
if($_REQUEST['canceled']) {
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
$cmd = $a->argv[1];
info( t('Message deleted.') . EOL );
}
//goaway($a->get_baseurl(true) . '/message' );
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
info( t('Conversation removed.') . EOL );
}
//goaway($a->get_baseurl(true) . '/message' );
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
}
$sparkle = '';
}
else {
- $from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
+ $from_url = 'redir/' . $message['contact-id'];
$sparkle = ' sparkle';
}
$tpl = get_markup_template($t);
$rslt = '';
- $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
+ $myprofile = 'profile/' . $a->user['nickname'];
foreach($msg as $rr) {
$rslt .= replace_macros($tpl, array(
'$id' => $rr['id'],
'$from_name' => $participants,
- '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
+ '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
'$sparkle' => ' sparkle',
'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
'$subject' => $subject_e,
intval(local_user())
);
}
- goaway($a->get_baseurl(true) . '/notifications/intros');
+ goaway('notifications/intros');
}
if($_POST['submit'] == t('Ignore')) {
$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d",
intval($intro_id));
- goaway($a->get_baseurl(true) . '/notifications/intros');
+ goaway('notifications/intros');
}
}
}
$tabs = array(
array(
'label' => t('System'),
- 'url'=>$a->get_baseurl(true) . '/notifications/system',
+ 'url'=>'notifications/system',
'sel'=> (($a->argv[1] == 'system') ? 'active' : ''),
'accesskey' => 'y',
),
array(
'label' => t('Network'),
- 'url'=>$a->get_baseurl(true) . '/notifications/network',
+ 'url'=>'notifications/network',
'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
'accesskey' => 'w',
),
array(
'label' => t('Personal'),
- 'url'=>$a->get_baseurl(true) . '/notifications/personal',
+ 'url'=>'notifications/personal',
'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''),
'accesskey' => 'r',
),
array(
'label' => t('Home'),
- 'url' => $a->get_baseurl(true) . '/notifications/home',
+ 'url' => 'notifications/home',
'sel'=> (($a->argv[1] == 'home') ? 'active' : ''),
'accesskey' => 'h',
),
array(
'label' => t('Introductions'),
- 'url' => $a->get_baseurl(true) . '/notifications/intros',
+ 'url' => 'notifications/intros',
'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
'accesskey' => 'i',
),
/*array(
'label' => t('Messages'),
- 'url' => $a->get_baseurl(true) . '/message',
+ 'url' => 'message',
'sel'=> '',
),*/ /*while I can have notifications for messages, this tablist is not place for message page link */
);
$entry = array(
'text' => $album['album'],
'total' => $album['total'],
- 'url' => z_root() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
+ 'url' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
'urlencode' => urlencode($album['album']),
'bin2hex' => bin2hex($album['album'])
);
'$recent' => t('Recent Photos'),
'$albums' => $albums['albums'],
'$baseurl' => z_root(),
- '$upload' => array( t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload'),
+ '$upload' => array( t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
'$can_post' => $can_post
));
}
$album = hex2bin($a->argv[3]);
if($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
);
if(! count($r)) {
notice( t('Album not found.') . EOL);
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query
if($_REQUEST['canceled']) {
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
}
/*
intval($page_owner_uid)
);
$newurl = str_replace(bin2hex($album),bin2hex($newalbum),$_SESSION['photo_return']);
- goaway($a->get_baseurl() . '/' . $newurl);
+ goaway($newurl);
return; // NOTREACHED
}
}
}
else {
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
}
}
}
- goaway($a->get_baseurl() . '/photos/' . $a->data['user']['nickname']);
+ goaway('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query for a single photo
if(($a->argc > 2) && $_REQUEST['canceled']) {
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
}
if(($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
}
}
- goaway($a->get_baseurl() . '/photos/' . $a->data['user']['nickname']);
+ goaway('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
$item_id = item_store($arr);
if($item_id) {
- //q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
- // dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
- // intval($page_owner_uid),
- // intval($item_id)
- //);
-
proc_run('php',"include/notifier.php","tag","$item_id");
}
}
}
}
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
return; // NOTREACHED
}
$item_id = item_store($arr);
- //if($item_id) {
- // q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
- // dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
- // intval($page_owner_uid),
- // intval($item_id)
- // );
- //}
-
if($visible)
proc_run('php', "include/notifier.php", 'wall-new', $item_id);
// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
// if they do not wish to be redirected
- goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+ goaway($_SESSION['photo_return']);
// NOTREACHED
}
$uploader = '';
- $ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
+ $ret = array('post_url' => 'photos/' . $a->data['user']['nickname'],
'addon_text' => $uploader,
'default_upload' => true);
else {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if($can_post) {
- $edit = array(t('Edit Album'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
+ $edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
}
}
}
if($_GET['order'] === 'posted')
- $order = array(t('Show Newest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
+ $order = array(t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
else
- $order = array(t('Show Oldest First'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+ $order = array(t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
$photos = array();
$photos[] = array(
'id' => $rr['id'],
'twist' => ' ' . $twist . rand(2,4),
- 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
+ 'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
'title' => t('View Photo'),
- 'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
+ 'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
'alt' => $imgalt_e,
'desc'=> $desc_e,
'ext' => $ext,
'$photos' => $photos,
'$album' => $album,
'$can_post' => $can_post,
- '$upload' => array(t('Upload New Photos'), $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
+ '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
'$order' => $order,
'$edit' => $edit
));
}
}
$edit_suffix = ((($cmd === 'edit') && ($can_post)) ? '/edit' : '');
- $prevlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
- $nextlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
}
}
}
- $album_link = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
+ $album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
$tools = Null;
$lock = Null;
if($can_post && ($ph[0]['uid'] == $owner_uid)) {
$tools = array(
- 'edit' => array($a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
- 'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')),
+ 'edit' => array('photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
+ 'profile'=>array('profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')),
);
// lock
$prevlink = array($prevlink, '<div class="icon prev"></div>') ;
$photo = array(
- 'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
+ 'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
'title'=> t('View Full Size'),
- 'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis'),
+ 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis'),
'height' => $hires['height'],
'width' => $hires['width'],
'album' => $hires['album'],
}
$tags = array(t('Tags: '), $tag_str);
if($cmd === 'edit') {
- $tags[] = $a->get_baseurl() . '/tagrm/' . $link_item['id'];
+ $tags[] = 'tagrm/' . $link_item['id'];
$tags[] = t('[Remove any tag]');
}
}
if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
continue;
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+ $redirect_url = 'redir/' . $item['cid'] ;
if(local_user() && ($item['contact-uid'] == local_user())
$photos[] = array(
'id' => $rr['id'],
'twist' => ' ' . $twist . rand(2,4),
- 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
+ 'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
'title' => t('View Photo'),
- 'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
+ 'src' => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
'alt' => $alt_e,
'album' => array(
- 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+ 'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
'name' => $name_e,
'alt' => t('View Album'),
),
$o .= replace_macros($tpl, array(
'$title' => t('Recent Photos'),
'$can_post' => $can_post,
- '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),
+ '$upload' => array(t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'),
'$photos' => $photos,
));
}
- $o .= search($search,'search-box','/search',((local_user()) ? true : false), false);
+ $o .= search($search,'search-box','search',((local_user()) ? true : false), false);
if(strpos($search,'#') === 0) {
$tag = true;
$tabs = array(
array(
'label' => t('Account'),
- 'url' => $a->get_baseurl(true).'/settings',
+ 'url' => 'settings',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
'accesskey' => 'o',
),
if(get_features()) {
$tabs[] = array(
'label' => t('Additional features'),
- 'url' => $a->get_baseurl(true).'/settings/features',
+ 'url' => 'settings/features',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
'accesskey' => 't',
);
$tabs[] = array(
'label' => t('Display'),
- 'url' => $a->get_baseurl(true).'/settings/display',
+ 'url' => 'settings/display',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
'accesskey' => 'i',
);
$tabs[] = array(
'label' => t('Social Networks'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
+ 'url' => 'settings/connectors',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
'accesskey' => 'w',
);
$tabs[] = array(
'label' => t('Plugins'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
+ 'url' => 'settings/addon',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
'accesskey' => 'l',
);
$tabs[] = array(
'label' => t('Delegations'),
- 'url' => $a->get_baseurl(true).'/delegate',
+ 'url' => 'delegate',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
'accesskey' => 'd',
);
$tabs[] = array(
'label' => t('Connected apps'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
+ 'url' => 'settings/oauth',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
'accesskey' => 'b',
);
$tabs[] = array(
'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
+ 'url' => 'uexport',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
'accesskey' => 'e',
);
$tabs[] = array(
'label' => t('Remove account'),
- 'url' => $a->get_baseurl(true) . '/removeme',
+ 'url' => 'removeme',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
'accesskey' => 'r',
);
);
call_hooks('display_settings_post', $_POST);
- goaway($a->get_baseurl(true) . '/settings/display' );
+ goaway('settings/display' );
return; // NOTREACHED
}
if (x($_POST,'resend_relocate')) {
proc_run('php', 'include/notifier.php', 'relocate', local_user());
info(t("Relocate message has been send to your contacts"));
- goaway($a->get_baseurl(true) . '/settings');
+ goaway('settings');
}
call_hooks('settings_post', $_POST);
}
- goaway($a->get_baseurl(true) . '/settings' );
+ goaway('settings' );
return; // NOTREACHED
}
info( t('Profile is <strong>not published</strong>.') . EOL );
- //$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
+ //$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . 'profile/' . $nickname : '');
$tpl_addr = get_markup_template("settings_nick_set.tpl");
require_once("mod/settings.php");
settings_init($a);
-
-/*
- $tabs = array(
- array(
- 'label' => t('Account settings'),
- 'url' => $a->get_baseurl(true).'/settings',
- 'selected' => '',
- ),
- array(
- 'label' => t('Display settings'),
- 'url' => $a->get_baseurl(true).'/settings/display',
- 'selected' =>'',
- ),
-
- array(
- 'label' => t('Connector settings'),
- 'url' => $a->get_baseurl(true).'/settings/connectors',
- 'selected' => '',
- ),
- array(
- 'label' => t('Plugin settings'),
- 'url' => $a->get_baseurl(true).'/settings/addon',
- 'selected' => '',
- ),
- array(
- 'label' => t('Connected apps'),
- 'url' => $a->get_baseurl(true) . '/settings/oauth',
- 'selected' => '',
- ),
- array(
- 'label' => t('Export personal data'),
- 'url' => $a->get_baseurl(true) . '/uexport',
- 'selected' => 'active'
- ),
- array(
- 'label' => t('Remove account'),
- 'url' => $a->get_baseurl(true) . '/removeme',
- 'selected' => ''
- )
- );
-
- $tabtpl = get_markup_template("generic_links_widget.tpl");
- $a->page['aside'] = replace_macros($tabtpl, array(
- '$title' => t('Settings'),
- '$class' => 'settings-widget',
- '$items' => $tabs,
- ));
-*/
}
function uexport_content(&$a){
* list of array( 'link url', 'link text', 'help text' )
*/
$options = array(
- array('/uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')),
- array('/uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')),
+ array('uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')),
+ array('uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')),
);
call_hooks('uexport_options', $options);
'version' => FRIENDICA_VERSION,
'schema' => DB_UPDATE_VERSION,
'baseurl' => $a->get_baseurl(),
- 'user' => $user,
- 'contact' => $contact,
- 'profile' => $profile,
+ 'user' => $user,
+ 'contact' => $contact,
+ 'profile' => $profile,
'photo' => $photo,
'pconfig' => $pconfig,
'group' => $group,
* echoes account data and items as separated json, one per line
*/
function uexport_all(&$a) {
-
- uexport_account($a);
+
+ uexport_account($a);
echo "\n";
$r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
$this->writable = ($this->get_data_value('writable') || $this->get_data_value('self'));
$ssl_state = ((local_user()) ? true : false);
- $this->redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $this->get_data_value('cid') ;
+ $this->redirect_url = 'redir/' . $this->get_data_value('cid') ;
if(get_config('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel())
$this->threaded = true;
$shareable = ((($conv->get_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false);
if(local_user() && link_compare($a->contact['url'],$item['author-link'])) {
if ($item["event-id"] != 0)
- $edpost = array($a->get_baseurl($ssl_state)."/events/event/".$item['event-id'], t("Edit"));
+ $edpost = array("events/event/".$item['event-id'], t("Edit"));
else
- $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+ $edpost = array("editpost/".$item['id'], t("Edit"));
} else
$edpost = false;
if(($this->get_data_value('uid') == local_user()) || $this->is_visiting())
call_hooks('render_location',$locate);
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
- $searchpath = $a->get_baseurl()."/search?tag=";
+ $searchpath = "search?tag=";
$tags=array();
$hashtags = array();
$mentions = array();
'$parent' => $this->get_id(),
'$qcomment' => $qcomment,
'$profile_uid' => $conv->get_profile_owner(),
- '$mylink' => $a->contact['url'],
+ '$mylink' => $a->remove_baseurl($a->contact['url']),
'$mytitle' => t('This is you'),
'$myphoto' => $a->remove_baseurl($a->contact['thumb']),
'$comment' => t('Comment'),
-<h3>{{$title}}</h3>\r
-\r
-\r
-{{foreach $options as $o}}\r
-<dl>\r
- <dt><a href="{{$baseurl}}/{{$o.0}}">{{$o.1}}</a></dt>\r
- <dd>{{$o.2}}</dd>\r
-</dl>\r
-{{/foreach}}
\ No newline at end of file
+<h3>{{$title}}</h3>
+
+
+{{foreach $options as $o}}
+<dl>
+ <dt><a href="{{$o.0}}">{{$o.1}}</a></dt>
+ <dd>{{$o.2}}</dd>
+</dl>
+{{/foreach}}
}
.children .wall-item-container .wall-item-item .wall-item-content img {
/* max-width: 650px; */
- /* max-width: 580px; */
- max-width: 100%;
+ max-width: 520px;
+ /* max-width: 100%; */
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;
$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = array(
- 'url' => z_root() . '/network?f=&cid=' . $contact['id'],
- 'external_url' => z_root() . '/redir/' . $contact['id'],
+ 'url' => 'network?f=&cid=' . $contact['id'],
+ 'external_url' => 'redir/' . $contact['id'],
'name' => $contact['name'],
'cid' => $contact['id'],
'selected' => $selected,
- 'micro' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
+ 'micro' => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
'id' => ++$id,
);
$entries[] = $entry;
projects / friendica.git / commitdiff