[geeklog-hg] geeklog: Merged with Upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Jun 13 18:38:13 EDT 2013
changeset 9093:86196169d169
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/86196169d169
user: Tom <websitemaster at cogeco.net>
date: Thu Jun 13 18:36:36 2013 -0400
description:
Merged with Upstream
diffstat:
public_html/admin/logviewer.php | 49 +-
public_html/layout/denim/breadcrumbs/breadcrumb.thtml | 4 +-
public_html/layout/denim/breadcrumbs/breadcrumb_child.thtml | 2 +-
public_html/layout/denim/breadcrumbs/breadcrumb_nolink.thtml | 2 +-
public_html/layout/denim/breadcrumbs/breadcrumbs.thtml | 2 +-
public_html/layout/denim/css_ltr/style.css | 3 +-
public_html/layout/denim/css_rtl/style.css | 3 +-
public_html/layout/modern_curve/breadcrumbs/breadcrumb.thtml | 4 +-
public_html/layout/modern_curve/breadcrumbs/breadcrumb_child.thtml | 2 +-
public_html/layout/modern_curve/breadcrumbs/breadcrumb_nolink.thtml | 2 +-
public_html/layout/modern_curve/breadcrumbs/breadcrumbs.thtml | 2 +-
public_html/layout/professional/breadcrumbs/breadcrumb.thtml | 4 +-
public_html/layout/professional/breadcrumbs/breadcrumb_child.thtml | 2 +-
public_html/layout/professional/breadcrumbs/breadcrumb_nolink.thtml | 2 +-
public_html/layout/professional/breadcrumbs/breadcrumbs.thtml | 2 +-
public_html/layout/professional_css/breadcrumbs/breadcrumb.thtml | 4 +-
public_html/layout/professional_css/breadcrumbs/breadcrumb_child.thtml | 2 +-
public_html/layout/professional_css/breadcrumbs/breadcrumb_nolink.thtml | 2 +-
public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml | 2 +-
public_html/usersettings.php | 2 +-
system/lib-topic.php | 198 ++++-----
21 files changed, 137 insertions(+), 158 deletions(-)
diffs (truncated from 516 to 300 lines):
diff -r 4a70366d2aac -r 86196169d169 public_html/admin/logviewer.php
--- a/public_html/admin/logviewer.php Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/admin/logviewer.php Thu Jun 13 18:36:36 2013 -0400
@@ -32,18 +32,23 @@
// | |
// +--------------------------------------------------------------------------+
+/**
+* Geeklog common function library
+*/
require_once '../lib-common.php';
+
+/**
+* Security check to ensure user even belongs on this page
+*/
+require_once 'auth.inc.php';
+
require_once $_CONF['path_system'] . 'lib-admin.php';
if (!SEC_inGroup('Root')) {
- $display = COM_siteHeader ('menu');
- $display .= COM_startBlock ($LANG27[12], '',
- COM_getBlockTemplate ('_msg_block', 'header'));
- $display .= $LANG27[12];
- $display .= COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
- $display .= COM_siteFooter ();
- COM_accessLog ("User {$_USER['username']} tried to illegally access the log viewer utility.");
- echo $display;
+ $display .= COM_showMessageText($MESSAGE[29], $MESSAGE[30]);
+ $display = COM_createHTMLDocument($display, array('pagetitle' => $MESSAGE[30]));
+ COM_accessLog("User {$_USER['username']} tried to illegally access the topic administration screen.");
+ COM_output($display);
exit;
}
@@ -77,7 +82,7 @@
$display .= $LANG_LOGVIEW['logs'].': ';
$files = array();
if ($dir = @opendir($_CONF['path_log'])) {
- while(($file = readdir($dir)) !== false) {
+ while (($file = readdir($dir)) !== false) {
if (is_file($_CONF['path_log'] . $file) && preg_match('/\.log$/i', $file)) {
array_push($files,$file);
}
@@ -100,23 +105,25 @@
$display .= '<input type="submit" name="clearlog" value="'.$LANG_LOGVIEW['clear'].'"'.XHTML.'>';
$display .= '</div></form>';
-if ( isset($_POST['clearlog']) ) {
- @unlink($_CONF['path_log'] . $log);
- $timestamp = strftime( "%c" );
- $fd = fopen( $_CONF['path_log'] . $log, 'a' );
- fputs( $fd, "$timestamp - Log File Cleared \n" );
- fclose($fd);
- $_POST['viewlog'] = 1;
+if (isset($_POST['clearlog'])) {
+ if (@unlink($_CONF['path_log'] . $log)) {
+ if ($fd = @fopen($_CONF['path_log'] . $log, 'a')) {
+ $timestamp = strftime("%c");
+ fputs($fd, "$timestamp - Log File Cleared \n");
+ fclose($fd);
+ $_POST['viewlog'] = 1;
+ }
+ }
}
-if ( isset($_POST['viewlog']) ) {
+if (isset($_POST['viewlog'])) {
$display .= '<p><strong>'.$LANG_LOGVIEW['log_file'].': ' . $log . '</strong></p>';
$display .= '<div style="margin:10px 0 5px;border-bottom:1px solid #cccccc;"></div>';
- $display .= '<div style="overflow:scroll; height:500px;"><pre>';
- $display .= htmlentities(implode('', file($_CONF['path_log'] . $log)),ENT_NOQUOTES,COM_getEncodingt());
- $display .= '</pre></div>';
+ $display .= '<pre style="overflow:scroll; height:500px;">';
+ $display .= htmlentities(implode('', file($_CONF['path_log'] . $log)), ENT_NOQUOTES, COM_getEncodingt());
+ $display .= '</pre>';
}
-$display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
+$display .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
$display = COM_createHTMLDocument($display, array('pagetitle' => $LANG_LOGVIEW['log_viewer']));
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/denim/breadcrumbs/breadcrumb.thtml
--- a/public_html/layout/denim/breadcrumbs/breadcrumb.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/denim/breadcrumbs/breadcrumb.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,5 +1,5 @@
-<a href="{url}" itemprop="url">
- <span itemprop="title">{name}</span>
+<a href="{url}"{!if microdata} itemprop="url"{!endif}>
+ <span{!if microdata} itemprop="title"{!endif}>{name}</span>
</a> {separator}
{breadcrumb_child}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/denim/breadcrumbs/breadcrumb_child.thtml
--- a/public_html/layout/denim/breadcrumbs/breadcrumb_child.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/denim/breadcrumbs/breadcrumb_child.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,3 +1,3 @@
-<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+<span{!if microdata} itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
{breadcrumb}
</span>
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/denim/breadcrumbs/breadcrumb_nolink.thtml
--- a/public_html/layout/denim/breadcrumbs/breadcrumb_nolink.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/denim/breadcrumbs/breadcrumb_nolink.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,3 +1,3 @@
- <span itemprop="title">{name}</span> {separator}
+ <span{!if microdata} itemprop="title"{!endif}>{name}</span> {separator}
{breadcrumb_child}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/denim/breadcrumbs/breadcrumbs.thtml
--- a/public_html/layout/denim/breadcrumbs/breadcrumbs.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/denim/breadcrumbs/breadcrumbs.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,5 +1,5 @@
<!-- Start of Breadcrumbs Navigation -->
-<div itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="bc_navigation">
+<div {!if microdata}itemscope itemtype="http://data-vocabulary.org/Breadcrumb" {!endif}class="bc_navigation">
{breadcrumbs_list}
</div>
<!-- End of Breadcrumbs Navigation -->
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/denim/css_ltr/style.css
--- a/public_html/layout/denim/css_ltr/style.css Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/denim/css_ltr/style.css Thu Jun 13 18:36:36 2013 -0400
@@ -266,7 +266,8 @@
line-height: 28px;
}
-select.multiple {
+select.multiple,
+select[multiple="multiple"] {
height: auto;
}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/denim/css_rtl/style.css
--- a/public_html/layout/denim/css_rtl/style.css Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/denim/css_rtl/style.css Thu Jun 13 18:36:36 2013 -0400
@@ -266,7 +266,8 @@
line-height: 28px;
}
-select.multiple {
+select.multiple,
+select[multiple="multiple"] {
height: auto;
}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/modern_curve/breadcrumbs/breadcrumb.thtml
--- a/public_html/layout/modern_curve/breadcrumbs/breadcrumb.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/modern_curve/breadcrumbs/breadcrumb.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,5 +1,5 @@
-<a href="{url}" itemprop="url">
- <span itemprop="title">{name}</span>
+<a href="{url}"{!if microdata} itemprop="url"{!endif}>
+ <span{!if microdata} itemprop="title"{!endif}>{name}</span>
</a> {separator}
{breadcrumb_child}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/modern_curve/breadcrumbs/breadcrumb_child.thtml
--- a/public_html/layout/modern_curve/breadcrumbs/breadcrumb_child.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/modern_curve/breadcrumbs/breadcrumb_child.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,3 +1,3 @@
-<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+<span{!if microdata} itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
{breadcrumb}
</span>
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/modern_curve/breadcrumbs/breadcrumb_nolink.thtml
--- a/public_html/layout/modern_curve/breadcrumbs/breadcrumb_nolink.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/modern_curve/breadcrumbs/breadcrumb_nolink.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,3 +1,3 @@
- <span itemprop="title">{name}</span> {separator}
+ <span{!if microdata} itemprop="title"{!endif}>{name}</span> {separator}
{breadcrumb_child}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/modern_curve/breadcrumbs/breadcrumbs.thtml
--- a/public_html/layout/modern_curve/breadcrumbs/breadcrumbs.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/modern_curve/breadcrumbs/breadcrumbs.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,6 +1,6 @@
<!-- Start of Breadcrumbs Navigation -->
<p>
-<div itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+<div{!if microdata} itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
{breadcrumbs_list}
</div>
</p>
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/professional/breadcrumbs/breadcrumb.thtml
--- a/public_html/layout/professional/breadcrumbs/breadcrumb.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/professional/breadcrumbs/breadcrumb.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,5 +1,5 @@
-<a href="{url}" itemprop="url">
- <span itemprop="title">{name}</span>
+<a href="{url}"{!if microdata} itemprop="url"{!endif}>
+ <span{!if microdata} itemprop="title"{!endif}>{name}</span>
</a> {separator}
{breadcrumb_child}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/professional/breadcrumbs/breadcrumb_child.thtml
--- a/public_html/layout/professional/breadcrumbs/breadcrumb_child.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/professional/breadcrumbs/breadcrumb_child.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,3 +1,3 @@
-<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+<span{!if microdata} itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
{breadcrumb}
</span>
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/professional/breadcrumbs/breadcrumb_nolink.thtml
--- a/public_html/layout/professional/breadcrumbs/breadcrumb_nolink.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/professional/breadcrumbs/breadcrumb_nolink.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,3 +1,3 @@
- <span itemprop="title">{name}</span> {separator}
+ <span{!if microdata} itemprop="title"{!endif}>{name}</span> {separator}
{breadcrumb_child}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/professional/breadcrumbs/breadcrumbs.thtml
--- a/public_html/layout/professional/breadcrumbs/breadcrumbs.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/professional/breadcrumbs/breadcrumbs.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,6 +1,6 @@
<!-- Start of Breadcrumbs Navigation -->
<p>
-<div itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+<div{!if microdata} itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
{breadcrumbs_list}
</div>
</p>
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/professional_css/breadcrumbs/breadcrumb.thtml
--- a/public_html/layout/professional_css/breadcrumbs/breadcrumb.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/professional_css/breadcrumbs/breadcrumb.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,8 +1,8 @@
<!-- breadcrumbs/breadcrumb.thtml { -->
-<a href="{url}" itemprop="url">
- <span itemprop="title">{name}</span>
+<a href="{url}"{!if microdata} itemprop="url"{!endif}>
+ <span{!if microdata} itemprop="title"{!endif}>{name}</span>
</a> {separator}
{breadcrumb_child}
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/professional_css/breadcrumbs/breadcrumb_child.thtml
--- a/public_html/layout/professional_css/breadcrumbs/breadcrumb_child.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/professional_css/breadcrumbs/breadcrumb_child.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,7 +1,7 @@
<!-- breadcrumbs/breadcrumb_child.thtml { -->
-<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+<span{!if microdata} itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
{breadcrumb}
</span>
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/professional_css/breadcrumbs/breadcrumb_nolink.thtml
--- a/public_html/layout/professional_css/breadcrumbs/breadcrumb_nolink.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/professional_css/breadcrumbs/breadcrumb_nolink.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -1,7 +1,7 @@
<!-- breadcrumbs/breadcrumb_nolink.thtml { -->
- <span itemprop="title">{name}</span> {separator}
+ <span{!if microdata} itemprop="title"{!endif}>{name}</span> {separator}
{breadcrumb_child}
<!-- } breadcrumbs/breadcrumb_nolink.thtml -->
diff -r 4a70366d2aac -r 86196169d169 public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml
--- a/public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml Thu Jun 13 18:36:36 2013 -0400
@@ -3,7 +3,7 @@
<!-- Start of Breadcrumbs Navigation -->
<p>
-<div itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+<div{!if microdata} itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
{breadcrumbs_list}
</div>
</p>
diff -r 4a70366d2aac -r 86196169d169 public_html/usersettings.php
--- a/public_html/usersettings.php Thu Jun 13 18:34:47 2013 -0400
+++ b/public_html/usersettings.php Thu Jun 13 18:36:36 2013 -0400
@@ -636,7 +636,7 @@
$B = DB_fetchArray ($query);
$selauthors .= '<option value="' . $B['uid'] . '"';
if (in_array (sprintf ('%d', $B['uid']), $authors)) {
- $selauthors .= ' selected';
+ $selauthors .= ' selected="selected"';
}
$selauthors .= '>' . COM_getDisplayName ($B['uid'], $B['username'],
$B['fullname'])
diff -r 4a70366d2aac -r 86196169d169 system/lib-topic.php
--- a/system/lib-topic.php Thu Jun 13 18:34:47 2013 -0400
+++ b/system/lib-topic.php Thu Jun 13 18:36:36 2013 -0400
@@ -1484,9 +1484,9 @@
}
/**
-* If found returns one or more html breadcrumb. Used by Topics, Stories and Plugins.
+* If found returns one or more html breadcrumb. Used by Topics, Stories and Plugins.
*
-* @param string $type Type of object to create breadcrumb trail
+* @param string $type Type of object to create breadcrumb trail
* @param string/array $id ID of object
* @return string 1 or more breadcrumb trail in html
*
@@ -1494,135 +1494,105 @@
function TOPIC_breadcrumbs($type, $id)
More information about the geeklog-cvs
mailing list