harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica
2014-01-15 03:14:07 -08:00
parent 47b8071ca7 d0e657f0f0
commit 403b01da23
6 changed files with 2479 additions and 2313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mod/editblock.php
View File

@@ -56,7 +56,11 @@ function editblock_content(&$a) {
intval($post_id),
intval($owner)
);
$item_id = q("select * from item_id where service = 'BUILDBLOCK' and iid = %d limit 1",
$itm[0]['id']
);
if($item_id)
$block_title = $item_id[0]['sid'];
$plaintext = true;
@@ -88,7 +92,8 @@ function editblock_content(&$a) {
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag,
'$nickname' => $a->user['nickname']
'$nickname' => $a->user['nickname'],
'$confirmdelete' => t('Delete block?')
));
@@ -135,6 +140,7 @@ function editblock_content(&$a) {
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
'$placeholdertitle' => t('Set title'),
'$pagetitle' => $block_title,
'$category' => '',
'$placeholdercategory' => t('Categories (comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
@@ -154,7 +160,7 @@ function editblock_content(&$a) {
$ob = get_observer_hash();
if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob))
$o .= '<br /><br /><a href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Block') . '</a><br />';
$o .= '<br /><br /><a class="block-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Block') . '</a><br />';
return $o;

14
mod/editlayout.php
View File

@@ -57,7 +57,11 @@ function editlayout_content(&$a) {
intval($owner)
);
$item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1",
$itm[0]['id']
);
if($item_id)
$layout_title = $item_id[0]['sid'];
$plaintext = true;
// You may or may not be a local user. This won't work,
@@ -74,7 +78,8 @@ function editlayout_content(&$a) {
'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
'$geotag' => $geotag,
'$nickname' => $a->user['nickname']
'$nickname' => $a->user['nickname'],
'$confirmdelete' => t('Delete layout?')
));
@@ -120,6 +125,7 @@ function editlayout_content(&$a) {
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
'$placeholdertitle' => t('Set title'),
'$pagetitle' => $layout_title,
'$category' => '',
'$placeholdercategory' => t('Categories (comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
@@ -134,11 +140,11 @@ function editlayout_content(&$a) {
'$feature_expire' => 'none',
'$expires' => t('Set expiration date'),
));
$ob = get_observer_hash();
if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob))
$o .= '<br /><br /><a href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />';
$o .= '<br /><br /><a class="layout-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />';
return $o;

4
mod/editwebpage.php
View File

@@ -99,8 +99,8 @@ function editwebpage_content(&$a) {
if($layout)
$layoutselect = '<input type="hidden" name="layout_mid" value="' . $layout . '" />';
else
$layoutselect = layout_select($itm[0]['uid']);
$layoutselect = layout_select($itm[0]['uid'],$itm[0]['layout_mid']);
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
'$title' => t('Edit Webpage')