[geeklog-cvs] Geeklog-1.x/public_html/docs calendar.html, 1.11, 1.12 config.html, 1.87, 1.88 polls.html, 1.6, 1.7 spamx.html, 1.23, 1.24 theme.html, 1.79, 1.80 themevars.html, 1.20, 1.21 trackback.html, 1.9, 1.10
Dirk Haun
dhaun at qs1489.pair.com
Sat May 10 12:35:24 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv89542
Modified Files:
calendar.html config.html polls.html spamx.html theme.html
themevars.html trackback.html
Log Message:
More config related documentation updates
Index: trackback.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/trackback.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** trackback.html 5 Aug 2007 09:33:02 -0000 1.9
--- trackback.html 10 May 2008 16:35:22 -0000 1.10
***************
*** 65,69 ****
<p>Your Geeklog site will, of course, be able to receive Trackbacks and Pingbacks to your stories. They will show up in a dedicated section below the story, similar to the section for comments. Once received, Geeklog will treat Trackbacks and Pingbacks the same, so you won't be able to tell the difference.</p>
! <p>When you disable Trackbacks and / or Pingbacks in <tt>config.php</tt>, you will also disable receiving them.</p>
--- 65,69 ----
<p>Your Geeklog site will, of course, be able to receive Trackbacks and Pingbacks to your stories. They will show up in a dedicated section below the story, similar to the section for comments. Once received, Geeklog will treat Trackbacks and Pingbacks the same, so you won't be able to tell the difference.</p>
! <p>When you disable Trackbacks and / or Pingbacks in the configuration, you will also disable receiving them.</p>
***************
*** 81,85 ****
<h2><a name="disable">Disabling Trackbacks</a></h2>
! <p>Since these functions may not be needed on certain sites (e.g. corporate sites), they can be switched off individually in <a href="config.html#desc_trackback_enabled">config.php</a>.</p>
<p>Note that "Trackback" is sometimes used as a generic term for both trackbacks
--- 81,85 ----
<h2><a name="disable">Disabling Trackbacks</a></h2>
! <p>Since these functions may not be needed on certain sites (e.g. corporate sites), they can be switched off individually in the <a href="config.html#desc_trackback_enabled">configuration</a>.</p>
<p>Note that "Trackback" is sometimes used as a generic term for both trackbacks
***************
*** 91,95 ****
only reference to trackbacks that you'll still see is the drop-down menu entry
in the Admin's story editor (to enable/disable trackbacks on a per-story basis).
! But its setting is overridden by the <tt>config.php</tt> entries, so it can be
ignored.</p>
--- 91,95 ----
only reference to trackbacks that you'll still see is the drop-down menu entry
in the Admin's story editor (to enable/disable trackbacks on a per-story basis).
! But its setting is overridden by the configuration settings, so it can be
ignored.</p>
Index: spamx.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/spamx.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** spamx.html 5 Aug 2007 09:33:02 -0000 1.23
--- spamx.html 10 May 2008 16:35:22 -0000 1.24
***************
*** 155,158 ****
--- 155,160 ----
<p>This would block all posts from user agents beginning with "libwww-perl".</p>
+ <!-- Currently not shipped with Geeklog
+
<h3><a name="honeypot">Project Honeypot http:BL Filter</a></h3>
***************
*** 178,181 ****
--- 180,185 ----
automatically.</p>
+ -->
+
<h2><a name="action">Action Modules</a></h2>
***************
*** 195,199 ****
to be added up with the number of the other action modules you want to enable
and entered as the value for the <a href="config.html#desc_spamx">spamx config
! variable</a> in Geeklog's main <tt>config.php</tt> file.</p>
<h3>Example</h3>
--- 199,203 ----
to be added up with the number of the other action modules you want to enable
and entered as the value for the <a href="config.html#desc_spamx">spamx config
! variable</a> in Geeklog's main configuration.</p>
<h3>Example</h3>
***************
*** 201,207 ****
<p>The Delete Action module has the value 128, while the Mail Admin Action
module has the value 8. So to activate both modules, add 128 + 8 = 136 and
! enter that in your config.php:</p>
!
! <pre> $_CONF['spamx'] = 136;</pre>
<p>The SLV Examine module is complemented by a <strong>SLV Action</strong>
--- 205,209 ----
<p>The Delete Action module has the value 128, while the Mail Admin Action
module has the value 8. So to activate both modules, add 128 + 8 = 136 and
! enter that in the Configuration admin panel.</p>
<p>The SLV Examine module is complemented by a <strong>SLV Action</strong>
***************
*** 262,271 ****
trackback URL matches the IP address that sent the trackback. Trackbacks that
fail any of these tests are usually spam. Please refer to the <a
! href="config.html#desc_check_trackback_link">config.php documentation</a> for
! more information.</p>
<h2><a name="config.php">Configuration File</a></h2>
! <p>The Spam-X plugin has its own configuration file, located at <tt>/path/to/geeklog/plugins/spamx/config.php</tt>. There you will find the following options:</p>
<table>
--- 264,276 ----
trackback URL matches the IP address that sent the trackback. Trackbacks that
fail any of these tests are usually spam. Please refer to the <a
! href="config.html#desc_check_trackback_link">documentation for the
! configuration</a> for more information.</p>
<h2><a name="config.php">Configuration File</a></h2>
! <p>The Spam-X plugin's configuration can be changed from the Configuration admin
! panel:</p>
!
! <h3><a name="main">Spam-X Main Settings</a></h3>
<table>
***************
*** 275,284 ****
</tr>
<tr>
! <td><a name="desc_action">action</a></td>
! <td>128</td>
! <td>This only exists as a fallback in case <a
! href="config.html#desc_spamx">$_CONF['spamx']</a> in Geeklog's main
! <tt>config.php</tt> is not set. I.e. <code>$_CONF['spamx']</code> takes
! precedence.</td>
</tr>
<tr class="r2">
--- 280,287 ----
</tr>
<tr>
! <td><a name="desc_logging">logging</a></td>
! <td><code>true</code></td>
! <td>Whether to log recognized spam posts in the <tt>spamx.log</tt> logfile
! (if set to <code>true</code>) or not (<code>false</code>).</td>
</tr>
<tr class="r2">
***************
*** 292,299 ****
</tr>
<tr>
! <td><a name="desc_logging">logging</a></td>
! <td><code>true</code></td>
! <td>Whether to log recognized spam posts in the <tt>spamx.log</tt> logfile
! (if set to <code>true</code>) or not (<code>false</code>).</td>
</tr>
<tr class="r2">
--- 295,301 ----
</tr>
<tr>
! <td><a name="desc_timeout">timeout</a></td>
! <td>5</td>
! <td>Timeout (in seconds) for contacting external services such as SLV.</td>
</tr>
<tr class="r2">
***************
*** 304,310 ****
</tr>
<tr>
! <td><a name="desc_timeout">timeout</a></td>
! <td>5</td>
! <td>Timeout (in seconds) for contacting external services such as SLV.</td>
</tr>
</table>
--- 306,315 ----
</tr>
<tr>
! <td><a name="desc_action">action</a></td>
! <td>128</td>
! <td>This only exists as a fallback in case <a
! href="config.html#desc_spamx">$_CONF['spamx']</a> in Geeklog's main
! configuration is not set. I.e. <code>$_CONF['spamx']</code> takes
! precedence.</td>
</tr>
</table>
Index: theme.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** theme.html 10 May 2008 15:02:14 -0000 1.79
--- theme.html 10 May 2008 16:35:22 -0000 1.80
***************
*** 147,151 ****
<p><strong><a name="left-blocks">Left blocks in the right column:</a></strong>
! <code>$_CONF['left_blocks_in_footer']</code> (in <tt>config.php</tt>) is a
rather curious option. It makes the <code>{left_blocks}</code> variable
available in the site's footer (i.e. <tt>footer.thtml</tt>) while at the same
--- 147,151 ----
<p><strong><a name="left-blocks">Left blocks in the right column:</a></strong>
! <code>$_CONF['left_blocks_in_footer']</code> is a
rather curious option. It makes the <code>{left_blocks}</code> variable
available in the site's footer (i.e. <tt>footer.thtml</tt>) while at the same
***************
*** 160,167 ****
blocks, will actually be displayed on the <em>right</em>.<br>
The theme's <tt>header.thtml</tt>, <tt>footer.thtml</tt>, and
! <tt>leftblocks.thtml</tt> will probably need some adjustments. It is also
! recommended to leave the <code>$_CONF</code> variable unchanged in
! <tt>config.php</tt> and overwrite it in the theme's <tt>functions.php</tt>
! instead. That way, you can even leave your users a choice between, for example,
a "normal" theme and one with the blocks on the right.</p>
--- 160,167 ----
blocks, will actually be displayed on the <em>right</em>.<br>
The theme's <tt>header.thtml</tt>, <tt>footer.thtml</tt>, and
! <tt>leftblocks.thtml</tt> will probably need some adjustments. The
! 'left_blocks_in_footer' option is therefore not available in the main
! configuration but should instead be set in the theme's <tt>functions.php</tt>
! file. That way, you can even leave your users a choice between, for example,
a "normal" theme and one with the blocks on the right.</p>
***************
*** 866,871 ****
<li>In the Classic and Digital Monochrome themes the "contact" link now
points to the form to send an email to the admin user instead of using a
! <code>mailto:</code> link with the site's email address from
! <tt>config.php</tt>.</li>
</ul>
--- 866,871 ----
<li>In the Classic and Digital Monochrome themes the "contact" link now
points to the form to send an email to the admin user instead of using a
! <code>mailto:</code> link with the site's email address from the
! configuration.</li>
</ul>
Index: polls.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/polls.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** polls.html 5 Aug 2007 09:33:02 -0000 1.6
--- polls.html 10 May 2008 16:35:22 -0000 1.7
***************
*** 15,21 ****
moved to a plugin as of Geeklog 1.4.0.</p>
! <h2><a name="config.php">Configuration File</a></h2>
! <p>The polls plugin has its own configuration file, located at <tt>/path/to/geeklog/plugins/polls/config.php</tt>. There you will find the following options:</p>
<table>
--- 15,24 ----
moved to a plugin as of Geeklog 1.4.0.</p>
! <h2><a name="config.php">Configuration</a></h2>
! <p>The Polls plugin's configuration can be changed from the Configuration admin
! panel:</p>
!
! <h3><a name="general">General Polls Settings</a></h3>
<table>
***************
*** 31,35 ****
Please note that <code>$_CONF['<a
href="config.html#desc_loginrequired">loginrequired</a>']</code> in
! <tt>config.php</tt> takes precedence over this setting. So when
<code>'loginrequired'</code> is set to 1, anonymous users can not access
the recent polls even when <code>'pollsloginrequired'</code> is set
--- 34,38 ----
Please note that <code>$_CONF['<a
href="config.html#desc_loginrequired">loginrequired</a>']</code> in
! Geeklog's main configuration takes precedence over this setting. So when
<code>'loginrequired'</code> is set to 1, anonymous users can not access
the recent polls even when <code>'pollsloginrequired'</code> is set
***************
*** 43,51 ****
</tr>
<tr>
! <td><a name="desc_maxanswers">maxanswers</a></td>
<td>10</td>
! <td>Maximum number of possible answers for the poll editor.</td>
</tr>
<tr class="r2">
<td><a name="desc_answerorder">answerorder</a></td>
<td>submitorder</td>
--- 46,59 ----
</tr>
<tr>
! <td><a name="desc_maxquestions">maxquestions</a></td>
<td>10</td>
! <td>Maximum number of questions in a poll.</td>
</tr>
<tr class="r2">
+ <td><a name="desc_maxanswers">maxanswers</a></td>
+ <td>10</td>
+ <td>Maximum number of options per question.</td>
+ </tr>
+ <tr>
<td><a name="desc_answerorder">answerorder</a></td>
<td>submitorder</td>
***************
*** 53,67 ****
in which they were entered ('submitorder').</td>
</tr>
! <tr>
<td><a name="desc_pollcookietime">pollcookietime</a></td>
<td>86400</td>
<td>Number of seconds to set a poll answer cookie to time out on.</td>
</tr>
! <tr class="r2">
<td><a name="desc_polladdresstime">polladdresstime</a></td>
<td>604800</td>
<td>Number of seconds to set a poll answer IP address to time out on.</td>
</tr>
! <tr>
<td><a name="desc_delete_polls">delete_polls</a></td>
<td>0</td>
--- 61,75 ----
in which they were entered ('submitorder').</td>
</tr>
! <tr class="r2">
<td><a name="desc_pollcookietime">pollcookietime</a></td>
<td>86400</td>
<td>Number of seconds to set a poll answer cookie to time out on.</td>
</tr>
! <tr>
<td><a name="desc_polladdresstime">polladdresstime</a></td>
<td>604800</td>
<td>Number of seconds to set a poll answer IP address to time out on.</td>
</tr>
! <tr class="r2">
<td><a name="desc_delete_polls">delete_polls</a></td>
<td>0</td>
***************
*** 71,74 ****
--- 79,94 ----
are deleted, including all the comments posted on that poll.</td>
</tr>
+ <tr>
+ <td><a name="desc_aftersave">aftersave</a></td>
+ <td>'list'</td>
+ <td>Which page to go to after a poll has been saved:
+ <ul>
+ <li>'item': display the poll</li>
+ <li>'list': show admin's list of polls (default)</li>
+ <li>'plugin': display the public list of polls</li>
+ <li>'home': display the site's homepage</li>
+ <li>'admin': go to the "Admin Home" page, i.e. Command & Control</li>
+ </ul></td>
+ </tr>
</table>
***************
*** 90,97 ****
<p>The amount of time your cookie and IP are stored can be changed in the polls
! plugin's <tt>config.php</tt>:</p>
! <pre>$_PO_CONF['pollcookietime'] = 86400;
! $_PO_CONF['polladdresstime'] = 604800;</pre>
<p>Both times are in seconds, i.e. the cookie is valid for 24 hours and the IP
--- 110,117 ----
<p>The amount of time your cookie and IP are stored can be changed in the polls
! plugin's configuration (see above):</p>
! <pre>$_PO_CONF['<a href="#desc_pollcookietime">pollcookietime</a>'] = 86400;
! $_PO_CONF['<a href="#desc_polladdresstime">polladdresstime</a>'] = 604800;</pre>
<p>Both times are in seconds, i.e. the cookie is valid for 24 hours and the IP
Index: themevars.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/themevars.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** themevars.html 5 Aug 2007 09:33:02 -0000 1.20
--- themevars.html 10 May 2008 16:35:22 -0000 1.21
***************
*** 50,55 ****
<td><tt>http://www.example.com</tt></td>
<td>The URL of your Geeklog site (the exact same URL you specified in
! <code>$_CONF['site_url']</code> in your <tt>config.php</tt>
! file).</td></tr>
<tr><td><code>layout_url</code></td>
<td><tt>http://www.example.com/layout/professional</tt></td>
--- 50,54 ----
<td><tt>http://www.example.com</tt></td>
<td>The URL of your Geeklog site (the exact same URL you specified in
! <code>$_CONF['site_url']</code> in the configuration.</td></tr>
<tr><td><code>layout_url</code></td>
<td><tt>http://www.example.com/layout/professional</tt></td>
***************
*** 157,162 ****
<td><tt>http://www.example.com</tt></td>
<td>The URL of your Geeklog site (the exact same URL you specified in
! <code>$_CONF['site_url']</code> in your <tt>config.php</tt>
! file).</td></tr>
<tr><td><code>layout_url</code></td>
<td><tt>http://www.example.com/layout/professional</tt></td>
--- 156,160 ----
<td><tt>http://www.example.com</tt></td>
<td>The URL of your Geeklog site (the exact same URL you specified in
! <code>$_CONF['site_url']</code> in the configuration.</td></tr>
<tr><td><code>layout_url</code></td>
<td><tt>http://www.example.com/layout/professional</tt></td>
***************
*** 286,290 ****
<p>The following variables are only available when
! <code>$_CONF['contributedbyline'] = 1;</code> in your <tt>config.php</tt>, i.e.
when you allow the name of the story's author to be displayed:</p>
--- 284,288 ----
<p>The following variables are only available when
! <code>$_CONF['contributedbyline'] = 1;</code> in the configuration, i.e.
when you allow the name of the story's author to be displayed:</p>
Index: calendar.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/calendar.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** calendar.html 10 May 2008 15:02:14 -0000 1.11
--- calendar.html 10 May 2008 16:35:22 -0000 1.12
***************
*** 33,37 ****
Please note that <code>$_CONF['<a
href="config.html#desc_loginrequired">loginrequired</a>']</code> in
! <tt>config.php</tt> takes precedence over this setting. So when
<code>'loginrequired'</code> is set to 1, anonymous users can not access
the calendar even when <code>'calendarloginrequired'</code> is set
--- 33,37 ----
Please note that <code>$_CONF['<a
href="config.html#desc_loginrequired">loginrequired</a>']</code> in
! Geeklog's main configuration takes precedence over this setting. So when
<code>'loginrequired'</code> is set to 1, anonymous users can not access
the calendar even when <code>'calendarloginrequired'</code> is set
***************
*** 114,123 ****
<h2><a name="others">Other Options</a></h2>
! <p>Please note that some of the options from Geeklog's main <tt>config.php</tt>
are also relevant for the calendar plugin:</p>
<ul>
<li>Times and dates are formatted according to the current language and the
<a href="config.html#locale">locale settings</a> from Geeklog's main
! <tt>config.php</tt>.</li>
</ul>
--- 114,123 ----
<h2><a name="others">Other Options</a></h2>
! <p>Please note that some of the options from Geeklog's main configuration
are also relevant for the calendar plugin:</p>
<ul>
<li>Times and dates are formatted according to the current language and the
<a href="config.html#locale">locale settings</a> from Geeklog's main
! configuration.</li>
</ul>
Index: config.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/config.html,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** config.html 3 May 2008 11:23:50 -0000 1.87
--- config.html 10 May 2008 16:35:22 -0000 1.88
***************
*** 1486,1490 ****
<h3><a name="date_formats">Locale and Date Formats</a></h3>
! <p>You can set the locale and date format in the config.php file. To set the
locale, set the variable to the proper string or if you leave it blank it
will pull the default locale from the operating system. The date formats
--- 1486,1490 ----
<h3><a name="date_formats">Locale and Date Formats</a></h3>
! <p>You can set the locale and date format in the configuration. To set the
locale, set the variable to the proper string or if you leave it blank it
will pull the default locale from the operating system. The date formats
More information about the geeklog-cvs
mailing list