From 6c771f84cedc71e7ffeecebe3e2fd7f912de3e7b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 22 Jun 2017 22:43:08 -0700
Subject: remove unused page_widgets.php include and provide a general function
 for loading sql from file to use in the cdav migration

---
 include/dba/dba_driver.php | 14 +++++++++++++
 include/page_widgets.php   | 52 ----------------------------------------------
 2 files changed, 14 insertions(+), 52 deletions(-)
 delete mode 100644 include/page_widgets.php

(limited to 'include')

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index b0ad7936c..4079bcaba 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -442,6 +442,20 @@ function db_getfunc($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.
 // This can cause a recursion if database debugging is enabled.
 // So this function preserves the current database debugging state and then turns it off
diff --git a/include/page_widgets.php b/include/page_widgets.php
deleted file mode 100644
index 3270de4a3..000000000
--- a/include/page_widgets.php
+++ /dev/null
@@ -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')
-
-	));
-
-}
-- 
cgit v1.2.3