Files Altered
- Note down what files have been altered here. A good format to use is "path/to/file:linenumber - what I altered" ie. "webcast/features.cgi:154 - fixed up that database problem"
current contents of ~/private/phpchanges.diff
--- docs/autoupdates/1157785910/mods/calendar/components/modbox.inc 2006-09-09 02:11:51.000000000 -0500
+++ mods/calendar/components/modbox.inc 2006-09-09 07:12:40.696765224 -0500
@@ -80,10 +80,10 @@
}
?>
<p class="center">
-<a href="<? echo($g_url) ?>mod/calendar/"><? echo _('view calendar week') ?></a>
+<a href="http://www.radicalendar.org/calendar/index.php?view=month&group=aotearoaimc"><? echo _('view calendar week') ?></a>
<br />
-<a href="http://www.radicalendar.org/calendar/<? echo $g_mod_prefs['calendar']['shortname']; ?>/all/new/index.php"><? echo _('add an event') ?></a>
+<a href="http://www.radicalendar.org/calendar/<? echo $g_mod_prefs['calendar']['shortname']; ?>/all/new/index.php?function=edit"><? echo _('add an event') ?></a>
</p>
</div>
</div>
-<!-- End Quick Calendar -->
\ No newline at end of file
+<!-- End Quick Calendar -->
--- docs/autoupdates/1157785910/mods/calendar/components/calendar.inc 2006-09-09 02:11:51.000000000 -0500
+++ mods/calendar/components/calendar.inc 2006-09-09 07:23:12.900655624 -0500
@@ -4,6 +4,8 @@
// copyright 2001-2004: dada typo and contributors
?>
<?
+header('Location: http://www.radicalendar.org/calendar/index.php?view=month&group=aotearoaimc');
+
include_once ('dt_classes/xmlrpc.inc');
$xmlrpc_internalencoding = 'utf-8';
$no_data_code = 800;
@@ -158,4 +160,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
--- cronjobs/cron.daily/mysqlbackup.php.orig 2006-09-10 01:32:48.000000000 -0500
+++ cronjobs/cron.daily/mysqlbackup.php 2006-09-10 01:33:11.000000000 -0500
@@ -13,7 +13,7 @@
$mysqldump_location = `which mysqldump`;
if ($mysqldump_location) {
$mysqldump_location = rtrim($mysqldump_location);
- $cmd = $mysqldump_location.' --opt --host='.$g_prefs['db_host'].' --user='.$g_prefs['db_user'].' --password='.$g_prefs['db_pass'].' '.$g_prefs['db_name'].' | gzip -c -f -5 > '.$g_prefs['logdir'].$g_prefs['db_name'].'_dump_'.date('w').'.sql.gz';
+ $cmd = $mysqldump_location.' --opt --host='.$g_prefs['db_host'].' --user='.$g_prefs['db_user'].' --password='.$g_prefs['db_pass'].' '.$g_prefs['db_name'].' | bzip2 > '.$g_prefs['logdir'].$g_prefs['db_name'].'_dump_'.date('w').'.sql.bz2';
$test = `$cmd`;
cronlog ('Executing '.(str_replace('--password='.$g_prefs['db_pass'],'--password=[password]',$cmd)).' returned '.$test);
} else {
@@ -22,4 +22,4 @@
} else {
cronlog ('Safe mode is enabled on this server. The mysqlbackup script cannot be run, and should be disabled.');
}
-?>
\ No newline at end of file
+?>
--- mods/newswire/components/modulebox.inc.orig 2006-09-15 03:27:52.918440264 -0500
+++ mods/newswire/components/modulebox.inc 2006-09-15 03:28:07.736187624 -0500
@@ -84,7 +84,7 @@
// uncomment the next few lines to display number of comments!
// * This will slow down the page a bit! *
- /*
+
if (check_mod('newswire','comments')) {
$c_oracle =& new CommentOracle();
$c_oracle->set_where_clause("comments.parent_class = 'Article'");
@@ -95,7 +95,7 @@
printf(' ('._('%d comments').')',$c_oracle->total_count);
}
}
- */
+
echo ('</div>');
if ($arr['deleted']) {
--- rightbar.inc.orig 2006-09-15 03:43:18.000000000 -0500
+++ rightbar.inc 2006-09-15 04:01:38.000000000 -0500
@@ -1 +1,2 @@
-<?
// dadaIMC: $Id: FilesAltered.txt,v 1.2 2007/02/07 09:20:18 AoTearoa Exp www-data $
// license: GNU LGPL
// copyright 2001-2004: dada typo and contributors
?>
<div id="rightbar">
<?
if ($t_mods = get_mod_hooks('rightbar')) {
foreach($t_mods as $onemod) {
if ($inc = $onemod->get_include_file('rightbar')) {
include($inc);
}
}
}
?>
</div>
\ No newline at end of file
+<?// dadaIMC: $Id: FilesAltered.txt,v 1.2 2007/02/07 09:20:18 AoTearoa Exp www-data $// license: GNU LGPL// copyright 2001-2004: dada typo and contributors
+?><div id="rightbar"><?if ($t_mods = get_mod_hooks('rightbar')) { foreach($t_mods as $onemod) { if ($inc = $onemod->get_include_file('rightbar')) { include($inc); if ($onemod->get_module_name() == 'Media Gallery') { print '<div class="publishbutton"><a href="http://indymedia.org.nz/newswire/index.php?function=publish" border="0"><img src="/images/publish_glow.gif" width="135" height="40" alt="PUBLISH"></a></div>'; } } } }?></div>
--- dt_classes/dt_FunctionLibrary.inc.orig 2006-09-15 21:56:57.000000000 -0500
+++ dt_classes/dt_FunctionLibrary.inc 2006-09-15 21:59:23.000000000 -0500
@@ -715,6 +715,7 @@
$fpath = $g_path.'locale/';
$all_languages = array();
$all_languages['en_US'] = array('code'=>'en_US','xml'=>'en','xml2'=>'en-us','label'=>_('English'),'directory'=>'en_US.utf8','alt'=>'en_US.UTF-8,en_US.ISO-8859-1,en_US.ISO88591,en_US,en','dir'=>'ltr');
+ if (file_exists($fpath.'mi_NZ/LC_MESSAGES/messages.mo')) $all_languages['mi_NZ'] = array('code'=>'mi_NZ','xml'=>'mi','xml2'=>'mi-nz','label'=>'New Zealand Maori','directory'=>'mi_NZ','alt'=>'mi_NZ.utf-8,mi','dir'=>'ltr');
if (file_exists($fpath.'ar_JO.utf8/LC_MESSAGES/messages.mo')) $all_languages['ar_JO'] = array('code'=>'ar_JO','xml'=>'ar','xml2'=>'ar-jo','label'=>'العربية (JO)','directory'=>'ar_JO.utf8','alt'=>'ar_JO.UTF-8,ar_JO.ISO-8859-6,ar_JO.ISO88596,ar_JO,ar','dir'=>'rtl');
if (file_exists($fpath.'ar_IQ.utf8/LC_MESSAGES/messages.mo')) $all_languages['ar_IQ'] = array('code'=>'ar_IQ','xml'=>'ar','xml2'=>'ar-iq','label'=>'العربية (IQ)','directory'=>'ar_IQ.utf8','alt'=>'ar_IQ.UTF-8,ar_IQ.ISO-8859-6,ar_IQ.ISO88596,ar_IQ,ar','dir'=>'rtl');
if (file_exists($fpath.'ca_ES.utf8/LC_MESSAGES/messages.mo')) $all_languages['ca_ES'] = array('code'=>'ca_ES','xml'=>'ca','xml2'=>'ca-es','label'=>'Català','directory'=>'ca_ES.utf8','alt'=>'ca_ES.UTF-8,ca_ES.ISO-8859-1,ca_ES.ISO88591,ca_ES,ca','dir'=>'ltr');
@@ -3029,4 +3030,4 @@
echo ("</select>\n");
}
-?>
\ No newline at end of file
+?>
--- mods/mediacenters/cronjobs/cron.daily/get_mediacenters.php.orig 2006-09-18 02:14:24.000000000 -0500
+++ mods/mediacenters/cronjobs/cron.daily/get_mediacenters.php 2006-09-18 04:36:36.000000000 -0500
@@ -122,6 +122,10 @@
$open = false;
$mediacentersinc = '<div class="quick"><h1>'._('Media Centers').'</h1>'."\n".'<div class="modbox" id="mediacenters">';
foreach($listing as $cat=>$regionarr) {
+ if ($cat == 'regions') {
+ continue;
+ }
+
// display the "current category" in bold
if ($cat != 'NULL') {
$mediacentersinc .= '<div class="region"><img src="'.$g_url.'images/disclosure_right.gif" alt="&" /><a href="#" onclick="var x=getObjectRef(document,\'mediacenters-'.cleanname($cat).'\');return showHide(x,\'block\');"><b>['.$cat."]</b></a></div>";
@@ -133,7 +137,9 @@
if (count($cityarr) != 1 || !isset($cityarr[$reg])) {
$mediacentersinc .= '<div class="region"><img src="'.$g_url.'images/disclosure_right.gif" alt="&" /><a href="#" onclick="var x=getObjectRef(document,\'mediacenters-'.cleanname($reg).'\');return showHide(x,\'block\');"><b>'.$reg."</b></a></div>";
}
- if (!$open) $mediacentersinc .= "\n<div id=\"mediacenters-".cleanname($reg)."\" class=\"hidden\"><ul style=\"list-style-type:none;\">\n";
+ if (!$open) {
+ $mediacentersinc .= "\n<div id=\"mediacenters-".cleanname($reg)."\" class=\"hidden\"><ul style=\"list-style-type:none;\">\n";
+ }
} elseif ($cat == 'NULL') {
$mediacentersinc .= "\n<div class=\"region\"><ul style=\"list-style-type:none;\">\n";
}
--- dt_classes/dt_FunctionLibrary.inc.orig 2006-09-21 06:21:06.953360088 -0500
+++ dt_classes/dt_FunctionLibrary.inc 2006-09-21 06:21:52.311464608 -0500
@@ -666,7 +666,7 @@
}
// email the error if level is greater or equal to error_email_mode
if ($g_prefs['error_email_mode'] && $level >= (int)$g_prefs['error_email_mode']) {
- error_log($errstr."\n",1,$g_admin_email,'From: '.$_SERVER['SERVER_ADMIN']."\nX-Mailer: PHP/".phpversion());
+ error_log($errstr."\n",1,$g_admin_email,'From: '.$g_admin_email."\nX-Mailer: PHP/".phpversion());
}
}
--- mods/newswire/cronjobs/cron.hourly/syndicate.php.orig 2006-09-22 05:20:39.425031728 -0500
+++ mods/newswire/cronjobs/cron.hourly/syndicate.php 2006-09-22 05:23:55.537218144 -0500
@@ -47,9 +47,9 @@
>
<channel rdf:about="'.$g_url.'index.php">
- <title>'.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').'</title>
+ <title>'.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').' - Newswire</title>
<link>'.$g_url.'</link>
- <description>Articles of the '.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').'</description>
+ <description>Newswire articles of the '.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').'</description>
<dc:publisher>'.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').' Editorial Collective</dc:publisher>
<dc:date>'.$current_datetime.'</dc:date>
<sy:updatePeriod>hourly</sy:updatePeriod>
@@ -109,4 +109,4 @@
fwrite($filepointer,$rss);
fclose($filepointer);
}
-?>
\ No newline at end of file
+?>
--- mods/features/cronjobs/cron.hourly/syndicate.php.orig 2006-09-22 05:47:16.069304904 -0500
+++ mods/features/cronjobs/cron.hourly/syndicate.php 2006-09-22 05:47:48.045443792 -0500
@@ -40,7 +40,7 @@
>
<channel rdf:about="'.$g_url.'index.php">
- <title>'.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').'</title>
+ <title>'.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').' - Features</title>
<link>'.$g_url.'</link>
<description>Features of the '.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').'</description>
<dc:publisher>'.htmlspecialchars($g_prefs['site_name'],ENT_COMPAT,'utf-8').' Editorial Collective</dc:publisher>
@@ -105,4 +105,4 @@
http('http://api.feedster.com/ping?u='.$g_url.'rss/features.1-0.rdf','GET',false,false,30,false);
http('http://api.my.yahoo.com/rss/ping?u='.$g_url.'rss/features.1-0.rdf','GET',false,false,30,false);
}
-?>
\ No newline at end of file
+?>
--- mods/media/dt_classes/dt_Media.inc.orig 2006-09-11 03:43:04.000000000 -0500
+++ mods/media/dt_classes/dt_Media.inc 2006-09-23 21:11:56.108260488 -0500
@@ -996,7 +996,7 @@
$this->set_contributorid($usrobj->objectid);
}
}
- if (isset($g_mod_prefs['media']['anti-spam']) && $g_mod_prefs['media']['anti-spam'] == 1) {
+ if (isset($g_mod_prefs['media']['anti-spam']) && $g_mod_prefs['media']['anti-spam'] == 1 && !isAuthorized('Editor')) {
$t_str = $_POST['form_date_created'];
$t_random = substr(md5($t_str),2,5);
if ($_POST['form_check'] != $t_random) {
@@ -1687,12 +1687,12 @@
case false:
// reset the mime type based on suffix
dt_log('Could not locate MIME type configured to handle file '.$this->filename.' by suffix.',4);
- mail($g_admin_email,'New MIME type for dadaIMC','Media object '.$this->objectid.' "'.$this->filename.'" reported MIME-type: '.$this->mime_type."\nYou may need to modify the Mimetypes table to recognize the suffix '$t_suffix' as a recognized extension.",'From: '.$_SERVER['SERVER_ADMIN']."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
+ mail($g_admin_email,'New MIME type for dadaIMC','Media object '.$this->objectid.' "'.$this->filename.'" reported MIME-type: '.$this->mime_type."\nYou may need to modify the Mimetypes table to recognize the suffix '$t_suffix' as a recognized extension.",'From: '.$g_admin_email."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
$ref = '<img src="'.$g_url.'images/'.$g_lang.'/unknown.gif" id="media_'.$this->objectid.'" alt="unknown media" />';
break;
default:
dt_log('Unknown media MIME type encountered in Media object with ID '.$this->objectid."\nMIME-type indicated: ".$this->mime_type,6);
- mail($g_admin_email,'New MIME type for dadaIMC','Media object '.$this->objectid.' "'.$this->filename.'" reported MIME-type: '.$this->mime_type."\nYou may need to modify the Mimetypes table to recognize the suffix '$t_suffix' as a recognized extension.",'From: '.$_SERVER['SERVER_ADMIN']."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
+ mail($g_admin_email,'New MIME type for dadaIMC','Media object '.$this->objectid.' "'.$this->filename.'" reported MIME-type: '.$this->mime_type."\nYou may need to modify the Mimetypes table to recognize the suffix '$t_suffix' as a recognized extension.",'From: '.$g_admin_email."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
$ref = '<img src="'.$g_url.'images/'.$g_lang.'/unknown.gif" id="media_'.$this->objectid.'" alt="unknown media" />';
break;
}
@@ -1822,4 +1822,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
--- mods/commonspace/dt_classes/dt_CommonItem.inc.orig 2006-09-23 21:13:32.687578200 -0500
+++ mods/commonspace/dt_classes/dt_CommonItem.inc 2006-09-23 21:14:38.302603200 -0500
@@ -730,13 +730,13 @@
}
} else {
dt_log('Could not locate MIME type configured to handle file '.$this->filename.' by suffix.',4);
- mail($g_admin_email,'New MIME type for dadaIMC','Media object '.$this->objectid.' "'.$this->orig_filename.'"reported MIME-type: '.$this->mime_type."\nIn order to avoid this message in the future, please add a new Mimetype entry.",'From: '.$_SERVER['SERVER_ADMIN']."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
+ mail($g_admin_email,'New MIME type for dadaIMC','Media object '.$this->objectid.' "'.$this->orig_filename.'"reported MIME-type: '.$this->mime_type."\nIn order to avoid this message in the future, please add a new Mimetype entry.",'From: '.$GLOBALS['g_admin_email']."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
$ref = '<img src="'.$g_url.'images/unknown.gif" id="media_'.$this->objectid.'" alt="unknown media" />';
}
break;
default:
dt_log('Unknown media MIME type encountered in Media object with ID '.$this->objectid."\nMIME-type indicated: ".$this->mime_type,6);
- mail($g_admin_email,'New MIME type for dadaIMC','Media object '.$this->objectid.' "'.$this->orig_filename.'"reported MIME-type: '.$this->mime_type."\nIn order to avoid this message in the future, please add a new Mimetype entry.",'From: '.$_SERVER['SERVER_ADMIN']."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
+ mail($g_admin_email,'New MIME type for dadaIMC','Media object '.$this->objectid.' "'.$this->orig_filename.'"reported MIME-type: '.$this->mime_type."\nIn order to avoid this message in the future, please add a new Mimetype entry.",'From: '.$GLOBALS['g_admin_email']."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
$ref = '<img src="'.$g_url.'images/unknown.gif" id="media_'.$this->objectid.'" alt="unknown media" />';
break;
}
@@ -823,4 +823,4 @@
}
}
-?>
\ No newline at end of file
+?>
--- mods/links/linkchecker.php.orig 2006-09-23 21:15:32.733328472 -0500
+++ mods/links/linkchecker.php 2006-09-23 21:15:53.714138904 -0500
@@ -287,8 +287,8 @@
} else {
if (!empty($logtext)) {
$report = 'Results of attempt to check links at '.date("m/d/Y H:i:s")." follow.\r\n".$logtext."\r\n";
- mail ($g_admin_email, 'Linkchecker report', $report, 'From: '.$_SERVER['SERVER_ADMIN']);
+ mail ($g_admin_email, 'Linkchecker report', $report, 'From: '.$g_admin_email);
}
}
return true;
-?>
\ No newline at end of file
+?>
--- mods/locale/editor_includes/locale.inc.orig 2006-09-23 21:17:21.110852584 -0500
+++ mods/locale/editor_includes/locale.inc 2006-09-23 21:17:50.457391232 -0500
@@ -263,7 +263,7 @@
$cmd = 'msgfmt -o '.$g_path.'locale/'.$t_filter.'.utf8/LC_MESSAGES/messages.mo '.$g_path.'locale/'.$t_filter.'.utf8/LC_MESSAGES/messages.po';
$success = `$cmd`;
error_log($cmd);
- mail($g_admin_email,'New messages.po file for compiling','There is a new messages.po file for '.$t_filter.' that requires msgfmting','From: '.$_SERVER['SERVER_ADMIN']."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
+ mail($g_admin_email,'New messages.po file for compiling','There is a new messages.po file for '.$t_filter.' that requires msgfmting','From: '.$g_admin_email."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
echo '<p class="alert">'._('Your messages.po file has been saved. The administrator has been notified and will compile the new file as soon as possible.').'</p>';
}
fclose($filepointer);
@@ -394,4 +394,4 @@
editor_list_all();
}
}
-?>
\ No newline at end of file
+?>
--- mods/locale/admin_includes/locale.inc.orig 2006-09-23 21:18:38.935021512 -0500
+++ mods/locale/admin_includes/locale.inc 2006-09-23 21:18:58.651024224 -0500
@@ -261,7 +261,7 @@
if ($filepointer) {
fwrite($filepointer,$str);
fclose($filepointer);
- mail($g_admin_email,'New messages.po file for compiling','There is a new messages.po file for '.$t_filter.' that requires msgfmting','From: '.$_SERVER['SERVER_ADMIN']."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
+ mail($g_admin_email,'New messages.po file for compiling','There is a new messages.po file for '.$t_filter.' that requires msgfmting','From: '.$g_admin_email."\nReply-To: ".$GLOBALS['g_admin_email']."\nX-Mailer: PHP/".phpversion());
echo '<p class="alert">'._('Your messages.po file has been saved. The administrator has been notified and will compile the new file as soon as possible.').'</p>';
} else {
dt_log("Error trying to open ".$g_path.'locale/'.$t_filter.'.utf8/LC_MESSAGES/messages.po');
@@ -389,4 +389,4 @@
admin_list_all();
}
}
-?>
\ No newline at end of file
+?>
--- mods/links/cronjobs/cron.monthly/linkchecker.php.orig 2006-09-23 21:30:14.153332264 -0500
+++ mods/links/cronjobs/cron.monthly/linkchecker.php 2006-09-23 21:30:47.783219744 -0500
@@ -292,8 +292,8 @@
} else {
if (!empty($logtext)) {
$report = 'Results of attempt to check links at '.date("m/d/Y H:i:s")." follow.\r\n".$logtext."\r\n";
- mail ($g_admin_email, 'Linkchecker report', $report, 'From: '.$_SERVER['SERVER_ADMIN']);
+ mail ($g_admin_email, 'Linkchecker report', $report, 'From: '.$g_admin_email);
}
}
return true;
-?>
\ No newline at end of file
+?>
--- mods/media/components/modulebox.inc.orig 2006-09-23 21:40:21.000000000 -0500
+++ mods/media/components/modulebox.inc 2006-09-23 21:46:40.279418312 -0500
@@ -64,7 +64,7 @@
echo ('<a href="'.$g_url.'media/index.php?function=browse&category=all&submit=Browse"><img src="'.$g_url.'images/galleryhome.gif" height="70" width="100" alt="Media Gallery" /></a>');
} else {
$imageobj = $oracle->object_array[0];
- echo ('<a href="'.$g_url.'media/index.php?function=browse&category=all&submit=Browse">');
+ echo ('<a href="'.$g_url.'media/all/display/'.$imageobj->objectid.'/index.php">');
echo ($imageobj->insert_thumb());
echo ('</a>');
}
--- mods/comments/components/quickcomment.inc.orig 2006-10-03 21:02:39.000000000 -0500
+++ mods/comments/components/quickcomment.inc 2006-10-03 21:03:42.309364440 -0500
@@ -169,13 +169,14 @@
}
//error_log('Count of right is now '.(count($right)));
}
- if (count($right) > 2) {
+ /*if (count($right) > 2) {
echo '<div id="Comment-'.$commentobj->objectid.'" class="article" style="margin-top:3px;padding-left:'.(count($right) * 20).'px;">';
echo '<b>'._('Reply').': <a href="'.$g_url.'mod/comments/display/'.$commentobj->objectid.'/index.php">'.$commentobj->heading.'</a></b> / '.$commentobj->date_created->get_date('date_long');
echo '</div>';
} else {
$commentobj->display_brief(count($right));
- }
+ }*/
+ $commentobj->display_brief(count($right));
$right[] = $commentobj->rgt;
//error_log('After adding a new value, count of right is now '.(count($right)));
}
--- mods/comments/components/quickcomment.inc.orig 2006-10-23 21:19:18.000000000 -0500
+++ mods/comments/components/quickcomment.inc 2006-10-23 21:20:29.000000000 -0500
@@ -61,7 +61,7 @@
?>
</div>
<table class="editform" cellspacing="0">
- <caption><? printf(_('Add a new %s'),strtolower(_('Comment'))); ?></caption>
+ <caption><? printf(_('Comment')._(' on this article')); ?></caption>
<tr>
<td class="formfield required"><? echo _('Title'); ?></td>
<td class="forminput">
--- mods/comments/object_functions/comment_display_brief.inc.orig 2006-10-23 21:27:53.751781872 -0500
+++ mods/comments/object_functions/comment_display_brief.inc 2006-10-23 21:29:25.259870528 -0500
@@ -39,9 +39,6 @@
?>
</div>
<?
- if (check_mod($this->module,'comments') == 1) {
- echo ('<div class="byline"><a href="'.$g_url.'mod/comments/display/'.$this->objectid.'/index.php#quickcomment">'._('Reply to this comment').'</a></div>');
- }
if (!empty($t_display_summary)) {
?>
<div class="summary">
@@ -85,6 +82,10 @@
}
}
}
+ if (check_mod($this->module,'comments') == 1) {
+ echo ('<div class="byline"><a href="'.$g_url.'mod/comments/display/'.$this->objectid.'/index.php#quickcomment">'._('Reply to this comment').'</a></div>');
+ }
+
?>
<div class="cleardiv"> </div>
</div>
--- emailto.php.orig 2006-09-09 03:34:20.000000000 -0500
+++ emailto.php 2006-12-05 20:05:59.094042832 -0600
@@ -1,196 +1,9 @@
-<?
-// dadaIMC: $Id: FilesAltered.txt,v 1.2 2007/02/07 09:20:18 AoTearoa Exp www-data $
-// license: GNU LGPL
-// copyright 2001-2005: dada typo and contributors
-?>
-<?php
-require_once('header.inc');
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<? echo get_langcode_xml(); ?>"<? if (isset($g_prefs['languages'][$g_lang]['dir'])) echo ' dir="'.$g_prefs['languages'][$g_lang]['dir'].'"'; ?>>
+<html>
<head>
- <title>
- <?
- // build the page title from known information
- $title = $g_prefs['page_title'];
- if (isset($module)) $title .= ': '.$module;
- if (isset($id)) $title .= '/'.$id;
- echo ($title);
- ?>
- </title>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <meta http-equiv="content-script-type" content="text/javascript" />
- <meta name="keywords" content="<? echo($g_prefs['site_keywords']); ?>" />
- <meta name="description" content="<? echo($g_prefs['site_description']); ?>" />
- <?
- if (!empty($g_stylesheet)) echo ('<link rel="stylesheet" type="text/css" href="'.$GLOBALS['g_url'].'styles/'.$g_stylesheet.'" />');
- ?>
- <script src="<? echo $g_url; ?>components/library.js" type="text/javascript" charset="utf-8" defer="defer"></script>
- <script type="text/javascript">
- // <![CDATA[
- function validate() {
- frommer = getObjectRef(document,'mailfrom');
- toer = getObjectRef(document,'mailto');
- if (!isValidEmail(frommer.value)) {
- alert("<? echo _('Invalid email address'); ?>");
- frommer.focus();frommer.select();
- return false;
- }
- if (!isValidEmail(toer.value)) {
- alert("<? echo _('Invalid email address'); ?>");
- toer.focus();toer.select();
- return false;
- }
- return true;
- }
- // ]]>
- </script>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
-<body style="background-color:#ffffff;background-image:none;min-width:400px;width:400px;">
-
-<?php
-// get the appropriate ID and module
-$orc = cleantext($_REQUEST['orc']);
-if (isset($id) && $id != 0 && isset($module) && $module != '' && isset($orc) && $orc != '') {
- $oracle =& new $orc();
- $obj = $oracle->get_unique($id)
- or die($oracle->display_error());
-
- if (isset($_POST['submit'])) {
- $body = $g_url.$module.'/display/'.$obj->objectid."\n\n";
- $body .= sprintf(_("The following %s has been sent to you by %s.\n\n"),$obj->display_name,$_POST['mailfrom']);
- if (!empty($_POST['message'])) {
- $body .= sprintf(_("The sender writes:\n%s\n\n"),cleantext($_POST['message']));
- }
- $body .= "------------------------------------------------------------\n".$obj->idfield."\n";
- $body .= "------------------------------------------------------------\n".$obj->date_created->get_date('extended')."\n";
- $body .= _('by').' '.$obj->authorobj->fullname."\n";
- $body .= "\n\n";
- if ($obj->mime_type == 'text/html') {
- $display_summary = $obj->summary;
- $display_summary = eregi_replace("\n?</p>\n?","\n",$display_summary);
- $display_summary = eregi_replace("\n?<br />\n?","\n",$display_summary);
- $display_summary = strip_tags($display_summary);
- $display_body = $obj->body;
- $display_body = eregi_replace("\n?</p>\n?","\n",$display_body);
- $display_body = eregi_replace("\n?<br />\n?","\n",$display_body);
- $display_body = strip_tags($display_body);
- } else {
- $display_summary = $obj->summary;
- $display_body = $obj->body;
- }
- $body .= _('Summary').': '.$display_summary."\n\n";
- $body .= $display_body."\n";
-
- if (check_mod($obj->module,'comments') && isset($_POST['comments'])) {
- $co =& new CommentOracle();
- $comms = $co->get_comments($obj->class_type,$obj->objectid,$obj->class_type,$obj->objectid);
- if ($comms) {
- $body .= "\n"._('Comments')."\n\n";
- foreach ($comms as $commentobj) {
- $body .= "------------------------------------------------------------\n".$commentobj->heading."\n";
- $body .= "------------------------------------------------------------\n".$commentobj->date_created->get_date('extended')."\n";
- $body .= _('by').' '.$commentobj->author."\n";
- $body .= "\n\n";
- if ($commentobj->mime_type == 'text/html') {
- if (!empty($commentobj->summary)) {
- $display_summary = $commentobj->summary;
- $display_summary = eregi_replace("\n?</p>\n?","\n",$display_summary);
- $display_summary = eregi_replace("\n?<br />\n?","\n",$display_summary);
- $display_summary = strip_tags($display_summary);
- $body .= _('Summary').': '.$display_summary."\n\n";
- }
- $display_body = $commentobj->body;
- $display_body = eregi_replace("\n?</p>\n?","\n",$display_body);
- $display_body = eregi_replace("\n?<br />\n?","\n",$display_body);
- $display_body = strip_tags($display_body);
- } else {
- if (!empty($commentobj->summary)) {
- $display_summary = $commentobj->summary;
- $body .= _('Summary').': '.$display_summary."\n\n";
- }
- $display_body = $commentobj->body;
- }
- $body .= $display_body."\n";
- }
- }
- }
- $body .= "\n".$g_site_name.': '.$g_url;
- mail ($_POST['mailto'], $g_site_name.': '.$obj->heading, $body, "Content-type: text/plain; charset=utf-8\nFrom: ".$_POST['mailfrom']."\nReply-To: ".$_POST['mailfrom']);
- echo ('<p>');
- printf(_('Your mail was sent to %s.'),$_POST['mailto']);
- echo ('</p>');
- echo ('<p class="center">
- <form id="myForm">
- <input type="button" onclick="window.close()" value="'._('Close window').'" />
- </form>
- </p>');
- } else {
- ?>
- <form action="<? echo($g_url) ?>emailto.php" method="post" onsubmit="return validate();">
- <div class="formtop">
- <input type="hidden" name="id" value="<? echo($id); ?>" />
- <input type="hidden" name="module" value="<? echo($module); ?>" />
- <input type="hidden" name="orc" value="<? echo($orc); ?>" />
- </div>
- <table class="editform">
- <caption><? echo _('Email this article to a friend'); ?></caption>
- <tr>
- <td class="formfield">
- <? echo _('Heading'); ?>
- </td>
- <td class="forminput">
- <? echo $g_site_name.': '.$obj->heading; ?>
- </td>
- </tr>
- <tr>
- <td class="formfield">
- <? echo _('Recipient email'); ?>
- </td>
- <td class="forminput">
- <input type="text" name="mailto" id="mailto" size="40" maxlength="80" />
- </td>
- </tr>
- <tr>
- <td class="formfield">
- <? echo _('Your email'); ?>
- </td>
- <td class="forminput">
- <input type="text" name="mailfrom" id="mailfrom" size="40" maxlength="80" value="<? if (isset($g_user->email)) echo $g_user->email; ?>" />
- </td>
- </tr>
- <tr>
- <td class="formfield top">
- <? echo _('Extra message'); ?>
- </td>
- <td class="forminput">
- <textarea name="message" rows="6" cols="40"></textarea>
- </td>
- </tr>
- <tr>
- <td class="formfield">
-
- </td>
- <td class="forminput">
- <input type="checkbox" name="comments" id="comments" value="1" /> <label for="comments"><? echo _('Include all comments'); ?></label>
- </td>
- </tr>
- <tr>
- <td>
-
- </td>
- <td class="buttons">
- <input type="submit" name="submit" value="<? printf(_('Email this %s'),$obj->display_name); ?>" />
- </td>
- </tr>
- </table>
- </form>
- <?php
- }
-} else {
- echo _('No ID passed for Article.');
-}
-?>
+<body>
+Due to abuse by spammers this feature is not available at this time. Please use your own mail client.
</body>
-</html>
\ No newline at end of file
+</html>
+
--- mods/newswire/cronjobs/cron.hourly/syndicate.php.orig 2006-12-06 21:26:00.000000000 -0600
+++ mods/newswire/cronjobs/cron.hourly/syndicate.php 2006-12-06 21:41:12.000000000 -0600
@@ -75,7 +75,7 @@
$t_regex = '/#[file_[0-9]+#/';
$t_summary = preg_replace($t_regex,'',$item->summary);
$rss .= '<item rdf:about="'.$srcurl.$item->objectid.'/index.php">
- <title>'.htmlspecialchars(strip_tags($item->heading,$allowable),ENT_COMPAT,'utf-8').'</title>
+ <title>'.strip_tags($item->heading,$allowable).'</title>
<link>'.$srcurl.$item->objectid.'/index.php</link>
<description>'.htmlspecialchars(strip_tags($t_summary,$allowable),ENT_COMPAT,'utf-8').'</description>
<dc:creator>'.htmlspecialchars($item->authorobj->get_fullname(),ENT_COMPAT,'utf-8').'</dc:creator>
@@ -83,17 +83,7 @@
<dc:language>'.substr($item->language,0,2).'</dc:language>
<dc:date>'.$item->date_created->get_W3C_date().'</dc:date>
';
- if (!empty($item->license) && $item->license != 'copyright') {
- $included_licenses[] = $item->license;
- if ($item->license == 'publicdomain') {
- $rss .= ' <cc:License rdf:resource="http://www.creativecommons.org/licenses/'.$item->license.'/" />
- ';
- } else {
- $rss .= ' <cc:License rdf:resource="http://www.creativecommons.org/licenses/'.$item->license.'/1.0/" />
- ';
- }
- }
- $rss .= '</item>
+ $rss .= '</item>
';
}
--- mods/features/cronjobs/cron.hourly/syndicate.php.orig 2006-12-06 21:48:53.942526688 -0600
+++ mods/features/cronjobs/cron.hourly/syndicate.php 2006-12-06 21:49:53.833421888 -0600
@@ -70,7 +70,7 @@
$t_regex = '/#[file_[0-9]+#/';
$t_summary = preg_replace($t_regex,'',$t_summary);
$rss .= '<item rdf:about="'.$srcurl.$item->objectid.'/index.php">
- <title>'.htmlspecialchars($item->heading,ENT_COMPAT).'</title>
+ <title>'.$item->heading.'</title>
<link>'.$srcurl.$item->objectid.'/index.php</link>
<description>'.htmlspecialchars(strip_tags($t_summary,$allowable),ENT_COMPAT,'utf-8').'</description>
<dc:creator>'.htmlspecialchars($item->authorobj->get_fullname(),ENT_COMPAT).'</dc:creator>
@@ -78,15 +78,6 @@
<dc:language>'.substr($item->language,0,2).'</dc:language>
<dc:date>'.$item->date_created->get_W3C_date().'</dc:date>
';
- if (!empty($item->license) && $item->license != 'copyright') {
- if ($item->license == 'publicdomain') {
- $rss .= ' <cc:license rdf:resource="http://www.creativecommons.org/licenses/'.$item->license.'/" />
- ';
- } else {
- $rss .= ' <cc:license rdf:resource="http://www.creativecommons.org/licenses/'.$item->license.'/1.0/" />
- ';
- }
- }
$rss .= '</item>
';
--- mods/media/object_functions/media_edit.inc.orig 2007-02-06 20:30:23.000000000 -0600
+++ mods/media/object_functions/media_edit.inc 2007-02-06 20:30:59.000000000 -0600
@@ -285,18 +285,6 @@
<tr>
<td class="forminput" style="vertical-align:middle;">
<?
- if ($this->license == 'copyright') {
- echo ('<input type="radio" name="form_license" value="copyright" checked="checked" />');
- } else {
- echo ('<input type="radio" name="form_license" value="copyright" />');
- }
- help('license_copyright','Copyright; all rights reserved by the artist.');
- ?>
- </td>
- </tr>
- <tr>
- <td class="forminput" style="vertical-align:middle;">
- <?
if ($this->license != 'copyright' && $this->license != 'publicdomain') {
echo ('<input type="radio" name="form_license" value="cc" checked="checked" />');
} else {
--- mods/comments/object_functions/comment_edit.inc.orig 2007-02-06 20:31:46.000000000 -0600
+++ mods/comments/object_functions/comment_edit.inc 2007-02-06 20:32:16.000000000 -0600
@@ -325,18 +325,6 @@
<tr>
<td class="forminput" style="vertical-align:middle;">
<?
- if ($this->license == 'copyright') {
- echo ('<input type="radio" name="form_license" value="copyright" checked="checked" />');
- } else {
- echo ('<input type="radio" name="form_license" value="copyright" />');
- }
- help('license_copyright','Copyright; all rights reserved by the author.');
- ?>
- </td>
- </tr>
- <tr>
- <td class="forminput" style="vertical-align:middle;">
- <?
if ($this->license != 'copyright' && $this->license != 'publicdomain') {
echo ('<input type="radio" name="form_license" value="cc" checked="checked" />');
} else {
@@ -446,4 +434,4 @@
</tr>
</table>
</form>
-</div>
\ No newline at end of file
+</div>
--- mods/newswire/object_functions/article_edit.inc.orig 2007-02-06 20:00:35.000000000 -0600
+++ mods/newswire/object_functions/article_edit.inc 2007-02-06 20:01:46.000000000 -0600
@@ -398,18 +398,6 @@
<tr>
<td class="forminput" style="vertical-align:middle;">
<?
- if ($this->license == 'copyright') {
- echo ('<input type="radio" name="form_license" value="copyright" checked="checked" />');
- } else {
- echo ('<input type="radio" name="form_license" value="copyright" />');
- }
- help('license_copyright','Copyright; all rights reserved by the author.');
- ?>
- </td>
- </tr>
- <tr>
- <td class="forminput" style="vertical-align:middle;">
- <?
if ($this->license != 'copyright' && $this->license != 'publicdomain') {
echo ('<input type="radio" name="form_license" value="cc" checked="checked" />');
} else {
@@ -532,4 +520,4 @@
</tr>
</table>
</form>
-</div>
\ No newline at end of file
+</div>
--- mods/features/object_functions/feature_edit.inc.orig 2007-02-06 20:32:35.000000000 -0600
+++ mods/features/object_functions/feature_edit.inc 2007-02-06 20:33:01.000000000 -0600
@@ -458,18 +458,6 @@
<tr>
<td class="forminput" style="vertical-align:middle;">
<?
- if ($this->license == 'copyright') {
- echo ('<input type="radio" name="form_license" value="copyright" checked="checked" />');
- } else {
- echo ('<input type="radio" name="form_license" value="copyright" />');
- }
- help('license_copyright','Copyright; all rights reserved by the author.');
- ?>
- </td>
- </tr>
- <tr>
- <td class="forminput" style="vertical-align:middle;">
- <?
if ($this->license != 'copyright' && $this->license != 'publicdomain') {
echo ('<input type="radio" name="form_license" value="cc" checked="checked" />');
} else {
--- mods/columns/object_functions/columnarticle_edit.inc.orig 2007-02-06 20:33:27.000000000 -0600
+++ mods/columns/object_functions/columnarticle_edit.inc 2007-02-06 20:33:56.000000000 -0600
@@ -352,18 +352,6 @@
<tr>
<td class="forminput" style="vertical-align:middle;">
<?
- if ($this->license == 'copyright') {
- echo ('<input type="radio" name="form_license" value="copyright" checked="checked" />');
- } else {
- echo ('<input type="radio" name="form_license" value="copyright" />');
- }
- help('license_copyright','Copyright; all rights reserved by the author.');
- ?>
- </td>
- </tr>
- <tr>
- <td class="forminput" style="vertical-align:middle;">
- <?
if ($this->license != 'copyright' && $this->license != 'publicdomain') {
echo ('<input type="radio" name="form_license" value="cc" checked="checked" />');
} else {
@@ -465,4 +453,4 @@
</tr>
</table>
</form>
-</div>
\ No newline at end of file
+</div>
to top
