Menu
▾
▴
tikipro-cvs — High volume list for all cvs logs
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(944) |
Mar
(1984) |
Apr
(1233) |
May
(1154) |
Jun
(324) |
Jul
(783) |
Aug
(604) |
Sep
(980) |
Oct
(762) |
Nov
(752) |
Dec
(913) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(563) |
Feb
(819) |
Mar
(537) |
Apr
(304) |
May
(1064) |
Jun
(553) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tik...@li...> - 2005-06-24 12:02:29
|
Hello all, This is announcement to say we've renamed the project and TikiPro is now called BitWeaver! We've got our first release to the public and we hope you find the quality and performance as impressive as we do. You'll be redirected to http://www.bitweaver.org it if you try to visit the TikiPro site. We encourage you to re-subscribe to the Bitweaver-cvs mailing list at http://lists.sourceforge.net/lists/listinfo/bitweaver-cvs and look forward working with you. Regards, The BitWeaver Team |
|
From: <tik...@li...> - 2005-06-18 15:30:21
|
Update of /cvsroot/tikipro/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17044 Modified Files: avail Log Message: adjust avail to prevent commit conflicts Index: avail =================================================================== RCS file: /cvsroot/tikipro/CVSROOT/avail,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** avail 17 May 2005 16:34:25 -0000 1.46 --- avail 18 Jun 2005 15:30:09 -0000 1.47 *************** *** 1,95 **** unavail ! avail||_p_tp_articles ! avail||_p_tp_babelfish ! avail||_p_tp_backups ! avail||_p_tp_banners ! avail||_p_tp_blogs ! avail||_p_tp_calendar ! avail||_p_tp_categories ! avail||_p_tp_charts ! avail||_p_tp_chat ! avail||_p_tp_contacts ! avail||_p_tp_db ! avail||_p_tp_dcs ! avail||_p_tp_debug ! avail||_p_tp_directory ! avail||_p_tp_doc ! avail||_p_tp_drawings ! avail||_p_tp_dump ! avail||_p_tp_ephemerides avail|nexe|_p_ezybiz ! avail||_p_tp_faqs ! avail||_p_tp_featured_links ! avail||_p_tp_filegals ! avail||_p_tp_fisheye ! avail||_p_tp_forums ! avail||_p_tp_Galaxia ! avail||_gallery2 ! avail||_p_tp_games ! avail||_p_tp_gatekeeper ! avail||_p_tp_google ! avail||_p_tp_hawhaw ! avail||_p_tp_hotwords ! avail||_p_tp_html ! avail||_p_tp_htmlarea ! avail||_p_tp_imagegals ! avail||_p_tp_img ! avail||_p_tp_install ! avail||_p_tp_integrator ! avail||_p_tp_irc ! avail||_p_tp_kernel ! avail||_p_tp_languages ! avail||_p_tp_liberty ! avail||_p_tp_live_support ! avail||_p_tp_maps ! avail||_p_tp_messu ! avail||_p_tp_multisites ! avail||_p_tp_minical ! avail||_p_tp_movies ! avail||_p_tp_nexus ! avail||_p_tp_newsletters ! avail||_p_tp_newsreader ! avail||_p_tp_notepad ! avail||_p_tp_notifications ! avail||_p_tp_pdf ! avail||_p_tp_polls ! avail||_p_tp_quicktags ! avail||_p_tp_quizzes ! avail||_p_tp_quota ! avail||_p_tp_rss ! avail||_p_tp_sample ! avail||_p_tp_search ! avail||_p_tp_shoutbox ! avail||_p_tp_smileys ! avail||_p_tp_snoopy ! avail||_p_tp_stats ! avail||_p_tp_stickies ! avail||_p_tp_stylist ! avail||_p_tp_structures ! avail||_p_tp_surveys ! avail||_p_tp_tabs ! avail||_p_tp_taglines ! avail||_p_tp_tail ! avail||_p_tp_themes ! avail||_p_tinymce ! avail||_p_tp_tikibot ! avail||_p_tp_tikiforums ! avail||_p_tp_tikihelp ! avail||_p_tp_trackers ! avail||_p_tp_tree ! avail||_p_tp_users ! avail||_p_tp_util ! avail||_p_tp_webmail ! avail||_p_tp_wiki ! avail||_p_tp_xmlrpc ! avail||_zencart ! avail||_jscalendar ! avail||_phpbb ! avail||_root ! avail|xing|_phplayers ! avail|lsces|_adodb ! avail|btodoroff avail|spiderr - avail|squareing - avail|wolff_borg unavail|tikipro --- 1,90 ---- unavail ! avail|spiderr|_p_tp_articles ! avail|spiderr|_p_tp_babelfish ! avail|spiderr|_p_tp_backups ! avail|spiderr|_p_tp_banners ! avail|spiderr|_p_tp_blogs ! avail|spiderr|_p_tp_calendar ! avail|spiderr|_p_tp_categories ! avail|spiderr|_p_tp_charts ! avail|spiderr|_p_tp_chat ! avail|spiderr|_p_tp_contacts ! avail|spiderr|_p_tp_db ! avail|spiderr|_p_tp_dcs ! avail|spiderr|_p_tp_debug ! avail|spiderr|_p_tp_directory ! avail|spiderr|_p_tp_doc ! avail|spiderr|_p_tp_drawings ! avail|spiderr|_p_tp_dump ! avail|spiderr|_p_tp_ephemerides avail|nexe|_p_ezybiz ! avail|spiderr|_p_tp_faqs ! avail|spiderr|_p_tp_featured_links ! avail|spiderr|_p_tp_filegals ! avail|spiderr|_p_tp_fisheye ! avail|spiderr|_p_tp_forums ! avail|spiderr|_p_tp_Galaxia ! avail|spiderr|_gallery2 ! avail|spiderr|_p_tp_games ! avail|spiderr|_p_tp_gatekeeper ! avail|spiderr|_p_tp_google ! avail|spiderr|_p_tp_hawhaw ! avail|spiderr|_p_tp_hotwords ! avail|spiderr|_p_tp_html ! avail|spiderr|_p_tp_htmlarea ! avail|spiderr|_p_tp_imagegals ! avail|spiderr|_p_tp_img ! avail|spiderr|_p_tp_install ! avail|spiderr|_p_tp_integrator ! avail|spiderr|_p_tp_irc ! avail|spiderr|_p_tp_kernel ! avail|spiderr|_p_tp_languages ! avail|spiderr|_p_tp_liberty ! avail|spiderr|_p_tp_live_support ! avail|spiderr|_p_tp_maps ! avail|spiderr|_p_tp_messu ! avail|spiderr|_p_tp_multisites ! avail|spiderr|_p_tp_minical ! avail|spiderr|_p_tp_movies ! avail|spiderr|_p_tp_nexus ! avail|spiderr|_p_tp_newsletters ! avail|spiderr|_p_tp_newsreader ! avail|spiderr|_p_tp_notepad ! avail|spiderr|_p_tp_notifications ! avail|spiderr|_p_tp_pdf ! avail|spiderr|_p_tp_polls ! avail|spiderr|_p_tp_quicktags ! avail|spiderr|_p_tp_quizzes ! avail|spiderr|_p_tp_quota ! avail|spiderr|_p_tp_rss ! avail|spiderr|_p_tp_sample ! avail|spiderr|_p_tp_search ! avail|spiderr|_p_tp_shoutbox ! avail|spiderr|_p_tp_smileys ! avail|spiderr|_p_tp_snoopy ! avail|spiderr|_p_tp_stats ! avail|spiderr|_p_tp_stickies ! avail|spiderr|_p_tp_stylist ! avail|spiderr|_p_tp_structures ! avail|spiderr|_p_tp_surveys ! avail|spiderr|_p_tp_tabs ! avail|spiderr|_p_tp_taglines ! avail|spiderr|_p_tp_tail ! avail|spiderr|_p_tp_themes ! avail|spiderr|_p_tinymce ! avail|spiderr|_p_tp_tikibot ! avail|spiderr|_p_tp_tikiforums ! avail|spiderr|_p_tp_tikihelp ! avail|spiderr|_p_tp_trackers ! avail|spiderr|_p_tp_tree ! avail|spiderr|_p_tp_users ! avail|spiderr|_p_tp_util ! avail|spiderr|_p_tp_webmail ! avail|spiderr|_p_tp_wiki ! avail|spiderr|_p_tp_xmlrpc ! avail|spiderr|_zencart ! avail|spiderr|_jscalendar ! avail|spiderr|_phpbb ! avail|spiderr|_root avail|spiderr unavail|tikipro |
|
From: <tik...@li...> - 2005-06-18 15:16:51
|
Update of /cvsroot/tikipro/_p_tp_install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/install Modified Files: TikiInstaller.php Log Message: Merge recent changes from CLYDE into HEAD Index: TikiInstaller.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_install/TikiInstaller.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** TikiInstaller.php 30 May 2005 21:54:40 -0000 1.32 --- TikiInstaller.php 18 Jun 2005 15:16:09 -0000 1.33 *************** *** 236,239 **** --- 236,244 ---- } break; + case 'PGSQL' : + if( preg_match( '/pgsql/', $db_tiki ) ) { + $sql = $step[$dbType]; + } + break; case 'SQL92' : $sql = $step[$dbType]; |
|
From: <tik...@li...> - 2005-06-18 15:16:50
|
Update of /cvsroot/tikipro/_p_tp_kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/kernel Modified Files: TikiLib.php Log Message: Merge recent changes from CLYDE into HEAD Index: TikiLib.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_kernel/TikiLib.php,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** TikiLib.php 11 Jun 2005 03:02:27 -0000 1.120 --- TikiLib.php 18 Jun 2005 15:16:09 -0000 1.121 *************** *** 799,808 **** } - function count_sessions() { - $query = "select count(*) from `".TIKI_DB_PREFIX."tiki_sessions`"; - $cant = $this->getOne($query,array()); - return $cant; - } - function list_cache($offset, $maxRecords, $sort_mode, $find) { --- 799,802 ---- |
|
From: <tik...@li...> - 2005-06-18 15:16:22
|
Update of /cvsroot/tikipro/_p_tp_wiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/wiki/templates Modified Files: center_wiki_page.tpl show_page.tpl Log Message: Merge recent changes from CLYDE into HEAD Index: show_page.tpl =================================================================== RCS file: /cvsroot/tikipro/_p_tp_wiki/templates/show_page.tpl,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** show_page.tpl 13 Jun 2005 03:55:20 -0000 1.74 --- show_page.tpl 18 Jun 2005 15:16:12 -0000 1.75 *************** *** 8,16 **** {if $pages > 1} <div class="pagination"> ! <a title="{tr}First page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$first_page}">{tikicon ipackage=liberty iname="nav_first" iexplain="first page"}</a> ! <a title="{tr}Previous page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$prev_page}">{tikicon ipackage=liberty iname="nav_prev" iexplain="previous page"}</a> ! {tr}page{/tr}:{$pagenum}/{$pages} ! <a title="{tr}Next page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$next_page}">{tikicon ipackage=liberty iname="nav_next" iexplain="next page"}</a> ! <a title="{tr}Last page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$last_page}">{tikicon ipackage=liberty iname="nav_last" iexplain="last page"}</a> </div> {/if} {* end .pagination *} --- 8,16 ---- {if $pages > 1} <div class="pagination"> ! {*<a title="{tr}First page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$first_page}">« «</a>*} ! <a title="{tr}Previous page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$prev_page}">«</a> ! {tr}Page {$pagenum} of {$pages}{/tr} ! <a title="{tr}Next page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$next_page}">»</a> ! {*<a title="{tr}Last page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$last_page}">» »</a>*} </div> {/if} {* end .pagination *} Index: center_wiki_page.tpl =================================================================== RCS file: /cvsroot/tikipro/_p_tp_wiki/templates/center_wiki_page.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** center_wiki_page.tpl 17 Jun 2005 20:40:29 -0000 1.9 --- center_wiki_page.tpl 18 Jun 2005 15:16:12 -0000 1.10 *************** *** 53,57 **** {/if} {if $gTikiSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'tiki_p_pdf_generation' )} ! <a title="{tr}create PDF{/tr}" href="{$gTikiLoc.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{tikicon ipackage="wiki" iname="pdf" iexplain="PDF"}</a> {/if} </div> <!-- End Actions --> --- 53,57 ---- {/if} {if $gTikiSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'tiki_p_pdf_generation' )} ! <a title="{tr}create PDF{/tr}" href="{$gTikiLoc.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{tikicon ipackage="pdf" iname="pdf" iexplain="PDF"}</a> {/if} </div> <!-- End Actions --> |
|
From: <tik...@li...> - 2005-06-18 15:16:21
|
Update of /cvsroot/tikipro/_p_tp_users/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/users/modules Modified Files: mod_who_is_there.php Log Message: Merge recent changes from CLYDE into HEAD Index: mod_who_is_there.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_users/modules/mod_who_is_there.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mod_who_is_there.php 21 Dec 2004 17:54:41 -0000 1.4 --- mod_who_is_there.php 18 Jun 2005 15:16:11 -0000 1.5 *************** *** 1,5 **** <?php global $userlib; ! $logged_users = $tikilib->count_sessions(); $online_users = $gTikiUser->get_online_users(); $smarty->assign('online_users', $online_users); --- 1,5 ---- <?php global $userlib; ! $logged_users = $gTikiUser->count_sessions(); $online_users = $gTikiUser->get_online_users(); $smarty->assign('online_users', $online_users); |
|
From: <tik...@li...> - 2005-06-18 15:16:21
|
Update of /cvsroot/tikipro/_p_tp_wiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/wiki Modified Files: TikiPage.php slideshow.php Log Message: Merge recent changes from CLYDE into HEAD Index: TikiPage.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_wiki/TikiPage.php,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** TikiPage.php 14 Jun 2005 21:24:58 -0000 1.108 --- TikiPage.php 18 Jun 2005 15:16:11 -0000 1.109 *************** *** 84,88 **** LibertyAttachable::load(); } else { ! LibertyContent::load($pContentId); } } --- 84,88 ---- LibertyAttachable::load(); } else { ! LibertyContent::load(); } } Index: slideshow.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_wiki/slideshow.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** slideshow.php 19 May 2005 20:50:40 -0000 1.11 --- slideshow.php 18 Jun 2005 15:16:12 -0000 1.12 *************** *** 74,78 **** $anonpref = $wikilib->getPreference('userbreadCrumb', 4); ! if ($user) { $userbreadCrumb = $wikilib->get_user_preference($user, 'userbreadCrumb', $anonpref); } else { --- 74,78 ---- $anonpref = $wikilib->getPreference('userbreadCrumb', 4); ! if( $gTikiUser->isRegistered() ) { $userbreadCrumb = $wikilib->get_user_preference($user, 'userbreadCrumb', $anonpref); } else { *************** *** 101,110 **** // Now increment page hits since we are visiting this page ! if ($count_admin_pvs == 'y' || !$gTikiUser->isAdmin()) { ! $wikilib->add_hit($page); ! } // Get page data ! $info = $wikilib->get_page_info($page); // Verify lock status --- 101,111 ---- // Now increment page hits since we are visiting this page ! //if ($count_admin_pvs == 'y' || !$gTikiUser->isAdmin()) { ! // $wikilib->add_hit($page); ! //} // Get page data ! include( WIKI_PKG_PATH.'lookup_page_inc.php' ); ! $info = $gContent->mInfo; // Verify lock status *************** *** 149,153 **** } ! $slide_data = $tikilib->parseData($slides[$_REQUEST["slide"] + 1]); if (isset($reqs[1][$_REQUEST["slide"] - 1])) { --- 150,154 ---- } ! $slide_data = $gContent->parseData( $slides[$_REQUEST["slide"] + 1] ); if (isset($reqs[1][$_REQUEST["slide"] - 1])) { *************** *** 190,197 **** // Display the Index Template - $smarty->assign('dblclickedit', 'y'); - $gTikiSystem->display( 'tikipackages:wiki/show_page.tpl'); $smarty->assign('show_page_bar', 'y'); ! $smarty->display("tikipackages:wiki/slideshow.tpl"); ?> --- 191,196 ---- // Display the Index Template $smarty->assign('show_page_bar', 'y'); ! $smarty->display("tikipackage:wiki/slideshow.tpl"); ?> |
|
From: <tik...@li...> - 2005-06-18 15:16:20
|
Update of /cvsroot/tikipro/_p_tp_kernel/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/kernel/admin Modified Files: schema_inc.php upgrade_inc.php Log Message: Merge recent changes from CLYDE into HEAD Index: upgrade_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_kernel/admin/upgrade_inc.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** upgrade_inc.php 3 Jun 2005 16:53:17 -0000 1.13 --- upgrade_inc.php 18 Jun 2005 15:16:10 -0000 1.14 *************** *** 85,92 **** array( 'ALTER' => array( - 'tiki_sessions' => array( - 'user_id' => array( '`user_id`', 'I4' ), // , 'NOTNULL' ), - 'session_id' => array( '`session_id`', 'VARCHAR(32)' ), // , 'NOTNULL' ), - ), 'tiki_preferences' => array( 'package' => array( '`package`', 'VARCHAR(100)' ), // , 'NOTNULL' ), --- 85,88 ---- *************** *** 101,105 **** array( 'QUERY' => array( 'SQL92' => array( - "UPDATE `".TIKI_DB_PREFIX."tiki_sessions` SET `user_id`=(SELECT `user_id` FROM `".TIKI_DB_PREFIX."users_users` WHERE `".TIKI_DB_PREFIX."users_users`.`login`=`".TIKI_DB_PREFIX."tiki_sessions`.`user`)", ) )), --- 97,100 ---- *************** *** 108,112 **** array( 'DATADICT' => array( array( 'DROPCOLUMN' => array( - 'tiki_sessions' => array( '`user`', '`sessionId`' ) )), )), --- 103,106 ---- Index: schema_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_kernel/admin/schema_inc.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** schema_inc.php 30 Apr 2005 13:38:10 -0000 1.44 --- schema_inc.php 18 Jun 2005 15:16:10 -0000 1.45 *************** *** 130,140 **** ", - 'tiki_sessions' => " - session_id C(32) PRIMARY, - user_id I4, - timestamp I8 - " - - ); --- 130,133 ---- |
|
From: <tik...@li...> - 2005-06-18 15:16:20
|
Update of /cvsroot/tikipro/_p_tp_liberty/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/liberty/admin Modified Files: upgrade_inc.php Log Message: Merge recent changes from CLYDE into HEAD Index: upgrade_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_liberty/admin/upgrade_inc.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** upgrade_inc.php 2 Jun 2005 04:22:10 -0000 1.15 --- upgrade_inc.php 18 Jun 2005 15:16:10 -0000 1.16 *************** *** 8,11 **** --- 8,18 ---- 'CLYDE' => array( + // Step 0 + array( 'QUERY' => + array( 'PGSQL' => array( + "ALTER TABLE `".TIKI_DB_PREFIX."tiki_files_pkey` RENAME TO `".TIKI_DB_PREFIX."tiki_old_files_pkey`", + )), + ), + // Step 1 array( 'DATADICT' => array( *************** *** 16,19 **** --- 23,27 ---- 'tiki_files' => 'tiki_old_files', )), + array( 'CREATE' => array ( 'tiki_plugins' => " *************** *** 111,118 **** "UPDATE `".TIKI_DB_PREFIX."tiki_structures` SET user_id=1", "INSERT INTO `".TIKI_DB_PREFIX."tiki_preferences` ( `name`, `value`, `package` ) VALUES ( 'liberty_auto_display_attachment_thumbs', 'y', 'liberty' )", ! )) /* array( 'PGSQL' => array( ! "ALTER TABLE `".TIKI_DB_PREFIX."tiki_structures ALTER user_id SET NOT NULL" "ALTER TABLE `".TIKI_DB_PREFIX."tiki_comments_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".TIKI_DB_PREFIX."tiki_content`( `content_id` ) "ALTER TABLE `".TIKI_DB_PREFIX."tiki_comments_parent_ref` FOREIGN KEY (`parent_id`) REFERENCES `".TIKI_DB_PREFIX."tiki_content`( `content_id` )' --- 119,126 ---- "UPDATE `".TIKI_DB_PREFIX."tiki_structures` SET user_id=1", "INSERT INTO `".TIKI_DB_PREFIX."tiki_preferences` ( `name`, `value`, `package` ) VALUES ( 'liberty_auto_display_attachment_thumbs', 'y', 'liberty' )", ! )), /* array( 'PGSQL' => array( ! "ALTER TABLE `".TIKI_DB_PREFIX."tiki_structures` ALTER user_id SET NOT NULL" "ALTER TABLE `".TIKI_DB_PREFIX."tiki_comments_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".TIKI_DB_PREFIX."tiki_content`( `content_id` ) "ALTER TABLE `".TIKI_DB_PREFIX."tiki_comments_parent_ref` FOREIGN KEY (`parent_id`) REFERENCES `".TIKI_DB_PREFIX."tiki_content`( `content_id` )' |
|
From: <tik...@li...> - 2005-06-18 15:16:20
|
Update of /cvsroot/tikipro/_p_tp_users/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/users/admin Modified Files: schema_inc.php upgrade_inc.php Log Message: Merge recent changes from CLYDE into HEAD Index: upgrade_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_users/admin/upgrade_inc.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** upgrade_inc.php 17 Jun 2005 20:40:28 -0000 1.22 --- upgrade_inc.php 18 Jun 2005 15:16:11 -0000 1.23 *************** *** 95,98 **** --- 95,102 ---- 'logo_attachment_id' => array( '`logo_attachment_id`', 'I4' ), // , 'NOTNULL' ), ), + 'tiki_sessions' => array( + 'user_id' => array( '`user_id`', 'I4' ), // , 'NOTNULL' ), + 'session_id' => array( '`session_id`', 'VARCHAR(32)' ), // , 'NOTNULL' ), + ), 'tiki_user_bookmarks_folders' => array( 'user_id' => array( '`user_id`', 'I4' ), // , 'NOTNULL' ), *************** *** 174,177 **** --- 178,182 ---- "INSERT INTO `".TIKI_DB_PREFIX."users_users` (`real_name`, `login`, `email` ) VALUES ('System', 'system', 'system@localhost' )", "UPDATE `".TIKI_DB_PREFIX."users_users` SET `login`='system' WHERE `user_id`=".ROOT_USER_ID, + "UPDATE `".TIKI_DB_PREFIX."tiki_sessions` SET `user_id`=(SELECT `user_id` FROM `".TIKI_DB_PREFIX."users_users` WHERE `".TIKI_DB_PREFIX."users_users`.`login`=`".TIKI_DB_PREFIX."tiki_sessions`.`user`)", "UPDATE `".TIKI_DB_PREFIX."tiki_user_preferences` SET `user_id`=(SELECT `user_id` FROM `".TIKI_DB_PREFIX."users_users` WHERE `".TIKI_DB_PREFIX."users_users`.`login`=`".TIKI_DB_PREFIX."tiki_user_preferences`.`user`)", "UPDATE `".TIKI_DB_PREFIX."tiki_user_bookmarks_folders` SET `user_id`=(SELECT `user_id` FROM `".TIKI_DB_PREFIX."users_users` WHERE `".TIKI_DB_PREFIX."users_users`.`login`=`".TIKI_DB_PREFIX."tiki_user_bookmarks_folders`.`user`)", *************** *** 193,196 **** --- 198,202 ---- array( 'DATADICT' => array( array( 'DROPCOLUMN' => array( + 'tiki_sessions' => array( '`user`', '`sessionId`' ), 'users_groups_map' => array( '`groupName`' ), 'users_grouppermissions' => array( '`groupName`' ), Index: schema_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_users/admin/schema_inc.php,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** schema_inc.php 1 Jun 2005 15:16:07 -0000 1.58 --- schema_inc.php 18 Jun 2005 15:16:11 -0000 1.59 *************** *** 35,38 **** --- 35,44 ---- ",*/ + 'tiki_sessions' => " + session_id C(32) PRIMARY, + user_id I4, + timestamp I8 + ", + 'tiki_user_bookmarks_urls' => " url_id I4 AUTO PRIMARY, |
|
From: <tik...@li...> - 2005-06-18 15:16:20
|
Update of /cvsroot/tikipro/_p_tp_users In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/users Modified Files: TikiUser.php Log Message: Merge recent changes from CLYDE into HEAD Index: TikiUser.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_users/TikiUser.php,v retrieving revision 1.154 retrieving revision 1.155 diff -C2 -d -r1.154 -r1.155 *** TikiUser.php 6 Jun 2005 11:05:31 -0000 1.154 --- TikiUser.php 18 Jun 2005 15:16:11 -0000 1.155 *************** *** 252,255 **** --- 252,260 ---- } + function count_sessions() { + $query = "select count(*) from `".TIKI_DB_PREFIX."tiki_sessions`"; + $cant = $this->getOne($query,array()); + return $cant; + } function logout() { |
|
From: <tik...@li...> - 2005-06-18 15:16:19
|
Update of /cvsroot/tikipro/_p_tp_messu/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954/messu/admin Modified Files: upgrade_inc.php Log Message: Merge recent changes from CLYDE into HEAD Index: upgrade_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_messu/admin/upgrade_inc.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** upgrade_inc.php 2 Jun 2005 06:30:54 -0000 1.1 --- upgrade_inc.php 18 Jun 2005 15:16:10 -0000 1.2 *************** *** 10,20 **** array( 'RENAMECOLUMN' => array( 'messu_messages' => array( ! 'msgId' => '`msg_id` I4 AUTO', ! 'isRead' => '`is_read` VARCHAR(1)', ! 'isReplied' => '`is_replied` VARCHAR(1)', ! 'isFlagged' => '`is_flagged` VARCHAR(1)', ! 'user_to' => '`msg_to` X', ! 'user_cc' => '`msg_cc` X', ! 'user_bcc' => '`msg_bcc` X', ), )), --- 10,20 ---- array( 'RENAMECOLUMN' => array( 'messu_messages' => array( ! '`msgId`' => '`msg_id` I4 AUTO', ! '`isRead`' => '`is_read` VARCHAR(1)', ! '`isReplied`' => '`is_replied` VARCHAR(1)', ! '`isFlagged`' => '`is_flagged` VARCHAR(1)', ! '`user_to`' => '`msg_to` X', ! '`user_cc`' => '`msg_cc` X', ! '`user_bcc`' => '`msg_bcc` X', ), )), |
|
From: <tik...@li...> - 2005-06-18 14:30:55
|
Update of /cvsroot/tikipro/_p_tp_liberty/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19543/liberty/admin Modified Files: Tag: CLYDE upgrade_inc.php Log Message: Added PGSQL only tiki_files_pkey rename Index: upgrade_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_liberty/admin/upgrade_inc.php,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** upgrade_inc.php 2 Jun 2005 04:22:10 -0000 1.15 --- upgrade_inc.php 18 Jun 2005 14:30:44 -0000 1.15.2.1 *************** *** 8,11 **** --- 8,18 ---- 'CLYDE' => array( + // Step 0 + array( 'QUERY' => + array( 'PGSQL' => array( + "ALTER TABLE `".TIKI_DB_PREFIX."tiki_files_pkey` RENAME TO `".TIKI_DB_PREFIX."tiki_old_files_pkey`", + )), + ), + // Step 1 array( 'DATADICT' => array( *************** *** 16,19 **** --- 23,27 ---- 'tiki_files' => 'tiki_old_files', )), + array( 'CREATE' => array ( 'tiki_plugins' => " *************** *** 111,118 **** "UPDATE `".TIKI_DB_PREFIX."tiki_structures` SET user_id=1", "INSERT INTO `".TIKI_DB_PREFIX."tiki_preferences` ( `name`, `value`, `package` ) VALUES ( 'liberty_auto_display_attachment_thumbs', 'y', 'liberty' )", ! )) /* array( 'PGSQL' => array( ! "ALTER TABLE `".TIKI_DB_PREFIX."tiki_structures ALTER user_id SET NOT NULL" "ALTER TABLE `".TIKI_DB_PREFIX."tiki_comments_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".TIKI_DB_PREFIX."tiki_content`( `content_id` ) "ALTER TABLE `".TIKI_DB_PREFIX."tiki_comments_parent_ref` FOREIGN KEY (`parent_id`) REFERENCES `".TIKI_DB_PREFIX."tiki_content`( `content_id` )' --- 119,126 ---- "UPDATE `".TIKI_DB_PREFIX."tiki_structures` SET user_id=1", "INSERT INTO `".TIKI_DB_PREFIX."tiki_preferences` ( `name`, `value`, `package` ) VALUES ( 'liberty_auto_display_attachment_thumbs', 'y', 'liberty' )", ! )), /* array( 'PGSQL' => array( ! "ALTER TABLE `".TIKI_DB_PREFIX."tiki_structures` ALTER user_id SET NOT NULL" "ALTER TABLE `".TIKI_DB_PREFIX."tiki_comments_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".TIKI_DB_PREFIX."tiki_content`( `content_id` ) "ALTER TABLE `".TIKI_DB_PREFIX."tiki_comments_parent_ref` FOREIGN KEY (`parent_id`) REFERENCES `".TIKI_DB_PREFIX."tiki_content`( `content_id` )' |
|
From: <tik...@li...> - 2005-06-18 14:17:17
|
Update of /cvsroot/tikipro/_p_tp_wiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13163/wiki Modified Files: Tag: CLYDE slideshow.php Log Message: fixed slideshow display, what a crappy slideshow though. do you we want to keep this? Index: slideshow.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_wiki/slideshow.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** slideshow.php 19 May 2005 20:50:40 -0000 1.11 --- slideshow.php 18 Jun 2005 14:17:09 -0000 1.11.2.1 *************** *** 74,78 **** $anonpref = $wikilib->getPreference('userbreadCrumb', 4); ! if ($user) { $userbreadCrumb = $wikilib->get_user_preference($user, 'userbreadCrumb', $anonpref); } else { --- 74,78 ---- $anonpref = $wikilib->getPreference('userbreadCrumb', 4); ! if( $gTikiUser->isRegistered() ) { $userbreadCrumb = $wikilib->get_user_preference($user, 'userbreadCrumb', $anonpref); } else { *************** *** 101,110 **** // Now increment page hits since we are visiting this page ! if ($count_admin_pvs == 'y' || !$gTikiUser->isAdmin()) { ! $wikilib->add_hit($page); ! } // Get page data ! $info = $wikilib->get_page_info($page); // Verify lock status --- 101,111 ---- // Now increment page hits since we are visiting this page ! //if ($count_admin_pvs == 'y' || !$gTikiUser->isAdmin()) { ! // $wikilib->add_hit($page); ! //} // Get page data ! include( WIKI_PKG_PATH.'lookup_page_inc.php' ); ! $info = $gContent->mInfo; // Verify lock status *************** *** 149,153 **** } ! $slide_data = $tikilib->parseData($slides[$_REQUEST["slide"] + 1]); if (isset($reqs[1][$_REQUEST["slide"] - 1])) { --- 150,154 ---- } ! $slide_data = $gContent->parseData( $slides[$_REQUEST["slide"] + 1] ); if (isset($reqs[1][$_REQUEST["slide"] - 1])) { *************** *** 190,197 **** // Display the Index Template - $smarty->assign('dblclickedit', 'y'); - $gTikiSystem->display( 'tikipackages:wiki/show_page.tpl'); $smarty->assign('show_page_bar', 'y'); ! $smarty->display("tikipackages:wiki/slideshow.tpl"); ?> --- 191,196 ---- // Display the Index Template $smarty->assign('show_page_bar', 'y'); ! $smarty->display("tikipackage:wiki/slideshow.tpl"); ?> |
|
From: <tik...@li...> - 2005-06-18 14:15:29
|
Update of /cvsroot/tikipro/_p_tp_wiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12445 Modified Files: Tag: CLYDE center_wiki_page.tpl Log Message: fix link to pdf icon Index: center_wiki_page.tpl =================================================================== RCS file: /cvsroot/tikipro/_p_tp_wiki/templates/center_wiki_page.tpl,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** center_wiki_page.tpl 15 Jun 2005 20:00:15 -0000 1.8.2.1 --- center_wiki_page.tpl 18 Jun 2005 14:15:20 -0000 1.8.2.2 *************** *** 53,57 **** {/if} {if $gTikiSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'tiki_p_pdf_generation' )} ! <a title="{tr}create PDF{/tr}" href="{$gTikiLoc.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{tikicon ipackage="wiki" iname="pdf" iexplain="PDF"}</a> {/if} </div> <!-- End Actions --> --- 53,57 ---- {/if} {if $gTikiSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'tiki_p_pdf_generation' )} ! <a title="{tr}create PDF{/tr}" href="{$gTikiLoc.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{tikicon ipackage="pdf" iname="pdf" iexplain="PDF"}</a> {/if} </div> <!-- End Actions --> |
|
From: <tik...@li...> - 2005-06-18 14:12:17
|
Update of /cvsroot/tikipro/_p_tp_messu/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10519/messu/admin Modified Files: Tag: CLYDE upgrade_inc.php Log Message: Fixed case-sensitive fields Index: upgrade_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_messu/admin/upgrade_inc.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** upgrade_inc.php 2 Jun 2005 06:30:54 -0000 1.1 --- upgrade_inc.php 18 Jun 2005 14:12:07 -0000 1.1.2.1 *************** *** 10,20 **** array( 'RENAMECOLUMN' => array( 'messu_messages' => array( ! 'msgId' => '`msg_id` I4 AUTO', ! 'isRead' => '`is_read` VARCHAR(1)', ! 'isReplied' => '`is_replied` VARCHAR(1)', ! 'isFlagged' => '`is_flagged` VARCHAR(1)', ! 'user_to' => '`msg_to` X', ! 'user_cc' => '`msg_cc` X', ! 'user_bcc' => '`msg_bcc` X', ), )), --- 10,20 ---- array( 'RENAMECOLUMN' => array( 'messu_messages' => array( ! '`msgId`' => '`msg_id` I4 AUTO', ! '`isRead`' => '`is_read` VARCHAR(1)', ! '`isReplied`' => '`is_replied` VARCHAR(1)', ! '`isFlagged`' => '`is_flagged` VARCHAR(1)', ! '`user_to`' => '`msg_to` X', ! '`user_cc`' => '`msg_cc` X', ! '`user_bcc`' => '`msg_bcc` X', ), )), |
|
From: <tik...@li...> - 2005-06-18 14:11:17
|
Update of /cvsroot/tikipro/_p_tp_users/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10104/users/modules Modified Files: Tag: CLYDE mod_who_is_there.php Log Message: Moved tiki_sessions from kernel to users package Index: mod_who_is_there.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_users/modules/mod_who_is_there.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** mod_who_is_there.php 21 Dec 2004 17:54:41 -0000 1.4 --- mod_who_is_there.php 18 Jun 2005 14:11:06 -0000 1.4.2.1 *************** *** 1,5 **** <?php global $userlib; ! $logged_users = $tikilib->count_sessions(); $online_users = $gTikiUser->get_online_users(); $smarty->assign('online_users', $online_users); --- 1,5 ---- <?php global $userlib; ! $logged_users = $gTikiUser->count_sessions(); $online_users = $gTikiUser->get_online_users(); $smarty->assign('online_users', $online_users); |
|
From: <tik...@li...> - 2005-06-18 14:11:16
|
Update of /cvsroot/tikipro/_p_tp_kernel/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10104/kernel/admin Modified Files: Tag: CLYDE schema_inc.php upgrade_inc.php Log Message: Moved tiki_sessions from kernel to users package Index: upgrade_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_kernel/admin/upgrade_inc.php,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** upgrade_inc.php 3 Jun 2005 16:53:17 -0000 1.13 --- upgrade_inc.php 18 Jun 2005 14:11:05 -0000 1.13.2.1 *************** *** 85,92 **** array( 'ALTER' => array( - 'tiki_sessions' => array( - 'user_id' => array( '`user_id`', 'I4' ), // , 'NOTNULL' ), - 'session_id' => array( '`session_id`', 'VARCHAR(32)' ), // , 'NOTNULL' ), - ), 'tiki_preferences' => array( 'package' => array( '`package`', 'VARCHAR(100)' ), // , 'NOTNULL' ), --- 85,88 ---- *************** *** 101,105 **** array( 'QUERY' => array( 'SQL92' => array( - "UPDATE `".TIKI_DB_PREFIX."tiki_sessions` SET `user_id`=(SELECT `user_id` FROM `".TIKI_DB_PREFIX."users_users` WHERE `".TIKI_DB_PREFIX."users_users`.`login`=`".TIKI_DB_PREFIX."tiki_sessions`.`user`)", ) )), --- 97,100 ---- *************** *** 108,112 **** array( 'DATADICT' => array( array( 'DROPCOLUMN' => array( - 'tiki_sessions' => array( '`user`', '`sessionId`' ) )), )), --- 103,106 ---- Index: schema_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_kernel/admin/schema_inc.php,v retrieving revision 1.44 retrieving revision 1.44.2.1 diff -C2 -d -r1.44 -r1.44.2.1 *** schema_inc.php 30 Apr 2005 13:38:10 -0000 1.44 --- schema_inc.php 18 Jun 2005 14:11:04 -0000 1.44.2.1 *************** *** 130,140 **** ", - 'tiki_sessions' => " - session_id C(32) PRIMARY, - user_id I4, - timestamp I8 - " - - ); --- 130,133 ---- |
|
From: <tik...@li...> - 2005-06-18 14:11:16
|
Update of /cvsroot/tikipro/_p_tp_users In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10104/users Modified Files: Tag: CLYDE TikiUser.php Log Message: Moved tiki_sessions from kernel to users package Index: TikiUser.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_users/TikiUser.php,v retrieving revision 1.154 retrieving revision 1.154.2.1 diff -C2 -d -r1.154 -r1.154.2.1 *** TikiUser.php 6 Jun 2005 11:05:31 -0000 1.154 --- TikiUser.php 18 Jun 2005 14:11:05 -0000 1.154.2.1 *************** *** 252,255 **** --- 252,260 ---- } + function count_sessions() { + $query = "select count(*) from `".TIKI_DB_PREFIX."tiki_sessions`"; + $cant = $this->getOne($query,array()); + return $cant; + } function logout() { |
|
From: <tik...@li...> - 2005-06-18 14:11:16
|
Update of /cvsroot/tikipro/_p_tp_users/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10104/users/admin Modified Files: Tag: CLYDE schema_inc.php upgrade_inc.php Log Message: Moved tiki_sessions from kernel to users package Index: upgrade_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_users/admin/upgrade_inc.php,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -C2 -d -r1.21.2.1 -r1.21.2.2 *** upgrade_inc.php 14 Jun 2005 22:23:54 -0000 1.21.2.1 --- upgrade_inc.php 18 Jun 2005 14:11:05 -0000 1.21.2.2 *************** *** 95,98 **** --- 95,102 ---- 'logo_attachment_id' => array( '`logo_attachment_id`', 'I4' ), // , 'NOTNULL' ), ), + 'tiki_sessions' => array( + 'user_id' => array( '`user_id`', 'I4' ), // , 'NOTNULL' ), + 'session_id' => array( '`session_id`', 'VARCHAR(32)' ), // , 'NOTNULL' ), + ), 'tiki_user_bookmarks_folders' => array( 'user_id' => array( '`user_id`', 'I4' ), // , 'NOTNULL' ), *************** *** 174,177 **** --- 178,182 ---- "INSERT INTO `".TIKI_DB_PREFIX."users_users` (`real_name`, `login`, `email` ) VALUES ('System', 'system', 'system@localhost' )", "UPDATE `".TIKI_DB_PREFIX."users_users` SET `login`='system' WHERE `user_id`=".ROOT_USER_ID, + "UPDATE `".TIKI_DB_PREFIX."tiki_sessions` SET `user_id`=(SELECT `user_id` FROM `".TIKI_DB_PREFIX."users_users` WHERE `".TIKI_DB_PREFIX."users_users`.`login`=`".TIKI_DB_PREFIX."tiki_sessions`.`user`)", "UPDATE `".TIKI_DB_PREFIX."tiki_user_preferences` SET `user_id`=(SELECT `user_id` FROM `".TIKI_DB_PREFIX."users_users` WHERE `".TIKI_DB_PREFIX."users_users`.`login`=`".TIKI_DB_PREFIX."tiki_user_preferences`.`user`)", "UPDATE `".TIKI_DB_PREFIX."tiki_user_bookmarks_folders` SET `user_id`=(SELECT `user_id` FROM `".TIKI_DB_PREFIX."users_users` WHERE `".TIKI_DB_PREFIX."users_users`.`login`=`".TIKI_DB_PREFIX."tiki_user_bookmarks_folders`.`user`)", *************** *** 193,196 **** --- 198,202 ---- array( 'DATADICT' => array( array( 'DROPCOLUMN' => array( + 'tiki_sessions' => array( '`user`', '`sessionId`' ), 'users_groups_map' => array( '`groupName`' ), 'users_grouppermissions' => array( '`groupName`' ), Index: schema_inc.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_users/admin/schema_inc.php,v retrieving revision 1.58 retrieving revision 1.58.2.1 diff -C2 -d -r1.58 -r1.58.2.1 *** schema_inc.php 1 Jun 2005 15:16:07 -0000 1.58 --- schema_inc.php 18 Jun 2005 14:11:05 -0000 1.58.2.1 *************** *** 35,38 **** --- 35,44 ---- ",*/ + 'tiki_sessions' => " + session_id C(32) PRIMARY, + user_id I4, + timestamp I8 + ", + 'tiki_user_bookmarks_urls' => " url_id I4 AUTO PRIMARY, |
|
From: <tik...@li...> - 2005-06-18 14:11:12
|
Update of /cvsroot/tikipro/_p_tp_kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10104/kernel Modified Files: Tag: CLYDE TikiLib.php Log Message: Moved tiki_sessions from kernel to users package Index: TikiLib.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_kernel/TikiLib.php,v retrieving revision 1.120 retrieving revision 1.120.2.1 diff -C2 -d -r1.120 -r1.120.2.1 *** TikiLib.php 11 Jun 2005 03:02:27 -0000 1.120 --- TikiLib.php 18 Jun 2005 14:11:04 -0000 1.120.2.1 *************** *** 799,808 **** } - function count_sessions() { - $query = "select count(*) from `".TIKI_DB_PREFIX."tiki_sessions`"; - $cant = $this->getOne($query,array()); - return $cant; - } - function list_cache($offset, $maxRecords, $sort_mode, $find) { --- 799,802 ---- |
|
From: <tik...@li...> - 2005-06-18 14:09:05
|
Update of /cvsroot/tikipro/_p_tp_install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9392/install Modified Files: Tag: CLYDE TikiInstaller.php Log Message: Added PGSQL case for QUERY statements Index: TikiInstaller.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_install/TikiInstaller.php,v retrieving revision 1.32 retrieving revision 1.32.2.1 diff -C2 -d -r1.32 -r1.32.2.1 *** TikiInstaller.php 30 May 2005 21:54:40 -0000 1.32 --- TikiInstaller.php 18 Jun 2005 14:08:56 -0000 1.32.2.1 *************** *** 236,239 **** --- 236,244 ---- } break; + case 'PGSQL' : + if( preg_match( '/pgsql/', $db_tiki ) ) { + $sql = $step[$dbType]; + } + break; case 'SQL92' : $sql = $step[$dbType]; |
|
From: <tik...@li...> - 2005-06-18 13:59:05
|
Update of /cvsroot/tikipro/_p_tp_wiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4759 Modified Files: Tag: CLYDE show_page.tpl Log Message: clean up wiki ...page... pagination Index: show_page.tpl =================================================================== RCS file: /cvsroot/tikipro/_p_tp_wiki/templates/show_page.tpl,v retrieving revision 1.74 retrieving revision 1.74.2.1 diff -C2 -d -r1.74 -r1.74.2.1 *** show_page.tpl 13 Jun 2005 03:55:20 -0000 1.74 --- show_page.tpl 18 Jun 2005 13:58:56 -0000 1.74.2.1 *************** *** 8,16 **** {if $pages > 1} <div class="pagination"> ! <a title="{tr}First page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$first_page}">{tikicon ipackage=liberty iname="nav_first" iexplain="first page"}</a> ! <a title="{tr}Previous page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$prev_page}">{tikicon ipackage=liberty iname="nav_prev" iexplain="previous page"}</a> ! {tr}page{/tr}:{$pagenum}/{$pages} ! <a title="{tr}Next page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$next_page}">{tikicon ipackage=liberty iname="nav_next" iexplain="next page"}</a> ! <a title="{tr}Last page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$last_page}">{tikicon ipackage=liberty iname="nav_last" iexplain="last page"}</a> </div> {/if} {* end .pagination *} --- 8,16 ---- {if $pages > 1} <div class="pagination"> ! {*<a title="{tr}First page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$first_page}">« «</a>*} ! <a title="{tr}Previous page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$prev_page}">«</a> ! {tr}Page {$pagenum} of {$pages}{/tr} ! <a title="{tr}Next page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$next_page}">»</a> ! {*<a title="{tr}Last page{/tr}" href="index.php?page_id={$pageInfo.page_id}&pagenum={$last_page}">» »</a>*} </div> {/if} {* end .pagination *} |
|
From: <tik...@li...> - 2005-06-18 11:19:57
|
Update of /cvsroot/tikipro/_p_tp_wiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26891 Modified Files: Tag: CLYDE TikiPage.php Log Message: fix erroneous use of pContentId var in ::load Index: TikiPage.php =================================================================== RCS file: /cvsroot/tikipro/_p_tp_wiki/TikiPage.php,v retrieving revision 1.107.2.1 retrieving revision 1.107.2.2 diff -C2 -d -r1.107.2.1 -r1.107.2.2 *** TikiPage.php 14 Jun 2005 08:56:20 -0000 1.107.2.1 --- TikiPage.php 18 Jun 2005 11:19:47 -0000 1.107.2.2 *************** *** 84,88 **** LibertyAttachable::load(); } else { ! LibertyContent::load($pContentId); } } --- 84,88 ---- LibertyAttachable::load(); } else { ! LibertyContent::load(); } } |
|
From: <tik...@li...> - 2005-06-17 21:08:23
|
Update of /cvsroot/tikipro/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32635 Modified Files: modules Log Message: cleanup everything module Index: modules =================================================================== RCS file: /cvsroot/tikipro/CVSROOT/modules,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -d -r1.137 -r1.138 *** modules 2 Jun 2005 06:33:09 -0000 1.137 --- modules 17 Jun 2005 21:07:09 -0000 1.138 *************** *** 173,175 **** ! everything _root &_p_tp_articles &_p_tp_backups &_p_tp_banners &_p_tp_blogs &_p_tp_calendar &_p_tp_categories &_p_tp_charts &_p_tp_chat &_p_tp_liberty &_p_tp_dcs &_p_tp_debug &_p_tp_directory &_p_tp_doc &_p_tp_drawings &_p_tp_ephemerides &_p_tp_faqs &_p_tp_featured_links &_p_tp_filegals &_p_tp_fisheye &_p_tp_Galaxia &_p_tp_games &_p_tp_gatekeeper &_p_tp_google &_p_tp_hawhaw &_p_tp_hotwords &_p_tp_html &_p_tp_htmlarea &_p_tp_imagegals &_p_tp_img &_p_tp_install &_p_tp_integrator &_p_tp_irc &_p_tp_kernel &_p_tp_languages &_p_tp_multisites &_p_tp_live_support &_p_tp_maps &_p_tp_messu &_p_tp_minical &_p_tp_movies &_p_tp_newsletters &_p_tp_newsreader &_p_tp_notepad &_p_tp_pdf &_p_tp_polls &_p_tp_quicktags &_p_tp_quizzes &_p_tp_quota &_p_tp_rss &_p_tp_sample &_p_tp_search &_p_tp_shoutbox &_p_tp_smileys &_p_tp_snoopy &_p_tp_stats &_p_tp_stickies &_p_tp_storage &_p_tp_stylist &_p_tp_surveys &_p_tp_tabs &_p_tp_taglines &_p_tp_tail &_p_tp_temp &_p_tp_themes &_p_tinymce &_p_tp_tikibot &_p_tp_tikiforums &_p_tp_tikihelp &_p_tp_trackers &_p_tp_tree &_p_tp_users &_p_tp_util &_p_tp_webmail &_p_tp_wiki &_p_tp_xmlrpc &_zencart &_phpbb &_phplayers &_jscalendar &_l_adodb &_l_smarty --- 173,175 ---- ! everything _root &_p_tp_articles &_p_tp_backups &_p_tp_banners &_p_tp_blogs &_p_tp_calendar &_p_tp_categories &_p_tp_charts &_p_tp_chat &_p_tp_liberty &_p_tp_dcs &_p_tp_debug &_p_tp_directory &_p_tp_doc &_p_tp_drawings &_p_tp_ephemerides &_p_tp_faqs &_p_tp_featured_links &_p_tp_filegals &_p_tp_fisheye &_p_tp_Galaxia &_p_tp_games &_p_tp_gatekeeper &_p_tp_google &_p_tp_hawhaw &_p_tp_hotwords &_p_tp_html &_p_tp_htmlarea &_p_tp_imagegals &_p_tp_img &_p_tp_install &_p_tp_integrator &_p_tp_irc &_p_tp_kernel &_p_tp_languages &_p_tp_multisites &_p_tp_live_support &_p_tp_maps &_p_tp_messu &_p_tp_minical &_p_tp_movies &_p_tp_nexus &_p_tp_newsletters &_p_tp_newsreader &_p_tp_notepad &_p_tp_pdf &_p_tp_polls &_p_tp_quicktags &_p_tp_quizzes &_p_tp_quota &_p_tp_rss &_p_tp_sample &_p_tp_search &_p_tp_shoutbox &_p_tp_smileys &_p_tp_snoopy &_p_tp_stats &_p_tp_stickies &_p_tp_storage &_p_tp_stylist &_p_tp_surveys &_p_tp_tabs &_p_tp_taglines &_p_tp_tail &_p_tp_temp &_p_tp_themes &_p_tinymce &_p_tp_tikibot &_p_tp_tikiforums &_p_tp_tikihelp &_p_tp_trackers &_p_tp_tree &_p_tp_users &_p_tp_util &_p_tp_webmail &_p_tp_wiki &_p_tp_xmlrpc &_zencart &_phpbb &_phplayers &_jscalendar &_l_adodb &_l_smarty |
8 messages has been excluded from this view by a project administrator.