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

remove unused page_widgets.php include and provide a general function for loading sql from file to use in the cdav migration

Browse Source
This commit is contained in:
zotlabs 2017-06-22 22:43:08 -07:00
parent 02b7bc0803
commit 6c771f84ce
5 changed files with 14 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Block.php
View File

@ -3,8 +3,6 @@ namespace Zotlabs\Module;
require_once('include/items.php'); require_once('include/items.php');
require_once('include/conversation.php'); require_once('include/conversation.php');
require_once('include/page_widgets.php');
class Block extends \Zotlabs\Web\Controller { class Block extends \Zotlabs\Web\Controller {

1
Zotlabs/Module/Page.php
View File

@ -3,7 +3,6 @@ namespace Zotlabs\Module;
require_once('include/items.php'); require_once('include/items.php');
require_once('include/conversation.php'); require_once('include/conversation.php');
require_once('include/page_widgets.php');
class Page extends \Zotlabs\Web\Controller { class Page extends \Zotlabs\Web\Controller {

9
Zotlabs/Module/Webpages.php
View File

@ -179,11 +179,8 @@ class Webpages extends \Zotlabs\Web\Controller {
// so just list titles and an edit link. // so just list titles and an edit link.
/** @TODO - this should be replaced with pagelist_widget */
$sql_extra = item_permissions_sql($owner); $sql_extra = item_permissions_sql($owner);
$r = q("select * from iconfig left join item on iconfig.iid = item.id $r = q("select * from iconfig left join item on iconfig.iid = item.id
where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d
$sql_extra order by item.created desc", $sql_extra order by item.created desc",
@ -191,12 +188,6 @@ class Webpages extends \Zotlabs\Web\Controller {
intval(ITEM_TYPE_WEBPAGE) intval(ITEM_TYPE_WEBPAGE)
); );
// $r = q("select * from item_id left join item on item_id.iid = item.id
// where item_id.uid = %d and service = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc",
// intval($owner),
// intval(ITEM_TYPE_WEBPAGE)
// );
if(! $r) if(! $r)
$x['pagetitle'] = 'home'; $x['pagetitle'] = 'home';

14
include/dba/dba_driver.php
View File

@ -442,6 +442,20 @@ function db_getfunc($f) {
return $f; return $f;
} }
function db_load_file($f) {
// db errors should get logged to the logfile
$str = @file_get_contents($f);
$arr = explode(';', $str);
if($arr) {
foreach($arr as $a) {
if(strlen(trim($a))) {
$r = dbq(trim($a));
}
}
}
}
// The logger function may make DB calls internally to query the system logging parameters. // The logger function may make DB calls internally to query the system logging parameters.
// This can cause a recursion if database debugging is enabled. // This can cause a recursion if database debugging is enabled.
// So this function preserves the current database debugging state and then turns it off // So this function preserves the current database debugging state and then turns it off

52
include/page_widgets.php
View File

@ -1,52 +0,0 @@
<?php
// A basic toolbar for observers with write_pages permissions
function writepages_widget ($who,$which) {
return replace_macros(get_markup_template('write_pages.tpl'), array(
'$new' => t('New Page'),
'$newurl' => "webpages/$who",
'$edit' => t('Edit'),
'$editurl' => "editwebpage/$who/$which"
));
}
// Chan is channel_id, $which is channel_address - we'll need to pass observer later too.
function pagelist_widget ($owner,$which) {
$r = q("select * from iconfig left join item on iconfig.iid = item.id where item_id.uid = %d
and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' order by item.created desc",
intval($owner)
);
$pages = null;
if($r) {
$pages = array();
foreach($r as $rr) {
$pages[$rr['iid']][] = array('url' => $rr['iid'],'pagetitle' => $rr['v'],'title' => $rr['title'],'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']));
}
}
//Build the base URL for edit links
$url = z_root() . "/editwebpage/" . $which;
// This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM).
return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
'$baseurl' => $url,
'$edit' => t('Edit'),
'$pages' => $pages,
'$channel' => $which,
'$view' => t('View'),
'$preview' => t('Preview'),
'$actions_txt' => t('Actions'),
'$pagelink_txt' => t('Page Link'),
'$title_txt' => t('Title'),
'$created_txt' => t('Created'),
'$edited_txt' => t('Edited')
));
}