mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

spacing tidy up

Browse Source
This commit is contained in:
dhawes 2005-08-11 12:45:38 +00:00
parent a4221c1d20
commit fd9576fb1b
6 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
blocks/rss_client/block_rss_client.php
View File

@ -40,7 +40,7 @@ class block_rss_client extends block_base {
$this->title = get_string('remotenewsfeed', 'block_rss_client');
}
}
function get_content() {
global $CFG, $editing;
@ -128,11 +128,11 @@ class block_rss_client extends block_base {
$count ++;
}
}
$this->content->text = $output;
return $this->content;
}
function instance_allow_multiple() {
return true;
}
@ -144,7 +144,7 @@ class block_rss_client extends block_base {
function instance_allow_config() {
return true;
}
/**
* @param int $rssid The feed to be displayed
* @param bool $display_description Should the description information from the feed be displayed or simply the title?
@ -161,7 +161,7 @@ class block_rss_client extends block_base {
if (!defined('MAGPIE_OUTPUT_ENCODING')) {
define('MAGPIE_OUTPUT_ENCODING', get_string('thischarset')); // see bug 3107
}
// Check if there is a cached string which has not timed out.
if (BLOCK_RSS_SECONDARY_CACHE_ENABLED &&
isset($this->config->{'rssid'. $rssid}) &&
@ -181,7 +181,7 @@ class block_rss_client extends block_base {
$rss = fetch_rss($rss_record->url);
$rsserror = ob_get_contents();
ob_end_clean();
if ($rss === false) {
if ($CFG->debug && !empty($rsserror)) {
// There was a failure in loading the rss feed, print link to full error text
@ -217,7 +217,7 @@ class block_rss_client extends block_base {
if (empty($rss) || empty($rss->items)) {
return '';
}
foreach ($rss->items as $item) {
$item['title'] = stripslashes_safe(rss_unhtmlentities($item['title']));
$item['description'] = stripslashes_safe(rss_unhtmlentities($item['description']));
@ -227,7 +227,7 @@ class block_rss_client extends block_base {
} else {
$item['title'] = break_up_long_words($item['title'], 30);
}
if ($item['link'] == '') {
$item['link'] = $item['guid'];
}
@ -236,7 +236,6 @@ class block_rss_client extends block_base {
$returnstring .= '<div class="link"><a href="'. $item['link'] .'" target="_blank">'. $item['title'] . '</a></div>' ."\n";
if ($display_description && !empty($item['description'])) {
$item['description'] = break_up_long_words($item['description'], 30);
$returnstring .= '<div class="description">'.
@ -263,7 +262,7 @@ class block_rss_client extends block_base {
$this->title = $feedtitle;
}
}
// store config setting for this rssid so we do not need to read from file each time
$this->config->{'rssid'. $rssid} = addslashes($returnstring);
$this->config->{'rssid'. $rssid .'timestamp'} = $now;
@ -271,4 +270,4 @@ class block_rss_client extends block_base {
return $returnstring;
}
}
?>
?>

14
blocks/rss_client/block_rss_client_action.php
View File

@ -54,7 +54,7 @@
} else {
$navigation = $straddedit;
}
print_header(get_string('feedsaddedit', 'block_rss_client'),
get_string('feedsaddedit', 'block_rss_client'),
$navigation );
@ -84,7 +84,7 @@
if (empty($url)) {
error( 'url not defined for rss feed' );
}
// By capturing the output from fetch_rss this way
// error messages do not display and clutter up the moodle interface
// however, we do lose out on seeing helpful messages like "cache hit", etc.
@ -95,7 +95,7 @@
$message .= ob_get_contents();
}
ob_end_clean();
$dataobject->id = $rssid;
if ($rss === false) {
$dataobject->description = '';
@ -141,7 +141,7 @@
$message .= ob_get_contents();
}
ob_end_clean();
if ($rss === false) {
$message .= '<br /><br />There was an error loading this rss feed. You may want to verify the url you have specified before using it.'; //Daryl Hawes note: localize this line
} else {
@ -174,7 +174,7 @@
rss_print_form($act, $url, $rssid, $preferredtitle, $id);
} else if ($act == 'delfeed') {
$file = $CFG->dataroot .'/cache/rsscache/'. $rssid .'.xml';
if (file_exists($file)) {
unlink($file);
@ -199,7 +199,7 @@
ob_start();
$rss = fetch_rss($rss_record->url);
ob_end_clean();
if (empty($rss_record->preferredtitle)) {
$feedtitle = stripslashes_safe($rss_record->preferredtitle);
} else {
@ -242,4 +242,4 @@
}
print_footer();
?>
?>

18
blocks/rss_client/block_rss_client_error.php
View File

@ -1,14 +1,14 @@
<?php //$Id$
// Print an error page condition
require_once('../../config.php');
require_once('../../config.php');
$error = required_param('error', PARAM_CLEAN);
$error = required_param('error',PARAM_CLEAN);
print_header(get_string('error'),
get_string('error'),
get_string('error') );
print_header(get_string('error'),
get_string('error'),
get_string('error') );
print clean_text(urldecode($error));
print clean_text(urldecode($error));
print_footer();
?>
print_footer();
?>

6
blocks/rss_client/config_global.html
View File

@ -17,6 +17,7 @@
<?php print_string('clientnumentries', 'block_rss_client') ?>
</td>
</tr>
<tr valign="top">
<td align="right">block_rss_timeout:</td>
<td>
@ -31,6 +32,7 @@
<?php print_string('timeout', 'block_rss_client') ?>
</td>
</tr>
<tr valign="top">
<td align="right">block_rss_client_submitters:</td>
<td>
@ -56,13 +58,11 @@
</td>
</tr>
<tr>
<td colspan="3" align="center">
<input type="submit" value="<?php print_string('savechanges') ?>"></td>
</tr>
<tr>
<td colspan="3" align="center"><a href=" <?php echo $CFG->wwwroot; ?>/blocks/rss_client/block_rss_client_action.php?id=<?php
if (!isset($id)) {
$id = '';
@ -70,4 +70,4 @@
echo $id; ?>"><?php print_string('feedsaddedit', 'block_rss_client')?></a></center><br /><br />
</td>
</tr>
</table>
</table>

12
blocks/rss_client/config_instance.html
View File

@ -1,4 +1,4 @@
<?php
<?php // $Id$ //
require_once($CFG->libdir .'/rsslib.php');
$id = optional_param('id', SITEID, PARAM_INT);
@ -7,7 +7,7 @@ $id = optional_param('id', SITEID, PARAM_INT);
$page = page_create_object($this->instance->pagetype, $this->instance->pageid);
/// Print tabs at top
$currentaction = optional_param( 'currentaction','',PARAM_ALPHA );
$currentaction = optional_param('currentaction', '', PARAM_ALPHA);
if (empty($currentaction) || $currentaction == 'configblock') {
$currentaction = 'configblock';
} else {
@ -38,6 +38,7 @@ if ($currentaction == 'configblock') {
?>
</td>
</tr>
<tr valign="top">
<td align="right" width="50%">
<?php print_string('shownumentrieslabel', 'block_rss_client') ?>
@ -56,6 +57,7 @@ if ($currentaction == 'configblock') {
?>" />
</td>
</tr>
<tr valign="top">
<td align="right" width="50%">
<?php print_string('choosefeedlabel', 'block_rss_client') ?>
@ -95,6 +97,7 @@ if ($currentaction == 'configblock') {
?>
</td>
</tr>
<tr valign="top">
<td align="right" width="50%"><?php print_string('uploadlabel'); ?></td>
<?php
@ -106,6 +109,7 @@ if ($currentaction == 'configblock') {
<td width="50%"><input type="text" name="title" size="30" value="<?php echo $title; ?>" />
</td>
</tr>
<tr valign="top">
<td align="right" width="50%"><?php print_string('clientshowchannellinklabel', 'block_rss_client'); ?></td>
<td width="50%">
@ -122,6 +126,7 @@ if ($currentaction == 'configblock') {
?>
</td>
</tr>
<tr valign="top">
<td align="right" width="50%"><?php print_string('clientshowimagelabel', 'block_rss_client'); ?></td>
<td width="50%">
@ -138,6 +143,7 @@ if ($currentaction == 'configblock') {
?>
</td>
</tr>
<tr>
<td colspan="2" align="center">
<input type="submit" value="<?php print_string('savechanges') ?>">
@ -153,4 +159,4 @@ if ($currentaction == 'configblock') {
print '</form>'; //not sure that this is needed
rss_print_form($act, $url, $rssid, $preferredtitle, $id);
print '</td></tr></table>';
} ?>
} ?>

26
blocks/rss_client/config_instance_tabs.php
View File

@ -2,21 +2,21 @@
/// This file to be included so we can assume config.php has already been included.
/// We also assume that $inactive, $activetab and $currentaction have been set
global $USER;
$tabs = $row = array();
global $USER;
$tabs = $row = array();
$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock', 'id' => $id));
$row[] = new tabobject('configblock', $script,
get_string('configblock', 'block_rss_client'));
$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock', 'id' => $id));
$row[] = new tabobject('configblock', $script,
get_string('configblock', 'block_rss_client'));
$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds', 'id' => $id));
$row[] = new tabobject('managefeeds', $script,
get_string('managefeeds', 'block_rss_client'));
$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds', 'id' => $id));
$row[] = new tabobject('managefeeds', $script,
get_string('managefeeds', 'block_rss_client'));
$tabs[] = $row;
$tabs[] = $row;
/// Print out the tabs and continue!
print '<div align="center">';
print_tabs($tabs, $currentaction);
print '</div>';
/// Print out the tabs and continue!
print '<div align="center">';
print_tabs($tabs, $currentaction);
print '</div>';
?>