Quam Plures

Merge lp:~quam-plures-core/quam-plures/qp-tidytemps4 into lp:quam-plures

  1. qp-tidytemps4
  2. Merge into trunk
Proposed by EdB
Status: Merged
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/qp-tidytemps4
Merge into: lp:quam-plures
Diff against target: 10946 lines (+3318/-3056)
136 files modified
a_notemplate.php (+45/-77)
contact.php (+9/-16)
default.php (+73/-84)
inc/_core/__core.init.php (+2/-0)
inc/_core/_template.funcs.php (+34/-11)
inc/_core/model/_log.class.php (+7/-5)
inc/_core/model/_timer.class.php (+2/-0)
inc/_core/model/dataobjects/_dataobjectlist2.class.php (+3/-0)
inc/_core/model/db/_sql.class.php (+12/-0)
inc/_core/ui/results/_results.class.php (+1/-1)
inc/_ext/_zip_archives.php (+72/-0)
inc/_ext/idna/_idna_convert.class.php (+1/-1)
inc/_ext/idna/_idna_convert.class.php4 (+8/-3)
inc/_ext/mime_parser/mime_parser.php (+117/-19)
inc/_ext/mime_parser/rfc822_addresses.php (+81/-0)
inc/_ext/xmlrpc/_xmlrpc.inc.php (+29/-0)
inc/_ext/xmlrpc/_xmlrpcs.inc.php (+20/-0)
inc/collections/model/_blog.class.php (+6/-3)
inc/dashboard/dashboard.ctrl.php (+12/-10)
inc/files/model/_fileroot.class.php (+3/-0)
inc/generic/views/_generic_list.inc.php (+3/-0)
inc/generic/views/_generic_ordered_list.inc.php (+3/-0)
inc/items/model/_item.class.php (+24/-19)
inc/items/model/_itemlight.class.php (+6/-6)
inc/items/model/_itemlist.class.php (+17/-0)
inc/items/model/_itemlistlight.class.php (+22/-1)
inc/items/views/_item_list_full.view.php (+100/-94)
inc/items/views/_item_list_sidebar.view.php (+95/-94)
inc/locales/_pofile.class.php (+3/-0)
inc/locales/locales.ctrl.php (+3/-0)
inc/sessions/_sessions.init.php (+2/-0)
inc/sessions/model/_goal.class.php (+3/-0)
inc/sessions/views/_stats_browserhits.view.php (+3/-1)
inc/sessions/views/_stats_summary.view.php (+3/-1)
inc/sessions/views/_stats_syndication.view.php (+3/-1)
inc/templates/_template.funcs.php (+12/-5)
inc/templates/model/_template.class.php (+4/-1)
inc/tools/mtimport.ctrl.php (+1/-1)
inc/tools/system.ctrl.php (+6/-0)
inc/tools/wpimport.ctrl.php (+6/-0)
inc/users/model/_user.class.php (+3/-0)
inc/widgets/model/_widget.class.php (+95/-22)
inc/xhtml_validator/_xhtml_validator.class.php (+3/-0)
inc/xmlrpc/model/_xmlrpc.funcs.php (+2/-2)
multiblogs.php (+82/-105)
plugins/basic_antispam_plugin/_basic_antispam.plugin.php (+3/-0)
plugins/calendar_plugin/_calendar.plugin.php (+1/-1)
plugins/code_highlight_plugin/_code_highlight.plugin.php (+9/-0)
plugins/code_highlight_plugin/highlighters/css.highlighter.php (+3/-0)
plugins/coll_tag_cloud_widget/_coll_tag_cloud.widget.php (+3/-0)
plugins/coll_xml_feeds_widget/_coll_xml_feeds.widget.php (+3/-0)
plugins/smilies_plugin/_smilies.plugin.php (+3/-1)
plugins/tinymce_plugin/_tinymce.plugin.php (+3/-0)
plugins/tinymce_plugin/tiny_mce/tiny_mce_gzip.php (+6/-0)
plugins/twitter_plugin/_twitter.plugin.php (+3/-3)
sitemap_a.php (+4/-0)
sitemap_blogs.php (+4/-0)
summary.php (+4/-5)
templates/_404_not_found.disp.php (+0/-1)
templates/_atom/comments.main.php (+8/-9)
templates/_atom/index.main.php (+13/-15)
templates/_body_footer.inc.php (+2/-2)
templates/_catdir.disp.php (+0/-1)
templates/_comments.disp.php (+31/-26)
templates/_html_header.inc.php (+23/-27)
templates/_item_comment.inc.php (+27/-28)
templates/_item_comment_form.inc.php (+8/-8)
templates/_item_comment_wp.inc.php (+26/-33)
templates/_item_content.inc.php (+21/-21)
templates/_item_feedback.inc.php (+6/-6)
templates/_mediaidx.disp.php (+0/-2)
templates/_msgform.disp.php (+24/-30)
templates/_rdf/comments.main.php (+8/-11)
templates/_rdf/index.main.php (+16/-20)
templates/_rss/comments.main.php (+8/-10)
templates/_rss/index.main.php (+11/-15)
templates/_rss2/comments.main.php (+8/-11)
templates/_rss2/index.main.php (+20/-24)
templates/_toolbar.inc.php (+21/-26)
templates/_wp_compatibility.inc.php (+22/-26)
templates/asevo/_body_footer.inc.php (+3/-4)
templates/asevo/_item_block.inc.php (+60/-68)
templates/asevo/index.main.php (+54/-61)
templates/custom/_item_block.inc.php (+60/-69)
templates/custom/_template.class.php (+3/-3)
templates/custom/index.main.php (+68/-61)
templates/evocamp/_body_footer.inc.php (+3/-3)
templates/evocamp/_body_header.inc.php (+1/-6)
templates/evocamp/_item_block.inc.php (+56/-55)
templates/evocamp/_sidebar_left.inc.php (+2/-6)
templates/evocamp/_sidebar_right.inc.php (+2/-7)
templates/evocamp/index.main.php (+33/-29)
templates/evocamp/page.main.php (+36/-34)
templates/evocamp/posts.main.php (+41/-45)
templates/evocamp/single.main.php (+81/-92)
templates/evopress/_body_footer.inc.php (+3/-3)
templates/evopress/_body_header.inc.php (+1/-4)
templates/evopress/_item_block.inc.php (+56/-67)
templates/evopress/_sidebar.inc.php (+0/-4)
templates/evopress/index.main.php (+30/-29)
templates/evopress/page.main.php (+32/-31)
templates/evopress/posts.main.php (+40/-45)
templates/evopress/single.main.php (+80/-94)
templates/glossyblue/_body_footer.inc.php (+3/-8)
templates/glossyblue/_body_header.inc.php (+1/-7)
templates/glossyblue/_item_block.inc.php (+54/-55)
templates/glossyblue/_item_content.inc.php (+3/-0)
templates/glossyblue/_item_feedback.inc.php (+29/-39)
templates/glossyblue/_sidebar.inc.php (+0/-5)
templates/glossyblue/index.main.php (+32/-30)
templates/glossyblue/page.main.php (+34/-34)
templates/glossyblue/posts.main.php (+37/-39)
templates/glossyblue/single.main.php (+88/-78)
templates/miami_blue/_item_block.inc.php (+52/-53)
templates/miami_blue/index.main.php (+50/-63)
templates/natural_pink/_body_footer.inc.php (+3/-3)
templates/natural_pink/_item_block.inc.php (+50/-56)
templates/natural_pink/_template.class.php (+3/-0)
templates/natural_pink/index.main.php (+57/-69)
templates/nifty_corners/_body_footer.inc.php (+3/-3)
templates/nifty_corners/_item_block.inc.php (+55/-60)
templates/nifty_corners/index.main.php (+55/-70)
templates/photoblog/_body_footer.inc.php (+3/-3)
templates/photoblog/_html_header.inc.php (+28/-29)
templates/photoblog/_item_block.inc.php (+57/-68)
templates/photoblog/feedback_popup.main.php (+15/-21)
templates/photoblog/index.main.php (+62/-71)
templates/pixelgreen/_item_block.inc.php (+75/-77)
templates/pixelgreen/_sidebar.inc.php (+0/-4)
templates/pixelgreen/index.main.php (+45/-53)
templates/terrafirma/_item_block.inc.php (+55/-61)
templates/terrafirma/_item_comment.inc.php (+7/-7)
templates/terrafirma/index.main.php (+64/-69)
templates/vastitude/_item_block.inc.php (+84/-75)
templates/vastitude/index.main.php (+70/-81)
xmlsrv/rsd.php (+6/-0)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/qp-tidytemps4
Reviewer Review Type Date Requested Status
Yabs (community) Approve
Review via email: mp+17478@code.launchpad.net
To post a comment you must log in.
Revision history for this message
EdB (edb) wrote :

Many changes. See http://forums.quamplures.net/viewtopic.php?f=9&t=166 (tidy templates, autodoc error fixing, autodoc enhancements, misc?)

lp:~quam-plures-core/quam-plures/qp-tidytemps4 updated
7404. By Yabs

merged trunk

Revision history for this message
Yabs (yabs) wrote :

done

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'a_notemplate.php'
2--- a_notemplate.php 2010-01-08 10:32:06 +0000
3+++ a_notemplate.php 2010-01-17 09:47:13 +0000
4@@ -15,9 +15,6 @@
5 *
6 * @todo EdB: figure out if this useful, shed if not else embrace and move to /templates/
7 *
8- * @todo EdB: template_widget.foo.sample.php files are not complete
9- * @todo EdB: Plugins__call_by_code.sample.php file is not complete
10- *
11 * @package templates
12 */
13
14@@ -72,9 +69,7 @@
15 { // Cache miss, we have to generate:
16 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
17
18-
19-// This is the main template; it may be used to display very different things.
20-// Do inits depending on current $disp:
21+// do $disp-based initializations...
22 template_init( $disp );
23
24 add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
25@@ -84,12 +79,7 @@
26 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
27 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
28 <head>
29- <title><?php
30- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
31- request_title( array(
32- 'auto_pilot' => 'seo_title',
33- ) );
34- ?></title>
35+<title><?php request_title( array( 'auto_pilot' => 'seo_title' ) ); ?></title>
36 <link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />
37 <?php template_content_meta(); /* Charset for static pages */ ?>
38 <?php $Plugins->trigger_event( 'TemplateBeginHtmlHead' ); ?>
39@@ -107,6 +97,7 @@
40 // --- --- --- --- --- --- --- --- --- --- ---
41 // --- TOOLBAR INCLUDED HERE ---
42 template_include( '_toolbar.inc.php' );
43+
44 echo "\n";
45 if( is_logged_in() )
46 {
47@@ -124,18 +115,15 @@
48 // display the Public Blog List widget
49 template_widget( array(
50 'widget' => 'colls_list_public',
51- // block-level params...
52 'block_start' => '<div class="NavBar">',
53 'block_end' => '</div>',
54 'block_display_title' => false,
55- // list params...
56 'list_start' => '',
57 'list_end' => '',
58 'item_start' => '',
59 'item_end' => '',
60 'item_selected_start' => '',
61 'item_selected_end' => '',
62- // miscellaneous params...
63 'link_selected_class' => 'NavButton2',
64 'link_default_class' => 'NavButton2',
65 ) );
66@@ -153,53 +141,51 @@
67
68 <div class="bPosts">
69 <?php
70-// ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
71+// messages generated from actions
72 messages( array(
73 'block_start' => '<div class="action_messages">',
74- 'block_end' => '</div>',
75+ 'block_end' => '</div>',
76 ) );
77
78-// ------------------- PREV/NEXT POST LINKS (SINGLE POST MODE) -------------------
79+// prev/next links in single post mode
80 item_prevnext_links( array(
81 'block_start' => '<table class="prevnext_post"><tr>',
82- 'prev_start' => '<td>',
83- 'prev_end' => '</td>',
84- 'next_start' => '<td class="right">',
85- 'next_end' => '</td>',
86- 'block_end' => '</tr></table>',
87+ 'prev_start' => '<td>',
88+ 'prev_end' => '</td>',
89+ 'next_start' => '<td class="right">',
90+ 'next_end' => '</td>',
91+ 'block_end' => '</tr></table>',
92 ) );
93
94-// ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
95+// title for the current request
96 request_title( array(
97- 'title_before'=> '<h2>',
98+ 'title_before' => '<h2>',
99 'title_after' => '</h2>',
100- 'title_none' => '',
101- 'glue' => ' - ',
102+ 'title_none' => '',
103+ 'glue' => ' - ',
104 'title_single_disp' => true,
105- 'format' => 'htmlbody',
106+ 'format' => 'htmlbody',
107 ) );
108
109-// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
110+// prev/next links on multi-post pages
111 mainlist_page_links( array(
112 'block_start' => '<p class="center"><strong>',
113 'block_end' => '</strong></p>',
114 ) );
115
116-// ------------------------------------ START OF POSTS ----------------------------------------
117-// Display message if no post:
118-display_if_empty();
119+display_if_empty(); // display a message if list is empty
120
121 while( $Item = & mainlist_get_item() )
122 { // For each blog post, do everything below up to the closing curly brace "}"
123
124 // ------------------------------ DATE SEPARATOR ------------------------------
125 $MainList->date_if_changed( array(
126- 'before' => '<h2>',
127- 'after' => '</h2>',
128+ 'before' => '<h2>',
129+ 'after' => '</h2>',
130 'date_format' => '#',
131 ) );
132 ?>
133- <div id="<?php $Item->anchor_id() ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
134+ <div id="<?php $Item->anchor_id(); ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang(); ?>">
135
136 <div class="bSmallHead">
137 <?php
138@@ -207,13 +193,15 @@
139 'text' => '#icon#',
140 ) );
141
142- $Item->issue_time(); // Post issue time
143-
144+ // display formatted issue time (datetime) of Item
145+ $Item->issue_time();
146+
147+ // list by name and link all cats, sub-cats, ext-cats
148 $Item->categories( array(
149- 'before' => ', '.T_('Categories').': ',
150- 'after' => ' ',
151- 'include_main' => true,
152- 'include_other' => true,
153+ 'before' => ', '.T_('Categories').': ',
154+ 'after' => ' ',
155+ 'include_main' => true,
156+ 'include_other' => true,
157 'include_external'=> true,
158 'link_categories' => true,
159 ) );
160@@ -238,28 +226,18 @@
161
162 <div class="bSmallPrint">
163 <?php
164- // Link to comments, trackbacks, etc.:
165+ // display link to, and count of, comments only
166 $Item->feedback_link( array(
167 'type' => 'comments',
168 'link_before' => '',
169 'link_after' => ' &bull; ',
170- 'link_text_zero' => '#',
171- 'link_text_one' => '#',
172- 'link_text_more' => '#',
173- 'link_title' => '#',
174- 'use_popup' => false,
175 ) );
176
177- // Link to comments, trackbacks, etc.:
178+ // display link to, and count of, trackbacks only
179 $Item->feedback_link( array(
180 'type' => 'trackbacks',
181 'link_before' => '',
182 'link_after' => ' &bull; ',
183- 'link_text_zero' => '#',
184- 'link_text_one' => '#',
185- 'link_text_more' => '#',
186- 'link_title' => '#',
187- 'use_popup' => false,
188 ) );
189 ?>
190
191@@ -279,7 +257,7 @@
192 <?php
193 }
194
195-// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
196+// prev/next links on multi-post pages
197 mainlist_page_links( array(
198 'block_start' => '<p class="center"><strong>',
199 'block_end' => '</strong></p>',
200@@ -302,32 +280,27 @@
201
202 <div class="bSideItem">
203 <h3><?php $Blog->disp( 'name', 'htmlbody' ); ?></h3>
204-
205- <p><?php
206- // BLOG LONG DESCRIPTION:
207- $Blog->disp( 'longdesc', 'htmlbody' );
208- // Note: we could have called the coll_longdesc widget instead, but that would be overkill.
209- ?></p>
210-
211- <?php
212- // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
213- mainlist_page_links( array(
214- 'block_start' => '<p class="center"><strong>',
215- 'block_end' => '</strong></p>',
216- 'links_format' => '$prev$ :: $next$',
217- 'prev_text' => '&lt;&lt; '.T_('Previous'),
218- 'next_text' => T_('Next').' &gt;&gt;',
219- ) );
220+<p><?php
221+// BLOG LONG DESCRIPTION:
222+$Blog->disp( 'longdesc', 'htmlbody' );
223+// we could have called the coll_longdesc widget, but that would be overkill. ?></p>
224+<?php
225+// prev/next links on multi-post pages
226+mainlist_page_links( array(
227+ 'block_start' => '<p class="center"><strong>',
228+ 'block_end' => '</strong></p>',
229+ 'links_format' => '$prev$ :: $next$',
230+ 'prev_text' => '&lt;&lt; '.T_('Previous'),
231+ 'next_text' => T_('Next').' &gt;&gt;',
232+) );
233
234 // display the Common Links widget
235 template_widget( array(
236 'widget' => 'coll_common_links',
237- // list params...
238 'list_start' => '<ul>',
239 'list_end' => '</ul>',
240 'item_start' => '<li>',
241 'item_end' => '</li>',
242- // widget-specific params...
243 'show_recently' => true,
244 'show_archives' => true,
245 'show_categories' => false,
246@@ -348,7 +321,6 @@
247 // display the Search Form widget
248 template_widget( array(
249 'widget' => 'coll_search_form',
250- // block-level params...
251 'block_start' => '<div class="bSideItem">',
252 'block_end' => '</div>',
253 'block_title_start' => '<h3 class="sideItemTitle">',
254@@ -358,7 +330,6 @@
255 // display the Category List widget
256 template_widget( array(
257 'widget' => 'coll_category_list',
258- // block-level params...
259 'block_start' => '<div class="bSideItem">',
260 'block_end' => '</div>',
261 'block_title_start' => '<h3 class="sideItemTitle">',
262@@ -376,7 +347,6 @@
263 // display the Linkblog widget
264 template_widget( array(
265 'widget' => 'linkblog',
266- // block-level params...
267 'block_start' => '<div class="bSideItem">',
268 'block_end' => '</div>',
269 'block_title_start' => '<h3 class="sideItemTitle">',
270@@ -386,7 +356,6 @@
271 // display the User Tools widget
272 template_widget( array(
273 'widget' => 'user_tools',
274- // block-level params...
275 'block_start' => '<div class="bSideItem">',
276 'block_end' => '</div>',
277 'block_title_start' => '<h3 class="sideItemTitle">',
278@@ -396,7 +365,6 @@
279 // display the XML Feeds widget
280 template_widget( array(
281 'widget' => 'coll_xml_feeds',
282- // block-level params...
283 'block_start' => '<div class="bSideItem">',
284 'block_end' => '</div>',
285 'block_title_start' => '<h3 class="sideItemTitle">',
286
287=== modified file 'contact.php'
288--- contact.php 2010-01-08 10:32:06 +0000
289+++ contact.php 2010-01-17 09:47:13 +0000
290@@ -45,9 +45,8 @@
291 header_content_type( 'text/html' );
292 ?>
293 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
294-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>"><!-- InstanceBegin template="/Templates/Standard.dwt" codeOutsideHTMLIsLocked="false" -->
295+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
296 <head>
297-<!-- InstanceBeginEditable name="doctitle" -->
298 <title><?php echo T_('Contact Form Demo'); ?></title>
299 <link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />
300 <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
301@@ -58,6 +57,7 @@
302 // --- --- --- --- --- --- --- --- --- --- ---
303 // --- TOOLBAR INCLUDED HERE ---
304 template_include( '_toolbar.inc.php' );
305+
306 echo "\n";
307 if( is_logged_in() )
308 {
309@@ -75,18 +75,15 @@
310 // display the Public Blog List widget
311 template_widget( array(
312 'widget' => 'colls_list_public',
313- // block-level params...
314 'block_start' => '<div class="NavBar">',
315 'block_end' => '</div>',
316 'block_display_title' => false,
317- // list params...
318 'list_start' => '',
319 'list_end' => '',
320 'item_start' => '',
321 'item_end' => '',
322 'item_selected_start' => '',
323 'item_selected_end' => '',
324- // miscellaneous params...
325 'link_selected_class' => 'NavButton2',
326 'link_default_class' => 'NavButton2',
327 ) );
328@@ -101,17 +98,13 @@
329
330 <div class="main">
331 <?php
332- // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
333- messages( array(
334- 'block_start' => '<div class="action_messages">',
335- 'block_end' => '</div>',
336- ) );
337- // --------------------------------- END OF MESSAGES ---------------------------------
338-?>
339-
340-
341-<?php
342- // ----------------------------- MESSAGE FORM ----------------------------
343+// messages generated from actions
344+messages( array(
345+ 'block_start' => '<div class="action_messages">',
346+ 'block_end' => '</div>',
347+) );
348+
349+// ----------------------------- MESSAGE FORM ----------------------------
350 if( empty( $return ) )
351 { // We are *not* coming back after sending a message:
352
353
354=== modified file 'default.php'
355--- default.php 2010-01-04 17:32:41 +0000
356+++ default.php 2010-01-17 09:47:13 +0000
357@@ -25,8 +25,6 @@
358 */
359 require_once $inc_path.'_main.inc.php';
360
361-
362-
363 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
364 // Note: This is totally optional. General caching must be enabled in Global settings, otherwise this will do nothing.
365 // Delete this block if you don't care about page level caching. Don't forget to delete the matching section at the end of the page.
366@@ -35,17 +33,13 @@
367 // Check for cached content & Start caching if needed:
368 if( ! $PageCache->check() )
369 { // Cache miss, we have to generate:
370- // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
371-
372
373 header_content_type( 'text/html' );
374 ?>
375 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
376-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>"><!-- InstanceBegin template="/Templates/evo_distrib_2.dwt" codeOutsideHTMLIsLocked="false" -->
377+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
378 <head>
379- <!-- InstanceBeginEditable name="doctitle" -->
380 <title><?php echo $app_name; ?> - Default Page</title>
381- <!-- InstanceEndEditable -->
382 <meta name="viewport" content="width = 750" />
383 <link href="rsc/css/evo_distrib_2.css" rel="stylesheet" type="text/css" />
384 <base href="<?php echo $baseurl ?>" />
385@@ -56,6 +50,7 @@
386 // --- --- --- --- --- --- --- --- --- --- ---
387 // --- TOOLBAR INCLUDED HERE ---
388 template_include( '_toolbar.inc.php' );
389+
390 echo "\n";
391 if( is_logged_in() )
392 {
393@@ -79,64 +74,59 @@
394 </div>
395
396 <?php
397- /**
398- * @var BlogCache
399- */
400- $BlogCache = & get_Cache('BlogCache');
401- $BlogCache->load_all();
402-
403- if( $pagenow == 'index.php' || count( $BlogCache->cache ) == 0 )
404- { // This page is actually included by the index.html page OR there are no blogs
405- ?>
406- <div class="block1">
407- <div class="block2">
408- <div class="block3">
409-
410- <h1><?php printf( T_('Welcome to %s'), $app_name ); ?></h1>
411-
412- <?php
413- messages( array(
414- 'block_start' => '<div class="action_messages">',
415- 'block_end' => '</div>',
416- ) );
417-
418- if( count( $BlogCache->cache ) == 0 )
419- { // There is no blog on this system!
420- echo '<p><strong>';
421- printf( T_('%s is installed and ready but you haven\'t created any blog on '
422- .'this system yet.'), $app_name );
423- echo '</strong></p>';
424-
425- echo '<p><a href="'.$admin_url.'?ctrl=collections&amp;action=new">'.T_( 'Create a first blog' ).' &raquo;</a></p>';
426- }
427- else
428- {
429- echo '<p><strong>';
430- printf( T_('You have successfully installed %s.'), $app_name );
431- echo '</strong></p>';
432-
433- echo '<p>'.T_('You haven\'t set a default blog yet. Thus, you see this default page.').'</p>';
434- ?>
435- <p><a href="<?php echo $admin_url ?>?ctrl=settings&amp;tab=general"><?php echo T_( 'Set a default blog' ) ?> &raquo;</a></p>
436- <?php
437- }
438- ?>
439- </div>
440- </div>
441- </div>
442- <?php
443- }
444-
445- if( count( $BlogCache->cache ) )
446- { // There are blogs on this system!
447+/**
448+ * @var BlogCache
449+ */
450+$BlogCache = & get_Cache('BlogCache');
451+$BlogCache->load_all();
452+
453+if( $pagenow == 'index.php' || count( $BlogCache->cache ) == 0 )
454+{ // This page is actually included by the index.html page OR there are no blogs
455+ ?>
456+ <div class="block1">
457+ <div class="block2">
458+ <div class="block3">
459+ <h1><?php printf( T_('Welcome to %s'), $app_name ); ?></h1>
460+ <?php
461+ // messages generated from actions
462+ messages( array(
463+ 'block_start' => '<div class="action_messages">',
464+ 'block_end' => '</div>',
465+ ) );
466+
467+ if( count( $BlogCache->cache ) == 0 )
468+ { // There is no blog on this system!
469+ echo '<p><strong>';
470+ printf( T_('%s is installed and ready but you haven\'t created any blog on this system yet.'), $app_name );
471+ echo '</strong></p>';
472+ echo '<p><a href="'.$admin_url.'?ctrl=collections&amp;action=new">'.T_( 'Create a first blog' ).' &raquo;</a></p>';
473+ }
474+ else
475+ {
476+ echo '<p><strong>';
477+ printf( T_('You have successfully installed %s.'), $app_name );
478+ echo '</strong></p>';
479+ echo '<p>'.T_('You haven\'t set a default blog yet. Thus, you see this default page.').'</p>';
480 ?>
481-
482- <div class="block1">
483- <div class="block2">
484- <div class="block3">
485-
486+ <p><a href="<?php echo $admin_url ?>?ctrl=settings&amp;tab=general"><?php echo T_( 'Set a default blog' ) ?> &raquo;</a></p>
487+ <?php
488+ }
489+ ?>
490+ </div>
491+ </div>
492+ </div>
493+
494+ <?php
495+}
496+
497+if( count( $BlogCache->cache ) )
498+{ // There are blogs on this system!
499+ ?>
500+
501+ <div class="block1">
502+ <div class="block2">
503+ <div class="block3">
504 <h2><?php echo T_('Blogs on this system') ?></h2>
505-
506 <ul>
507 <?php // --------------------------- BLOG LIST -----------------------------
508 for( $l_Blog = & $BlogCache->get_first();
509@@ -151,7 +141,6 @@
510 echo '</a></strong>';
511 echo '</li>';
512 }
513- // ---------------------------------- END OF BLOG LIST ---------------------------------
514 ?>
515 </ul>
516
517@@ -195,27 +184,27 @@
518 <?php
519 }
520 ?>
521-
522-<!-- InstanceEndEditable -->
523- </div>
524-
525- <div class="body_fade_out">
526-
527- <div class="menu_bottom"><!-- InstanceBeginEditable name="MenuBottom" -->Powered by <a href="<?php echo $app_homepage; ?>" target="_blank"><?php echo $app_name; ?></a><!-- InstanceEndEditable --></div>
528-
529- <div class="copyright"><!-- InstanceBeginEditable name="CopyrightTail" -->
530- <a href="contact.php"><?php echo T_('Contact the admin') ?></a>
531- <!-- InstanceEndEditable --></div>
532-
533- </div>
534- </div>
535-
536- <!-- InstanceBeginEditable name="BodyFoot" -->
537- <!-- End of template_wrapper -->
538- </div>
539- <!-- InstanceEndEditable -->
540+</div>
541+
542+<div class="body_fade_out">
543+
544+<div class="menu_bottom">
545+Powered by <a href="<?php echo $app_homepage; ?>" target="_blank"><?php echo $app_name; ?></a>
546+</div>
547+
548+<div class="copyright">
549+<a href="contact.php"><?php echo T_('Contact the admin') ?></a>
550+</div>
551+
552+</div>
553+
554+</div>
555+
556+</div>
557+
558 </body>
559-<!-- InstanceEnd --></html>
560+
561+</html>
562 <?php
563 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
564 // Save collected cached data if needed:
565
566=== modified file 'inc/_core/__core.init.php'
567--- inc/_core/__core.init.php 2010-01-09 20:20:31 +0000
568+++ inc/_core/__core.init.php 2010-01-17 09:47:13 +0000
569@@ -122,6 +122,8 @@
570
571 /**
572 * _core_Module definition
573+ *
574+ * @package pond
575 */
576 class _core_Module
577 {
578
579=== modified file 'inc/_core/_template.funcs.php'
580--- inc/_core/_template.funcs.php 2009-12-19 19:51:52 +0000
581+++ inc/_core/_template.funcs.php 2010-01-17 09:47:13 +0000
582@@ -199,18 +199,25 @@
583 * Display a global title matching filter params
584 *
585 * Outputs the title of the category when you load the page with <code>?cat=</code>
586- * Display "Archive Directory" title if it has been requested
587- * Display "Latest comments" title if these have been requested
588- * Display "Statistics" title if these have been requested
589- * Display "User profile" title if it has been requested
590- *
591- * @todo single month: Respect locales datefmt
592- * @todo single post: posts do no get proper checking (wether they are in the requested blog or wether their permissions match user rights,
593+ *
594+ * Displays title depending on value of $disp:
595+ * - "Archive Directory" (arcdir_text param) title if $disp is 'arcdir'
596+ * - "Category Directory" (catdir_text param) title if $disp is 'catdir'
597+ * - "Latest comments (on)" title if $disp is 'comments'
598+ * - "Feedback on" title if $disp is 'feedback-popup'
599+ * - "User profile" title if $disp is 'profile'
600+ * - "Subscriptions" title if $disp is 'subs'
601+ * - "Send an email message" title if $disp is 'msgform'
602+ * - "PREVIEW" title if we are previewing an item
603+ * - "User" title if $disp is 'user'
604+ *
605+ * @todo (legacy): single month: Respect locales datefmt
606+ * @todo (legacy): single post: posts do no get proper checking (wether they are in the requested blog or wether their permissions match user rights,
607 * thus the title sometimes gets displayed even when it should not. We need to pre-query the ItemList instead!!
608- * @todo make it complete with all possible params!
609+ * @todo (legacy): make it complete with all possible params!
610 *
611 * @param array params
612- * - "auto_pilot": "seo_title": Use the SEO title autopilot. (Default: "none")
613+ * - "auto_pilot": "seo_title": Use the SEO title autopilot. (Default: "none")
614 */
615 function request_title( $params = array() )
616 {
617@@ -772,7 +779,11 @@
618
619
620 /**
621- * Stub: Links to previous and next post in single post mode
622+ * Template Tag
623+ *
624+ * Displays links to previous and next posts in single post mode
625+ *
626+ * @uses ItemList2::prevnext_item_links()
627 */
628 function item_prevnext_links( $params = array() )
629 {
630@@ -788,6 +799,14 @@
631 /**
632 * Stub
633 */
634+/**
635+ * Template Tag
636+ *
637+ * Displays messages from actions if there are any
638+ *
639+ * @uses Log::disp()
640+ * @uses Log::display()
641+ */
642 function messages( $params = array() )
643 {
644 global $Messages;
645@@ -797,7 +816,11 @@
646
647
648 /**
649- * Stub: Links to list pages:
650+ * Template Tag
651+ *
652+ * Displays links to previous and next posts in multi-post (or list) mode
653+ *
654+ * @uses ItemListLight::page_links()
655 */
656 function mainlist_page_links( $params = array() )
657 {
658
659=== modified file 'inc/_core/model/_log.class.php'
660--- inc/_core/model/_log.class.php 2009-12-19 19:51:52 +0000
661+++ inc/_core/model/_log.class.php 2010-01-17 09:47:13 +0000
662@@ -253,14 +253,16 @@
663 * The purpose here is to have a tag which is simple yet flexible.
664 * the display function is WAAAY too bloated.
665 *
666- * @todo optimize
667- *
668 * @param string HTML to display before the log when there is something to display
669 * @param string HTML to display after the log when there is something to display
670 * @param boolean Skip if previewing?
671- * TODO: dh> This appears to not display e.g. errors which got inserted?!!
672- * I also don't see how this is a "simple" param (in the sense
673- * of useful/required)
674+ *
675+ * @uses Log::display()
676+ *
677+ * @todo EdB: why is disp always called with the defaults redefined with the same values?
678+ * @todo (legacy): optimize
679+ * @todo (legacy): dh> This appears to not display e.g. errors which got inserted?!!
680+ * I also don't see how this is a "simple" param (in the sense of useful/required)
681 */
682 function disp( $before = '<div class="action_messages">', $after = '</div>', $skip_if_preview = true )
683 {
684
685=== modified file 'inc/_core/model/_timer.class.php'
686--- inc/_core/model/_timer.class.php 2009-12-19 19:51:52 +0000
687+++ inc/_core/model/_timer.class.php 2010-01-17 09:47:13 +0000
688@@ -34,6 +34,8 @@
689
690 /**
691 * This is a simple class to allow timing/profiling of code portions.
692+ *
693+ * @package pond
694 */
695 class Timer
696 {
697
698=== modified file 'inc/_core/model/dataobjects/_dataobjectlist2.class.php'
699--- inc/_core/model/dataobjects/_dataobjectlist2.class.php 2009-12-19 19:51:52 +0000
700+++ inc/_core/model/dataobjects/_dataobjectlist2.class.php 2010-01-17 09:47:14 +0000
701@@ -168,6 +168,9 @@
702 }
703
704
705+/**
706+ * dummy docblock makes error-free autodocs
707+ */
708 function & get_row_by_idx( $idx )
709 {
710 return $this->rows[ $idx ];
711
712=== modified file 'inc/_core/model/db/_sql.class.php'
713--- inc/_core/model/db/_sql.class.php 2009-12-19 19:51:52 +0000
714+++ inc/_core/model/db/_sql.class.php 2010-01-17 09:47:14 +0000
715@@ -263,16 +263,25 @@
716 $this->where .= '('.$where_or.')';
717 }
718
719+/**
720+ * dummy docblock makes error-free autodocs
721+ */
722 function GROUP_BY( $group_by )
723 {
724 $this->group_by = $group_by;
725 }
726
727+/**
728+ * dummy docblock makes error-free autodocs
729+ */
730 function ORDER_BY( $order_by )
731 {
732 $this->order_by = $order_by;
733 }
734
735+/**
736+ * dummy docblock makes error-free autodocs
737+ */
738 function ORDER_BY_prepend( $order_by_prepend )
739 {
740 if( empty( $order_by_prepend ) )
741@@ -290,6 +299,9 @@
742 }
743 }
744
745+/**
746+ * dummy docblock makes error-free autodocs
747+ */
748 function LIMIT( $limit )
749 {
750 $this->limit = $limit;
751
752=== modified file 'inc/_core/ui/results/_results.class.php'
753--- inc/_core/ui/results/_results.class.php 2009-12-19 19:51:52 +0000
754+++ inc/_core/ui/results/_results.class.php 2010-01-17 09:47:14 +0000
755@@ -1695,7 +1695,7 @@
756 }
757
758
759- /*
760+ /**
761 * Returns a scrolling page list under the table
762 */
763 function page_scroll_list()
764
765=== modified file 'inc/_ext/_zip_archives.php'
766--- inc/_ext/_zip_archives.php 2009-12-21 17:27:20 +0000
767+++ inc/_ext/_zip_archives.php 2010-01-17 09:47:14 +0000
768@@ -30,6 +30,9 @@
769 */
770 class archive
771 {
772+/**
773+ * dummy docblock makes error-free autodocs
774+ */
775 function archive($name)
776 {
777 $this->options = array (
778@@ -53,6 +56,9 @@
779 $this->error = array ();
780 }
781
782+/**
783+ * dummy docblock makes error-free autodocs
784+ */
785 function set_options($options)
786 {
787 foreach ($options as $key => $value)
788@@ -77,6 +83,9 @@
789 }
790 }
791
792+/**
793+ * dummy docblock makes error-free autodocs
794+ */
795 function create_archive()
796 {
797 $this->make_list();
798@@ -152,6 +161,9 @@
799 }
800 }
801
802+/**
803+ * dummy docblock makes error-free autodocs
804+ */
805 function add_data($data)
806 {
807 if ($this->options['inmemory'] == 0)
808@@ -160,6 +172,9 @@
809 $this->archive .= $data;
810 }
811
812+/**
813+ * dummy docblock makes error-free autodocs
814+ */
815 function make_list()
816 {
817 if (!empty ($this->exclude))
818@@ -175,6 +190,9 @@
819 unset ($this->exclude, $this->storeonly);
820 }
821
822+/**
823+ * dummy docblock makes error-free autodocs
824+ */
825 function add_files($list)
826 {
827 $temp = $this->list_files($list);
828@@ -182,6 +200,9 @@
829 $this->files[] = $current;
830 }
831
832+/**
833+ * dummy docblock makes error-free autodocs
834+ */
835 function exclude_files($list)
836 {
837 $temp = $this->list_files($list);
838@@ -189,6 +210,9 @@
839 $this->exclude[] = $current;
840 }
841
842+/**
843+ * dummy docblock makes error-free autodocs
844+ */
845 function store_files($list)
846 {
847 $temp = $this->list_files($list);
848@@ -196,6 +220,9 @@
849 $this->storeonly[] = $current;
850 }
851
852+/**
853+ * dummy docblock makes error-free autodocs
854+ */
855 function list_files($list)
856 {
857 if (!is_array ($list))
858@@ -250,6 +277,9 @@
859 return $files;
860 }
861
862+/**
863+ * dummy docblock makes error-free autodocs
864+ */
865 function parse_dir($dirname)
866 {
867 if ($this->options['storepaths'] == 1 && !preg_match("/^(\.+\/*)+$/", $dirname))
868@@ -286,6 +316,9 @@
869 return $files;
870 }
871
872+/**
873+ * dummy docblock makes error-free autodocs
874+ */
875 function sort_files($a, $b)
876 {
877 if ($a['type'] != $b['type'])
878@@ -304,6 +337,9 @@
879 return 0;
880 }
881
882+/**
883+ * dummy docblock makes error-free autodocs
884+ */
885 function download_file()
886 {
887 if ($this->options['inmemory'] == 0)
888@@ -346,12 +382,18 @@
889 */
890 class tar_file extends archive
891 {
892+/**
893+ * dummy docblock makes error-free autodocs
894+ */
895 function tar_file($name)
896 {
897 $this->archive($name);
898 $this->options['type'] = "tar";
899 }
900
901+/**
902+ * dummy docblock makes error-free autodocs
903+ */
904 function create_tar()
905 {
906 $pwd = getcwd();
907@@ -410,6 +452,9 @@
908 return 1;
909 }
910
911+/**
912+ * dummy docblock makes error-free autodocs
913+ */
914 function extract_files()
915 {
916 $pwd = getcwd();
917@@ -496,6 +541,9 @@
918 chdir($pwd);
919 }
920
921+/**
922+ * dummy docblock makes error-free autodocs
923+ */
924 function open_archive()
925 {
926 return @fopen($this->options['name'], "rb");
927@@ -511,12 +559,18 @@
928 */
929 class gzip_file extends tar_file
930 {
931+/**
932+ * dummy docblock makes error-free autodocs
933+ */
934 function gzip_file($name)
935 {
936 $this->tar_file($name);
937 $this->options['type'] = "gzip";
938 }
939
940+/**
941+ * dummy docblock makes error-free autodocs
942+ */
943 function create_gzip()
944 {
945 if ($this->options['inmemory'] == 0)
946@@ -544,6 +598,9 @@
947 return 1;
948 }
949
950+/**
951+ * dummy docblock makes error-free autodocs
952+ */
953 function open_archive()
954 {
955 return @gzopen($this->options['name'], "rb");
956@@ -559,12 +616,18 @@
957 */
958 class bzip_file extends tar_file
959 {
960+/**
961+ * dummy docblock makes error-free autodocs
962+ */
963 function bzip_file($name)
964 {
965 $this->tar_file($name);
966 $this->options['type'] = "bzip";
967 }
968
969+/**
970+ * dummy docblock makes error-free autodocs
971+ */
972 function create_bzip()
973 {
974 if ($this->options['inmemory'] == 0)
975@@ -592,6 +655,9 @@
976 return 1;
977 }
978
979+/**
980+ * dummy docblock makes error-free autodocs
981+ */
982 function open_archive()
983 {
984 return @bzopen($this->options['name'], "rb");
985@@ -607,12 +673,18 @@
986 */
987 class zip_file extends archive
988 {
989+/**
990+ * dummy docblock makes error-free autodocs
991+ */
992 function zip_file($name)
993 {
994 $this->archive($name);
995 $this->options['type'] = "zip";
996 }
997
998+/**
999+ * dummy docblock makes error-free autodocs
1000+ */
1001 function create_zip()
1002 {
1003 $files = 0;
1004
1005=== modified file 'inc/_ext/idna/_idna_convert.class.php'
1006--- inc/_ext/idna/_idna_convert.class.php 2009-12-06 09:37:19 +0000
1007+++ inc/_ext/idna/_idna_convert.class.php 2010-01-17 09:47:14 +0000
1008@@ -56,7 +56,7 @@
1009 * @author Leonid Kogan <lko@neuse.de>
1010 * @copyright 2004-2009 phlyLabs Berlin, http://phlylabs.de
1011 * @version 0.6.2
1012- * @changelog since 0.5.1 class updated to PHP5/6 style should be compatible to PHP 4.3+
1013+ * changelog since 0.5.1 class updated to PHP5/6 style should be compatible to PHP 4.3+
1014 *
1015 * @package pond
1016 */
1017
1018=== modified file 'inc/_ext/idna/_idna_convert.class.php4'
1019--- inc/_ext/idna/_idna_convert.class.php4 2009-12-12 16:12:01 +0000
1020+++ inc/_ext/idna/_idna_convert.class.php4 2010-01-17 09:47:14 +0000
1021@@ -110,6 +110,9 @@
1022 var $_strict_mode = false; // Behave strict or not
1023
1024 // The constructor
1025+/**
1026+ * dummy docblock makes error-free autodocs
1027+ */
1028 function idna_convert($options = false)
1029 {
1030 $this->slast = $this->_sbase + $this->_lcount * $this->_vcount * $this->_tcount;
1031@@ -958,9 +961,11 @@
1032 }
1033
1034 /**
1035-* Adapter class for aligning the API of idna_convert with that of Net_IDNA
1036-* @author Matthias Sommerfeld <mso@phlylabs.de>
1037-*/
1038+ * Adapter class for aligning the API of idna_convert with that of Net_IDNA
1039+ * @author Matthias Sommerfeld <mso@phlylabs.de>
1040+ *
1041+ * @package pond
1042+ */
1043 class Net_IDNA_php4 extends idna_convert
1044 {
1045 /**
1046
1047=== modified file 'inc/_ext/mime_parser/mime_parser.php'
1048--- inc/_ext/mime_parser/mime_parser.php 2009-12-06 09:37:19 +0000
1049+++ inc/_ext/mime_parser/mime_parser.php 2010-01-17 09:47:14 +0000
1050@@ -5,22 +5,67 @@
1051 * @package pond
1052 */
1053
1054+/**
1055+ * dummy docblock makes error-free autodocs
1056+ */
1057 define('MIME_PARSER_START', 1);
1058+/**
1059+ * dummy docblock makes error-free autodocs
1060+ */
1061 define('MIME_PARSER_HEADER', 2);
1062+/**
1063+ * dummy docblock makes error-free autodocs
1064+ */
1065 define('MIME_PARSER_HEADER_VALUE', 3);
1066+/**
1067+ * dummy docblock makes error-free autodocs
1068+ */
1069 define('MIME_PARSER_BODY', 4);
1070+/**
1071+ * dummy docblock makes error-free autodocs
1072+ */
1073 define('MIME_PARSER_BODY_START', 5);
1074+/**
1075+ * dummy docblock makes error-free autodocs
1076+ */
1077 define('MIME_PARSER_BODY_DATA', 6);
1078+/**
1079+ * dummy docblock makes error-free autodocs
1080+ */
1081 define('MIME_PARSER_BODY_DONE', 7);
1082+/**
1083+ * dummy docblock makes error-free autodocs
1084+ */
1085 define('MIME_PARSER_END', 8);
1086
1087+/**
1088+ * dummy docblock makes error-free autodocs
1089+ */
1090 define('MIME_MESSAGE_START', 1);
1091+/**
1092+ * dummy docblock makes error-free autodocs
1093+ */
1094 define('MIME_MESSAGE_GET_HEADER_NAME', 2);
1095+/**
1096+ * dummy docblock makes error-free autodocs
1097+ */
1098 define('MIME_MESSAGE_GET_HEADER_VALUE', 3);
1099+/**
1100+ * dummy docblock makes error-free autodocs
1101+ */
1102 define('MIME_MESSAGE_GET_BODY', 4);
1103+/**
1104+ * dummy docblock makes error-free autodocs
1105+ */
1106 define('MIME_MESSAGE_GET_BODY_PART', 5);
1107
1108+/**
1109+ * dummy docblock makes error-free autodocs
1110+ */
1111 define('MIME_ADDRESS_START', 1);
1112+/**
1113+ * dummy docblock makes error-free autodocs
1114+ */
1115 define('MIME_ADDRESS_FIRST', 2);
1116
1117 /**
1118@@ -285,23 +330,35 @@
1119
1120 /* Private functions */
1121
1122+/**
1123+ * dummy docblock makes error-free autodocs
1124+ */
1125 Function SetError($error)
1126 {
1127 $this->error = $error;
1128 return(0);
1129 }
1130
1131+/**
1132+ * dummy docblock makes error-free autodocs
1133+ */
1134 Function SetErrorWithContact($error)
1135 {
1136 return($this->SetError($error.'. Please contact the author Manuel Lemos <mlemos@acm.org> and send a copy of this message to let him add support for this kind of messages'));
1137 }
1138
1139+/**
1140+ * dummy docblock makes error-free autodocs
1141+ */
1142 Function SetPositionedError($error, $position)
1143 {
1144 $this->error_position = $position;
1145 return($this->SetError($error));
1146 }
1147
1148+/**
1149+ * dummy docblock makes error-free autodocs
1150+ */
1151 Function SetPositionedWarning($error, $position)
1152 {
1153 if(!$this->ignore_syntax_errors)
1154@@ -310,6 +367,9 @@
1155 return(1);
1156 }
1157
1158+/**
1159+ * dummy docblock makes error-free autodocs
1160+ */
1161 Function SetPHPError($error, &$php_error_message)
1162 {
1163 if(IsSet($php_error_message)
1164@@ -318,6 +378,9 @@
1165 return($this->SetError($error));
1166 }
1167
1168+/**
1169+ * dummy docblock makes error-free autodocs
1170+ */
1171 Function ResetParserState()
1172 {
1173 $this->error='';
1174@@ -339,6 +402,9 @@
1175 $this->next_token = '';
1176 }
1177
1178+/**
1179+ * dummy docblock makes error-free autodocs
1180+ */
1181 Function Tokenize($string,$separator="")
1182 {
1183 if(!strcmp($separator,""))
1184@@ -363,6 +429,9 @@
1185 }
1186 }
1187
1188+/**
1189+ * dummy docblock makes error-free autodocs
1190+ */
1191 Function ParseStructuredHeader($value, &$type, &$parameters, &$character_sets, &$languages)
1192 {
1193 $type = strtolower(trim($this->Tokenize($value, ';')));
1194@@ -394,6 +463,9 @@
1195 }
1196 }
1197
1198+/**
1199+ * dummy docblock makes error-free autodocs
1200+ */
1201 Function FindStringLineBreak($string, $position, &$break, &$line_break)
1202 {
1203 if(GetType($line_break=strpos($string, $break="\n", $position))=='integer')
1204@@ -409,6 +481,9 @@
1205 return(GetType($line_break=strpos($string, $break="\r", $position))=='integer');
1206 }
1207
1208+/**
1209+ * dummy docblock makes error-free autodocs
1210+ */
1211 Function FindLineBreak($position, &$break, &$line_break)
1212 {
1213 if(GetType($line_break=strpos($this->buffer, $break="\r", $position))=='integer')
1214@@ -421,6 +496,9 @@
1215 return(GetType($line_break=strpos($this->buffer, $break="\n", $position))=='integer');
1216 }
1217
1218+/**
1219+ * dummy docblock makes error-free autodocs
1220+ */
1221 Function FindBodyLineBreak($position, &$break, &$line_break)
1222 {
1223 if(GetType($line_break=strpos($this->body_buffer, $break="\r", $position))=='integer')
1224@@ -433,6 +511,9 @@
1225 return(GetType($line_break=strpos($this->body_buffer, $break="\n", $position))=='integer');
1226 }
1227
1228+/**
1229+ * dummy docblock makes error-free autodocs
1230+ */
1231 Function ParseHeaderString($body, &$position, &$headers)
1232 {
1233 $l = strlen($body);
1234@@ -456,6 +537,9 @@
1235 }
1236 }
1237
1238+/**
1239+ * dummy docblock makes error-free autodocs
1240+ */
1241 Function ParsePart($end, &$part, &$need_more_data)
1242 {
1243 $need_more_data = 0;
1244@@ -717,6 +801,9 @@
1245 return(1);
1246 }
1247
1248+/**
1249+ * dummy docblock makes error-free autodocs
1250+ */
1251 Function QueueBodyParts()
1252 {
1253 for(;;)
1254@@ -731,6 +818,9 @@
1255 }
1256 }
1257
1258+/**
1259+ * dummy docblock makes error-free autodocs
1260+ */
1261 Function ParseParameters($value, &$first, &$parameters, $return)
1262 {
1263 $first = strtolower(trim(strtok($value, ';')));
1264@@ -752,6 +842,9 @@
1265 return($return_value);
1266 }
1267
1268+/**
1269+ * dummy docblock makes error-free autodocs
1270+ */
1271 Function DecodePart($part)
1272 {
1273 switch($part['Type'])
1274@@ -1181,6 +1274,9 @@
1275 return(1);
1276 }
1277
1278+/**
1279+ * dummy docblock makes error-free autodocs
1280+ */
1281 Function DecodeStream($parameters, &$end_of_message, &$decoded)
1282 {
1283 $end_of_message = 1;
1284@@ -1394,6 +1490,9 @@
1285
1286 /* Public functions */
1287
1288+/**
1289+ * dummy docblock makes error-free autodocs
1290+ */
1291 Function Parse($data, $end)
1292 {
1293 if(strlen($this->error))
1294@@ -1424,6 +1523,9 @@
1295 return(1);
1296 }
1297
1298+/**
1299+ * dummy docblock makes error-free autodocs
1300+ */
1301 Function ParseFile($file)
1302 {
1303 if(strlen($this->error))
1304@@ -1449,6 +1551,9 @@
1305 return(1);
1306 }
1307
1308+/**
1309+ * dummy docblock makes error-free autodocs
1310+ */
1311 Function GetPart(&$part, &$end)
1312 {
1313 $end = ($this->part_position >= count($this->parts));
1314@@ -1624,6 +1729,9 @@
1315 <do>
1316 {/metadocument}
1317 */
1318+/**
1319+ * dummy docblock makes error-free autodocs
1320+ */
1321 Function Decode($parameters, &$decoded)
1322 {
1323 if(IsSet($parameters['File']))
1324@@ -1688,13 +1796,10 @@
1325 fclose($this->file);
1326 return($success);
1327 }
1328-/*
1329-{metadocument}
1330- </do>
1331- </function>
1332-{/metadocument}
1333-*/
1334
1335+/**
1336+ * dummy docblock makes error-free autodocs
1337+ */
1338 Function CopyAddresses($message, &$results, $header)
1339 {
1340 if(!IsSet($message['Headers'][$header]))
1341@@ -1727,6 +1832,9 @@
1342 $results[ucfirst(substr($header, 0, strlen($header) -1))] = $addresses;
1343 }
1344
1345+/**
1346+ * dummy docblock makes error-free autodocs
1347+ */
1348 Function ReadMessageBody($message, &$body, $prefix)
1349 {
1350 if(IsSet($message[$prefix]))
1351@@ -1894,6 +2002,9 @@
1352 <do>
1353 {/metadocument}
1354 */
1355+/**
1356+ * dummy docblock makes error-free autodocs
1357+ */
1358 Function Analyze($message, &$results)
1359 {
1360 $results = array();
1361@@ -2168,21 +2279,8 @@
1362 }
1363 return(1);
1364 }
1365-/*
1366-{metadocument}
1367- </do>
1368- </function>
1369-{/metadocument}
1370-*/
1371
1372 };
1373
1374-/*
1375-
1376-{metadocument}
1377-</class>
1378-{/metadocument}
1379-
1380-*/
1381
1382 ?>
1383\ No newline at end of file
1384
1385=== modified file 'inc/_ext/mime_parser/rfc822_addresses.php'
1386--- inc/_ext/mime_parser/rfc822_addresses.php 2009-12-06 09:37:19 +0000
1387+++ inc/_ext/mime_parser/rfc822_addresses.php 2010-01-17 09:47:14 +0000
1388@@ -129,24 +129,36 @@
1389
1390 /* Private functions */
1391
1392+/**
1393+ * dummy docblock makes error-free autodocs
1394+ */
1395 Function SetError($error)
1396 {
1397 $this->error = $error;
1398 return(0);
1399 }
1400
1401+/**
1402+ * dummy docblock makes error-free autodocs
1403+ */
1404 Function SetPositionedError($error, $position)
1405 {
1406 $this->error_position = $position;
1407 return($this->SetError($error));
1408 }
1409
1410+/**
1411+ * dummy docblock makes error-free autodocs
1412+ */
1413 Function SetWarning($warning, $position)
1414 {
1415 $this->warnings[$position]=$warning;
1416 return(1);
1417 }
1418
1419+/**
1420+ * dummy docblock makes error-free autodocs
1421+ */
1422 Function SetPositionedWarning($error, $position)
1423 {
1424 if(!$this->ignore_syntax_errors)
1425@@ -154,6 +166,9 @@
1426 return($this->SetWarning($error, $position));
1427 }
1428
1429+/**
1430+ * dummy docblock makes error-free autodocs
1431+ */
1432 Function QDecode($p, &$value, &$encoding)
1433 {
1434 $encoding = $charset = null;
1435@@ -244,6 +259,9 @@
1436 return(1);
1437 }
1438
1439+/**
1440+ * dummy docblock makes error-free autodocs
1441+ */
1442 Function ParseCText(&$p, &$c_text)
1443 {
1444 $c_text = null;
1445@@ -258,6 +276,9 @@
1446 return(1);
1447 }
1448
1449+/**
1450+ * dummy docblock makes error-free autodocs
1451+ */
1452 Function ParseQText(&$p, &$q_text)
1453 {
1454 $q_text = null;
1455@@ -276,6 +297,9 @@
1456 return(1);
1457 }
1458
1459+/**
1460+ * dummy docblock makes error-free autodocs
1461+ */
1462 Function ParseQuotedPair(&$p, &$quoted_pair)
1463 {
1464 $quoted_pair = null;
1465@@ -292,6 +316,9 @@
1466 return(1);
1467 }
1468
1469+/**
1470+ * dummy docblock makes error-free autodocs
1471+ */
1472 Function ParseCContent(&$p, &$c_content)
1473 {
1474 $c_content = null;
1475@@ -315,6 +342,9 @@
1476 return(1);
1477 }
1478
1479+/**
1480+ * dummy docblock makes error-free autodocs
1481+ */
1482 Function SkipWhiteSpace(&$p)
1483 {
1484 $v = $this->v;
1485@@ -335,6 +365,9 @@
1486 return(1);
1487 }
1488
1489+/**
1490+ * dummy docblock makes error-free autodocs
1491+ */
1492 Function ParseComment(&$p, &$comment)
1493 {
1494 $comment = null;
1495@@ -365,6 +398,9 @@
1496 return(1);
1497 }
1498
1499+/**
1500+ * dummy docblock makes error-free autodocs
1501+ */
1502 Function SkipCommentWhiteSpace(&$p)
1503 {
1504 $v = $this->v;
1505@@ -389,6 +425,9 @@
1506 return(1);
1507 }
1508
1509+/**
1510+ * dummy docblock makes error-free autodocs
1511+ */
1512 Function ParseQContent(&$p, &$q_content)
1513 {
1514 $q_content = null;
1515@@ -407,6 +446,9 @@
1516 return(1);
1517 }
1518
1519+/**
1520+ * dummy docblock makes error-free autodocs
1521+ */
1522 Function ParseAtom(&$p, &$atom, $dot)
1523 {
1524 $atom = null;
1525@@ -435,6 +477,9 @@
1526 return(1);
1527 }
1528
1529+/**
1530+ * dummy docblock makes error-free autodocs
1531+ */
1532 Function ParseQuotedString(&$p, &$quoted_string)
1533 {
1534 $quoted_string = null;
1535@@ -476,6 +521,9 @@
1536 return(1);
1537 }
1538
1539+/**
1540+ * dummy docblock makes error-free autodocs
1541+ */
1542 Function ParseWord(&$p, &$word)
1543 {
1544 $word = null;
1545@@ -488,6 +536,9 @@
1546 return(1);
1547 }
1548
1549+/**
1550+ * dummy docblock makes error-free autodocs
1551+ */
1552 Function ParseObsPhrase(&$p, &$obs_phrase)
1553 {
1554 $obs_phrase = null;
1555@@ -525,6 +576,9 @@
1556 return(1);
1557 }
1558
1559+/**
1560+ * dummy docblock makes error-free autodocs
1561+ */
1562 Function ParsePhrase(&$p, &$phrase)
1563 {
1564 $phrase = null;
1565@@ -549,6 +603,9 @@
1566 return(1);
1567 }
1568
1569+/**
1570+ * dummy docblock makes error-free autodocs
1571+ */
1572 Function ParseAddrSpec(&$p, &$addr_spec)
1573 {
1574 $addr_spec = null;
1575@@ -576,6 +633,9 @@
1576 return(1);
1577 }
1578
1579+/**
1580+ * dummy docblock makes error-free autodocs
1581+ */
1582 Function ParseAngleAddr(&$p, &$addr)
1583 {
1584 $addr = null;
1585@@ -601,6 +661,9 @@
1586 return(1);
1587 }
1588
1589+/**
1590+ * dummy docblock makes error-free autodocs
1591+ */
1592 Function ParseNameAddr(&$p, &$address)
1593 {
1594 $address = null;
1595@@ -624,6 +687,9 @@
1596 return(1);
1597 }
1598
1599+/**
1600+ * dummy docblock makes error-free autodocs
1601+ */
1602 Function ParseAddrNameAddr(&$p, &$address)
1603 {
1604 $address = null;
1605@@ -648,6 +714,9 @@
1606 return(1);
1607 }
1608
1609+/**
1610+ * dummy docblock makes error-free autodocs
1611+ */
1612 Function ParseMailbox(&$p, &$address)
1613 {
1614 $address = null;
1615@@ -670,6 +739,9 @@
1616 return(1);
1617 }
1618
1619+/**
1620+ * dummy docblock makes error-free autodocs
1621+ */
1622 Function ParseMailboxGroup(&$p, &$mailbox_group)
1623 {
1624 $v = $this->v;
1625@@ -696,6 +768,9 @@
1626 return(1);
1627 }
1628
1629+/**
1630+ * dummy docblock makes error-free autodocs
1631+ */
1632 Function ParseGroup(&$p, &$address)
1633 {
1634 $address = null;
1635@@ -737,6 +812,9 @@
1636 return(1);
1637 }
1638
1639+/**
1640+ * dummy docblock makes error-free autodocs
1641+ */
1642 Function ParseAddress(&$p, &$address)
1643 {
1644 $address = null;
1645@@ -803,6 +881,9 @@
1646 <do>
1647 {/metadocument}
1648 */
1649+/**
1650+ * dummy docblock makes error-free autodocs
1651+ */
1652 Function ParseAddressList($value, &$addresses)
1653 {
1654 $this->warnings = array();
1655
1656=== modified file 'inc/_ext/xmlrpc/_xmlrpc.inc.php'
1657--- inc/_ext/xmlrpc/_xmlrpc.inc.php 2009-12-06 09:37:19 +0000
1658+++ inc/_ext/xmlrpc/_xmlrpc.inc.php 2010-01-17 09:47:14 +0000
1659@@ -791,6 +791,11 @@
1660 return true;
1661 }
1662
1663+/**
1664+ * dummy docblock makes error-free autodocs
1665+ *
1666+ * @package pond
1667+ */
1668 class xmlrpc_client
1669 {
1670 var $path;
1671@@ -1900,6 +1905,11 @@
1672 }
1673 } // end class xmlrpc_client
1674
1675+/**
1676+ * dummy docblock makes error-free autodocs
1677+ *
1678+ * @package pond
1679+ */
1680 class xmlrpcresp
1681 {
1682 var $val = 0;
1683@@ -2058,6 +2068,11 @@
1684 }
1685 }
1686
1687+/**
1688+ * dummy docblock makes error-free autodocs
1689+ *
1690+ * @package pond
1691+ */
1692 class xmlrpcmsg
1693 {
1694 var $payload;
1695@@ -2685,6 +2700,11 @@
1696 }
1697 }
1698
1699+/**
1700+ * dummy docblock makes error-free autodocs
1701+ *
1702+ * @package pond
1703+ */
1704 class xmlrpcval
1705 {
1706 var $me=array();
1707@@ -2863,6 +2883,9 @@
1708
1709 // poor man's version of print_r ???
1710 // DEPRECATED!
1711+/**
1712+ * dummy docblock makes error-free autodocs
1713+ */
1714 function dump($ar)
1715 {
1716 foreach($ar as $key => $val)
1717@@ -2992,6 +3015,9 @@
1718 }
1719
1720 // DEPRECATED
1721+/**
1722+ * dummy docblock makes error-free autodocs
1723+ */
1724 function serializeval($o)
1725 {
1726 // add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...
1727@@ -3049,6 +3075,9 @@
1728
1729 // DEPRECATED! this code looks like it is very fragile and has not been fixed
1730 // for a long long time. Shall we remove it for 2.0?
1731+/**
1732+ * dummy docblock makes error-free autodocs
1733+ */
1734 function getval()
1735 {
1736 // UNSTABLE
1737
1738=== modified file 'inc/_ext/xmlrpc/_xmlrpcs.inc.php'
1739--- inc/_ext/xmlrpc/_xmlrpcs.inc.php 2009-12-06 09:37:19 +0000
1740+++ inc/_ext/xmlrpc/_xmlrpcs.inc.php 2010-01-17 09:47:14 +0000
1741@@ -68,6 +68,9 @@
1742 $_xmlrpcs_getCapabilities_sig=array(array($GLOBALS['xmlrpcStruct']));
1743 $_xmlrpcs_getCapabilities_doc='This method lists all the capabilites that the XML-RPC server has: the (more or less standard) extensions to the xmlrpc spec that it adheres to';
1744 $_xmlrpcs_getCapabilities_sdoc=array(array('list of capabilities, described as structs with a version number and url for the spec'));
1745+/**
1746+ * dummy docblock makes error-free autodocs
1747+ */
1748 function _xmlrpcs_getCapabilities($server, $m=null)
1749 {
1750 $outAr = $GLOBALS['xmlrpcs_capabilities'];
1751@@ -86,6 +89,9 @@
1752 $_xmlrpcs_listMethods_sig=array(array($GLOBALS['xmlrpcArray']));
1753 $_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';
1754 $_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
1755+/**
1756+ * dummy docblock makes error-free autodocs
1757+ */
1758 function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
1759 {
1760
1761@@ -107,6 +113,9 @@
1762 $_xmlrpcs_methodSignature_sig=array(array($GLOBALS['xmlrpcArray'], $GLOBALS['xmlrpcString']));
1763 $_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
1764 $_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
1765+/**
1766+ * dummy docblock makes error-free autodocs
1767+ */
1768 function _xmlrpcs_methodSignature($server, $m)
1769 {
1770 // let accept as parameter both an xmlrpcval or string
1771@@ -160,6 +169,9 @@
1772 $_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
1773 $_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';
1774 $_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
1775+/**
1776+ * dummy docblock makes error-free autodocs
1777+ */
1778 function _xmlrpcs_methodHelp($server, $m)
1779 {
1780 // let accept as parameter both an xmlrpcval or string
1781@@ -201,6 +213,9 @@
1782 $_xmlrpcs_multicall_sig = array(array($GLOBALS['xmlrpcArray'], $GLOBALS['xmlrpcArray']));
1783 $_xmlrpcs_multicall_doc = 'Boxcar multiple RPC calls in one request. See http://www.xmlrpc.com/discuss/msgReader$1208 for details';
1784 $_xmlrpcs_multicall_sdoc = array(array('list of response structs, where each struct has the usual members', 'list of calls, with each call being represented as a struct, with members "methodname" and "params"'));
1785+/**
1786+ * dummy docblock makes error-free autodocs
1787+ */
1788 function _xmlrpcs_multicall_error($err)
1789 {
1790 if(is_string($err))
1791@@ -437,6 +452,11 @@
1792 $GLOBALS['_xmlrpc_debuginfo'] .= $m . "\n";
1793 }
1794
1795+/**
1796+ * dummy docblock makes error-free autodocs
1797+ *
1798+ * @package pond
1799+ */
1800 class xmlrpc_server
1801 {
1802 /// array defining php functions exposed as xmlrpc methods by this server
1803
1804=== modified file 'inc/collections/model/_blog.class.php'
1805--- inc/collections/model/_blog.class.php 2010-01-02 08:34:34 +0000
1806+++ inc/collections/model/_blog.class.php 2010-01-17 09:47:14 +0000
1807@@ -1897,7 +1897,7 @@
1808 }
1809
1810
1811- /*
1812+ /**
1813 * Template function: display name of blog
1814 *
1815 * Template tag
1816@@ -1920,7 +1920,7 @@
1817 }
1818
1819
1820- /*
1821+ /**
1822 * Template function: display name of blog
1823 *
1824 * Template tag
1825@@ -1943,7 +1943,7 @@
1826 }
1827
1828
1829- /*
1830+ /**
1831 * Template function: display name of blog
1832 *
1833 * Template tag
1834@@ -1977,6 +1977,9 @@
1835 }
1836
1837
1838+/**
1839+ * dummy docblock makes error-free autodocs
1840+ */
1841 function get_maxlen_name( $maxlen = 50 )
1842 {
1843 return strmaxlen( $this->get_name(), $maxlen );
1844
1845=== modified file 'inc/dashboard/dashboard.ctrl.php'
1846--- inc/dashboard/dashboard.ctrl.php 2010-01-02 08:34:34 +0000
1847+++ inc/dashboard/dashboard.ctrl.php 2010-01-17 09:47:14 +0000
1848@@ -178,11 +178,12 @@
1849 $Item->get_creator_User();
1850
1851 echo '<div class="dashboard_float_actions">';
1852- $Item->edit_link( array( // Link to backoffice for editing
1853- 'before' => ' ',
1854- 'after' => ' ',
1855- 'class' => 'ActionButton'
1856- ) );
1857+ // link to edit an item if user has permission
1858+ $Item->edit_link( array(
1859+ 'before' => ' ',
1860+ 'after' => ' ',
1861+ 'class' => 'ActionButton'
1862+ ) );
1863 $Item->publish_link( '', '', '#', '#', 'PublishButton' );
1864 echo '<img src="'.$rsc_url.'/img/blank.gif">';
1865 echo '</div>';
1866@@ -237,11 +238,12 @@
1867 $Item->get_creator_User();
1868
1869 echo '<div class="dashboard_float_actions">';
1870- $Item->edit_link( array( // Link to backoffice for editing
1871- 'before' => ' ',
1872- 'after' => ' ',
1873- 'class' => 'ActionButton'
1874- ) );
1875+ // link to edit an item if user has permission
1876+ $Item->edit_link( array(
1877+ 'before' => ' ',
1878+ 'after' => ' ',
1879+ 'class' => 'ActionButton'
1880+ ) );
1881 echo '</div>';
1882
1883 echo '<h3 class="dashboard_post_title">';
1884
1885=== modified file 'inc/files/model/_fileroot.class.php'
1886--- inc/files/model/_fileroot.class.php 2010-01-02 08:34:34 +0000
1887+++ inc/files/model/_fileroot.class.php 2010-01-17 09:47:14 +0000
1888@@ -163,6 +163,9 @@
1889 }
1890
1891
1892+/**
1893+ * dummy docblock makes error-free autodocs
1894+ */
1895 function get_typegroupname()
1896 {
1897 switch( $this->type )
1898
1899=== modified file 'inc/generic/views/_generic_list.inc.php'
1900--- inc/generic/views/_generic_list.inc.php 2009-12-19 19:51:52 +0000
1901+++ inc/generic/views/_generic_list.inc.php 2010-01-17 09:47:14 +0000
1902@@ -67,6 +67,9 @@
1903 );
1904
1905
1906+/**
1907+ * dummy docblock makes error-free autodocs
1908+ */
1909 function link_name( $title , $ID )
1910 {
1911 global $GenericElementCache;
1912
1913=== modified file 'inc/generic/views/_generic_ordered_list.inc.php'
1914--- inc/generic/views/_generic_ordered_list.inc.php 2009-12-19 19:51:52 +0000
1915+++ inc/generic/views/_generic_ordered_list.inc.php 2010-01-17 09:47:14 +0000
1916@@ -66,6 +66,9 @@
1917 'td' => "\$$GenericElementCache->dbIDname\$",
1918 );
1919
1920+/**
1921+ * dummy docblock makes error-free autodocs
1922+ */
1923 function link_name( $title , $ID )
1924 {
1925 global $GenericElementCache;
1926
1927=== modified file 'inc/items/model/_item.class.php'
1928--- inc/items/model/_item.class.php 2010-01-02 15:13:47 +0000
1929+++ inc/items/model/_item.class.php 2010-01-17 09:47:14 +0000
1930@@ -1656,7 +1656,7 @@
1931
1932
1933 /**
1934- *
1935+ * empty docblock for a reason?
1936 */
1937 function page_links( $before = '#', $after = '#', $separator = ' ', $single = '', $current_page = '#', $pagelink = '%d', $url = '' )
1938 {
1939@@ -1971,23 +1971,25 @@
1940 }
1941
1942 $params = array_merge( array(
1943- 'type' => 'feedbacks',
1944- 'status' => 'published',
1945- 'link_before' => '',
1946- 'link_after' => '',
1947- 'link_text_zero' => '#',
1948- 'link_text_one' => '#',
1949- 'link_text_more' => '#',
1950- 'link_anchor_zero' => '#',
1951- 'link_anchor_one' => '#',
1952- 'link_anchor_more' => '#',
1953- 'link_title' => '#',
1954- 'use_popup' => false,
1955- 'url' => '#',
1956- ), $params );
1957-
1958-
1959- // dh> TODO: Add plugin hook, where a Pingback plugin could hook and provide "pingbacks"
1960+ 'type' => 'feedbacks',
1961+ 'status' => 'published',
1962+ 'link_before' => '',
1963+ 'link_after' => '',
1964+ 'link_text_zero' => '#',
1965+ 'link_text_one' => '#',
1966+ 'link_text_more' => '#',
1967+ 'link_anchor_zero' => '#',
1968+ 'link_anchor_one' => '#',
1969+ 'link_anchor_more' => '#',
1970+ 'link_title' => '#',
1971+ 'use_popup' => false,
1972+ 'url' => '#',
1973+ ), $params );
1974+
1975+
1976+ /**
1977+ * @todo (legacy): dh> TODO: Add plugin hook, where a Pingback plugin could hook and provide "pingbacks"
1978+ */
1979 switch( $params['type'] )
1980 {
1981 case 'feedbacks':
1982@@ -2357,7 +2359,7 @@
1983 *
1984 * @param array Params:
1985 * - 'before': to display before link
1986- * - 'after': to display after link
1987+ * - 'after': to display after link
1988 * - 'text': link text
1989 * - 'title': link title
1990 * - 'class': CSS class name
1991@@ -2469,6 +2471,9 @@
1992 }
1993
1994
1995+/**
1996+ * dummy docblock makes error-free autodocs
1997+ */
1998 function publish_link( $before = ' ', $after = ' ', $text = '#', $title = '#', $class = '', $glue = '&amp;', $save_context = true )
1999 {
2000 echo $this->get_publish_link( $before, $after, $text, $title, $class, $glue, $save_context );
2001
2002=== modified file 'inc/items/model/_itemlight.class.php'
2003--- inc/items/model/_itemlight.class.php 2009-12-19 19:51:52 +0000
2004+++ inc/items/model/_itemlight.class.php 2010-01-17 09:47:14 +0000
2005@@ -357,12 +357,12 @@
2006 'include_main' => true,
2007 'include_other' => true,
2008 'include_external'=> true,
2009- 'before_main' => '', // string fo display before the MAIN category,
2010- 'after_main' => '', // string fo display after the MAIN category
2011- 'before_other' => '', // string fo display before OTHER categories
2012- 'after_other' => '', // string fo display after OTHER categories
2013- 'before_external' => '<em>', // string fo display before EXTERNAL categories
2014- 'after_external' => '</em>', // string fo display after EXTERNAL categories,
2015+ 'before_main' => '', // string to display before the MAIN category,
2016+ 'after_main' => '', // string to display after the MAIN category
2017+ 'before_other' => '', // string to display before OTHER categories
2018+ 'after_other' => '', // string to display after OTHER categories
2019+ 'before_external' => '<em>', // string to display before EXTERNAL categories
2020+ 'after_external' => '</em>', // string to display after EXTERNAL categories,
2021 'separator' => ', ',
2022 'link_categories' => true,
2023 'link_title' => '#',
2024
2025=== modified file 'inc/items/model/_itemlist.class.php'
2026--- inc/items/model/_itemlist.class.php 2009-12-19 19:51:52 +0000
2027+++ inc/items/model/_itemlist.class.php 2010-01-17 09:47:14 +0000
2028@@ -415,6 +415,23 @@
2029
2030 /**
2031 * Link to previous and next link in collection
2032+ *
2033+ * <code>
2034+ * $params = array_merge( array(
2035+ * 'template' => '$prev$$next$',
2036+ * 'prev_start' => '',
2037+ * 'prev_text' => '&laquo; $title$',
2038+ * 'prev_end' => '',
2039+ * 'prev_no_item' => '',
2040+ * 'next_start' => '',
2041+ * 'next_text' => '$title$ &raquo;',
2042+ * 'next_end' => '',
2043+ * 'next_no_item' => '',
2044+ * ), $params );
2045+ * </code>
2046+ *
2047+ * @todo EdB: there must be a way to extract the defaults from $params
2048+ * without having to copy/paste and edit them into an unordered list :(
2049 */
2050 function prevnext_item_links( $params )
2051 {
2052
2053=== modified file 'inc/items/model/_itemlistlight.class.php'
2054--- inc/items/model/_itemlistlight.class.php 2009-12-19 19:51:52 +0000
2055+++ inc/items/model/_itemlistlight.class.php 2010-01-17 09:47:14 +0000
2056@@ -1454,7 +1454,28 @@
2057
2058
2059 /**
2060- * Template tag
2061+ * Lousy DocBlock Title
2062+ *
2063+ * <code>
2064+ * $default_params = array(
2065+ * 'block_start' => '<p class="center">',
2066+ * 'block_end' => '</p>',
2067+ * 'block_single' => '',
2068+ * 'links_format' => '#',
2069+ * 'page_url' => '', // All generated links will refer to the current page
2070+ * 'prev_text' => '&lt;&lt;',
2071+ * 'next_text' => '&gt;&gt;',
2072+ * 'no_prev_text' => '',
2073+ * 'no_next_text' => '',
2074+ * 'list_prev_text' => '...',
2075+ * 'list_next_text' => '...',
2076+ * 'list_span' => 11,
2077+ * 'scroll_list_range' => 5,
2078+ * );
2079+ * </code>
2080+ *
2081+ * @todo EdB: there must be a way to extract the defaults from $params
2082+ * without having to copy/paste and edit them into an unordered list :(
2083 */
2084 function page_links( $params = array() )
2085 {
2086
2087=== modified file 'inc/items/views/_item_list_full.view.php'
2088--- inc/items/views/_item_list_full.view.php 2009-12-21 17:27:20 +0000
2089+++ inc/items/views/_item_list_full.view.php 2010-01-17 09:47:17 +0000
2090@@ -124,87 +124,93 @@
2091 while( $Item = & $ItemList->get_item() )
2092 {
2093 ?>
2094- <div id="<?php $Item->anchor_id() ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
2095- <?php
2096- // We don't switch locales in the backoffice, since we use the user pref anyway
2097- // Load item's creator user:
2098- $Item->get_creator_User();
2099- ?>
2100- <div class="bSmallHead <?php
2101- if( $Item->ID == $highlight )
2102- {
2103- echo 'fadeout-ffff00" id="fadeout-1';
2104- }
2105- ?>">
2106- <?php
2107- echo '<div class="bSmallHeadRight">';
2108- If( !empty( $Item->order ) )
2109- {
2110- echo T_('Order').': '.$Item->order;
2111- }
2112- $Item->locale_flag(array('class'=>'flagtop'));
2113- echo '</div>';
2114-
2115- $Item->issue_date( array(
2116- 'before' => '<span class="bDate">',
2117- 'after' => '</span>',
2118- 'date_format' => '#',
2119- ) );
2120-
2121- $Item->issue_time( array(
2122- 'before' => ' @ <span class="bTime">',
2123- 'after' => '</span>',
2124- ) );
2125-
2126- // TRANS: backoffice: each post is prefixed by "date BY author IN categories"
2127- echo ' ', T_('by'), ' <acronym title="';
2128- $Item->creator_User->login();
2129- echo ', '.T_('level:');
2130- $Item->creator_User->level();
2131- echo '"><span class="bAuthor">';
2132- $Item->creator_User->preferred_name();
2133- echo '</span></acronym>';
2134-
2135- echo '<div class="bSmallHeadRight">';
2136- $Item->status( array(
2137- 'before' => T_('Visibility').': <span class="bStatus">',
2138- 'after' => '</span>',
2139- ) );
2140- echo '</div>';
2141-
2142- echo '<br />';
2143- $Item->type( T_('Type').': <span class="bType">', '</span> &nbsp; ' );
2144-
2145- if( $Blog->get_setting( 'use_workflow' ) )
2146- { // Only display workflow properties, if activated for this blog.
2147- $Item->priority( T_('Priority').': <span class="bPriority">', '</span> &nbsp; ' );
2148- $Item->assigned_to( T_('Assigned to').': <span class="bAssignee">', '</span> &nbsp; ' );
2149- $Item->extra_status( T_('Task Status').': <span class="bExtStatus">', '</span>' );
2150- }
2151- echo '&nbsp;';
2152-
2153- echo '<div class="bSmallHeadRight"><span class="bViews">';
2154- $Item->views();
2155- echo '</span></div>';
2156-
2157- echo '<br />';
2158-
2159- $Item->categories( array(
2160- 'before' => T_('Categories').': <span class="bCategories">',
2161- 'after' => '</span>',
2162- 'include_main' => true,
2163- 'include_other' => true,
2164- 'include_external'=> true,
2165- 'link_categories' => false,
2166- ) );
2167- ?>
2168- </div>
2169-
2170- <div class="bContent">
2171- <h3 class="bTitle"><?php $Item->title() ?></h3>
2172-
2173- <?php
2174- // Display images that are linked to this post:
2175+ <div id="<?php $Item->anchor_id(); ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang(); ?>">
2176+ <?php
2177+ // We don't switch locales in the backoffice, since we use the user pref anyway
2178+ // Load item's creator user:
2179+ $Item->get_creator_User();
2180+ ?>
2181+ <div class="bSmallHead <?php
2182+ if( $Item->ID == $highlight )
2183+ {
2184+ echo 'fadeout-ffff00" id="fadeout-1';
2185+ }
2186+ ?>">
2187+ <?php
2188+ echo '<div class="bSmallHeadRight">';
2189+ if( !empty( $Item->order ) )
2190+ {
2191+ echo T_('Order').': '.$Item->order;
2192+ }
2193+ // display item's locale flag
2194+ $Item->locale_flag( array(
2195+ 'class'=>'flagtop',
2196+ ) );
2197+ echo '</div>';
2198+
2199+ // display formatted issue date (datetime) of Item
2200+ $Item->issue_date( array(
2201+ 'before' => '<span class="bDate">',
2202+ 'after' => '</span>',
2203+ 'date_format' => '#',
2204+ ) );
2205+
2206+ // display formatted issue time (datetime) of Item
2207+ $Item->issue_time( array(
2208+ 'before' => ' @ <span class="bTime">',
2209+ 'after' => '</span>',
2210+ ) );
2211+
2212+ // TRANS: backoffice: each post is prefixed by "date BY author IN categories"
2213+ echo ' ', T_('by'), ' <acronym title="';
2214+ $Item->creator_User->login();
2215+ echo ', '.T_('level:');
2216+ $Item->creator_User->level();
2217+ echo '"><span class="bAuthor">';
2218+ $Item->creator_User->preferred_name();
2219+ echo '</span></acronym>';
2220+
2221+ echo '<div class="bSmallHeadRight">';
2222+ $Item->status( array(
2223+ 'before' => T_('Visibility').': <span class="bStatus">',
2224+ 'after' => '</span>',
2225+ ) );
2226+ echo '</div>';
2227+
2228+ echo '<br />';
2229+ $Item->type( T_('Type').': <span class="bType">', '</span> &nbsp; ' );
2230+
2231+ if( $Blog->get_setting( 'use_workflow' ) )
2232+ { // Only display workflow properties, if activated for this blog.
2233+ $Item->priority( T_('Priority').': <span class="bPriority">', '</span> &nbsp; ' );
2234+ $Item->assigned_to( T_('Assigned to').': <span class="bAssignee">', '</span> &nbsp; ' );
2235+ $Item->extra_status( T_('Task Status').': <span class="bExtStatus">', '</span>' );
2236+ }
2237+
2238+ echo '&nbsp;';
2239+
2240+ echo '<div class="bSmallHeadRight"><span class="bViews">';
2241+ $Item->views();
2242+ echo '</span></div>';
2243+
2244+ echo '<br />';
2245+
2246+ // list by name and link all cats, sub-cats, ext-cats
2247+ $Item->categories( array(
2248+ 'before' => T_('Categories').': <span class="bCategories">',
2249+ 'after' => '</span>',
2250+ 'include_main' => true,
2251+ 'include_other' => true,
2252+ 'include_external'=> true,
2253+ 'link_categories' => false,
2254+ ) );
2255+ ?>
2256+ </div>
2257+
2258+ <div class="bContent">
2259+ <h3 class="bTitle"><?php $Item->title() ?></h3>
2260+ <?php
2261+ // Display images that are linked to this post:
2262 $Item->images( array(
2263 'before' => '<div class="bImages">',
2264 'before_image' => '<div class="image_block">',
2265@@ -257,19 +263,19 @@
2266 <?php
2267 $Item->permanent_link( array(
2268 'class' => 'permalink_right',
2269- ) );
2270-
2271- echo '<a href="?ctrl=items&amp;blog='.$Blog->ID.'&amp;p='.$Item->ID.'" class="ActionButton">'.T_('View...').'</a>';
2272-
2273- // Display edit button if current user has the rights:
2274- $Item->edit_link( array( // Link to backoffice for editing
2275- 'before' => ' ',
2276- 'after' => ' ',
2277- 'class' => 'ActionButton'
2278- ) );
2279-
2280- echo '<a href="'.url_add_param( $Blog->get_filemanager_link(), 'fm_mode=link_item&amp;item_ID='.$Item->ID )
2281- .'" class="ActionButton">'.get_icon( 'folder', 'imgtag' ).' '.T_('Files...').'</a>';
2282+ ) );
2283+
2284+ echo '<a href="?ctrl=items&amp;blog='.$Blog->ID.'&amp;p='.$Item->ID.'" class="ActionButton">'.T_('View...').'</a>';
2285+
2286+ // link to edit an item if user has permission
2287+ $Item->edit_link( array(
2288+ 'before' => ' ',
2289+ 'after' => ' ',
2290+ 'class' => 'ActionButton'
2291+ ) );
2292+
2293+ echo '<a href="'.url_add_param( $Blog->get_filemanager_link(), 'fm_mode=link_item&amp;item_ID='.$Item->ID )
2294+ .'" class="ActionButton">'.get_icon( 'folder', 'imgtag' ).' '.T_('Files...').'</a>';
2295
2296 // Display publish NOW button if current user has the rights:
2297 $Item->publish_link( ' ', ' ', '#', '#', 'PublishButton');
2298
2299=== modified file 'inc/items/views/_item_list_sidebar.view.php'
2300--- inc/items/views/_item_list_sidebar.view.php 2010-01-02 08:34:34 +0000
2301+++ inc/items/views/_item_list_sidebar.view.php 2010-01-17 09:47:17 +0000
2302@@ -65,86 +65,91 @@
2303 }
2304 echo $Widget->replace_vars( $template['block_start'] );
2305
2306- $Form = & new Form( NULL, 'resetform', 'get', 'none' );
2307-
2308- $Form->begin_form( '' );
2309-
2310- $Form->hidden_ctrl();
2311- $Form->submit( array( 'submit', T_('Search'), 'search', '', 'float:right' ) );
2312-
2313- $Form->hidden( 'tab', $tab );
2314- $Form->hidden( 'blog', $Blog->ID );
2315-
2316- echo '<fieldset>';
2317- echo '<legend>'.T_('Posts to show').'</legend>';
2318- ?>
2319- <div>
2320-
2321- <input type="checkbox" name="show_past" value="1" id="ts_min" class="checkbox" <?php if( $show_past ) echo 'checked="checked" '?> />
2322- <label for="ts_min"><?php echo T_('Past') ?></label><br />
2323-
2324- <input type="checkbox" name="show_future" value="1" id="ts_max" class="checkbox" <?php if( $show_future ) echo 'checked="checked" '?> />
2325- <label for="ts_max"><?php echo T_('Future') ?></label>
2326-
2327- </div>
2328-
2329- <div>
2330-
2331- <input type="checkbox" name="show_statuses[]" value="published" id="sh_published" class="checkbox" <?php if( in_array( "published", $show_statuses ) ) echo 'checked="checked" '?> />
2332- <label for="sh_published"><?php echo T_('Published') ?> <span class="notes">(<?php echo T_('Public') ?>)</span></label><br />
2333-
2334- <input type="checkbox" name="show_statuses[]" value="protected" id="sh_protected" class="checkbox" <?php if( in_array( "protected", $show_statuses ) ) echo 'checked="checked" '?> />
2335- <label for="sh_protected"><?php echo T_('Protected') ?> <span class="notes">(<?php echo T_('Members only') ?>)</span></label><br />
2336-
2337- <input type="checkbox" name="show_statuses[]" value="private" id="sh_private" class="checkbox" <?php if( in_array( "private", $show_statuses ) ) echo 'checked="checked" '?> />
2338- <label for="sh_private"><?php echo T_('Private') ?> <span class="notes">(<?php echo T_('You only') ?>)</span></label><br />
2339-
2340- <input type="checkbox" name="show_statuses[]" value="draft" id="sh_draft" class="checkbox" <?php if( in_array( "draft", $show_statuses ) ) echo 'checked="checked" '?> />
2341- <label for="sh_draft"><?php echo T_('Draft') ?> <span class="notes">(<?php echo T_('Not published!') ?>)</span></label><br />
2342-
2343- <input type="checkbox" name="show_statuses[]" value="deprecated" id="sh_deprecated" class="checkbox" <?php if( in_array( "deprecated", $show_statuses ) ) echo 'checked="checked" '?> />
2344- <label for="sh_deprecated"><?php echo T_('Deprecated') ?> <span class="notes">(<?php echo T_('Not published!') ?>)</span></label><br />
2345-
2346- <input type="checkbox" name="show_statuses[]" value="redirected" id="sh_redirected" class="checkbox" <?php if( in_array( "redirected", $show_statuses ) ) echo 'checked="checked" '?> />
2347- <label for="sh_redirected"><?php echo T_('Redirected') ?></label><br />
2348-
2349- </div>
2350-
2351- <?php
2352- echo '</fieldset>';
2353-
2354-
2355- echo '<fieldset>';
2356- echo '<legend>'.T_('Title / Text contains').'</legend>';
2357-
2358- echo $Form->inputstart;
2359- ?>
2360- <div><input type="text" name="s" size="20" value="<?php echo htmlspecialchars($s) ?>" class="SearchField" /></div>
2361- <?php
2362- echo $Form->inputend;
2363- // echo T_('Words').' : ';
2364- ?>
2365- <div class="tile">
2366- <input type="radio" name="sentence" value="AND" id="sentAND" class="radio" <?php if( $sentence=='AND' ) echo 'checked="checked" '?> />
2367- <label for="sentAND"><?php echo T_('AND') ?></label>
2368- </div>
2369- <div class="tile">
2370- <input type="radio" name="sentence" value="OR" id="sentOR" class="radio" <?php if( $sentence=='OR' ) echo 'checked="checked" '?> />
2371- <label for="sentOR"><?php echo T_('OR') ?></label>
2372- </div>
2373- <div class="tile">
2374- <input type="radio" name="sentence" value="sentence" id="sentence" class="radio" <?php if( $sentence=='sentence' ) echo 'checked="checked" '?> />
2375- <label for="sentence"><?php echo T_('Entire phrase') ?></label>
2376- </div>
2377- <div class="tile">
2378- <input type="checkbox" name="exact" value="1" id="exact" class="checkbox" <?php if( $exact ) echo 'checked="checked" '?> />
2379- <label for="exact"><?php echo T_('Exact match') ?></label>
2380- </div>
2381-
2382- <?php
2383- echo '</fieldset>';
2384-
2385-
2386+$Form = & new Form( NULL, 'resetform', 'get', 'none' );
2387+
2388+$Form->begin_form( '' );
2389+
2390+$Form->hidden_ctrl();
2391+
2392+$Form->submit( array( 'submit', T_('Search'), 'search', '', 'float:right' ) );
2393+
2394+$Form->hidden( 'tab', $tab );
2395+$Form->hidden( 'blog', $Blog->ID );
2396+?>
2397+
2398+<fieldset>
2399+<legend><?php T_('Posts to show'); ?></legend>
2400+
2401+<div>
2402+<input type="checkbox" name="show_past" value="1" id="ts_min" class="checkbox" <?php if( $show_past ) echo 'checked="checked" '?> />
2403+<label for="ts_min"><?php echo T_('Past') ?></label>
2404+<br />
2405+<input type="checkbox" name="show_future" value="1" id="ts_max" class="checkbox" <?php if( $show_future ) echo 'checked="checked" '?> />
2406+<label for="ts_max"><?php echo T_('Future') ?></label>
2407+</div>
2408+
2409+<div>
2410+<input type="checkbox" name="show_statuses[]" value="published" id="sh_published" class="checkbox" <?php if( in_array( "published", $show_statuses ) ) echo 'checked="checked" '?> />
2411+<label for="sh_published"><?php echo T_('Published') ?> <span class="notes">(<?php echo T_('Public') ?>)</span></label>
2412+<br />
2413+<input type="checkbox" name="show_statuses[]" value="protected" id="sh_protected" class="checkbox" <?php if( in_array( "protected", $show_statuses ) ) echo 'checked="checked" '?> />
2414+<label for="sh_protected"><?php echo T_('Protected') ?> <span class="notes">(<?php echo T_('Members only') ?>)</span></label>
2415+<br />
2416+<input type="checkbox" name="show_statuses[]" value="private" id="sh_private" class="checkbox" <?php if( in_array( "private", $show_statuses ) ) echo 'checked="checked" '?> />
2417+<label for="sh_private"><?php echo T_('Private') ?> <span class="notes">(<?php echo T_('You only') ?>)</span></label>
2418+<br />
2419+<input type="checkbox" name="show_statuses[]" value="draft" id="sh_draft" class="checkbox" <?php if( in_array( "draft", $show_statuses ) ) echo 'checked="checked" '?> />
2420+<label for="sh_draft"><?php echo T_('Draft') ?> <span class="notes">(<?php echo T_('Not published!') ?>)</span></label>
2421+<br />
2422+<input type="checkbox" name="show_statuses[]" value="deprecated" id="sh_deprecated" class="checkbox" <?php if( in_array( "deprecated", $show_statuses ) ) echo 'checked="checked" '?> />
2423+<label for="sh_deprecated"><?php echo T_('Deprecated') ?> <span class="notes">(<?php echo T_('Not published!') ?>)</span></label>
2424+<br />
2425+<input type="checkbox" name="show_statuses[]" value="redirected" id="sh_redirected" class="checkbox" <?php if( in_array( "redirected", $show_statuses ) ) echo 'checked="checked" '?> />
2426+<label for="sh_redirected"><?php echo T_('Redirected') ?></label>
2427+<br />
2428+</div>
2429+
2430+</fieldset>
2431+
2432+<fieldset>
2433+<legend><?php T_('Title / Text contains'); ?></legend>
2434+<?php
2435+echo $Form->inputstart;
2436+?>
2437+
2438+<div>
2439+<input type="text" name="s" size="20" value="<?php echo htmlspecialchars($s) ?>" class="SearchField" />
2440+</div>
2441+
2442+<?php
2443+echo $Form->inputend;
2444+// echo T_('Words').' : ';
2445+?>
2446+
2447+<div class="tile">
2448+<input type="radio" name="sentence" value="AND" id="sentAND" class="radio" <?php if( $sentence=='AND' ) echo 'checked="checked" '?> />
2449+<label for="sentAND"><?php echo T_('AND') ?></label>
2450+</div>
2451+
2452+<div class="tile">
2453+<input type="radio" name="sentence" value="OR" id="sentOR" class="radio" <?php if( $sentence=='OR' ) echo 'checked="checked" '?> />
2454+<label for="sentOR"><?php echo T_('OR') ?></label>
2455+</div>
2456+
2457+<div class="tile">
2458+<input type="radio" name="sentence" value="sentence" id="sentence" class="radio" <?php if( $sentence=='sentence' ) echo 'checked="checked" '?> />
2459+<label for="sentence"><?php echo T_('Entire phrase') ?></label>
2460+</div>
2461+
2462+<div class="tile">
2463+<input type="checkbox" name="exact" value="1" id="exact" class="checkbox" <?php if( $exact ) echo 'checked="checked" '?> />
2464+<label for="exact"><?php echo T_('Exact match') ?></label>
2465+</div>
2466+
2467+</fieldset>
2468+
2469+
2470+<?php
2471 /*
2472 * Assignees:
2473 * TODO: allow multiple selection
2474@@ -227,20 +232,16 @@
2475 echo '</fieldset>';
2476 }
2477
2478- // --------------------------------- START OF CATEGORY LIST --------------------------------
2479- template_widget( array(
2480- // CODE for the widget:
2481- 'widget' => 'coll_category_list',
2482- // Optional display params
2483- 'block_start' => '<fieldset>',
2484- 'block_end' => '</fieldset>',
2485- 'block_title_start' => '<legend>',
2486- 'block_title_end' => '</legend>',
2487- 'link_type' => 'context',
2488- 'display_checkboxes' => 1,
2489- ) );
2490- // ---------------------------------- END OF CATEGORY LIST ---------------------------------
2491-
2492+// display the Category List widget
2493+template_widget( array(
2494+ 'widget' => 'coll_category_list',
2495+ 'block_start' => '<fieldset>',
2496+ 'block_end' => '</fieldset>',
2497+ 'block_title_start' => '<legend>',
2498+ 'block_title_end' => '</legend>',
2499+ 'link_type' => 'context',
2500+ 'display_checkboxes' => 1,
2501+) );
2502
2503 // ARCHIVES:
2504 // Call the Archives plugin:
2505
2506=== modified file 'inc/locales/_pofile.class.php'
2507--- inc/locales/_pofile.class.php 2009-12-21 17:27:20 +0000
2508+++ inc/locales/_pofile.class.php 2010-01-17 09:47:17 +0000
2509@@ -30,6 +30,9 @@
2510 {
2511 var $msgids = array();
2512
2513+/**
2514+ * dummy docblock makes error-free autodocs
2515+ */
2516 function POFile($filename=null)
2517 {
2518 $this->filename = str_replace( '\\', '/', $filename );
2519
2520=== modified file 'inc/locales/locales.ctrl.php'
2521--- inc/locales/locales.ctrl.php 2009-12-19 19:51:52 +0000
2522+++ inc/locales/locales.ctrl.php 2010-01-17 09:47:17 +0000
2523@@ -165,6 +165,9 @@
2524 // reload locales: an existing one could have been renamed (but we keep $evo_charset, which may have changed)
2525 $old_evo_charset = $evo_charset;
2526 unset( $locales );
2527+/**
2528+ * dummy docblock makes error-free autodocs
2529+ */
2530 include $conf_path.'_locales.php';
2531 if( file_exists($conf_path.'_overrides_TEST.php') )
2532 { // also overwrite settings again:
2533
2534=== modified file 'inc/sessions/_sessions.init.php'
2535--- inc/sessions/_sessions.init.php 2010-01-02 08:34:34 +0000
2536+++ inc/sessions/_sessions.init.php 2010-01-17 09:47:17 +0000
2537@@ -64,6 +64,8 @@
2538
2539 /**
2540 * sessions_Module definition
2541+ *
2542+ * @package sessions
2543 */
2544 class sessions_Module
2545 {
2546
2547=== modified file 'inc/sessions/model/_goal.class.php'
2548--- inc/sessions/model/_goal.class.php 2009-12-21 17:27:20 +0000
2549+++ inc/sessions/model/_goal.class.php 2010-01-17 09:47:17 +0000
2550@@ -89,6 +89,9 @@
2551 }
2552
2553
2554+/**
2555+ * dummy docblock makes error-free autodocs
2556+ */
2557 function get_name()
2558 {
2559 return $this->name;
2560
2561=== modified file 'inc/sessions/views/_stats_browserhits.view.php'
2562--- inc/sessions/views/_stats_browserhits.view.php 2009-12-19 19:51:52 +0000
2563+++ inc/sessions/views/_stats_browserhits.view.php 2010-01-17 09:47:17 +0000
2564@@ -114,7 +114,9 @@
2565 array_unshift( $chart[ 'chart_data' ][ 6 ], 'Referer spam' );
2566 array_unshift( $chart[ 'chart_data' ][ 7 ], 'Admin' );
2567
2568- // Include common chart properties:
2569+ /**
2570+ * Include common chart properties:
2571+ */
2572 require dirname(__FILE__).'/inc/_bar_chart.inc.php';
2573
2574 $chart[ 'series_color' ] = array (
2575
2576=== modified file 'inc/sessions/views/_stats_summary.view.php'
2577--- inc/sessions/views/_stats_summary.view.php 2009-12-19 19:51:52 +0000
2578+++ inc/sessions/views/_stats_summary.view.php 2010-01-17 09:47:17 +0000
2579@@ -94,7 +94,9 @@
2580 array_unshift( $chart[ 'chart_data' ][ 3 ], 'Browsers' ); // Translations need to be UTF-8
2581 array_unshift( $chart[ 'chart_data' ][ 4 ], 'Unknown' );
2582
2583- // Include common chart properties:
2584+ /**
2585+ * Include common chart properties:
2586+ */
2587 require dirname(__FILE__).'/inc/_bar_chart.inc.php';
2588
2589 $chart[ 'series_color' ] = array (
2590
2591=== modified file 'inc/sessions/views/_stats_syndication.view.php'
2592--- inc/sessions/views/_stats_syndication.view.php 2009-12-19 19:51:52 +0000
2593+++ inc/sessions/views/_stats_syndication.view.php 2010-01-17 09:47:17 +0000
2594@@ -70,7 +70,9 @@
2595 array_unshift( $chart[ 'chart_data' ][ 0 ], '' );
2596 array_unshift( $chart[ 'chart_data' ][ 1 ], 'XML (RSS/Atom) hits' ); // Translations need to be UTF-8
2597
2598- // Include common chart properties:
2599+/**
2600+ * Include common chart properties:
2601+ */
2602 require dirname(__FILE__).'/inc/_bar_chart.inc.php';
2603
2604 $chart[ 'series_color' ] = array (
2605
2606=== modified file 'inc/templates/_template.funcs.php'
2607--- inc/templates/_template.funcs.php 2010-01-02 15:13:47 +0000
2608+++ inc/templates/_template.funcs.php 2010-01-17 09:47:17 +0000
2609@@ -77,8 +77,7 @@
2610
2611 $Debuglog->add('template_init: '.$disp, 'template');
2612
2613- // This is the main template; it may be used to display very different things.
2614- // Do inits depending on current $disp:
2615+ // do inits depending on $disp value...
2616 switch( $disp )
2617 {
2618 case 'posts':
2619@@ -388,8 +387,7 @@
2620 /**
2621 * Template tag. Include a sub-template at the current position
2622 *
2623- * A docblock test. This text will show up in the autodocs?
2624- * If so, $disp_handler is very nice :)
2625+ * @todo EdB: $disp_handler is very nice :)
2626 */
2627 function template_include( $template_name, $params = array() )
2628 {
2629@@ -660,6 +658,9 @@
2630 *
2631 * This load the widget class, instantiates it, and displays it.
2632 *
2633+ * @uses ComponentWidget::display()
2634+ * @uses ComponentWidget::init_display()
2635+ *
2636 * @param array
2637 */
2638 function template_widget( $params )
2639@@ -692,7 +693,13 @@
2640
2641
2642 /**
2643- * Display a container
2644+ * Display a container's widgets
2645+ *
2646+ * Param priorities: widget, container, defaults
2647+ *
2648+ * @uses Template::container()
2649+ * @uses ComponentWidget::display()
2650+ * @uses ComponentWidget::init_display()
2651 *
2652 * @param string
2653 * @param array
2654
2655=== modified file 'inc/templates/model/_template.class.php'
2656--- inc/templates/model/_template.class.php 2010-01-02 08:34:34 +0000
2657+++ inc/templates/model/_template.class.php 2010-01-17 09:47:17 +0000
2658@@ -162,10 +162,13 @@
2659 /**
2660 * Display a container
2661 *
2662- * @todo fp> if it doesn't get any template specific, move it outta here! :P
2663+ * @todo (legacy): fp> if it doesn't get any template specific, move it outta here! :P
2664 * fp> Do we need Template objects in the frontoffice at all? -- Do we want to include the dispatcher into the Template object? WARNING: globals
2665 * fp> We might want to customize the container defaults. -- Per blog or per template?
2666 *
2667+ * @uses ComponentWidget::display()
2668+ * @uses ComponentWidget::init_display()
2669+ *
2670 * @param string
2671 * @param array
2672 */
2673
2674=== modified file 'inc/tools/mtimport.ctrl.php'
2675--- inc/tools/mtimport.ctrl.php 2010-01-02 08:34:34 +0000
2676+++ inc/tools/mtimport.ctrl.php 2010-01-17 09:47:17 +0000
2677@@ -41,7 +41,7 @@
2678 global $dispatcher;
2679
2680 /**
2681- * @const IMPORT_SRC_DIR directory where to be imported files get searched for.
2682+ * IMPORT_SRC_DIR directory where to be imported files get searched for.
2683 */
2684 define('IMPORT_SRC_DIR', $basepath);
2685
2686
2687=== modified file 'inc/tools/system.ctrl.php'
2688--- inc/tools/system.ctrl.php 2010-01-08 10:32:06 +0000
2689+++ inc/tools/system.ctrl.php 2010-01-17 09:47:17 +0000
2690@@ -48,6 +48,9 @@
2691 // Begin payload block:
2692 $AdminUI->disp_payload_begin();
2693
2694+/**
2695+ * dummy docblock makes error-free autodocs
2696+ */
2697 function init_system_check( $name, $value )
2698 {
2699 global $syscheck_name, $syscheck_value;
2700@@ -55,6 +58,9 @@
2701 $syscheck_value = $value;
2702 }
2703
2704+/**
2705+ * dummy docblock makes error-free autodocs
2706+ */
2707 function disp_system_check( $condition, $message = '' )
2708 {
2709 global $syscheck_name, $syscheck_value;
2710
2711=== modified file 'inc/tools/wpimport.ctrl.php'
2712--- inc/tools/wpimport.ctrl.php 2009-12-12 16:12:01 +0000
2713+++ inc/tools/wpimport.ctrl.php 2010-01-17 09:47:17 +0000
2714@@ -339,6 +339,9 @@
2715 if (! $db)
2716 die ($app_name.' database name is incorrect. Please check the name and try again.');
2717
2718+/**
2719+ * dummy docblock makes error-free autodocs
2720+ */
2721 function fix_date( $date )
2722 {
2723 if( $date == '0000-00-00 00:00:00' )
2724@@ -348,6 +351,9 @@
2725 return $date;
2726 }
2727
2728+/**
2729+ * dummy docblock makes error-free autodocs
2730+ */
2731 function convert_status( $status )
2732 {
2733 switch( $status )
2734
2735=== modified file 'inc/users/model/_user.class.php'
2736--- inc/users/model/_user.class.php 2009-12-20 21:15:30 +0000
2737+++ inc/users/model/_user.class.php 2010-01-17 09:47:17 +0000
2738@@ -1144,6 +1144,9 @@
2739 }
2740
2741
2742+/**
2743+ * dummy docblock makes error-free autodocs
2744+ */
2745 function callback_optionsForIdMode( $value )
2746 {
2747 $field_options = '';
2748
2749=== modified file 'inc/widgets/model/_widget.class.php'
2750--- inc/widgets/model/_widget.class.php 2010-01-02 08:34:34 +0000
2751+++ inc/widgets/model/_widget.class.php 2010-01-17 09:47:17 +0000
2752@@ -9,12 +9,12 @@
2753 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
2754 *
2755 * {@internal License choice
2756- * - If you have received this file as part of a package, please find the license.txt file in
2757- * the same folder or the closest folder above for complete license terms.
2758- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
2759- * then you must choose one of the following licenses before using the file:
2760- * - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
2761- * - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
2762+ * If you have received this file as part of a package, please find the license.txt file in
2763+ * the same folder or the closest folder above for complete license terms.
2764+ * If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
2765+ * then you must choose one of the following licenses before using the file:
2766+ * - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
2767+ * - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
2768 * }}
2769 *
2770 * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
2771@@ -373,8 +373,73 @@
2772 /**
2773 * Prepare display params
2774 *
2775- * @todo Document default params and default values.
2776- * This might link to a wiki page, too.
2777+ * (next bit moved up from a // type of comment inside the function, for autodocs... /edb)<br />
2778+ * Merge basic defaults < widget defaults < container params < DB params<br />
2779+ * When called with template_widget it falls back to: <br />
2780+ * basic defaults < widget defaults < calltime params < array()
2781+ *
2782+ * <code>
2783+ * $params = array_merge( array(
2784+ * // block-level params...
2785+ * 'block_start' => '<div class="$wi_class$">',
2786+ * 'block_end' => '</div>',
2787+ * 'block_display_title' => true,
2788+ * 'block_title_start' => '<h3>',
2789+ * 'block_title_end' => '</h3>',
2790+ * // is this maybe sub-block params?
2791+ * 'collist_start' => '',
2792+ * 'collist_end' => '',
2793+ * 'coll_start' => '<h4>',
2794+ * 'coll_end' => '</h4>',
2795+ * // group and list params...
2796+ * 'group_start' => '<ul>',
2797+ * 'group_end' => '</ul>',
2798+ * 'list_start' => '<ul>',
2799+ * 'list_end' => '</ul>',
2800+ * // way too many item params...
2801+ * 'item_start' => '<li>',
2802+ * 'item_end' => '</li>',
2803+ * 'item_text_start' => '',
2804+ * 'item_text' => '%s',
2805+ * 'item_text_end' => '',
2806+ * 'item_selected_start' => '<li class="selected">',
2807+ * 'item_selected_text' => '%s',
2808+ * 'item_selected_end' => '</li>',
2809+ * 'item_selected_text_start' => '',
2810+ * 'item_selected_text_end' => '',
2811+ * // grid params are probably only used in one place, which is dumb
2812+ * 'grid_start' => '<table cellspacing="1" class="widget_grid">',
2813+ * 'grid_end' => '</table>',
2814+ * 'grid_nb_cols' => 2,
2815+ * 'grid_colstart' => '<tr>',
2816+ * 'grid_colend' => '</tr>',
2817+ * 'grid_cellstart' => '<td>',
2818+ * 'grid_cellend' => '</td>',
2819+ * // link params...
2820+ * 'link_default_class' => 'default',
2821+ * 'link_selected_class' => 'selected',
2822+ * 'link_type' => 'canonic', // 'canonic' | 'context' (context will regenrate URL injecting/replacing a single filter)
2823+ * // notes params...
2824+ * 'notes_start' => '<div class="notes">',
2825+ * 'notes_end' => '</div>',
2826+ * // thumb size might be only with grid params but we need more image defaults
2827+ * 'thumb_size' => 'crop-80x80',
2828+ * // 'thumb_size' => 'fit-160x120',
2829+ * // tag cloud params are probably only used in one place, which is dumb
2830+ * 'tag_cloud_start' => '<p class="tag_cloud">',
2831+ * 'tag_cloud_end' => '</p>',
2832+ * // this is probably a tag cloud param disguised as a real one
2833+ * 'limit' => 100,
2834+ * ), $widget_defaults, $params, $this->param_array );
2835+ * </code>
2836+ *
2837+ * @todo EdB: there must be a way to extract the defaults from $params
2838+ * without having to copy/paste and edit them into an unordered list :(
2839+ *
2840+ * @todo EdB: for v1 we need to clean up the defaults. Seems like quite a few
2841+ * are uni-purpose and/or strong contributors to divitis and viewsource bloat.
2842+ *
2843+ * @todo (legacy) Document default params and default values.
2844 *
2845 * @param array
2846 */
2847@@ -400,29 +465,35 @@
2848 // Load DB configuration:
2849 $this->load_param_array();
2850
2851- // Merge basic defaults < widget defaults < container params < DB params
2852- // note: when called with template_widget it falls back to basic defaults < widget defaults < calltime params < array()
2853 $params = array_merge( array(
2854+ // block-level params...
2855 'block_start' => '<div class="$wi_class$">',
2856 'block_end' => '</div>',
2857 'block_display_title' => true,
2858 'block_title_start' => '<h3>',
2859 'block_title_end' => '</h3>',
2860+ // is this maybe sub-block params?
2861 'collist_start' => '',
2862 'collist_end' => '',
2863 'coll_start' => '<h4>',
2864 'coll_end' => '</h4>',
2865+ // group and list params...
2866+ 'group_start' => '<ul>',
2867+ 'group_end' => '</ul>',
2868 'list_start' => '<ul>',
2869 'list_end' => '</ul>',
2870+ // way too many item params...
2871 'item_start' => '<li>',
2872 'item_end' => '</li>',
2873- 'link_default_class' => 'default',
2874 'item_text_start' => '',
2875+ 'item_text' => '%s',
2876 'item_text_end' => '',
2877- 'item_text' => '%s',
2878 'item_selected_start' => '<li class="selected">',
2879+ 'item_selected_text' => '%s',
2880 'item_selected_end' => '</li>',
2881- 'item_selected_text' => '%s',
2882+ 'item_selected_text_start' => '',
2883+ 'item_selected_text_end' => '',
2884+ // grid params are probably only used in one place, which is dumb
2885 'grid_start' => '<table cellspacing="1" class="widget_grid">',
2886 'grid_end' => '</table>',
2887 'grid_nb_cols' => 2,
2888@@ -430,18 +501,20 @@
2889 'grid_colend' => '</tr>',
2890 'grid_cellstart' => '<td>',
2891 'grid_cellend' => '</td>',
2892- 'thumb_size' => 'crop-80x80',
2893- // 'thumb_size' => 'fit-160x120',
2894+ // link params...
2895+ 'link_default_class' => 'default',
2896 'link_selected_class' => 'selected',
2897 'link_type' => 'canonic', // 'canonic' | 'context' (context will regenrate URL injecting/replacing a single filter)
2898- 'item_selected_text_start' => '',
2899- 'item_selected_text_end' => '',
2900- 'group_start' => '<ul>',
2901- 'group_end' => '</ul>',
2902+ // notes params...
2903 'notes_start' => '<div class="notes">',
2904 'notes_end' => '</div>',
2905+ // thumb size might be only with grid params but we need more image defaults
2906+ 'thumb_size' => 'crop-80x80',
2907+ // 'thumb_size' => 'fit-160x120',
2908+ // tag cloud params are probably only used in one place, which is dumb
2909 'tag_cloud_start' => '<p class="tag_cloud">',
2910 'tag_cloud_end' => '</p>',
2911+ // this is probably a tag cloud param disguised as a real one
2912 'limit' => 100,
2913 ), $widget_defaults, $params, $this->param_array );
2914
2915@@ -467,7 +540,9 @@
2916 *
2917 * Should be overriden by core widgets
2918 *
2919- * @todo fp> handle custom params for each widget
2920+ * @uses ComponentWidget::init_display()
2921+ *
2922+ * @todo (legacy): fp> handle custom params for each widget
2923 *
2924 * @param array MUST contain at least the basic display params
2925 */
2926@@ -502,8 +577,6 @@
2927 * This is useful for the lists in the headers
2928 * fp> I'm not sur if this param should be overridable by widgets themselves (priority problem)
2929 * Maybe an "auto" setting.
2930- *
2931- * @protected
2932 */
2933 function disp_title( $title = NULL )
2934 {
2935
2936=== modified file 'inc/xhtml_validator/_xhtml_validator.class.php'
2937--- inc/xhtml_validator/_xhtml_validator.class.php 2009-12-21 17:27:20 +0000
2938+++ inc/xhtml_validator/_xhtml_validator.class.php 2010-01-17 09:47:17 +0000
2939@@ -307,6 +307,9 @@
2940 array_pop($this->stack);
2941 }
2942
2943+/**
2944+ * dummy docblock makes error-free autodocs
2945+ */
2946 function html_error( $string )
2947 {
2948 global $Messages;
2949
2950=== modified file 'inc/xmlrpc/model/_xmlrpc.funcs.php'
2951--- inc/xmlrpc/model/_xmlrpc.funcs.php 2009-12-20 21:15:30 +0000
2952+++ inc/xmlrpc/model/_xmlrpc.funcs.php 2010-01-17 09:47:17 +0000
2953@@ -17,14 +17,14 @@
2954 /**
2955 * Can we use XML-RPC functionality?
2956 *
2957- * @constant CANUSEXMLRPC true|string Either === true or holds the error message.
2958+ * CANUSEXMLRPC true|string Either === true or holds the error message.
2959 */
2960 define( 'CANUSEXMLRPC', TRUE );
2961 }
2962 elseif( !(bool)ini_get('enable_dl') || (bool)ini_get('safe_mode'))
2963 { // We'll not be able to do dynamic loading (fix by Sakichan)
2964 /**
2965- * @ignore
2966+ * dummy docblock makes error-free autodocs
2967 */
2968 define( 'CANUSEXMLRPC', 'XML extension not loaded, but we cannot dynamically load.' );
2969 }
2970
2971=== modified file 'multiblogs.php'
2972--- multiblogs.php 2010-01-08 10:32:06 +0000
2973+++ multiblogs.php 2010-01-17 09:47:13 +0000
2974@@ -46,10 +46,8 @@
2975 // Make sure includes will check in the current folder!
2976 $ads_current_template_path = dirname(__FILE__).'/';
2977
2978-
2979 # Now, below you'll find the magic template...
2980
2981-
2982 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
2983 // Note: This is totally optional. General caching must be enabled in Global settings, otherwise this will do nothing.
2984 // Delete this block if you don't care about page level caching. Don't forget to delete the matching section at the end of the page.
2985@@ -60,9 +58,7 @@
2986 { // Cache miss, we have to generate:
2987 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
2988
2989-
2990-// This is the main template; it may be used to display very different things.
2991-// Do inits depending on current $disp:
2992+// do $disp-based initializations...
2993 template_init( $disp );
2994
2995 add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
2996@@ -72,24 +68,22 @@
2997 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2998 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
2999 <head>
3000- <title><?php
3001- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
3002- request_title( array(
3003- 'title_before'=> '',
3004- 'title_after' => ' - ',
3005- 'title_none' => '',
3006- 'glue' => ' - ',
3007- 'format' => 'htmlhead',
3008- ) );
3009- ?>Multiblog Demo</title>
3010+<title><?php // title for the current request
3011+request_title( array(
3012+ 'title_before' => '',
3013+ 'title_after' => ' - ',
3014+ 'title_none' => '',
3015+ 'glue' => ' - ',
3016+ 'format' => 'htmlhead',
3017+) ); ?>Multiblog Demo</title>
3018 <link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />
3019- <?php template_base_tag(); /* You're not using any template here but this won't hurt. However it will be very helpful to have this here when you make the switch to a template! */ ?>
3020- <?php template_description_tag(); ?>
3021- <?php template_keywords_tag(); ?>
3022- <?php meta_generator_tag(); /* Please leave this for stats */ ?>
3023- <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php $Blog->disp( 'rss2_url', 'raw' ) ?>" />
3024- <link rel="alternate" type="application/atom+xml" title="Atom" href="<?php $Blog->disp( 'atom_url', 'raw' ) ?>" />
3025- <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
3026+<?php template_base_tag(); /* You're not using any template here but this won't hurt. However it will be very helpful to have this here when you make the switch to a template! */ ?>
3027+<?php template_description_tag(); ?>
3028+<?php template_keywords_tag(); ?>
3029+<?php meta_generator_tag(); /* Please leave this for stats */ ?>
3030+<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php $Blog->disp( 'rss2_url', 'raw' ) ?>" />
3031+<link rel="alternate" type="application/atom+xml" title="Atom" href="<?php $Blog->disp( 'atom_url', 'raw' ) ?>" />
3032+<?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
3033 </head>
3034
3035 <body>
3036@@ -97,6 +91,7 @@
3037 // --- --- --- --- --- --- --- --- --- --- ---
3038 // --- TOOLBAR INCLUDED HERE ---
3039 template_include( '_toolbar.inc.php' );
3040+
3041 echo "\n";
3042 if( is_logged_in() )
3043 {
3044@@ -114,18 +109,15 @@
3045 // display the Public Blog List widget
3046 template_widget( array(
3047 'widget' => 'colls_list_public',
3048- // block-level params...
3049 'block_start' => '<div class="NavBar">',
3050 'block_end' => '</div>',
3051 'block_display_title' => false,
3052- // list params...
3053 'list_start' => '',
3054 'list_end' => '',
3055 'item_start' => '',
3056 'item_end' => '',
3057 'item_selected_start' => '',
3058 'item_selected_end' => '',
3059- // miscellaneous params...
3060 'link_selected_class' => 'NavButton2',
3061 'link_default_class' => 'NavButton2',
3062 ) );
3063@@ -138,57 +130,53 @@
3064
3065 <div class="pageSubTitle"><?php echo T_('This demo template displays 3 blogs at once (1 on the left, 2 on the right)') ?></div>
3066
3067-
3068 <div class="main">
3069
3070 <div class="bPosts">
3071- <h2>#1: <a href="<?php $Blog->disp( 'blogurl', 'raw' ) ?>"><?php echo $Blog->disp( 'name', 'htmlbody' ) ?></a></h2>
3072-
3073- <?php
3074- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
3075- request_title( array(
3076- 'title_before'=> '<h2>',
3077- 'title_after' => '</h2>',
3078- 'title_none' => '',
3079- 'glue' => ' - ',
3080- 'title_single_disp' => true,
3081- 'format' => 'htmlbody',
3082- ) );
3083-
3084- // ------------------------------------ START OF POSTS ----------------------------------------
3085- // Display message if no post:
3086- display_if_empty();
3087-
3088- while( $Item = & mainlist_get_item() )
3089- { // For each blog post, do everything below up to the closing curly brace "}"
3090- // ------------------------------ DATE SEPARATOR ------------------------------
3091- $MainList->date_if_changed( array(
3092- 'before' => '<h2>',
3093- 'after' => '</h2>',
3094+<h2>#1: <a href="<?php $Blog->disp( 'blogurl', 'raw' ) ?>"><?php echo $Blog->disp( 'name', 'htmlbody' ) ?></a></h2>
3095+<?php
3096+// title for the current request
3097+request_title( array(
3098+ 'title_before' => '<h2>',
3099+ 'title_after' => '</h2>',
3100+ 'title_none' => '',
3101+ 'glue' => ' - ',
3102+ 'title_single_disp' => true,
3103+ 'format' => 'htmlbody',
3104+) );
3105+
3106+display_if_empty(); // display a message if list is empty
3107+
3108+while( $Item = & mainlist_get_item() )
3109+{ // For each blog post, do everything below up to the closing curly brace "}"
3110+ // ------------------------------ DATE SEPARATOR ------------------------------
3111+ $MainList->date_if_changed( array(
3112+ 'before' => '<h2>',
3113+ 'after' => '</h2>',
3114 'date_format' => '#',
3115- ) );
3116- ?>
3117-
3118- <div id="<?php $Item->anchor_id() ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
3119-
3120- <div class="bSmallHead">
3121- <?php
3122- $Item->permanent_link( array(
3123+ ) );
3124+ ?>
3125+
3126+ <div id="<?php $Item->anchor_id() ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
3127+
3128+ <div class="bSmallHead">
3129+ <?php
3130+ $Item->permanent_link( array(
3131 'text' => '#icon#',
3132- ) );
3133- ?>
3134- <?php
3135- $Item->issue_time(); // Post issue time
3136- ?>
3137- <?php
3138- $Item->categories( array(
3139- 'before' => ', '.T_('Categories').': ',
3140- 'after' => ' ',
3141- 'include_main' => true,
3142- 'include_other' => true,
3143+ ) );
3144+
3145+ // display formatted issue time (datetime) of Item
3146+ $Item->issue_time();
3147+
3148+ // list by name and link all cats, sub-cats, ext-cats
3149+ $Item->categories( array(
3150+ 'before' => ', '.T_('Categories').': ',
3151+ 'after' => ' ',
3152+ 'include_main' => true,
3153+ 'include_other' => true,
3154 'include_external'=> true,
3155 'link_categories' => true,
3156- ) );
3157+ ) );
3158 ?>
3159 </div>
3160
3161@@ -203,33 +191,22 @@
3162
3163 <div class="bSmallPrint">
3164 <?php
3165- // Link to comments, trackbacks, etc.:
3166- $Item->feedback_link( array(
3167+ // display link to, and count of, comments only
3168+ $Item->feedback_link( array(
3169 'type' => 'comments',
3170 'link_before' => '',
3171 'link_after' => ' &bull; ',
3172- 'link_text_zero' => '#',
3173- 'link_text_one' => '#',
3174- 'link_text_more' => '#',
3175- 'link_title' => '#',
3176- 'use_popup' => false,
3177- ) );
3178- ?>
3179- <?php
3180- // Link to comments, trackbacks, etc.:
3181- $Item->feedback_link( array(
3182+ ) );
3183+
3184+ // display link to, and count of, trackbacks only
3185+ $Item->feedback_link( array(
3186 'type' => 'trackbacks',
3187 'link_before' => '',
3188 'link_after' => ' &bull; ',
3189- 'link_text_zero' => '#',
3190- 'link_text_one' => '#',
3191- 'link_text_more' => '#',
3192- 'link_title' => '#',
3193- 'use_popup' => false,
3194- ) );
3195- ?>
3196+ ) );
3197+ ?>
3198
3199- <?php $Item->permanent_link(); ?>
3200+ <?php $Item->permanent_link(); ?>
3201 </div>
3202
3203 <?php
3204@@ -243,16 +220,16 @@
3205 </div>
3206
3207 <?php
3208- } // ---------------------------------- END OF POSTS ------------------------------------
3209+}
3210
3211- // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
3212- mainlist_page_links( array(
3213- 'block_start' => '<p class="center"><strong>',
3214- 'block_end' => '</strong></p>',
3215- 'links_format' => '$prev$ :: $next$',
3216- 'prev_text' => '&lt;&lt; '.T_('Previous'),
3217- 'next_text' => T_('Next').' &gt;&gt;',
3218- ) );
3219+// prev/next links on multi-post pages
3220+mainlist_page_links( array(
3221+ 'block_start' => '<p class="center"><strong>',
3222+ 'block_end' => '</strong></p>',
3223+ 'links_format' => '$prev$ :: $next$',
3224+ 'prev_text' => '&lt;&lt; '.T_('Previous'),
3225+ 'next_text' => T_('Next').' &gt;&gt;',
3226+ ) );
3227
3228 // --- --- --- --- --- --- --- --- --- --- ---
3229 // MAIN CONTENT INCLUDED HERE
3230@@ -312,9 +289,9 @@
3231 <?php
3232 // Display CONTENT (teaser only):
3233 $Item->content_teaser( array(
3234- 'before' => '',
3235- 'after' => '',
3236- 'disppage' => 1,
3237+ 'before' => '',
3238+ 'after' => '',
3239+ 'disppage' => 1,
3240 'stripteaser' => false,
3241 ) );
3242 ?>
3243@@ -355,7 +332,7 @@
3244 while( $Item = & $LinkblogList->get_item() )
3245 {
3246 ?>
3247- <div id="<?php $Item->anchor_id() ?>" class="bPostSide bPostSide<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
3248+ <div id="<?php $Item->anchor_id(); ?>" class="bPostSide bPostSide<?php $Item->status_raw() ?>" lang="<?php $Item->lang(); ?>">
3249 <h4 class="bTitle">
3250 <?php
3251 $Item->permanent_link( array(
3252@@ -368,9 +345,9 @@
3253 <?php
3254 // Display CONTENT (teaser only):
3255 $Item->content_teaser( array(
3256- 'before' => '',
3257- 'after' => '',
3258- 'disppage' => 1,
3259+ 'before' => '',
3260+ 'after' => '',
3261+ 'disppage' => 1,
3262 'stripteaser' => false,
3263 ) );
3264 ?>
3265
3266=== modified file 'plugins/basic_antispam_plugin/_basic_antispam.plugin.php'
3267--- plugins/basic_antispam_plugin/_basic_antispam.plugin.php 2009-12-19 17:30:30 +0000
3268+++ plugins/basic_antispam_plugin/_basic_antispam.plugin.php 2010-01-17 09:47:17 +0000
3269@@ -69,6 +69,9 @@
3270 }
3271
3272
3273+/**
3274+ * dummy docblock makes error-free autodocs
3275+ */
3276 function GetDefaultSettings()
3277 {
3278 return array(
3279
3280=== modified file 'plugins/calendar_plugin/_calendar.plugin.php'
3281--- plugins/calendar_plugin/_calendar.plugin.php 2010-01-02 08:34:34 +0000
3282+++ plugins/calendar_plugin/_calendar.plugin.php 2010-01-17 09:47:17 +0000
3283@@ -518,7 +518,7 @@
3284 }
3285
3286
3287- /*
3288+ /**
3289 * Calendar->set(-)
3290 *
3291 * set a variable
3292
3293=== modified file 'plugins/code_highlight_plugin/_code_highlight.plugin.php'
3294--- plugins/code_highlight_plugin/_code_highlight.plugin.php 2010-01-02 08:34:34 +0000
3295+++ plugins/code_highlight_plugin/_code_highlight.plugin.php 2010-01-17 09:47:17 +0000
3296@@ -208,6 +208,9 @@
3297 $this->DisplayCodeToolbar();
3298 }
3299
3300+/**
3301+ * dummy docblock makes error-free autodocs
3302+ */
3303 function DisplayCodeToolbar()
3304 {
3305 echo '<div class="edit_toolbar code_toolbar">';
3306@@ -306,6 +309,9 @@
3307 }
3308
3309
3310+/**
3311+ * dummy docblock makes error-free autodocs
3312+ */
3313 function CommentFormSent( & $params )
3314 {
3315 if( $this->Settings->get( 'render_comments' ) )
3316@@ -317,6 +323,9 @@
3317 }
3318 }
3319
3320+/**
3321+ * dummy docblock makes error-free autodocs
3322+ */
3323 function BeforeCommentFormInsert( $params )
3324 {
3325 if( $this->Settings->get( 'render_comments' ) )
3326
3327=== modified file 'plugins/code_highlight_plugin/highlighters/css.highlighter.php'
3328--- plugins/code_highlight_plugin/highlighters/css.highlighter.php 2009-12-12 16:59:58 +0000
3329+++ plugins/code_highlight_plugin/highlighters/css.highlighter.php 2010-01-17 09:47:17 +0000
3330@@ -111,6 +111,9 @@
3331 return '<span class="amc_default">'.$block.'</span>';
3332 }
3333
3334+/**
3335+ * dummy docblock makes error-free autodocs
3336+ */
3337 function highlight_rest( $block )
3338 {
3339 // highlight all css declarations and values
3340
3341=== modified file 'plugins/coll_tag_cloud_widget/_coll_tag_cloud.widget.php'
3342--- plugins/coll_tag_cloud_widget/_coll_tag_cloud.widget.php 2009-12-26 17:10:42 +0000
3343+++ plugins/coll_tag_cloud_widget/_coll_tag_cloud.widget.php 2010-01-17 09:47:17 +0000
3344@@ -201,6 +201,9 @@
3345 }
3346
3347
3348+/**
3349+ * dummy docblock makes error-free autodocs
3350+ */
3351 function tag_cloud_cmp($a, $b)
3352 {
3353 return strcasecmp($a->tag_name, $b->tag_name);
3354
3355=== modified file 'plugins/coll_xml_feeds_widget/_coll_xml_feeds.widget.php'
3356--- plugins/coll_xml_feeds_widget/_coll_xml_feeds.widget.php 2010-01-02 08:34:34 +0000
3357+++ plugins/coll_xml_feeds_widget/_coll_xml_feeds.widget.php 2010-01-17 09:47:17 +0000
3358@@ -93,6 +93,9 @@
3359 }
3360
3361
3362+/**
3363+ * dummy docblock makes error-free autodocs
3364+ */
3365 function get_title()
3366 {
3367 global $rsc_url;
3368
3369=== modified file 'plugins/smilies_plugin/_smilies.plugin.php'
3370--- plugins/smilies_plugin/_smilies.plugin.php 2010-01-02 08:34:34 +0000
3371+++ plugins/smilies_plugin/_smilies.plugin.php 2010-01-17 09:47:17 +0000
3372@@ -397,7 +397,9 @@
3373 }
3374 }
3375
3376- // returns the relevant smiley parts (char_code, image_file)
3377+ /**
3378+ * returns the relevant smiley parts (char_code, image_file)
3379+ */
3380 function get_smiley( $smiley_parts )
3381 {
3382 return ( ( isset( $smiley_parts[1] ) && isset( $smiley_parts[2] ) ) ? $smiley_parts[1].'<->'.$smiley_parts[2] : '' );
3383
3384=== modified file 'plugins/tinymce_plugin/_tinymce.plugin.php'
3385--- plugins/tinymce_plugin/_tinymce.plugin.php 2010-01-02 08:34:34 +0000
3386+++ plugins/tinymce_plugin/_tinymce.plugin.php 2010-01-17 09:47:17 +0000
3387@@ -48,6 +48,9 @@
3388 */
3389 var $tmce_editor_id = 'itemform_post_content';
3390
3391+/**
3392+ * dummy docblock makes error-free autodocs
3393+ */
3394 function PluginInit()
3395 {
3396 $this->short_desc = $this->T_('Javascript WYSIWYG editor');
3397
3398=== modified file 'plugins/tinymce_plugin/tiny_mce/tiny_mce_gzip.php'
3399--- plugins/tinymce_plugin/tiny_mce/tiny_mce_gzip.php 2009-12-06 09:37:19 +0000
3400+++ plugins/tinymce_plugin/tiny_mce/tiny_mce_gzip.php 2010-01-17 09:47:17 +0000
3401@@ -163,6 +163,9 @@
3402
3403 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
3404
3405+/**
3406+ * dummy docblock makes error-free autodocs
3407+ */
3408 function getParam($name, $def = false) {
3409 if (!isset($_GET[$name]))
3410 return $def;
3411@@ -170,6 +173,9 @@
3412 return preg_replace("/[^0-9a-z\-_,]+/i", "", $_GET[$name]); // Remove anything but 0-9,a-z,-_
3413 }
3414
3415+/**
3416+ * dummy docblock makes error-free autodocs
3417+ */
3418 function getFileContents($path) {
3419 $path = realpath($path);
3420
3421
3422=== modified file 'plugins/twitter_plugin/_twitter.plugin.php'
3423--- plugins/twitter_plugin/_twitter.plugin.php 2009-12-19 17:30:30 +0000
3424+++ plugins/twitter_plugin/_twitter.plugin.php 2010-01-17 09:47:17 +0000
3425@@ -27,8 +27,8 @@
3426 *
3427 * This plugin will post to your twitter account when you have added a post to your blog.
3428 *
3429- * @todo use OAuth -- http://www.jaisenmathai.com/blog/2009/03/31/how-to-quickly-integrate-with-twitters-oauth-api-using-php/
3430- * @todo Tblue> Do not use cURL, or at least do not depend on it! We could
3431+ * @todo (legacy): use OAuth -- http://www.jaisenmathai.com/blog/2009/03/31/how-to-quickly-integrate-with-twitters-oauth-api-using-php/
3432+ * @todo (legacy): Tblue> Do not use cURL, or at least do not depend on it! We could
3433 * clone/modify {@link fetch_remote_page()} to be able to do
3434 *
3435 * @package plugins
3436@@ -227,7 +227,7 @@
3437 /**
3438 * Define here default collection/blog settings that are to be made available in the backoffice.
3439 *
3440- * @todo: ideally we'd want a warning if the twitter ping is not enabled
3441+ * @todo (legacy): ideally we'd want a warning if the twitter ping is not enabled
3442 *
3443 * @return array See {@link Plugin::GetDefaultSettings()}.
3444 */
3445
3446=== modified file 'sitemap_a.php'
3447--- sitemap_a.php 2010-01-04 17:32:41 +0000
3448+++ sitemap_a.php 2010-01-17 09:47:13 +0000
3449@@ -7,6 +7,10 @@
3450 * @package xml
3451 * @subpackage sitemap
3452 */
3453+
3454+/**
3455+ * dummy docblock makes error-free autodocs
3456+ */
3457 require_once dirname(__FILE__).'/conf/_config.php';
3458
3459 # First, select which blog you want to map
3460
3461=== modified file 'sitemap_blogs.php'
3462--- sitemap_blogs.php 2010-01-04 17:32:41 +0000
3463+++ sitemap_blogs.php 2010-01-17 09:47:13 +0000
3464@@ -7,6 +7,10 @@
3465 * @package xml
3466 * @subpackage sitemap
3467 */
3468+
3469+/**
3470+ * dummy docblock makes error-free autodocs
3471+ */
3472 require_once dirname(__FILE__).'/conf/_config.php';
3473
3474 # First, select which blog you want to map
3475
3476=== modified file 'summary.php'
3477--- summary.php 2010-01-08 10:32:06 +0000
3478+++ summary.php 2010-01-17 09:47:13 +0000
3479@@ -54,6 +54,7 @@
3480 // --- --- --- --- --- --- --- --- --- --- ---
3481 // --- TOOLBAR INCLUDED HERE ---
3482 template_include( '_toolbar.inc.php' );
3483+
3484 echo "\n";
3485 if( is_logged_in() )
3486 {
3487@@ -71,18 +72,15 @@
3488 // display the Public Blog List widget
3489 template_widget( array(
3490 'widget' => 'colls_list_public',
3491- // block-level params...
3492 'block_start' => '<div class="NavBar">',
3493 'block_end' => '</div>',
3494 'block_display_title' => false,
3495- // list params...
3496 'list_start' => '',
3497 'list_end' => '',
3498 'item_start' => '',
3499 'item_end' => '',
3500 'item_selected_start' => '',
3501 'item_selected_end' => '',
3502- // miscellaneous params...
3503 'link_selected_class' => 'NavButton2',
3504 'link_default_class' => 'NavButton2',
3505 ) );
3506@@ -128,9 +126,10 @@
3507 ?>
3508 <li lang="<?php $Item->lang() ?>">
3509 <?php
3510+ // display formatted issue date (datetime) of Item
3511 $Item->issue_date( array(
3512- 'before' => ' ',
3513- 'after' => ' ',
3514+ 'before' => ' ',
3515+ 'after' => ' ',
3516 'date_format' => '#',
3517 ) );
3518
3519
3520=== modified file 'templates/_404_not_found.disp.php'
3521--- templates/_404_not_found.disp.php 2010-01-08 10:32:06 +0000
3522+++ templates/_404_not_found.disp.php 2010-01-17 09:47:17 +0000
3523@@ -35,7 +35,6 @@
3524 // display the Tag Cloud widget
3525 template_widget( array(
3526 'widget' => 'coll_tag_cloud',
3527- // block-level params...
3528 'block_start' => '<div class="tag_cloud">',
3529 'block_end' => '</div>',
3530 'block_title_start' => '<h2>',
3531
3532=== modified file 'templates/_atom/comments.main.php'
3533--- templates/_atom/comments.main.php 2010-01-08 10:32:06 +0000
3534+++ templates/_atom/comments.main.php 2010-01-17 09:47:17 +0000
3535@@ -35,16 +35,15 @@
3536 <feed xml:lang="<?php $Blog->disp( 'locale', 'xml' ) ?>" xmlns="http://www.w3.org/2005/Atom">
3537 <title><?php
3538 $Blog->disp( 'name', 'xml' );
3539- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
3540+ // title for the current request
3541 request_title( array(
3542- 'title_before'=> ' - ',
3543- 'title_after' => '',
3544- 'title_none' => '',
3545- 'glue' => ' - ',
3546- 'title_single_disp' => true,
3547- 'format' => 'xml',
3548- ) );
3549- ?></title>
3550+ 'title_before'=> ' - ',
3551+ 'title_after' => '',
3552+ 'title_none' => '',
3553+ 'glue' => ' - ',
3554+ 'title_single_disp' => true,
3555+ 'format' => 'xml',
3556+ ) ); ?></title>
3557 <link rel="alternate" type="text/html" href="<?php $Blog->disp( 'lastcommentsurl', 'xml' ) ?>" />
3558 <link rel="self" type="application/atom+xml" href="<?php $Blog->disp( 'comments_atom_url', 'xmlattr' ) ?>" />
3559 <id><?php $Blog->disp( 'comments_atom_url', 'xmlattr' ) /* TODO: may need a regenerate_url() */ ?></id>
3560
3561=== modified file 'templates/_atom/index.main.php'
3562--- templates/_atom/index.main.php 2010-01-08 10:32:06 +0000
3563+++ templates/_atom/index.main.php 2010-01-17 09:47:17 +0000
3564@@ -45,17 +45,15 @@
3565 <feed xml:lang="<?php $Blog->disp( 'locale', 'xml' ) ?>" xmlns="http://www.w3.org/2005/Atom">
3566 <title><?php
3567 $Blog->disp( 'name', 'xml' );
3568- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
3569+ // title for the current request
3570 request_title( array(
3571- 'title_before'=> ' - ',
3572- 'title_after' => '',
3573- 'title_none' => '',
3574- 'glue' => ' - ',
3575- 'title_single_disp' => true,
3576- 'format' => 'xml',
3577- ) );
3578- // ------------------------------ END OF REQUEST TITLE -----------------------------
3579- ?></title>
3580+ 'title_before'=> ' - ',
3581+ 'title_after' => '',
3582+ 'title_none' => '',
3583+ 'glue' => ' - ',
3584+ 'title_single_disp' => true,
3585+ 'format' => 'xml',
3586+ ) ); ?></title>
3587 <link rel="alternate" type="text/html" href="<?php $Blog->disp( 'url', 'xml' ) ?>" />
3588 <link rel="self" type="application/atom+xml" href="<?php $Blog->disp( 'atom_url', 'xmlattr' ) ?>" />
3589 <id><?php $Blog->disp( 'atom_url', 'xmlattr' ); /* TODO: may need a regenerate_url() */ ?></id>
3590@@ -97,9 +95,9 @@
3591 <?php
3592 $Item->issue_date( array(
3593 'before' => '<published>',
3594- 'after' => '</published>',
3595+ 'after' => '</published>',
3596 'date_format' => 'isoZ',
3597- 'use_GMT' => true,
3598+ 'use_GMT' => true,
3599 ) );
3600 ?>
3601 <updated><?php $Item->mod_date( 'isoZ', true ) ?></updated>
3602@@ -134,7 +132,7 @@
3603 $Item->url_link( array(
3604 'before' => '<p>',
3605 'after' => '</p>',
3606- 'podcast' => false,
3607+ 'podcast' => false,
3608 ) );
3609
3610 // Display images that are linked to this post:
3611@@ -154,8 +152,8 @@
3612 { // Teasers only
3613 $content .= $Item->get_more_link( array(
3614 'before' => '',
3615- 'after' => '',
3616- 'disppage' => 1,
3617+ 'after' => '',
3618+ 'disppage' => 1,
3619 ) );
3620 }
3621 else
3622
3623=== modified file 'templates/_body_footer.inc.php'
3624--- templates/_body_footer.inc.php 2010-01-08 10:32:06 +0000
3625+++ templates/_body_footer.inc.php 2010-01-17 09:47:17 +0000
3626@@ -15,9 +15,9 @@
3627 // Display a link to contact the owner of this blog (if owner accepts messages):
3628 $Blog->contact_link( array(
3629 'before' => '',
3630- 'after' => ' &bull; ',
3631+ 'after' => ' &bull; ',
3632 'text' => T_('Contact'),
3633- 'title' => T_('Send a message to the owner of this blog...'),
3634+ 'title' => T_('Send a message to the owner of this blog...'),
3635 ) );
3636 ?>
3637
3638
3639=== modified file 'templates/_catdir.disp.php'
3640--- templates/_catdir.disp.php 2010-01-08 10:32:06 +0000
3641+++ templates/_catdir.disp.php 2010-01-17 09:47:17 +0000
3642@@ -19,7 +19,6 @@
3643 // display the Category List widget
3644 template_widget( array(
3645 'widget' => 'coll_category_list',
3646- // block-level params...
3647 'block_start' => '',
3648 'block_end' => '',
3649 'block_display_title' => false,
3650
3651=== modified file 'templates/_comments.disp.php'
3652--- templates/_comments.disp.php 2010-01-08 10:32:06 +0000
3653+++ templates/_comments.disp.php 2010-01-17 09:47:17 +0000
3654@@ -26,33 +26,38 @@
3655 // Load comment's Item object:
3656 $Comment->get_Item();
3657 $Comment->anchor(); ?>
3658+
3659 <div class="bComment">
3660- <h3 class="bTitle">
3661- <?php echo T_('In response to:') ?>
3662- <?php $Comment->Item->title( array(
3663- 'link_type' => 'permalink',
3664- ) ); ?>
3665- </h3>
3666- <div class="bCommentTitle">
3667- <?php $Comment->author(); ?>
3668- <?php $Comment->author_url( '', ' &middot; ', '' ) ?>
3669- </div>
3670- <div class="bCommentText">
3671- <?php $Comment->content(); ?>
3672- </div>
3673- <div class="bCommentSmallPrint">
3674- <?php
3675- $Comment->permanent_link( array(
3676- 'class' => 'permalink_right',
3677- 'nofollow' => true,
3678- ) );
3679- ?>
3680- <?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
3681- <?php $Comment->edit_link( ' &middot; ' ) /* Link to backoffice for editing */ ?>
3682- <?php $Comment->delete_link( ' &middot; ' ); /* Link to backoffice for deleting */ ?>
3683- </div>
3684- </div>
3685- <!-- ========== END of a COMMENT ========== -->
3686+ <h3 class="bTitle">
3687+ <?php echo T_('In response to:') ?>
3688+ <?php
3689+ $Comment->Item->title( array(
3690+ 'link_type' => 'permalink',
3691+ ) ); ?>
3692+ </h3>
3693+
3694+ <div class="bCommentTitle">
3695+ <?php $Comment->author(); ?>
3696+ <?php $Comment->author_url( '', ' &middot; ', '' ) ?>
3697+ </div>
3698+
3699+ <div class="bCommentText">
3700+ <?php $Comment->content(); ?>
3701+ </div>
3702+
3703+ <div class="bCommentSmallPrint">
3704+ <?php
3705+ $Comment->permanent_link( array(
3706+ 'class' => 'permalink_right',
3707+ 'nofollow' => true,
3708+ ) );
3709+ ?>
3710+ <?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
3711+ <?php $Comment->edit_link( ' &middot; ' ) /* Link to backoffice for editing */ ?>
3712+ <?php $Comment->delete_link( ' &middot; ' ); /* Link to backoffice for deleting */ ?>
3713+ </div>
3714+
3715+ </div>
3716 <?php
3717 } // End of comment loop.
3718
3719
3720=== modified file 'templates/_html_header.inc.php'
3721--- templates/_html_header.inc.php 2010-01-08 10:32:06 +0000
3722+++ templates/_html_header.inc.php 2010-01-17 09:47:17 +0000
3723@@ -18,36 +18,31 @@
3724 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3725 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang(); ?>" lang="<?php locale_lang(); ?>">
3726 <head>
3727- <?php template_content_meta(); /* Charset for static pages */ ?>
3728- <?php template_base_tag(); /* Base URL for this template. You need this to fix relative links! */ ?>
3729- <?php $Plugins->trigger_event( 'TemplateBeginHtmlHead' ); ?>
3730- <title><?php
3731- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
3732- request_title( array(
3733- 'auto_pilot' => 'seo_title',
3734- ) );
3735- ?></title>
3736- <?php template_description_tag(); ?>
3737- <?php template_keywords_tag(); ?>
3738- <?php robots_tag(); ?>
3739- <?php meta_generator_tag(); /* Please leave this for stats */ ?>
3740- <?php
3741- if( $Blog->get_setting( 'feed_content' ) != 'none' )
3742- { // auto-discovery urls
3743- ?>
3744+<?php template_content_meta(); /* Charset for static pages */ ?>
3745+<?php template_base_tag(); /* Base URL for this template. You need this to fix relative links! */ ?>
3746+<?php $Plugins->trigger_event( 'TemplateBeginHtmlHead' ); ?>
3747+<title><?php request_title( array( 'auto_pilot' => 'seo_title' ) ); ?></title>
3748+<?php template_description_tag(); ?>
3749+<?php template_keywords_tag(); ?>
3750+<?php robots_tag(); ?>
3751+<?php meta_generator_tag(); /* Please leave this for stats */ ?>
3752+<?php
3753+if( $Blog->get_setting( 'feed_content' ) != 'none' )
3754+{ // auto-discovery urls
3755+ ?>
3756 <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php $Blog->disp( 'rss2_url', 'raw' ) ?>" />
3757 <link rel="alternate" type="application/atom+xml" title="Atom" href="<?php $Blog->disp( 'atom_url', 'raw' ) ?>" />
3758- <?php
3759- }
3760- ?>
3761- <link rel="EditURI" type="application/rsd+xml" title="RSD" href="<?php echo $xmlsrv_url; ?>rsd.php?blog=<?php echo $Blog->ID; ?>" />
3762- <meta name="viewport" content="width = 750" />
3763- <link rel="stylesheet" href="style.css" type="text/css" />
3764- <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
3765 <?php
3766- $Blog->disp( 'blog_css', 'raw');
3767- $Blog->disp( 'user_css', 'raw');
3768- ?>
3769+}
3770+?>
3771+<link rel="EditURI" type="application/rsd+xml" title="RSD" href="<?php echo $xmlsrv_url; ?>rsd.php?blog=<?php echo $Blog->ID; ?>" />
3772+<meta name="viewport" content="width = 750" />
3773+<link rel="stylesheet" href="style.css" type="text/css" />
3774+<?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
3775+<?php
3776+$Blog->disp( 'blog_css', 'raw');
3777+$Blog->disp( 'user_css', 'raw');
3778+?>
3779 </head>
3780
3781 <body>
3782@@ -55,6 +50,7 @@
3783 // --- --- --- --- --- --- --- --- --- --- ---
3784 // --- TOOLBAR INCLUDED HERE ---
3785 template_include( '_toolbar.inc.php' );
3786+
3787 echo "\n";
3788 if( is_logged_in() )
3789 {
3790
3791=== modified file 'templates/_item_comment.inc.php'
3792--- templates/_item_comment.inc.php 2010-01-08 10:32:06 +0000
3793+++ templates/_item_comment.inc.php 2010-01-17 09:47:17 +0000
3794@@ -15,7 +15,7 @@
3795
3796 // Default params:
3797 $params = array_merge( array(
3798- 'comment_start' => '<div class="bComment">',
3799+ 'comment_start' => '<div class="bComment">',
3800 'comment_end' => '</div>',
3801 'Comment' => NULL, // This object MUST be passed as a param!
3802 ), $params );
3803@@ -40,9 +40,9 @@
3804 { // Normal comment
3805 $Comment->permanent_link( array(
3806 'before' => '',
3807- 'after' => ' '.T_('from:').' ',
3808+ 'after' => ' '.T_('from:').' ',
3809 'text' => T_('Comment'),
3810- 'nofollow' => true,
3811+ 'nofollow' => true,
3812 ) );
3813 }
3814 $Comment->author();
3815@@ -53,9 +53,9 @@
3816 case 'trackback': // Display a trackback:
3817 $Comment->permanent_link( array(
3818 'before' => '',
3819- 'after' => ' '.T_('from:').' ',
3820+ 'after' => ' '.T_('from:').' ',
3821 'text' => T_('Trackback'),
3822- 'nofollow' => true,
3823+ 'nofollow' => true,
3824 ) );
3825 $Comment->author( '', '#', '', '#', 'htmlbody', true );
3826 break;
3827@@ -63,31 +63,30 @@
3828 case 'pingback': // Display a pingback:
3829 $Comment->permanent_link( array(
3830 'before' => '',
3831- 'after' => ' '.T_('from:').' ',
3832+ 'after' => ' '.T_('from:').' ',
3833 'text' => T_('Pingback'),
3834- 'nofollow' => true,
3835+ 'nofollow' => true,
3836 ) );
3837 $Comment->author( '', '#', '', '#', 'htmlbody', true );
3838 break;
3839- }
3840- ?>
3841- </div>
3842- <?php $Comment->rating(); ?>
3843- <div class="bCommentText">
3844- <?php $Comment->content(); ?>
3845- </div>
3846- <div class="bCommentSmallPrint">
3847- <?php
3848- $Comment->edit_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for editing */
3849- $Comment->delete_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for deleting */
3850- ?>
3851-
3852- <?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
3853- </div>
3854-<?php
3855- echo $params['comment_end'];
3856-?>
3857-<!-- ========== END of a COMMENT/TB/PB ========== -->
3858-<?php
3859-
3860+ }
3861+?>
3862+</div>
3863+
3864+<?php $Comment->rating(); ?>
3865+
3866+<div class="bCommentText">
3867+<?php $Comment->content(); ?>
3868+</div>
3869+
3870+<div class="bCommentSmallPrint">
3871+<?php
3872+$Comment->edit_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for editing */
3873+$Comment->delete_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for deleting */
3874+?>
3875+<?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
3876+</div>
3877+
3878+<?php
3879+echo $params['comment_end'];
3880 ?>
3881
3882=== modified file 'templates/_item_comment_form.inc.php'
3883--- templates/_item_comment_form.inc.php 2010-01-08 10:32:06 +0000
3884+++ templates/_item_comment_form.inc.php 2010-01-17 09:47:17 +0000
3885@@ -20,14 +20,14 @@
3886
3887 // Default params:
3888 $params = array_merge( array(
3889- 'disp_comment_form' => true,
3890- 'form_title_start' => '<h3>',
3891- 'form_title_end' => '</h3>',
3892+ 'disp_comment_form' => true,
3893+ 'form_title_start' => '<h3>',
3894+ 'form_title_end' => '</h3>',
3895 'policy_text' => '',
3896- 'textarea_lines' => 10,
3897+ 'textarea_lines' => 10,
3898 'default_text' => '',
3899 'preview_start' => '<div class="bComment" id="comment_preview">',
3900- 'comment_template' => '_item_comment.inc.php',
3901+ 'comment_template' => '_item_comment.inc.php',
3902 'preview_end' => '</div>',
3903 ), $params );
3904
3905@@ -47,11 +47,11 @@
3906 $PageCache->abort_collect();
3907
3908 // --- --- --- --- --- --- --- --- --- --- ---
3909- // --- A SINGLE COMMENT INCLUDED HERE ---
3910+ // --- A SINGLE COMMENT PREVIEWED HERE ---
3911 template_include( $params['comment_template'], array(
3912 'Comment' => & $Comment,
3913- 'comment_start' => $params['comment_start'],
3914- 'comment_end' => $params['comment_end'],
3915+ 'comment_start' => $params['preview_start'],
3916+ 'comment_end' => $params['preview_end'],
3917 ) );
3918
3919 // Form fields:
3920
3921=== modified file 'templates/_item_comment_wp.inc.php'
3922--- templates/_item_comment_wp.inc.php 2010-01-08 10:32:06 +0000
3923+++ templates/_item_comment_wp.inc.php 2010-01-17 09:47:17 +0000
3924@@ -15,11 +15,11 @@
3925
3926 // Default params:
3927 $params = array_merge( array(
3928- 'comment_start' => '<li>',
3929- 'comment_end' => '</li>',
3930- 'preview_start' => '<ul><li id="comment_preview">',
3931- 'preview_end' => '</li></ul>',
3932- 'Comment' => NULL, // This object MUST be passed as a param!
3933+ 'comment_start' => '<li>',
3934+ 'comment_end' => '</li>',
3935+ 'preview_start' => '<ul><li id="comment_preview">',
3936+ 'preview_end' => '</li></ul>',
3937+ 'Comment' => NULL, // This object MUST be passed as a param!
3938 ), $params );
3939
3940 /**
3941@@ -47,9 +47,9 @@
3942 { // Normal comment
3943 $Comment->permanent_link( array(
3944 'before' => '',
3945- 'after' => ' '.T_('by').' ',
3946+ 'after' => ' '.T_('by').' ',
3947 'text' => T_('Comment'),
3948- 'nofollow' => true,
3949+ 'nofollow' => true,
3950 ) );
3951 }
3952 $Comment->author();
3953@@ -60,40 +60,33 @@
3954 case 'trackback': // Display a trackback:
3955 $Comment->permanent_link( array(
3956 'before' => '',
3957- 'after' => ' '.T_('by').' ',
3958+ 'after' => ' '.T_('by').' ',
3959 'text' => T_('Trackback'),
3960- 'nofollow' => true,
3961+ 'nofollow' => true,
3962 ) );
3963 $Comment->author( '', '#', '', '#', 'htmlbody', true );
3964 break;
3965
3966- case 'pingback': // Display a pingback:
3967- $Comment->permanent_link( array(
3968- 'before' => '',
3969- 'after' => ' '.T_('by').' ',
3970- 'text' => T_('Pingback'),
3971- 'nofollow' => true,
3972- ) );
3973- $Comment->author( '', '#', '', '#', 'htmlbody', true );
3974- break;
3975- }
3976- ?>
3977- &#8212;
3978- <?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
3979+ case 'pingback': // Display a pingback:
3980+ $Comment->permanent_link( array(
3981+ 'before' => '',
3982+ 'after' => ' '.T_('by').' ',
3983+ 'text' => T_('Pingback'),
3984+ 'nofollow' => true,
3985+ ) );
3986+ $Comment->author( '', '#', '', '#', 'htmlbody', true );
3987+ break;
3988+ }
3989+?>
3990+&#8212;
3991+<?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
3992 </cite>
3993-
3994 <?php
3995- $Comment->edit_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for editing */
3996- $Comment->delete_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for deleting */
3997+$Comment->edit_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for editing */
3998+$Comment->delete_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for deleting */
3999 ?>
4000 </p>
4001-
4002 <br/>
4003-
4004-<?php
4005- echo $params['comment_end'];
4006-?>
4007-<!-- ========== END of a COMMENT/TB/PB ========== -->
4008-<?php
4009-
4010+<?php
4011+ echo $params['comment_end'];
4012 ?>
4013
4014=== modified file 'templates/_item_content.inc.php'
4015--- templates/_item_content.inc.php 2010-01-08 10:32:06 +0000
4016+++ templates/_item_content.inc.php 2010-01-17 09:47:17 +0000
4017@@ -24,37 +24,37 @@
4018 'force_more' => false, // This will be set to true id 'content_mode' resolves to 'full'.
4019 'content_start_excerpt' => '<div class="content_excerpt">',
4020 'content_end_excerpt' => '</div>',
4021- 'content_start_full' => '<div class="content_full">',
4022+ 'content_start_full' => '<div class="content_full">',
4023 'content_end_full' => '</div>',
4024- 'before_images' => '<div class="bImages">',
4025+ 'before_images' => '<div class="bImages">',
4026 'before_image' => '<div class="image_block">',
4027 'before_image_legend' => '<div class="image_legend">',
4028- 'after_image_legend' => '</div>',
4029+ 'after_image_legend' => '</div>',
4030 'after_image' => '</div>',
4031 'after_images' => '</div>',
4032 'image_size' => 'fit-400x320',
4033- 'excerpt_image_size' => 'fit-80x80',
4034- 'before_url_link' => '<p class="post_link">'.T_('Link:').' ',
4035+ 'excerpt_image_size' => 'fit-80x80',
4036+ 'before_url_link' => '<p class="post_link">'.T_('Link:').' ',
4037 'after_url_link' => '</p>',
4038 'url_link_text_template' => '$url$',
4039 'before_more_link' => '<p class="bMore">',
4040- 'after_more_link' => '</p>',
4041+ 'after_more_link' => '</p>',
4042 'more_link_text' => '#',
4043 'excerpt_before_text' => '<div class="excerpt">',
4044- 'excerpt_after_text' => '</div>',
4045+ 'excerpt_after_text' => '</div>',
4046 'excerpt_before_more' => ' <span class="excerpt_more">',
4047- 'excerpt_after_more' => '</span>',
4048+ 'excerpt_after_more' => '</span>',
4049 'excerpt_more_text' => T_('more').' &raquo;',
4050 /**
4051 * @todo (legacy): fp> todo: rename 'files' to 'attach' (as in attachments)
4052 */
4053 'limit_files' => 1000,
4054- 'file_list_start' => '<div class="attchments"><h3>'.T_('Attachments').':</h3><ul>',
4055- 'file_list_end' => '</ul></div>',
4056+ 'file_list_start' => '<div class="attchments"><h3>'.T_('Attachments').':</h3><ul>',
4057+ 'file_list_end' => '</ul></div>',
4058 'file_start' => '<li>',
4059- 'file_end' => '</li>',
4060+ 'file_end' => '</li>',
4061 'before_file_size' => ' <span class="file_size">',
4062- 'after_file_size' => '</span>',
4063+ 'after_file_size' => '</span>',
4064 ), $params );
4065
4066 // Determine content mode to use..
4067@@ -119,9 +119,9 @@
4068
4069 $Item->excerpt( array(
4070 'before' => $params['excerpt_before_text'],
4071- 'after' => $params['excerpt_after_text'],
4072+ 'after' => $params['excerpt_after_text'],
4073 'excerpt_before_more' => $params['excerpt_before_more'],
4074- 'excerpt_after_more' => $params['excerpt_after_more'],
4075+ 'excerpt_after_more' => $params['excerpt_after_more'],
4076 'excerpt_more_text' => $params['excerpt_more_text'],
4077 ) );
4078
4079@@ -164,26 +164,26 @@
4080 'before' => $params['before_url_link'],
4081 'after' => $params['after_url_link'],
4082 'text_template' => $params['url_link_text_template'],
4083- 'url_template' => '$url$',
4084+ 'url_template' => '$url$',
4085 'target' => '',
4086- 'podcast' => '#', // auto display mp3 player if post type is podcast (=> false, to disable)
4087+ 'podcast' => '#', // auto display mp3 player if post type is podcast (=> false, to disable)
4088 ) );
4089
4090 // Display CONTENT:
4091 $Item->content_teaser( array(
4092 'before' => '',
4093- 'after' => '',
4094+ 'after' => '',
4095 ) );
4096 $Item->more_link( array(
4097- 'force_more' => $params['force_more'],
4098+ 'force_more' => $params['force_more'],
4099 'before' => $params['before_more_link'],
4100- 'after' => $params['after_more_link'],
4101+ 'after' => $params['after_more_link'],
4102 'link_text' => $params['more_link_text'],
4103 ) );
4104 $Item->content_extension( array(
4105 'before' => '',
4106- 'after' => '',
4107- 'force_more' => $params['force_more'],
4108+ 'after' => '',
4109+ 'force_more' => $params['force_more'],
4110 ) );
4111
4112 // Links to post pages (for multipage posts):
4113
4114=== modified file 'templates/_item_feedback.inc.php'
4115--- templates/_item_feedback.inc.php 2010-01-08 10:32:06 +0000
4116+++ templates/_item_feedback.inc.php 2010-01-17 09:47:17 +0000
4117@@ -27,18 +27,18 @@
4118 'disp_comment_form' => true,
4119 'disp_trackbacks' => true,
4120 'disp_trackback_url' => true,
4121- 'disp_pingbacks' => true,
4122+ 'disp_pingbacks' => true,
4123 'before_section_title' => '<h3>',
4124- 'after_section_title' => '</h3>',
4125+ 'after_section_title' => '</h3>',
4126 'comment_list_start' => "\n\n",
4127- 'comment_list_end' => "\n\n",
4128+ 'comment_list_end' => "\n\n",
4129 'comment_start' => '<div class="bComment">',
4130 'comment_end' => '</div>',
4131 'preview_start' => '<div class="bComment" id="comment_preview">',
4132 'preview_end' => '</div>',
4133- 'comment_template' => '_item_comment.inc.php',
4134- 'form_title_start' => '<h3>',
4135- 'form_title_end' => '</h3>',
4136+ 'comment_template' => '_item_comment.inc.php',
4137+ 'form_title_start' => '<h3>',
4138+ 'form_title_end' => '</h3>',
4139 ), $params );
4140
4141
4142
4143=== modified file 'templates/_mediaidx.disp.php'
4144--- templates/_mediaidx.disp.php 2010-01-08 10:32:06 +0000
4145+++ templates/_mediaidx.disp.php 2010-01-17 09:47:17 +0000
4146@@ -19,11 +19,9 @@
4147 // display the Media Index widget
4148 template_widget( array(
4149 'widget' => 'coll_media_index',
4150- // block-level params...
4151 'block_start' => '',
4152 'block_end' => '',
4153 'block_display_title' => false,
4154- // widget-specific params...
4155 'thumb_size' => 'fit-80x80',
4156 'thumb_layout' => 'grid',
4157 'grid_start' => '<table class="image_index" cellspacing="3">',
4158
4159=== modified file 'templates/_msgform.disp.php'
4160--- templates/_msgform.disp.php 2010-01-08 10:32:06 +0000
4161+++ templates/_msgform.disp.php 2010-01-17 09:47:17 +0000
4162@@ -150,38 +150,32 @@
4163 }
4164 }
4165 }
4166-?>
4167-
4168-<!-- form to send email -->
4169-<?php
4170
4171 $Form = new Form( $htsrv_url.'message_send.php' );
4172- $Form->begin_form( 'bComment' );
4173-
4174- if( !empty( $Blog ) )
4175- {
4176- $Form->hidden( 'blog', $Blog->ID );
4177- }
4178- $Form->hidden( 'recipient_id', $recipient_id );
4179- $Form->hidden( 'post_id', $post_id );
4180- $Form->hidden( 'comment_id', $comment_id );
4181- $Form->hidden( 'redirect_to', url_rel_to_same_host($redirect_to, $htsrv_url) );
4182-
4183- ?>
4184-
4185- <fieldset>
4186- <div class="label"><label><?php echo T_('To')?>:</label></div>
4187- <div class="info"><strong><?php echo $recipient_name;?></strong></div>
4188- </fieldset>
4189-
4190- <?php
4191- // Note: we use funky field name in order to defeat the most basic guestbook spam bots:
4192- $Form->text( 'd', $email_author, 40, T_('From'), T_('Your name.'), 50, 'bComment' );
4193- $Form->text( 'f', $email_author_address, 40, T_('Email'), T_('Your email address. (Will <strong>not</strong> be displayed on this site.)'), 100, 'bComment' );
4194- $Form->text( 'g', $subject, 40, T_('Subject'), T_('Subject of email message.'), 255, 'bComment' );
4195- $Form->textarea( 'h', '', 15, T_('Message'), T_('Plain text only.'), 40, 'bComment' );
4196-
4197- $Plugins->trigger_event( 'DisplayMessageFormFieldset', array( 'Form' => & $Form,
4198+$Form->begin_form( 'bComment' );
4199+if( !empty( $Blog ) )
4200+{
4201+ $Form->hidden( 'blog', $Blog->ID );
4202+}
4203+$Form->hidden( 'recipient_id', $recipient_id );
4204+$Form->hidden( 'post_id', $post_id );
4205+$Form->hidden( 'comment_id', $comment_id );
4206+$Form->hidden( 'redirect_to', url_rel_to_same_host($redirect_to, $htsrv_url) );
4207+?>
4208+
4209+<fieldset>
4210+<div class="label"><label><?php echo T_('To')?>:</label></div>
4211+<div class="info"><strong><?php echo $recipient_name;?></strong></div>
4212+</fieldset>
4213+
4214+<?php
4215+// Note: we use funky field name in order to defeat the most basic guestbook spam bots:
4216+$Form->text( 'd', $email_author, 40, T_('From'), T_('Your name.'), 50, 'bComment' );
4217+$Form->text( 'f', $email_author_address, 40, T_('Email'), T_('Your email address. (Will <strong>not</strong> be displayed on this site.)'), 100, 'bComment' );
4218+$Form->text( 'g', $subject, 40, T_('Subject'), T_('Subject of email message.'), 255, 'bComment' );
4219+$Form->textarea( 'h', '', 15, T_('Message'), T_('Plain text only.'), 40, 'bComment' );
4220+
4221+$Plugins->trigger_event( 'DisplayMessageFormFieldset', array( 'Form' => & $Form,
4222 'recipient_ID' => & $recipient_id, 'item_ID' => $post_id, 'comment_ID' => $comment_id ) );
4223
4224 $Form->begin_fieldset();
4225
4226=== modified file 'templates/_rdf/comments.main.php'
4227--- templates/_rdf/comments.main.php 2010-01-08 10:32:06 +0000
4228+++ templates/_rdf/comments.main.php 2010-01-17 09:47:17 +0000
4229@@ -25,22 +25,19 @@
4230
4231 echo '<?xml version="1.0" encoding="'.$io_charset.'"?'.'>';
4232 ?>
4233-<!-- generator="<?php echo $app_name; ?>/<?php echo $app_version ?>" -->
4234 <rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns:admin="http://webns.net/mvcb/" xmlns:content="http://purl.org/rss/1.0/modules/content/">
4235 <channel rdf:about="<?php $Blog->disp( 'url', 'xmlattr' ) ?>">
4236 <title><?php
4237 $Blog->disp( 'name', 'xml' );
4238- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
4239+ // title for the current request
4240 request_title( array(
4241- 'title_before'=> ' - ',
4242- 'title_after' => '',
4243- 'title_none' => '',
4244- 'glue' => ' - ',
4245- 'title_single_disp' => true,
4246- 'format' => 'xml',
4247- ) );
4248- // ------------------------------ END OF REQUEST TITLE -----------------------------
4249- ?></title>
4250+ 'title_before'=> ' - ',
4251+ 'title_after' => '',
4252+ 'title_none' => '',
4253+ 'glue' => ' - ',
4254+ 'title_single_disp' => true,
4255+ 'format' => 'xml',
4256+ ) ); ?></title>
4257 <link><?php $Blog->disp( 'lastcommentsurl', 'xml' ) ?></link>
4258 <description></description>
4259 <dc:language><?php $Blog->disp( 'locale', 'xml' ) ?></dc:language>
4260
4261=== modified file 'templates/_rdf/index.main.php'
4262--- templates/_rdf/index.main.php 2010-01-08 10:32:06 +0000
4263+++ templates/_rdf/index.main.php 2010-01-17 09:47:17 +0000
4264@@ -26,24 +26,20 @@
4265 header_content_type( 'application/xml' ); // Sets charset!
4266
4267 echo '<?xml version="1.0" encoding="'.$io_charset.'"?'.'>';
4268-
4269 ?>
4270-<!-- generator="<?php echo $app_name; ?>/<?php echo $app_version ?>" -->
4271 <rdf:RDF xmlns="http://purl.org/rss/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns:admin="http://webns.net/mvcb/" xmlns:content="http://purl.org/rss/1.0/modules/content/">
4272 <channel rdf:about="<?php $Blog->disp( 'url', 'xmlattr' ) ?>">
4273 <title><?php
4274 $Blog->disp( 'name', 'xml' );
4275- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
4276+ // title for the current request
4277 request_title( array(
4278- 'title_before'=> ' - ',
4279- 'title_after' => '',
4280- 'title_none' => '',
4281- 'glue' => ' - ',
4282- 'title_single_disp' => true,
4283- 'format' => 'xml',
4284- ) );
4285- // ------------------------------ END OF REQUEST TITLE -----------------------------
4286- ?></title>
4287+ 'title_before'=> ' - ',
4288+ 'title_after' => '',
4289+ 'title_none' => '',
4290+ 'glue' => ' - ',
4291+ 'title_single_disp' => true,
4292+ 'format' => 'xml',
4293+ ) ); ?></title>
4294 <link><?php $Blog->disp( 'url', 'xml' ) ?></link>
4295 <description><?php $Blog->disp( 'shortdesc', 'xml' ) ?></description>
4296 <dc:language><?php $Blog->disp( 'locale', 'xml' ) ?></dc:language>
4297@@ -79,9 +75,9 @@
4298 <?php
4299 $Item->issue_date( array(
4300 'before' => '<dc:date>',
4301- 'after' => '</dc:date>',
4302+ 'after' => '</dc:date>',
4303 'date_format' => 'isoZ',
4304- 'use_GMT' => true,
4305+ 'use_GMT' => true,
4306 ) );
4307 ?>
4308 <dc:creator><?php $Item->creator_User->preferred_name( 'xml' ) ?></dc:creator>
4309@@ -135,7 +131,7 @@
4310 'before' => '<p>',
4311 'after' => '</p>',
4312 'format' => 'entityencoded',
4313- 'podcast' => false,
4314+ 'podcast' => false,
4315 ) );
4316
4317 // Display images that are linked to this post:
4318@@ -155,8 +151,8 @@
4319 { // Teasers only
4320 $content .= $Item->get_more_link( array(
4321 'before' => '',
4322- 'after' => '',
4323- 'disppage' => 1,
4324+ 'after' => '',
4325+ 'disppage' => 1,
4326 'format' => 'entityencoded',
4327 ) );
4328 }
4329@@ -183,7 +179,7 @@
4330 $Item->url_link( array(
4331 'before' => '<p>',
4332 'after' => '</p>',
4333- 'podcast' => false,
4334+ 'podcast' => false,
4335 ) );
4336
4337 // Display images that are linked to this post:
4338@@ -203,8 +199,8 @@
4339 { // Teasers only
4340 $content .= $Item->get_more_link( array(
4341 'before' => '',
4342- 'after' => '',
4343- 'disppage' => 1,
4344+ 'after' => '',
4345+ 'disppage' => 1,
4346 ) );
4347 }
4348 else
4349
4350=== modified file 'templates/_rss/comments.main.php'
4351--- templates/_rss/comments.main.php 2010-01-08 10:32:06 +0000
4352+++ templates/_rss/comments.main.php 2010-01-17 09:47:17 +0000
4353@@ -25,21 +25,19 @@
4354
4355 echo '<?xml version="1.0" encoding="'.$io_charset.'"?'.'>';
4356 ?>
4357-<!-- generator="<?php echo $app_name; ?>/<?php echo $app_version ?>" -->
4358 <rss version="0.92">
4359 <channel>
4360 <title><?php
4361 $Blog->disp( 'name', 'xml' );
4362- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
4363+ // title for the current request
4364 request_title( array(
4365- 'title_before'=> ' - ',
4366- 'title_after' => '',
4367- 'title_none' => '',
4368- 'glue' => ' - ',
4369- 'title_single_disp' => true,
4370- 'format' => 'xml',
4371- ) );
4372- ?></title>
4373+ 'title_before'=> ' - ',
4374+ 'title_after' => '',
4375+ 'title_none' => '',
4376+ 'glue' => ' - ',
4377+ 'title_single_disp' => true,
4378+ 'format' => 'xml',
4379+ ) ); ?></title>
4380 <link><?php $Blog->disp( 'lastcommentsurl', 'xml' ) ?></link>
4381 <description></description>
4382 <language><?php $Blog->disp( 'locale', 'xml' ) ?></language>
4383
4384=== modified file 'templates/_rss/index.main.php'
4385--- templates/_rss/index.main.php 2010-01-08 10:32:06 +0000
4386+++ templates/_rss/index.main.php 2010-01-17 09:47:17 +0000
4387@@ -26,24 +26,20 @@
4388 header_content_type( 'application/xml' ); // Sets charset!
4389
4390 echo '<?xml version="1.0" encoding="'.$io_charset.'"?'.'>';
4391-
4392 ?>
4393-<!-- generator="<?php echo $app_name; ?>/<?php echo $app_version ?>" -->
4394 <rss version="0.92">
4395 <channel>
4396 <title><?php
4397 $Blog->disp( 'name', 'xml' );
4398- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
4399+ // title for the current request
4400 request_title( array(
4401- 'title_before'=> ' - ',
4402- 'title_after' => '',
4403- 'title_none' => '',
4404- 'glue' => ' - ',
4405- 'title_single_disp' => true,
4406- 'format' => 'xml',
4407- ) );
4408- // ------------------------------ END OF REQUEST TITLE -----------------------------
4409- ?></title>
4410+ 'title_before'=> ' - ',
4411+ 'title_after' => '',
4412+ 'title_none' => '',
4413+ 'glue' => ' - ',
4414+ 'title_single_disp' => true,
4415+ 'format' => 'xml',
4416+ ) ); ?></title>
4417 <link><?php $Blog->disp( 'url', 'xml' ) ?></link>
4418 <description><?php $Blog->disp( 'shortdesc' ,'xml' ) ?></description>
4419 <language><?php $Blog->disp( 'locale', 'xml' ) ?></language>
4420@@ -89,7 +85,7 @@
4421 'before' => '<p>',
4422 'after' => '</p>',
4423 'format' => 'entityencoded',
4424- 'podcast' => false,
4425+ 'podcast' => false,
4426 ) );
4427
4428 // Display images that are linked to this post:
4429@@ -109,8 +105,8 @@
4430 { // Teasers only
4431 $content .= $Item->get_more_link( array(
4432 'before' => '',
4433- 'after' => '',
4434- 'disppage' => 1,
4435+ 'after' => '',
4436+ 'disppage' => 1,
4437 'format' => 'entityencoded',
4438 ) );
4439 }
4440
4441=== modified file 'templates/_rss2/comments.main.php'
4442--- templates/_rss2/comments.main.php 2010-01-08 10:32:06 +0000
4443+++ templates/_rss2/comments.main.php 2010-01-17 09:47:17 +0000
4444@@ -26,23 +26,20 @@
4445 header_content_type( 'application/xml' ); // Sets charset!
4446
4447 echo '<?xml version="1.0" encoding="'.$io_charset.'"?'.'>';
4448-
4449 ?>
4450-<!-- generator="<?php echo $app_name ?>/<?php echo $app_version ?>" -->
4451 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:admin="http://webns.net/mvcb/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom">
4452 <channel>
4453 <title><?php
4454 $Blog->disp( 'name', 'xml' );
4455- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
4456+ // title for the current request
4457 request_title( array(
4458- 'title_before'=> ' - ',
4459- 'title_after' => '',
4460- 'title_none' => '',
4461- 'glue' => ' - ',
4462- 'title_single_disp' => true,
4463- 'format' => 'xml',
4464- ) );
4465- ?></title>
4466+ 'title_before'=> ' - ',
4467+ 'title_after' => '',
4468+ 'title_none' => '',
4469+ 'glue' => ' - ',
4470+ 'title_single_disp' => true,
4471+ 'format' => 'xml',
4472+ ) ); ?></title>
4473 <link><?php $Blog->disp( 'lastcommentsurl', 'xml' ) ?></link>
4474 <atom:link rel="self" type="application/rss+xml" href="<?php echo $selfurl; ?>" />
4475 <description></description>
4476
4477=== modified file 'templates/_rss2/index.main.php'
4478--- templates/_rss2/index.main.php 2010-01-08 10:32:06 +0000
4479+++ templates/_rss2/index.main.php 2010-01-17 09:47:17 +0000
4480@@ -35,24 +35,20 @@
4481 header_content_type( 'application/xml' ); // Sets charset!
4482
4483 echo '<?xml version="1.0" encoding="'.$io_charset.'"?'.'>';
4484-
4485 ?>
4486-<!-- generator="<?php echo $app_name ?>/<?php echo $app_version ?>" -->
4487 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:admin="http://webns.net/mvcb/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:atom="http://www.w3.org/2005/Atom">
4488 <channel>
4489 <title><?php
4490 $Blog->disp( 'name', 'xml' );
4491- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
4492+ // title for the current request
4493 request_title( array(
4494- 'title_before'=> ' - ',
4495- 'title_after' => '',
4496- 'title_none' => '',
4497- 'glue' => ' - ',
4498- 'title_single_disp' => true,
4499- 'format' => 'xml',
4500- ) );
4501- // ------------------------------ END OF REQUEST TITLE -----------------------------
4502- ?></title>
4503+ 'title_before'=> ' - ',
4504+ 'title_after' => '',
4505+ 'title_none' => '',
4506+ 'glue' => ' - ',
4507+ 'title_single_disp' => true,
4508+ 'format' => 'xml',
4509+ ) ); ?></title>
4510 <link><?php $Blog->disp( 'url', 'xml' ) ?></link>
4511 <atom:link rel="self" type="application/rss+xml" href="<?php $Blog->disp( 'rss2_url', 'xmlattr' ); ?>" />
4512 <description><?php $Blog->disp( 'shortdesc', 'xml' ) ?></description>
4513@@ -73,9 +69,9 @@
4514 <?php
4515 $Item->issue_date( array(
4516 'before' => '<pubDate>',
4517- 'after' => '</pubDate>',
4518+ 'after' => '</pubDate>',
4519 'date_format' => 'r',
4520- 'use_GMT' => true,
4521+ 'use_GMT' => true,
4522 ) );
4523 ?>
4524 <dc:creator><?php $Item->get_creator_User(); $Item->creator_User->preferred_name('xml') ?></dc:creator>
4525@@ -86,14 +82,14 @@
4526 'include_main' => true,
4527 'include_other' => true,
4528 'include_external'=> true,
4529- 'before_main' => '<category domain="main">',
4530+ 'before_main' => '<category domain="main">',
4531 'after_main' => '</category>',
4532 'before_other' => '<category domain="alt">',
4533- 'after_other' => '</category>',
4534+ 'after_other' => '</category>',
4535 'before_external' => '<category domain="external">',
4536- 'after_external' => '</category>',
4537+ 'after_external' => '</category>',
4538 'link_categories' => false,
4539- 'separator' => "\n",
4540+ 'separator' => "\n",
4541 'format' => 'htmlbody',
4542 /**
4543 * @todo (legacy): "xml" eats away the tags!!
4544@@ -162,7 +158,7 @@
4545 'before' => '<p>',
4546 'after' => '</p>',
4547 'format' => 'entityencoded',
4548- 'podcast' => false,
4549+ 'podcast' => false,
4550 ) );
4551
4552 // Display images that are linked to this post:
4553@@ -182,8 +178,8 @@
4554 { // Teasers only
4555 $content .= $Item->get_more_link( array(
4556 'before' => '',
4557- 'after' => '',
4558- 'disppage' => 1,
4559+ 'after' => '',
4560+ 'disppage' => 1,
4561 'format' => 'entityencoded',
4562 ) );
4563 }
4564@@ -210,7 +206,7 @@
4565 $Item->url_link( array(
4566 'before' => '<p>',
4567 'after' => '</p>',
4568- 'podcast' => false,
4569+ 'podcast' => false,
4570 ) );
4571
4572 // Display images that are linked to this post:
4573@@ -230,8 +226,8 @@
4574 { // Teasers only
4575 $content .= $Item->get_more_link( array(
4576 'before' => '',
4577- 'after' => '',
4578- 'disppage' => 1,
4579+ 'after' => '',
4580+ 'disppage' => 1,
4581 ) );
4582 }
4583 else
4584
4585=== modified file 'templates/_toolbar.inc.php'
4586--- templates/_toolbar.inc.php 2010-01-08 10:32:06 +0000
4587+++ templates/_toolbar.inc.php 2010-01-17 09:47:17 +0000
4588@@ -20,23 +20,19 @@
4589 }
4590
4591 global $Blog;
4592-
4593 global $Settings;
4594-
4595 global $is_admin_page, $localtimenow, $disp_detail;
4596
4597 /**
4598 * @var User
4599 */
4600 global $current_User;
4601-
4602 global $home_url, $admin_url, $debug, $seo_page_type, $robots_index;
4603
4604 /**
4605 * @var Hit
4606 */
4607 global $Hit;
4608-
4609 global $Plugins;
4610
4611 load_class( '_core/ui/_menu.class.php' );
4612@@ -53,36 +49,35 @@
4613 global $topright_Menu;
4614 $topright_Menu = new Menu();
4615
4616-
4617 // Let the modules construct the menu:
4618 modules_call_method( 'build_evobar_menu' );
4619
4620 // Call AdminAfterToolbarInit to notify Plugins that the toolbar menus are initialized. Plugins can add entries.
4621 $Plugins->trigger_event( 'AdminAfterEvobarInit' );
4622-
4623 ?>
4624
4625 <div id="evo_toolbar" class="evo_toolbar_<?php echo $Hit->get_agent_name(); ?>">
4626- <div class="actions_right">
4627- <?php
4628- // Display evobar menu:
4629- echo $topright_Menu->get_html_menu( NULL, 'sf-menu-right' );
4630- ?>
4631- </div>
4632- <div class="actions_left">
4633- <?php
4634- if( $is_admin_page || $current_User->check_perm( 'admin', 'visible' ) )
4635- { // We are already in admin or we have permission to view admin options:
4636- // Display evobar menu:
4637- echo $topleft_Menu->get_html_menu( NULL, 'sf-menu-left' );
4638-
4639- if( $debug )
4640- {
4641- echo '<div style="position:absolute;left:80ex;top:2px;color:#999">'.$disp_detail.'</div>';
4642- }
4643- }
4644- ?>
4645- </ul>
4646+
4647+<div class="actions_right">
4648+<?php
4649+// Display evobar menu:
4650+echo $topright_Menu->get_html_menu( NULL, 'sf-menu-right' );
4651+?>
4652+</div>
4653+
4654+<div class="actions_left">
4655+<?php
4656+if( $is_admin_page || $current_User->check_perm( 'admin', 'visible' ) )
4657+{ // We are already in admin or we have permission to view admin options:
4658+ // Display evobar menu:
4659+ echo $topleft_Menu->get_html_menu( NULL, 'sf-menu-left' );
4660+ if( $debug )
4661+ {
4662+ echo '<div style="position:absolute;left:80ex;top:2px;color:#999">'.$disp_detail.'</div>';
4663+ }
4664+}
4665+?>
4666+</ul>
4667 </div>
4668
4669 </div>
4670
4671=== modified file 'templates/_wp_compatibility.inc.php'
4672--- templates/_wp_compatibility.inc.php 2010-01-08 10:32:06 +0000
4673+++ templates/_wp_compatibility.inc.php 2010-01-17 09:47:17 +0000
4674@@ -11,8 +11,6 @@
4675 * we going to get rid of the stupid "UNSUPPORTED" attitude problem? I mean
4676 * if we write it don't we 'support' it as much as the rest of our code?
4677 *
4678- * @todo EdB: tutorial sample for template_widget()is probably not complete
4679- *
4680 * @package templates
4681 */
4682 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
4683@@ -48,7 +46,6 @@
4684 // display the Category List widget
4685 template_widget( array(
4686 'widget' => 'coll_category_list',
4687- // block-level params...
4688 'block_start' => '<div class="bSideItem">',
4689 'block_end' => '</div>',
4690 'block_title_start' => '<h3 class="sideItemTitle">',
4691@@ -65,12 +62,10 @@
4692 template_widget( array(
4693 'widget' => 'coll_tag_cloud',
4694 'title' => T_( 'Tag Cloud' ).':',
4695- // block-level params...
4696 'block_start' => '<div class="tag_cloud">',
4697 'block_end' => '</div>',
4698 'block_title_start' => '<h3 class="sideItemTitle">',
4699 'block_title_end' => '</h3>',
4700- // widget-specific params...
4701 'max_tags' => 100,
4702 'min_size' => 8,
4703 'max_size' => 22,
4704@@ -150,9 +145,10 @@
4705 function the_time( $format = '#' )
4706 {
4707 global $Item;
4708+ // display formatted issue time (datetime) of Item
4709 $Item->issue_time( array(
4710- 'time_format' => $format,
4711- ) );
4712+ 'time_format' => $format,
4713+ ) );
4714 }
4715
4716
4717@@ -172,18 +168,16 @@
4718 function comments_popup_link( $zero = '#', $one = '#', $more = '#' )
4719 {
4720 global $Item;
4721+ // display link to, and count of, comments and trackbacks
4722 $Item->feedback_link( array(
4723- 'type' => 'feedbacks',
4724- 'status' => 'published',
4725- 'link_before' => '',
4726- 'link_after' => '',
4727- 'link_text_zero' => $zero,
4728- 'link_text_one' => $one,
4729- 'link_text_more' => str_replace( '%', '%d', $more ),
4730- 'link_title' => '#',
4731- 'use_popup' => false,
4732- 'url' => '#',
4733- ) );
4734+ 'type' => 'feedbacks',
4735+ 'status' => 'published',
4736+ 'link_before' => '',
4737+ 'link_after' => '',
4738+ 'link_text_zero' => $zero,
4739+ 'link_text_one' => $one,
4740+ 'link_text_more' => str_replace( '%', '%d', $more ),
4741+ ) );
4742 }
4743
4744
4745@@ -203,19 +197,20 @@
4746 function the_category( $separator )
4747 {
4748 global $Item;
4749+ // list by name and link all cats, sub-cats, ext-cats
4750 $Item->categories( array(
4751 'before' => ' ',
4752 'after' => ' ',
4753 'include_main' => true,
4754 'include_other' => true,
4755 'include_external'=> true,
4756- 'before_main' => '', // string fo display before the MAIN category,
4757- 'after_main' => '', // string fo display after the MAIN category
4758- 'before_other' => '', // string fo display before OTHER categories
4759- 'after_other' => '', // string fo display after OTHER categories
4760- 'before_external' => '<em>', // string fo display before EXTERNAL categories
4761- 'after_external' => '</em>', // string fo display after EXTERNAL categories,
4762- 'separator' => $separator,
4763+ 'before_main' => '', // string to display before the MAIN category,
4764+ 'after_main' => '', // string to display after the MAIN category
4765+ 'before_other' => '', // string to display before OTHER categories
4766+ 'after_other' => '', // string to display after OTHER categories
4767+ 'before_external' => '<em>', // string to display before EXTERNAL categories
4768+ 'after_external' => '</em>', // string to display after EXTERNAL categories,
4769+ 'separator' => $separator,
4770 'link_categories' => true,
4771 'link_title' => '#',
4772 'format' => 'htmlbody',
4773@@ -244,7 +239,8 @@
4774 function edit_post_link()
4775 {
4776 global $Item;
4777- $Item->edit_link();
4778+ // link to edit an item if user has permission
4779+ $Item->edit_link( array();
4780 }
4781
4782
4783
4784=== modified file 'templates/asevo/_body_footer.inc.php'
4785--- templates/asevo/_body_footer.inc.php 2010-01-08 10:32:06 +0000
4786+++ templates/asevo/_body_footer.inc.php 2010-01-17 09:47:17 +0000
4787@@ -10,14 +10,13 @@
4788 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
4789 ?>
4790
4791-<!-- =================================== START OF FOOTER =================================== -->
4792 <div class="foot_zone">
4793 <div class="inner_wrapper">
4794 <?php
4795 // Display footer text (text can be edited in Blog Settings):
4796 $Blog->footer_text( array(
4797 'before' => '<p class="baseline">',
4798- 'after' => '</p>',
4799+ 'after' => '</p>',
4800 ) );
4801 ?>
4802
4803@@ -26,9 +25,9 @@
4804 // Display a link to contact the owner of this blog (if owner accepts messages):
4805 $Blog->contact_link( array(
4806 'before' => '',
4807- 'after' => ' | ',
4808+ 'after' => ' | ',
4809 'text' => T_('Contact'),
4810- 'title' => T_('Send a message to the owner of this blog...'),
4811+ 'title' => T_('Send a message to the owner of this blog...'),
4812 ) );
4813 ?>
4814
4815
4816=== modified file 'templates/asevo/_item_block.inc.php'
4817--- templates/asevo/_item_block.inc.php 2010-01-08 10:32:06 +0000
4818+++ templates/asevo/_item_block.inc.php 2010-01-17 09:47:17 +0000
4819@@ -19,60 +19,63 @@
4820
4821 // Default params:
4822 $params = array_merge( array(
4823- 'feature_block' => false,
4824- 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail
4825+ 'feature_block' => false,
4826+ 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail
4827 'item_class' => 'evo_post',
4828- 'image_size' => 'fit-400x320',
4829+ 'image_size' => 'fit-400x320',
4830 ), $params );
4831+
4832+// temporarily switch to post locale
4833+$Item->locale_temp_switch();
4834 ?>
4835
4836 <div id="<?php $Item->anchor_id(); ?>" class="<?php $Item->div_classes( $params ) ?>" lang="<?php $Item->lang(); ?>">
4837 <?php
4838- $Item->locale_temp_switch(); // Temporarily switch to post locale (useful for multilingual blogs)
4839- ?>
4840-
4841- <?php
4842- $Item->edit_link( array( // Link to backoffice for editing
4843- 'before' => ' ',
4844- 'after' => ' ',
4845- 'class' => 'floatright small'
4846- ) );
4847- ?>
4848-
4849- <h1 class="evo_post_title"><?php $Item->title(); ?></h1>
4850-
4851- <div class="evo_post_head">
4852- <?php
4853+// link to edit an item if user has permission
4854+$Item->edit_link( array(
4855+ 'before' => ' ',
4856+ 'after' => ' ',
4857+ 'class' => 'floatright small'
4858+) );
4859+?>
4860+<h1 class="evo_post_title"><?php $Item->title(); ?></h1>
4861+
4862+<div class="evo_post_head">
4863+<?php
4864 $Item->permanent_link( array(
4865 'text' => '#icon#',
4866 ) );
4867
4868- $Item->issue_date( array(
4869- 'before' => ' ',
4870- 'after' => ' ',
4871- 'date_format' => '#',
4872- ) );
4873-
4874- $Item->issue_time( array(
4875- 'after' => '',
4876- 'time_format' => 'H:i',
4877- ) );
4878-
4879- $Item->author( array(
4880- 'before' => ', '.T_('by').' ',
4881- 'after' => '',
4882- ) );
4883-
4884- $Item->categories( array(
4885- 'before' => ', '.T_('Categories').': ',
4886- 'after' => ' ',
4887- 'include_main' => true,
4888- 'include_other' => true,
4889- 'include_external'=> true,
4890- 'link_categories' => true,
4891- ) );
4892-
4893- // List all tags attached to this post:
4894+// display formatted issue date (datetime) of Item
4895+$Item->issue_date( array(
4896+ 'before' => ' ',
4897+ 'after' => ' ',
4898+ 'date_format' => '#',
4899+) );
4900+
4901+// display formatted issue time (datetime) of Item
4902+$Item->issue_time( array(
4903+ 'after' => '',
4904+ 'time_format' => 'H:i',
4905+) );
4906+
4907+// display author/creator of item
4908+$Item->author( array(
4909+ 'before' => ', '.T_('by').' ',
4910+ 'after' => '',
4911+) );
4912+
4913+// list by name and link all cats, sub-cats, ext-cats
4914+$Item->categories( array(
4915+ 'before' => ', '.T_('Categories').': ',
4916+ 'after' => ' ',
4917+ 'include_main' => true,
4918+ 'include_other' => true,
4919+ 'include_external'=> true,
4920+ 'link_categories' => true,
4921+) );
4922+
4923+// List all tags attached to this post:
4924 $Item->tags( array(
4925 'before' => ', '.T_('Tags').': ',
4926 'after' => ' ',
4927@@ -89,30 +92,19 @@
4928
4929 <div class="evo_post_foot">
4930 <?php
4931- // Link to comments, trackbacks, etc.:
4932- $Item->feedback_link( array(
4933- 'type' => 'comments',
4934- 'link_before' => '',
4935- 'link_after' => '',
4936- 'link_text_zero' => '#',
4937- 'link_text_one' => '#',
4938- 'link_text_more' => '#',
4939- 'link_title' => '#',
4940- 'use_popup' => false,
4941- ) );
4942- ?>
4943- <?php
4944- // Link to comments, trackbacks, etc.:
4945- $Item->feedback_link( array(
4946- 'type' => 'trackbacks',
4947- 'link_before' => ' &bull; ',
4948- 'link_after' => '',
4949- 'link_text_zero' => '#',
4950- 'link_text_one' => '#',
4951- 'link_text_more' => '#',
4952- 'link_title' => '#',
4953- 'use_popup' => false,
4954- ) );
4955+// display link to, and count of, comments only
4956+$Item->feedback_link( array(
4957+ 'type' => 'comments',
4958+ 'link_before' => '',
4959+ 'link_after' => '',
4960+) );
4961+
4962+// display link to, and count of, trackbacks only
4963+$Item->feedback_link( array(
4964+ 'type' => 'trackbacks',
4965+ 'link_before' => ' &bull; ',
4966+ 'link_after' => '',
4967+) );
4968 ?>
4969 </div>
4970
4971
4972=== modified file 'templates/asevo/index.main.php'
4973--- templates/asevo/index.main.php 2010-01-08 10:32:06 +0000
4974+++ templates/asevo/index.main.php 2010-01-17 09:47:17 +0000
4975@@ -1,17 +1,25 @@
4976 <?php
4977 /**
4978- * This is the main/default page template.
4979- *
4980- * It is used to display the blog when no specific page template is available to handle the request.
4981- *
4982+ * default $disp.main.php for the "Asevo" template.
4983+
4984+Need help doing something with this file?
4985+http://docs.quamplures.net/li_templates.html - see the left side navigation...
4986+http://docs.quamplures.net/templates/tutorial_mains.pkg.html
4987+http://docs.quamplures.net/templates/tutorial_template_container.pkg.html
4988+
4989+ * This file is used to display the content when no $disp-matching .main.php file exists.
4990+ *
4991+ * @tutorial files_mains.pkg
4992+ * @tutorial template_container.pkg
4993+ *
4994+ * @copyright {@link http://quamplures.net/team.html The Quam Plures Team, 2010}
4995+ * @license http://quamplures.net/license.html Our License
4996 * @package templates
4997 * @subpackage asevo
4998 */
4999 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
5000
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches