webbinder-commits Mailing List for Web Binder
Brought to you by:
jasondiceman,
sylvieg
Menu
▾
▴
webbinder-commits — Temporary cvs list until the cvs list is archived
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(39) |
Sep
(333) |
Oct
(57) |
Nov
(17) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(1) |
Feb
(4) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(3) |
Jul
(9) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sylvie G. <sgr...@gm...> - 2009-06-08 17:37:54
|
envoi avec sgr...@gm... |
|
From: Sylvie G. <sy...@us...> - 2006-09-05 14:09:13
|
Update of /cvsroot/webbinder/root In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1880 Modified Files: jhot.php Log Message: security Index: jhot.php =================================================================== RCS file: /cvsroot/webbinder/root/jhot.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** jhot.php 18 Aug 2005 13:35:15 -0000 1.1.1.1 --- jhot.php 5 Sep 2006 14:09:10 -0000 1.2 *************** *** 12,15 **** --- 12,18 ---- include_once ('lib/drawings/drawlib.php'); + if (($tiki_p_admin_drawings != 'y') && ($tiki_p_edit_drawings != 'y') && ($feature_drawings != 'y')) { + die; + } if (isset($_FILES['filepath']) && is_uploaded_file($_FILES['filepath']['tmp_name'])) { $size = $_FILES['filepath']['size']; *************** *** 31,40 **** $now = date("U"); ! if (strstr($name, '.gif')) { $hash = $absolute_name . md5(uniqid('.')). '.gif'; ! } ! ! if (strstr($name, '.pad_xml')) { $hash = $absolute_name . md5(uniqid('.')). '.pad_xml'; } --- 34,43 ---- $now = date("U"); ! if (substr($name,-4,4) == '.gif') { $hash = $absolute_name . md5(uniqid('.')). '.gif'; ! } elseif (substr($name,-8,8) == '.pad_xml') { $hash = $absolute_name . md5(uniqid('.')). '.pad_xml'; + } else { + die(); } |
|
From: Sylvie G. <sy...@us...> - 2006-08-31 10:58:32
|
Update of /cvsroot/webbinder/root/doc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4595/doc Added Files: diff_templates.txt Log Message: list of templates change since first copy --- NEW FILE: diff_templates.txt --- /attachments.tpl/1.2/Tue Aug 23 02:58:57 2005// /categobjects.tpl/1.3/Fri Sep 23 21:48:37 2005// /categorize.tpl/1.2/Tue Aug 23 02:58:57 2005// /categpath.tpl/1.2/Wed Oct 12 04:53:57 2005// /comment.tpl/1.3/Wed Oct 12 04:50:43 2005// /comments.tpl/1.4/Thu Oct 13 05:56:49 2005// /error.tpl/1.3/Thu Sep 29 14:27:34 2005// /footer.tpl/1.2/Wed Aug 24 16:23:42 2005// /header.tpl/1.5/Fri Oct 14 03:30:20 2005// /messu-compose.tpl/1.2/Thu Sep 1 10:52:10 2005// /tiki-admin-include-features.tpl/1.3/Thu Sep 29 16:10:31 2005// /tiki-admin-include-search.tpl/1.3/Mon Nov 14 22:26:33 2005// /tiki-admin-include-wiki.tpl/1.4/Fri Sep 23 17:48:13 2005// /tiki-admin_menu_options.tpl/1.2/Thu Oct 13 05:56:49 2005// /tiki-admin_menus.tpl/1.2/Thu Oct 13 05:56:49 2005// /tiki-adminusers.tpl/1.2/Tue Oct 4 10:32:35 2005// /tiki-bot_bar.tpl/1.5/Thu Oct 13 05:56:49 2005// /tiki-browse_categories.tpl/1.5/Tue Jul 18 01:17:15 2006// /tiki-edit_article.tpl/1.2/Wed Oct 26 08:43:17 2005// /tiki-edit_help.tpl/1.2/Tue Aug 23 02:58:57 2005// /tiki-editpage.tpl/1.5/Wed Sep 28 18:04:46 2005// /tiki-list_comments.tpl/1.4/Thu Oct 13 16:12:56 2005// /tiki-listpages.tpl/1.3/Wed Oct 12 16:42:17 2005// /tiki-my_tiki.tpl/1.3/Fri Sep 2 17:37:54 2005// /tiki-preview.tpl/1.2/Tue Aug 23 02:58:57 2005// /tiki-show_page.tpl/1.8/Wed Oct 12 04:53:57 2005// /tiki-top_bar.tpl/1.5/Fri Oct 14 04:01:19 2005// /tiki-user_menu.tpl/1.3/Fri Oct 21 21:21:23 2005// /tiki-view_tracker.tpl/1.2/Thu Sep 1 10:39:30 2005// /tiki-view_tracker_item.tpl/1.2/Thu Sep 1 10:39:30 2005// /tiki.tpl/1.2/Tue Aug 23 02:58:57 2005// /translated-lang.tpl/1.2/Tue Aug 23 02:58:57 2005// /browsedcategory.tpl/1.3/Tue Jul 18 16:26:12 2006// /mod-admin_shortcuts.tpl/1.3/Thu Oct 13 05:56:49 2005// /mod-categories.tpl/1.2/Thu Oct 13 05:56:49 2005// /mod-last_modif_pages.tpl/1.2/Wed Oct 12 03:54:26 2005// /mod-login_box.tpl/1.3/Wed Oct 12 03:54:26 2005// /mod-most_commented.tpl/1.2/Wed Oct 12 03:54:26 2005// /mod-search_wiki_page_new.tpl/1.2/Wed Oct 26 09:23:37 2005// /mod-top_commenters.tpl/1.1/Tue Aug 23 02:25:28 2005// /mod-top_edited_pages.tpl/1.2/Wed Oct 12 03:54:26 2005// /mod-top_page_editors.tpl/1.2/Wed Oct 12 03:54:26 2005// /mod-top_voted_comments.tpl/1.1/Tue Aug 23 02:25:28 2005// /mod-wiki_last_comments.tpl/1.4/Wed Oct 12 04:47:41 2005// D |
|
From: Jason D. <jas...@us...> - 2006-08-01 17:26:56
|
Update of /cvsroot/webbinder/root/styles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9347/styles Modified Files: webbinder.css Log Message: browse categories search form is back Index: webbinder.css =================================================================== RCS file: /cvsroot/webbinder/root/styles/webbinder.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** webbinder.css 26 Oct 2005 09:01:33 -0000 1.3 --- webbinder.css 1 Aug 2006 17:26:52 -0000 1.4 *************** *** 407,413 **** /* ! * admin interfaces */ /* content boxes */ .cbox-title { --- 407,418 ---- /* ! ****** admin interfaces **** */ + .rbox { + margin: 5px; + border: 1px solid red; + } + /* content boxes */ .cbox-title { *************** *** 425,436 **** padding:4px; } ! .catitemcount { /*custom for webbinder0604 set in tiki-browse_categories.php */ font-size: 0.8em; color: #666666; } /* ! * wiki pages */ --- 430,495 ---- padding:4px; } ! ! /*custom for webbinder set in tiki-browse_categories.php */ ! .catitemcount { font-size: 0.8em; color: #666666; } + .catsearch { + text-align:right; + } + + /* tiki tabs */ + .tabs { + padding : 1px 5px; + } + .tabmark { + display : inline; + font-size : 10px; + background-color : #DDDDDD; + border : 1px solid #666666; + margin : 0px; + margin-right : 5px; + padding: 2px 0; + border-radius : 5px 5px 0 0; + -moz-border-radius : 5px 5px 0 0; + -khtml-border-radius : 5px 5px 0 0; + } + .tabmark a { + border-radius : 5px 5px 0 0; + -moz-border-radius : 5px 5px 0 0; + -khtml-border-radius : 5px 5px 0 0; + border-bottom : 0; + color : #666666; + font-weight : bold; + padding : 1px 5px; + } + .tabmark a:active { + background-color : white; + color : red; + } + .tabmark a:hover { + color : black; + background-color : #CCCCCC; + } + .tabcontent { + z-index : 200; + position : relative; + border : 1px solid #999999; + padding: 6px 2px 2px 2px; + margin: 5px; + margin-top : 0; + background-color : #EEEEEE; + border-radius : 0px 4px 4px 4px; + -moz-border-radius : 0px 4px 4px 4px; + -khtml-border-radius : 0px 4px 4px 4px; + } + + + /* ! ****** wiki pages **** */ *************** *** 490,493 **** --- 549,553 ---- border:1px solid #999999; padding:5px; + vertical-align:top; } |
|
From: Jason D. <jas...@us...> - 2006-08-01 17:26:56
|
Update of /cvsroot/webbinder/root/templates In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9347/templates Modified Files: tiki-browse_categories.tpl Log Message: browse categories search form is back Index: tiki-browse_categories.tpl =================================================================== RCS file: /cvsroot/webbinder/root/templates/tiki-browse_categories.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tiki-browse_categories.tpl 18 Jul 2006 01:17:15 -0000 1.5 --- tiki-browse_categories.tpl 1 Aug 2006 17:26:52 -0000 1.6 *************** *** 1,7 **** {* $Header$ *} ! <h1>{tr}Categories{/tr}</h1> ! <!-- Selected category --> <div class="category_page_title"> --- 1,28 ---- {* $Header$ *} ! ! ! <table width="99%" border="0"> ! <tr> ! <td><h1>{tr}Categories{/tr}</h1></td> ! <td class="catsearch"> ! <!-- category title search form --> ! <form method="post" action="tiki-browse_categories.php"> ! <input type="submit" value="{tr}Search{/tr}" name="search" /> ! <input type="checkbox" name="deep" checked="checked" class="hidden"/> ! <input type="text" name="find" value="{$find|escape}" size="30" /><br> ! {if !$p_info.name}{tr}titles in all categories{/tr}{else}{tr}titles in category{/tr}: <i>{$p_info.name}</i>{/if} ! <input type="hidden" name="parentId" value="{$parentId|escape}" /> ! <input type="hidden" name="type" value="{$type|escape}" /> ! <input type="hidden" name="sort_mode" value="{$sort_mode|escape}" /> ! </form> ! <!-- category title search form END --> ! </td> ! </tr> ! </table> ! ! ! <!-- Selected category --> <div class="category_page_title"> |
|
From: Sylvie G. <sy...@us...> - 2006-07-18 18:16:30
|
Update of /cvsroot/webbinder/root In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21063 Modified Files: tiki-browse_categories.php Log Message: to have the menu extended Index: tiki-browse_categories.php =================================================================== RCS file: /cvsroot/webbinder/root/tiki-browse_categories.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tiki-browse_categories.php 6 Jul 2006 15:59:58 -0000 1.6 --- tiki-browse_categories.php 18 Jul 2006 18:16:26 -0000 1.7 *************** *** 103,106 **** --- 103,107 ---- if ($type) $urlEnd .= "&type=$type"; + $urlEnd .= "||||1";// to have the menu expanded $urlEnd .= "\n"; list($itall, $count) = $tikiphplayers->mkCatEntry(0, ".", '', $ctall, $urlEnd, 'browsedcategory.tpl'); |
|
From: Sylvie G. <sy...@us...> - 2006-07-18 16:32:25
|
Update of /cvsroot/webbinder/root/templates In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14823/templates Modified Files: browsedcategory.tpl Log Message: translate categories names Index: browsedcategory.tpl =================================================================== RCS file: /cvsroot/webbinder/root/templates/browsedcategory.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** browsedcategory.tpl 23 Sep 2005 21:48:37 -0000 1.2 --- browsedcategory.tpl 18 Jul 2006 16:32:21 -0000 1.3 *************** *** 1 **** ! <strong>{$categoryName}</strong> <small>({$categoryLocal}/{$categoryTotal})</small>{* $categoryName, $categoryLocal, $categoryTotal - cerefull don't put space or | in the text*} \ No newline at end of file --- 1 ---- ! <strong>{tr}{$categoryName}{/tr}</strong> <small>({$categoryLocal}/{$categoryTotal})</small>{* $categoryName, $categoryLocal, $categoryTotal - cerefull don't put space or | in the text*} \ No newline at end of file |
|
From: Sylvie G. <sy...@us...> - 2006-07-18 16:32:25
|
Update of /cvsroot/webbinder/root/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14823/modules Modified Files: mod-categories.php Log Message: translate categories names Index: mod-categories.php =================================================================== RCS file: /cvsroot/webbinder/root/modules/mod-categories.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mod-categories.php 24 Aug 2005 22:22:08 -0000 1.3 --- mod-categories.php 18 Jul 2006 16:32:21 -0000 1.4 *************** *** 67,71 **** "id" => $cat["categId"], "parent" => $cat["parentId"], ! "data" => '<a class="catname" href="tiki-browse_categories.php?parentId=' . $cat["categId"] .$urlEnd.'">' . $cat["name"] . '</a><br />' ); } --- 67,71 ---- "id" => $cat["categId"], "parent" => $cat["parentId"], ! "data" => '<a class="catname" href="tiki-browse_categories.php?parentId=' . $cat["categId"] .$urlEnd.'">' . tra($cat["name"]) . '</a><br />' ); } |
|
From: Sylvie G. <sy...@us...> - 2006-07-18 16:32:25
|
Update of /cvsroot/webbinder/root/lib/phplayers_tiki In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14823/lib/phplayers_tiki Modified Files: tiki-phplayers.php Log Message: translate categories names Index: tiki-phplayers.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/phplayers_tiki/tiki-phplayers.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tiki-phplayers.php 1 Sep 2005 21:53:52 -0000 1.3 --- tiki-phplayers.php 18 Jul 2006 16:32:21 -0000 1.4 *************** *** 23,27 **** $back .= $smarty->fetchLang($language, $tpl); } else ! $back .= $k['name']; $back .= '|tiki-browse_categories.php?parentId='.$k['categId'].$urlEnd; $back .= $subTree; --- 23,27 ---- $back .= $smarty->fetchLang($language, $tpl); } else ! $back .= tra($k['name']); $back .= '|tiki-browse_categories.php?parentId='.$k['categId'].$urlEnd; $back .= $subTree; |
|
From: Jason D. <jas...@us...> - 2006-07-18 01:17:19
|
Update of /cvsroot/webbinder/root/templates In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3788/templates Modified Files: tiki-browse_categories.tpl Log Message: removed category search and add tree Index: tiki-browse_categories.tpl =================================================================== RCS file: /cvsroot/webbinder/root/templates/tiki-browse_categories.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tiki-browse_categories.tpl 14 Jun 2006 21:08:19 -0000 1.4 --- tiki-browse_categories.tpl 18 Jul 2006 01:17:15 -0000 1.5 *************** *** 1,78 **** {* $Header$ *} ! <table width="99%" border="0" cellpadding="6" cellspacing="0"> ! <tr> ! <td><h1>{tr}Categories{/tr}</h1> ! <!-- {* hide browse in features list ! {tr}Browse in{/tr}:<br /> ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&parentId={$parentId}&sort_mode={$sort_mode}">{tr}All{/tr}</a> ! {if $feature_wiki eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=wiki+page&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'wiki page'}<span class="highlight">{/if}{tr}Wiki pages{/tr}{if $type eq 'wiki page'}</span>{/if}</a> ! {/if} ! {if $feature_galleries eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=image+gallery&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'image gallery'}<span class="highlight">{/if}{tr}Image galleries{/tr}{if $type eq 'image gallery'}</span>{/if}</a> ! {/if} ! {if $feature_galleries eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=image&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'image'}<span class="highlight">{/if}{tr}Images{/tr}{if $type eq image}</span>{/if}</a> ! {/if} ! {if $feature_file_galleries eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=file+gallery&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'file gallery'}<span class="highlight">{/if}{tr}File galleries{/tr}{if $type eq 'file gallery'}</span>{/if}</a> ! {/if} ! {if $feature_blogs eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=blog&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'blog'}<span class="highlight">{/if}{tr}Blogs{/tr}{if $type eq 'blog'}</span>{/if}</a> ! {/if} ! {if $feature_trackers eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=tracker&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'tracker'}<span class="highlight">{/if}{tr}Trackers{/tr}{if $type eq 'tracker'}</span>{/if}</a> ! {/if}<a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=trackerItem&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'trackerItem'}<span class="highlight">{/if}{tr}Trackers Items{/tr}{if $type eq 'trackerItem'}</span>{/if}</a> ! {if $feature_quizzes eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=quiz&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'quiz'}<span class="highlight">{/if}{tr}Quizzes{/tr}{if $type eq 'quiz'}</span>{/if}</a> ! {/if} ! {if $feature_polls eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=poll&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'poll'}<span class="highlight">{/if}{tr}Polls{/tr}{if $type eq 'poll'}</span>{/if}</a> ! {/if} ! {if $feature_surveys eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=survey&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'survey'}<span class="highlight">{/if}{tr}Surveys{/tr}{if $type eq 'survey'}</span>{/if}</a> ! {/if} ! {if $feature_directory eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=directory&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'directory'}<span class="highlight">{/if}{tr}Directory{/tr}{if $type eq 'directory'}</span>{/if}</a> ! {/if} ! {if $feature_faqs eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=faq&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'faq'}<span class="highlight">{/if}{tr}FAQs{/tr}{if $type eq 'faq'}</span>{/if}</a> ! {/if} ! {if $feature_sheet eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=sheet&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'sheet'}<span class="highlight">{/if}{tr}Sheets{/tr}{if $type eq 'sheet'}</span>{/if}</a> ! {/if} ! {if $feature_articles eq 'y'} ! <a class="linkbut" href="tiki-browse_categories.php?find={$find|escape}&deep={$deep}&type=article&parentId={$parentId}&sort_mode={$sort_mode}">{if $type eq 'article'}<span class="highlight">{/if}{tr}Articles{/tr}{if $type eq 'article'}</span>{/if}</a> ! {/if} ! hide browse in features list END *} --></td> ! <td align="right" > ! ! <!-- search form --> ! <form method="post" action="tiki-browse_categories.php"> ! <input type="submit" value="{tr}Search{/tr}" name="search" /> ! <input type="checkbox" name="deep" checked="checked" class="hidden"/> ! <input type="text" name="find" value="{$find|escape}" size="30" /><br> ! {if !$p_info.name}{tr}in all categories{/tr}{else}{tr}in category{/tr}: <i>{$p_info.name}</i>{/if} ! <input type="hidden" name="parentId" value="{$parentId|escape}" /> ! <input type="hidden" name="type" value="{$type|escape}" /> ! <input type="hidden" name="sort_mode" value="{$sort_mode|escape}" /> ! </form> ! <!-- search form END --> ! ! </td> ! </tr> ! </table> ! ! <!-- hide deep switch ! {if $deep eq 'on'} ! <a class="link" href="tiki-browse_categories.php?find={$find|escape}&type={$type|escape}&parentId={$parentId}&sort_mode={$sort_mode}">{tr}Hide subcategories objects{/tr}</a> ! {else} ! <a class="link" href="tiki-browse_categories.php?find={$find|escape}&type={$type|escape}&deep=on&parentId={$parentId}&sort_mode={$sort_mode}">{tr}Show subcategories objects{/tr}</a> ! {/if} ! hide deep switch END --> ! ! ! <!-- Selected category --> --- 1,6 ---- {* $Header$ *} ! <h1>{tr}Categories{/tr}</h1> ! <!-- Selected category --> *************** *** 81,85 **** Top {else} ! {$p_info.name} {if $tiki_p_admin_categories eq 'y'} <a class="linkbut" href="tiki-admin_categories.php?parentId={$parentId}" title="{tr}admin the category system{/tr}"><img src="img/icons/edit.gif" alt="{tr}edit{/tr}" border="0" height="16" width="20"></a> --- 9,13 ---- Top {else} ! {tr}{$p_info.name}{/tr} {if $tiki_p_admin_categories eq 'y'} <a class="linkbut" href="tiki-admin_categories.php?parentId={$parentId}" title="{tr}admin the category system{/tr}"><img src="img/icons/edit.gif" alt="{tr}edit{/tr}" border="0" height="16" width="20"></a> *************** *** 93,97 **** - <div class="category_path"> {if $path} --- 21,24 ---- *************** *** 99,103 **** {section name=x loop=$path} > ! <a class="categpath" href="tiki-browse_categories.php?parentId={$path[x].categId}&deep={$deep}&type={$type|escape}">{$path[x].name}</a> {/section} {elseif $paths} --- 26,30 ---- {section name=x loop=$path} > ! <a class="categpath" href="tiki-browse_categories.php?parentId={$path[x].categId}&deep={$deep}&type={$type|escape}">{tr}{$path[x].name}{/tr}</a> {/section} {elseif $paths} *************** *** 105,109 **** {section name=y loop=$paths[x]} :: ! <a class="categpath" href="tiki-browse_categories.php?parentId={$paths[x][y].categId}&deep={$deep}&type={$type|escape}">{$paths[x][y].name}</a> {/section} <br /> --- 32,36 ---- {section name=y loop=$paths[x]} :: ! <a class="categpath" href="tiki-browse_categories.php?parentId={$paths[x][y].categId}&deep={$deep}&type={$type|escape}">{tr}{$paths[x][y].name}{/tr}</a> {/section} <br /> *************** *** 111,121 **** {/if} </div> ! {* hide .. ! {if $parentId ne '0'} ! <div class="treenode"> ! <a class="catname" href="tiki-browse_categories.php?parentId={$father}&deep={$deep}&type={$type}" title="{tr}Upper level{/tr}">..</a> ! </div> {/if} ! hide .. END *} <noscript> --- 38,50 ---- {/if} </div> ! ! <!-- show tree when at TOP --> ! {if $parentId eq '0'} ! <div class="tree"> ! {$tree} ! </div> {/if} ! <!-- show tree when at TOP END --> ! <noscript> *************** *** 129,133 **** {* hide 3 of items ! {$cantobjects} {tr}items categorized{/tr} <strong>"{if !$p_info.name}Top{else}{$p_info.name}{/if}"</strong> -- hide end *} {if $cantobjects > 0} --- 58,62 ---- {* hide 3 of items ! {$cantobjects} {tr}items categorized{/tr} <strong>"{if !$p_info.name}Top{else}{tr}{$p_info.name}{/tr}{/if}"</strong> -- hide end *} {if $cantobjects > 0} *************** *** 139,143 **** hide type END --> ! <li><strong><a href="{$objects[ix].href}" class="catname">{$objects[ix].name}</a></strong> <small>{$objects[ix].description}</small></li> {/section} --- 68,72 ---- hide type END --> ! <li><strong><a href="{$objects[ix].href}" class="catname">{tr}{$objects[ix].name}{/tr}</a></strong> <small>{$objects[ix].description}</small></li> {/section} |
|
From: Sylvie G. <sy...@us...> - 2006-07-06 17:14:10
|
Update of /cvsroot/webbinder/root In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20899 Modified Files: .htaccess Log Message: category/2+5 Index: .htaccess =================================================================== RCS file: /cvsroot/webbinder/root/.htaccess,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** .htaccess 6 Jul 2006 16:23:20 -0000 1.9 --- .htaccess 6 Jul 2006 17:14:02 -0000 1.10 *************** *** 75,80 **** RewriteRule ^survey/([0-9]+) tiki-take_survey.php?surveyId=$1 [QSA,L] RewriteRule ^tracker/([0-9]+) tiki-view_tracker.php?trackerId=$1 [QSA,L] ! RewriteRule ^category/([0-9]+)+([0-9]+)+([0-9]+) tiki-browse_categories.php?parentId[]=$1&parentId[]=$2parentId[]=$3&and=y [QSA,L] ! RewriteRule ^category/([0-9]+)+([0-9]+) tiki-browse_categories.php?parentId[]=$1&parentId[]=$2&and=y [QSA,L] RewriteRule ^category/([0-9]+) tiki-browse_categories.php?parentId=$1 [QSA,L] #RewriteRule ^wiki/([-_\+A-Za-z0-9]+) tiki-index.php?page=$1 [QSA,L] --- 75,80 ---- RewriteRule ^survey/([0-9]+) tiki-take_survey.php?surveyId=$1 [QSA,L] RewriteRule ^tracker/([0-9]+) tiki-view_tracker.php?trackerId=$1 [QSA,L] ! RewriteRule ^category/([0-9]+)\+([0-9]+)\+([0-9]+) tiki-browse_categories.php?parentId[]=$1&parentId[]=$2parentId[]=$3&and=y [QSA,L] ! RewriteRule ^category/([0-9]+)\+([0-9]+) tiki-browse_categories.php?parentId[]=$1&parentId[]=$2&and=y [QSA,L] RewriteRule ^category/([0-9]+) tiki-browse_categories.php?parentId=$1 [QSA,L] #RewriteRule ^wiki/([-_\+A-Za-z0-9]+) tiki-index.php?page=$1 [QSA,L] |
|
From: Sylvie G. <sy...@us...> - 2006-07-06 16:48:43
|
Update of /cvsroot/webbinder/root/lib/categories In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21886/lib/categories Modified Files: categlib.php Log Message: and betwen categ Index: categlib.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/categories/categlib.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** categlib.php 14 Jun 2006 21:08:19 -0000 1.3 --- categlib.php 6 Jul 2006 15:59:58 -0000 1.4 *************** *** 272,279 **** } ! function list_category_objects($categId, $offset, $maxRecords, $sort_mode='pageName_asc', $type='', $find='', $deep=false) { // Build the condition to restrict which categories objects must be in to be returned. ! if (is_array($categId)) { $bindWhere = $categId; if ($deep) { --- 272,288 ---- } ! function list_category_objects($categId, $offset, $maxRecords, $sort_mode='pageName_asc', $type='', $find='', $deep=false, $and=false) { // Build the condition to restrict which categories objects must be in to be returned. ! $join = ''; ! if (is_array($categId) && $and) { ! $i = count($categId); ! $bindWhere = $categId; ! foreach ($categId as $c) { ! if (--$i) ! $join .= " INNER JOIN tiki_category_objects tco$i on (tco$i.`catObjectId`=o.`catObjectId` and tco$i.`categId`=?) "; ! } ! $where = ' AND c.`categId`=? '; ! } elseif (is_array($categId)) { $bindWhere = $categId; if ($deep) { *************** *** 368,372 **** } ! $query_cant = "SELECT c.*, o.*, count(u.`objectId`) as perms, $allowField as allow FROM `tiki_category_objects` c,`tiki_categorized_objects` o LEFT JOIN `users_objectpermissions` u ON u.`objectId`=MD5(".$this->db->concat("o.`type`","LOWER(o.`objId`)").") AND u.`objectType`=o.`type` WHERE c.`catObjectId`=o.`catObjectId` $where GROUP BY o.`type`, o.`objId` $sqlHaving"; $query = $query_cant . $orderBy; $result = $this->query($query,$bindVars,$maxRecords,$offset); --- 377,381 ---- } ! $query_cant = "SELECT c.*, o.*, count(u.`objectId`) as perms, $allowField as allow FROM `tiki_category_objects` c,`tiki_categorized_objects` o LEFT JOIN `users_objectpermissions` u ON u.`objectId`=MD5(".$this->db->concat("o.`type`","LOWER(o.`objId`)").") AND u.`objectType`=o.`type` $join WHERE c.`catObjectId`=o.`catObjectId` $where GROUP BY o.`type`, o.`objId` $sqlHaving"; $query = $query_cant . $orderBy; $result = $this->query($query,$bindVars,$maxRecords,$offset); |
|
From: Sylvie G. <sy...@us...> - 2006-07-06 16:42:20
|
Update of /cvsroot/webbinder/root In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21886 Modified Files: tiki-browse_categories.php Log Message: and betwen categ Index: tiki-browse_categories.php =================================================================== RCS file: /cvsroot/webbinder/root/tiki-browse_categories.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tiki-browse_categories.php 14 Jun 2006 21:08:19 -0000 1.5 --- tiki-browse_categories.php 6 Jul 2006 15:59:58 -0000 1.6 *************** *** 120,124 **** } ! $objects = $categlib->list_category_objects($_REQUEST["parentId"], $offset, $maxRecords, $sort_mode, $type, $find, $deep=='on'); $smarty->assign_by_ref('objects', $objects["data"]); --- 120,124 ---- } ! $objects = $categlib->list_category_objects($_REQUEST["parentId"], $offset, $maxRecords, $sort_mode, $type, $find, $deep=='on', (!empty($_REQUEST['and']))?true:false); $smarty->assign_by_ref('objects', $objects["data"]); |
|
From: Sylvie G. <sy...@us...> - 2006-07-06 16:23:25
|
Update of /cvsroot/webbinder/root In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1802 Modified Files: .htaccess Log Message: category/2+5 Index: .htaccess =================================================================== RCS file: /cvsroot/webbinder/root/.htaccess,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** .htaccess 27 Oct 2005 14:09:17 -0000 1.8 --- .htaccess 6 Jul 2006 16:23:20 -0000 1.9 *************** *** 75,78 **** --- 75,80 ---- RewriteRule ^survey/([0-9]+) tiki-take_survey.php?surveyId=$1 [QSA,L] RewriteRule ^tracker/([0-9]+) tiki-view_tracker.php?trackerId=$1 [QSA,L] + RewriteRule ^category/([0-9]+)+([0-9]+)+([0-9]+) tiki-browse_categories.php?parentId[]=$1&parentId[]=$2parentId[]=$3&and=y [QSA,L] + RewriteRule ^category/([0-9]+)+([0-9]+) tiki-browse_categories.php?parentId[]=$1&parentId[]=$2&and=y [QSA,L] RewriteRule ^category/([0-9]+) tiki-browse_categories.php?parentId=$1 [QSA,L] #RewriteRule ^wiki/([-_\+A-Za-z0-9]+) tiki-index.php?page=$1 [QSA,L] |
|
From: Sylvie G. <sy...@us...> - 2006-06-14 21:08:26
|
Update of /cvsroot/webbinder/root/templates In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5549/templates Modified Files: tiki-browse_categories.tpl Log Message: can give a list of parentIds to category browse: parentId[]=1&parentId[]=2 Index: tiki-browse_categories.tpl =================================================================== RCS file: /cvsroot/webbinder/root/templates/tiki-browse_categories.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tiki-browse_categories.tpl 13 Oct 2005 05:56:49 -0000 1.3 --- tiki-browse_categories.tpl 14 Jun 2006 21:08:19 -0000 1.4 *************** *** 95,98 **** --- 95,99 ---- <div class="category_path"> + {if $path} <a href="tiki-browse_categories.php?parentId=0&deep={$deep}&type={$type|escape}" class="categpath">{tr}Top{/tr}</a> {section name=x loop=$path} *************** *** 100,103 **** --- 101,113 ---- <a class="categpath" href="tiki-browse_categories.php?parentId={$path[x].categId}&deep={$deep}&type={$type|escape}">{$path[x].name}</a> {/section} + {elseif $paths} + {section name=x loop=$paths} + {section name=y loop=$paths[x]} + :: + <a class="categpath" href="tiki-browse_categories.php?parentId={$paths[x][y].categId}&deep={$deep}&type={$type|escape}">{$paths[x][y].name}</a> + {/section} + <br /> + {/section} + {/if} </div> {* hide .. |
|
From: Sylvie G. <sy...@us...> - 2006-06-14 21:08:26
|
Update of /cvsroot/webbinder/root/lib/categories In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5549/lib/categories Modified Files: categlib.php Log Message: can give a list of parentIds to category browse: parentId[]=1&parentId[]=2 Index: categlib.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/categories/categlib.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** categlib.php 1 Sep 2005 11:02:08 -0000 1.2 --- categlib.php 14 Jun 2006 21:08:19 -0000 1.3 *************** *** 275,285 **** // Build the condition to restrict which categories objects must be in to be returned. ! if ($deep) { ! $bindWhere = $this->get_category_descendants($categId); ! $bindWhere[] = $categId; ! $where = " AND c.`categId` IN (".str_repeat("?,",count($bindWhere)-1)."?)"; } else { ! $bindWhere = array($categId); ! $where = ' AND c.`categId`=? '; } --- 275,295 ---- // Build the condition to restrict which categories objects must be in to be returned. ! if (is_array($categId)) { ! $bindWhere = $categId; ! if ($deep) { ! foreach ($categId as $c) { ! $bindWhere = array_merge($bindWhere, $this->get_category_descendants($c)); ! } ! } ! $where = " AND c.`categId` IN (".str_repeat("?,",count($bindWhere)-1)."?)"; } else { ! if ($deep) { ! $bindWhere = $this->get_category_descendants($categId); ! $bindWhere[] = $categId; ! $where = " AND c.`categId` IN (".str_repeat("?,",count($bindWhere)-1)."?)"; ! } else { ! $bindWhere = array($categId); ! $where = ' AND c.`categId`=? '; ! } } |
|
From: Sylvie G. <sy...@us...> - 2006-06-14 21:08:23
|
Update of /cvsroot/webbinder/root In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5549 Modified Files: tiki-browse_categories.php Log Message: can give a list of parentIds to category browse: parentId[]=1&parentId[]=2 Index: tiki-browse_categories.php =================================================================== RCS file: /cvsroot/webbinder/root/tiki-browse_categories.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tiki-browse_categories.php 23 Sep 2005 21:38:27 -0000 1.4 --- tiki-browse_categories.php 14 Jun 2006 21:08:19 -0000 1.5 *************** *** 76,95 **** } ! // If the parent category is not zero get the category path ! if ($_REQUEST["parentId"]) { ! $path = $categlib->get_category_path($_REQUEST["parentId"]); ! ! $p_info = $categlib->get_category($_REQUEST["parentId"]); ! $father = $p_info["parentId"]; ! $smarty->assign_by_ref('p_info', $p_info); } else { ! $path = tra("TOP"); ! ! $father = 0; } - $smarty->assign('path', $path); - $smarty->assign('father', $father); - $ctall = $categlib->get_all_categories_respect_perms($user, 'tiki_p_view_categories'); --- 76,99 ---- } ! if (is_array($_REQUEST['parentId'])) { ! foreach ($_REQUEST['parentId'] as $p) { ! $paths[] = $categlib->get_category_path($p); ! } ! $smarty->assign('paths', $paths); } else { ! // If the parent category is not zero get the category path ! if ($_REQUEST["parentId"]) { ! $path = $categlib->get_category_path($_REQUEST["parentId"]); ! $p_info = $categlib->get_category($_REQUEST["parentId"]); ! $father = $p_info["parentId"]; ! $smarty->assign_by_ref('p_info', $p_info); ! } else { ! $path = tra("TOP"); ! $father = 0; ! } ! $smarty->assign('path', $path); ! $smarty->assign('father', $father); } $ctall = $categlib->get_all_categories_respect_perms($user, 'tiki_p_view_categories'); |
|
From: Sylvie G. <sy...@us...> - 2006-04-27 20:04:01
|
Update of /cvsroot/webbinder/root/lib/wiki-plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23831/lib/wiki-plugins Modified Files: wikiplugin_attach.php Log Message: display name of the missing file if knows Index: wikiplugin_attach.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/wiki-plugins/wikiplugin_attach.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wikiplugin_attach.php 27 Apr 2006 19:48:27 -0000 1.3 --- wikiplugin_attach.php 27 Apr 2006 20:03:56 -0000 1.4 *************** *** 229,232 **** --- 229,234 ---- { $data = "<strong>".tra('no such attachment on this page')."</strong>"; + if (isset($file)) + $data.= ' '.$file; } |
|
From: Sylvie G. <sy...@us...> - 2006-04-27 19:48:38
|
Update of /cvsroot/webbinder/root/lib/wiki-plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9843/lib/wiki-plugins Modified Files: wikiplugin_attach.php Log Message: avoid a notice. Not sure about the fix Index: wikiplugin_attach.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/wiki-plugins/wikiplugin_attach.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wikiplugin_attach.php 25 Aug 2005 14:14:55 -0000 1.2 --- wikiplugin_attach.php 27 Apr 2006 19:48:27 -0000 1.3 *************** *** 216,220 **** if( isset( $inline ) ) { ! $data = $out[1]; } else { $data = implode($separator,$out); --- 216,220 ---- if( isset( $inline ) ) { ! $data = isset($out[1])? $out[1]: $out[0]; } else { $data = implode($separator,$out); |
|
From: Jason D. <jas...@us...> - 2006-03-21 00:16:37
|
Update of /cvsroot/webbinder/root In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8949 Added Files: fixAttach.php Log Message: add fixattach.php --- NEW FILE: fixAttach.php --- <?php if (!isset($_REQUEST['file'])) { echo "Youmust give a paraml file"; die; } if (isset($_REQUEST['dir'])) $dir = $_REQUEST['dir']; else $dir = ''; $file = $dir.'/'.$_REQUEST['file']; $fp = fopen($file, 'rb'); if (!$fp) { echo "file $file can't be read"; die; } $jump = 0; $final = ''; while (!feof($fp)) { for ($i = 0; $i < $jump; ++$i) { fread($fp, 8192*16); } $final .= fread($fp, 8192*16); ++$jump; } fclose($fp); $fp = fopen($file, 'wb'); if (!$fp) { echo "the file must be writable"; die; } fwrite($fp, $final); fclose($fp); echo "Done<br>"; ?> |
|
From: Jason D. <jas...@us...> - 2006-03-20 22:39:20
|
Update of /cvsroot/webbinder/root/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4257/lib Modified Files: tikilib.php Log Message: made delay 23 min Index: tikilib.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/tikilib.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** tikilib.php 1 Feb 2006 18:32:34 -0000 1.20 --- tikilib.php 20 Mar 2006 22:39:12 -0000 1.21 *************** *** 2574,2578 **** if ($user === false) $user = ''; $now = date("U"); ! $delay = 5*60; // 5 minutes $oldy = $now - $delay; if ($user != '') { // was the user timeout? --- 2574,2578 ---- if ($user === false) $user = ''; $now = date("U"); ! $delay = 23*60; /* 23 minutes, session.gc_maxlifetime is 24 minutes (1440 sec) */ $oldy = $now - $delay; if ($user != '') { // was the user timeout? |
|
From: Sylvie G. <sy...@us...> - 2006-02-27 11:07:47
|
Update of /cvsroot/webbinder/root/lib/webmail In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27026/lib/webmail Modified Files: htmlMimeMail.php Log Message: notice Index: htmlMimeMail.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/webmail/htmlMimeMail.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** htmlMimeMail.php 5 Feb 2006 14:43:58 -0000 1.2 --- htmlMimeMail.php 27 Feb 2006 11:07:20 -0000 1.3 *************** *** 400,404 **** return $obj->addSubpart($text, $params); } else { ! return new Mail_mimePart($text, $params); } } --- 400,405 ---- return $obj->addSubpart($text, $params); } else { ! $result = new Mail_mimePart($text, $params); ! return $result; } } *************** *** 416,420 **** return $obj->addSubpart($this->html, $params); } else { ! return new Mail_mimePart($this->html, $params); } } --- 417,422 ---- return $obj->addSubpart($this->html, $params); } else { ! $n = new Mail_mimePart($this->html, $params); ! return $n; } } *************** *** 425,430 **** function _addMixedPart() { $params['content_type'] = 'multipart/mixed'; ! ! return new Mail_mimePart('', $params); } --- 427,432 ---- function _addMixedPart() { $params['content_type'] = 'multipart/mixed'; ! $n = new Mail_mimePart('', $params); ! return $n; } *************** *** 438,442 **** return $obj->addSubpart('', $params); } else { ! return new Mail_mimePart('', $params); } } --- 440,445 ---- return $obj->addSubpart('', $params); } else { ! $n = new Mail_mimePart('', $params); ! return $n; } } *************** *** 451,455 **** return $obj->addSubpart('', $params); } else { ! return new Mail_mimePart('', $params); } } --- 454,459 ---- return $obj->addSubpart('', $params); } else { ! $n = new Mail_mimePart('', $params); ! return $n; } } |
|
From: Sylvie G. <sy...@us...> - 2006-02-05 14:44:06
|
Update of /cvsroot/webbinder/root/lib/webmail In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4877/lib/webmail Modified Files: htmlMimeMail.php Log Message: avoid notice for new php version Index: htmlMimeMail.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/webmail/htmlMimeMail.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** htmlMimeMail.php 18 Aug 2005 13:44:38 -0000 1.1.1.1 --- htmlMimeMail.php 5 Feb 2006 14:43:58 -0000 1.2 *************** *** 391,395 **** * Adds a text subpart to a mime_part object */ ! function &_addTextPart(&$obj, $text) { $params['content_type'] = 'text/plain'; --- 391,395 ---- * Adds a text subpart to a mime_part object */ ! function _addTextPart(&$obj, $text) { $params['content_type'] = 'text/plain'; *************** *** 407,411 **** * Adds a html subpart to a mime_part object */ ! function &_addHtmlPart(&$obj) { $params['content_type'] = 'text/html'; --- 407,411 ---- * Adds a html subpart to a mime_part object */ ! function _addHtmlPart(&$obj) { $params['content_type'] = 'text/html'; *************** *** 423,427 **** * Starts a message with a mixed part */ ! function &_addMixedPart() { $params['content_type'] = 'multipart/mixed'; --- 423,427 ---- * Starts a message with a mixed part */ ! function _addMixedPart() { $params['content_type'] = 'multipart/mixed'; *************** *** 432,436 **** * Adds an alternative part to a mime_part object */ ! function &_addAlternativePart(&$obj) { $params['content_type'] = 'multipart/alternative'; --- 432,436 ---- * Adds an alternative part to a mime_part object */ ! function _addAlternativePart(&$obj) { $params['content_type'] = 'multipart/alternative'; *************** *** 445,449 **** * Adds a html subpart to a mime_part object */ ! function &_addRelatedPart(&$obj) { $params['content_type'] = 'multipart/related'; --- 445,449 ---- * Adds a html subpart to a mime_part object */ ! function _addRelatedPart(&$obj) { $params['content_type'] = 'multipart/related'; *************** *** 458,462 **** * Adds an html image subpart to a mime_part object */ ! function &_addHtmlImagePart(&$obj, $value) { $params['content_type'] = $value['c_type']; --- 458,462 ---- * Adds an html image subpart to a mime_part object */ ! function _addHtmlImagePart(&$obj, $value) { $params['content_type'] = $value['c_type']; *************** *** 471,475 **** * Adds an attachment subpart to a mime_part object */ ! function &_addAttachmentPart(&$obj, $value) { $params['content_type'] = $value['c_type']; --- 471,475 ---- * Adds an attachment subpart to a mime_part object */ ! function _addAttachmentPart(&$obj, $value) { $params['content_type'] = $value['c_type']; *************** *** 1065,1069 **** * @access public */ ! function &addSubPart($body, $params) { $this->_subparts[] = new Mail_mimePart($body, $params); --- 1065,1069 ---- * @access public */ ! function addSubPart($body, $params) { $this->_subparts[] = new Mail_mimePart($body, $params); *************** *** 2135,2139 **** * the HELO command. */ ! function &connect($params = array()) { if (!isset($this->status)) { $obj = new smtp($params); --- 2135,2139 ---- * the HELO command. */ ! function connect($params = array()) { if (!isset($this->status)) { $obj = new smtp($params); *************** *** 2349,2353 **** * Function to get data. */ ! function &get_data() { $return = ''; --- 2349,2353 ---- * Function to get data. */ ! function get_data() { $return = ''; |
|
From: Sylvie G. <sy...@us...> - 2006-02-05 14:42:05
|
Update of /cvsroot/webbinder/root/lib/search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4222/lib/search Modified Files: searchlib.php Log Message: avoid notice for new php version Index: searchlib.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/search/searchlib.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** searchlib.php 18 Aug 2005 13:44:07 -0000 1.1.1.1 --- searchlib.php 5 Feb 2006 14:41:49 -0000 1.2 *************** *** 38,42 **** } ! function &find($where,$words,$offset, $maxRecords) { $exact=$this->find_exact($where,$words,$offset, $maxRecords); $part=$this->find_part($where,$words,$offset, $maxRecords); --- 38,42 ---- } ! function find($where,$words,$offset, $maxRecords) { $exact=$this->find_exact($where,$words,$offset, $maxRecords); $part=$this->find_part($where,$words,$offset, $maxRecords); *************** *** 62,66 **** ! function &find_part($where,$words,$offset, $maxRecords) { $words=preg_split("/[\s]+/",$words,-1,PREG_SPLIT_NO_EMPTY); if (count($words)>0) { --- 62,66 ---- ! function find_part($where,$words,$offset, $maxRecords) { $words=preg_split("/[\s]+/",$words,-1,PREG_SPLIT_NO_EMPTY); if (count($words)>0) { *************** *** 107,111 **** } ! function &refresh_lru_wordlist($syllable) { global $search_max_syllwords; global $search_lru_length; --- 107,111 ---- } ! function refresh_lru_wordlist($syllable) { global $search_max_syllwords; global $search_lru_length; *************** *** 161,165 **** } ! function &get_lru_wordlist($syllable) { if(!isset($this->wordlist_cache[$syllable])) { $query="select `searchword` from `tiki_searchwords` where `syllable`=?"; --- 161,165 ---- } ! function get_lru_wordlist($syllable) { if(!isset($this->wordlist_cache[$syllable])) { $query="select `searchword` from `tiki_searchwords` where `syllable`=?"; *************** *** 172,176 **** } ! function &get_wordlist_from_syllables($syllables) { $ret=array(); global $search_syll_age; --- 172,176 ---- } ! function get_wordlist_from_syllables($syllables) { $ret=array(); global $search_syll_age; *************** *** 199,239 **** } ! function &find_part_articles($words,$offset, $maxRecords) { return $this->find_exact_articles($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_forums($words,$offset, $maxRecords) { return $this->find_exact_forums($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_blogs($words,$offset, $maxRecords) { return $this->find_exact_blogs($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_blog_posts($words,$offset, $maxRecords) { return $this->find_exact_blog_posts($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_faqs($words,$offset, $maxRecords) { return $this->find_exact_faqs($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_directory($words,$offset, $maxRecords) { return $this->find_exact_directory($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_imggals($words,$offset, $maxRecords) { return $this->find_exact_imggals($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_img($words,$offset, $maxRecords) { return $this->find_exact_img($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_trackers($words,$offset, $maxRecords) { return $this->find_exact_trackers($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function &find_part_files($words,$offset, $maxRecords) { return $this->find_exact_files($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } --- 199,239 ---- } ! function find_part_articles($words,$offset, $maxRecords) { return $this->find_exact_articles($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_forums($words,$offset, $maxRecords) { return $this->find_exact_forums($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_blogs($words,$offset, $maxRecords) { return $this->find_exact_blogs($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_blog_posts($words,$offset, $maxRecords) { return $this->find_exact_blog_posts($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_faqs($words,$offset, $maxRecords) { return $this->find_exact_faqs($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_directory($words,$offset, $maxRecords) { return $this->find_exact_directory($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_imggals($words,$offset, $maxRecords) { return $this->find_exact_imggals($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_img($words,$offset, $maxRecords) { return $this->find_exact_img($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_trackers($words,$offset, $maxRecords) { return $this->find_exact_trackers($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } ! function find_part_files($words,$offset, $maxRecords) { return $this->find_exact_files($this->get_wordlist_from_syllables($words),$offset, $maxRecords); } *************** *** 241,245 **** ! function &find_part_all($words,$offset, $maxRecords) { global $feature_wiki, $feature_directory, $feature_galleries, $feature_file_galleries, --- 241,245 ---- ! function find_part_all($words,$offset, $maxRecords) { global $feature_wiki, $feature_directory, $feature_galleries, $feature_file_galleries, *************** *** 345,349 **** } ! function &find_exact($where,$words,$offset, $maxRecords) { $words=preg_split("/[\s]+/",$words,-1,PREG_SPLIT_NO_EMPTY); if (count($words)>0) { --- 345,349 ---- } ! function find_exact($where,$words,$offset, $maxRecords) { $words=preg_split("/[\s]+/",$words,-1,PREG_SPLIT_NO_EMPTY); if (count($words)>0) { *************** *** 390,394 **** } ! function &find_exact_all($words,$offset, $maxRecords) { global $feature_wiki, $feature_directory, $feature_galleries, $feature_file_galleries, $feature_articles, $feature_forums, $feature_blogs, $feature_faqs, $feature_trackers, $feature_file_galleries; --- 390,394 ---- } ! function find_exact_all($words,$offset, $maxRecords) { global $feature_wiki, $feature_directory, $feature_galleries, $feature_file_galleries, $feature_articles, $feature_forums, $feature_blogs, $feature_faqs, $feature_trackers, $feature_file_galleries; *************** *** 491,495 **** ! function &find_exact_trackers($words,$offset, $maxRecords) { global $feature_trackers, $tiki_p_view_trackers_pending, $tiki_p_view_trackers_closed, $tikilib; global $user; --- 491,495 ---- ! function find_exact_trackers($words,$offset, $maxRecords) { global $feature_trackers, $tiki_p_view_trackers_pending, $tiki_p_view_trackers_closed, $tikilib; global $user; *************** *** 571,575 **** ! function &find_exact_imggals($words,$offset, $maxRecords) { global $feature_galleries; global $user; --- 571,575 ---- ! function find_exact_imggals($words,$offset, $maxRecords) { global $feature_galleries; global $user; *************** *** 605,609 **** } ! function &find_exact_img($words,$offset, $maxRecords) { global $feature_galleries; global $user; --- 605,609 ---- } ! function find_exact_img($words,$offset, $maxRecords) { global $feature_galleries; global $user; *************** *** 640,644 **** } ! function &find_exact_blogs($words,$offset, $maxRecords) { global $feature_blogs; global $user; --- 640,644 ---- } ! function find_exact_blogs($words,$offset, $maxRecords) { global $feature_blogs; global $user; *************** *** 675,679 **** ! function &find_exact_blog_posts($words,$offset, $maxRecords) { global $feature_blogs; global $user; --- 675,679 ---- ! function find_exact_blog_posts($words,$offset, $maxRecords) { global $feature_blogs; global $user; *************** *** 710,714 **** } ! function &find_exact_articles($words,$offset, $maxRecords) { global $feature_articles; global $user; --- 710,714 ---- } ! function find_exact_articles($words,$offset, $maxRecords) { global $feature_articles; global $user; *************** *** 744,748 **** } ! function &find_exact_wiki($words,$offset, $maxRecords) { global $feature_wiki; global $user; --- 744,748 ---- } ! function find_exact_wiki($words,$offset, $maxRecords) { global $feature_wiki; global $user; *************** *** 780,784 **** } ! function &find_exact_directory($words,$offset, $maxRecords) { global $feature_directory; global $user; --- 780,784 ---- } ! function find_exact_directory($words,$offset, $maxRecords) { global $feature_directory; global $user; *************** *** 815,819 **** } ! function &find_exact_directory_sites($words,$offset, $maxRecords) { global $feature_directory; global $user; --- 815,819 ---- } ! function find_exact_directory_sites($words,$offset, $maxRecords) { global $feature_directory; global $user; *************** *** 853,857 **** ! function &find_exact_faqs($words,$offset, $maxRecords) { global $feature_faqs; global $user; --- 853,857 ---- ! function find_exact_faqs($words,$offset, $maxRecords) { global $feature_faqs; global $user; *************** *** 888,892 **** } ! function &find_exact_faqquestions($words,$offset, $maxRecords) { global $feature_faqs; global $user; --- 888,892 ---- } ! function find_exact_faqquestions($words,$offset, $maxRecords) { global $feature_faqs; global $user; *************** *** 924,928 **** ! function &find_exact_forums($words,$offset, $maxRecords) { global $feature_forums; global $user; --- 924,928 ---- ! function find_exact_forums($words,$offset, $maxRecords) { global $feature_forums; global $user; *************** *** 959,963 **** } ! function &find_exact_forumcomments($words,$offset, $maxRecords) { global $feature_forums; global $user; --- 959,963 ---- } ! function find_exact_forumcomments($words,$offset, $maxRecords) { global $feature_forums; global $user; *************** *** 993,997 **** } } ! function &find_exact_files($words,$offset, $maxRecords) { global $feature_file_galleries; global $user; --- 993,997 ---- } } ! function find_exact_files($words,$offset, $maxRecords) { global $feature_file_galleries; global $user; |
|
From: Sylvie G. <sy...@us...> - 2006-02-01 18:32:42
|
Update of /cvsroot/webbinder/root/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13584/lib Modified Files: tikilib.php Log Message: big download problem Index: tikilib.php =================================================================== RCS file: /cvsroot/webbinder/root/lib/tikilib.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** tikilib.php 19 Oct 2005 18:36:36 -0000 1.19 --- tikilib.php 1 Feb 2006 18:32:34 -0000 1.20 *************** *** 6503,6509 **** if ($store_type == 'dir') { $data .= fread($fp, 8192*16); - fwrite($fw, $data); } else { ! $data = fread($fp, 8192*16); } } --- 6503,6508 ---- if ($store_type == 'dir') { $data .= fread($fp, 8192*16); } else { ! $data .= fread($fp, 8192*16); } } *************** *** 6511,6514 **** --- 6510,6514 ---- unlink($tmp_dest); if ($store_type == 'dir') { + fwrite($fw, $data); fclose($fw); $data = ""; |
