BitKeeper patch
[email protected] (Ferenc Veres) Tue, 19 Apr 2005 02:13:46 +0200 (CEST)
| Newsgroups | gmane.comp.cms.xaraya.patches |
|---|---|
| Message-ID | <[email protected]> |
This BitKeeper patch contains the following changesets: lion@kempelen.(none)|ChangeSet|20050419001312|27286 lion@kempelen.(none)|ChangeSet|20050419000135|28644 lion@kempelen.(none)|ChangeSet|20050418235620|28657 lion@kempelen.(none)|ChangeSet|20050418234428|29509 lion@kempelen.(none)|ChangeSet|20050415191728|09620 lion@kempelen.(none)|ChangeSet|20050412225947|08118 # ID: [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a # User: lion # Host: kempelen.(none) # Root: /home/lion/bk/core # Patch vers: 1.3 # Patch type: REGULAR == ChangeSet == [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a [email protected]|ChangeSet|20050412200709|10303 D 1.1921 05/04/13 00:59:47+02:00 lion@kempelen.(none) +22 -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c ah, charset encoding conversion is now possible while importing K 8118 P ChangeSet ------------------------------------------------ 0a0 > [email protected]|tests/import/postnuke/import_pn_users.php|20030620194516|23697|59796346 lion@kempelen.(none)|tools/import/postnuke/import_pn_users.php|20050412224035|07810 > [email protected]|tests/import/postnuke/import_pn_pollcomments.php|20030620194515|31158|595e083f lion@kempelen.(none)|tools/import/postnuke/import_pn_pollcomments.php|20050412224035|38750 > [email protected]|tests/import/postnuke/import_pn_faqcategories.php|20030620194515|30207|59492b30 lion@kempelen.(none)|tools/import/postnuke/import_pn_faqcategories.php|20050412224035|04815 > voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_posts.php|20050315092439|02407|b4cb994b6cb4b7d3 lion@kempelen.(none)|tools/import/postnuke/import_pn_phpbb14_posts.php|20050412224035|28427 > voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_topics.php|20050315092439|02842|b38150fe39030d lion@kempelen.(none)|tools/import/postnuke/import_pn_phpbb14_topics.php|20050412224035|02016 > [email protected]|tests/import/postnuke/import_pn_seccont.php|20030620194515|61722|5966a849 lion@kempelen.(none)|tools/import/postnuke/import_pn_seccont.php|20050412224035|18891 > [email protected]|tests/import/postnuke/import_pn_links_categories.php|20030620194515|32145|594d404c lion@kempelen.(none)|tools/import/postnuke/import_pn_links_categories.php|20050412224035|12704 > [email protected]|tests/import/postnuke/import_pn_stories.php|20030620194516|05000|596ff3d7 lion@kempelen.(none)|tools/import/postnuke/import_pn_stories.php|20050412224035|57119 > voll-/[email protected]|tools/import/postnuke/import_pn_downloads_categories.php|20050315092438|16541|f1662ddf6ac94932 lion@kempelen.(none)|tools/import/postnuke/import_pn_downloads_categories.php|20050412224034|49046 > [email protected]|tests/import/postnuke/import_pn_queue.php|20030620194515|20981|596276f5 lion@kempelen.(none)|tools/import/postnuke/import_pn_queue.php|20050412224035|55776 > [email protected]|tests/import/postnuke/import_pn_sections.php|20030620194516|40873|596ae90a lion@kempelen.(none)|tools/import/postnuke/import_pn_sections.php|20050412224035|57431 > [email protected]|tests/import/postnuke/import_pn_poll_desc.php|20030620194515|33954|59597d70 lion@kempelen.(none)|tools/import/postnuke/import_pn_poll_desc.php|20050412224035|14041 > [email protected]|tests/import/postnuke/import_pn_comments.php|20030620194515|26754|5940f71c lion@kempelen.(none)|tools/import/postnuke/import_pn_comments.php|20050412224034|63581 > [email protected]|tests/import/postnuke/import_pn_poll_data.php|20030620194515|35231|59557612 lion@kempelen.(none)|tools/import/postnuke/import_pn_poll_data.php|20050412224035|21504 > BK|tests/import8.php|19700101030959|03976|86a864223597f23a lion@kempelen.(none)|tools/import/postnuke/import_pn.php|20050412224034|51816 > [email protected]|tests/import/postnuke/import_pn_faqanswer.php|20030620194515|60449|59450e7f lion@kempelen.(none)|tools/import/postnuke/import_pn_faqanswer.php|20050412224035|13571 > voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_forums.php|20050315092439|02206|9c6dd2197c3b37e3 lion@kempelen.(none)|tools/import/postnuke/import_pn_phpbb14_forums.php|20050412224035|00208 > [email protected]|tests/import/postnuke/import_pn_cleanup.php|20030620194515|23714|593cdc98 lion@kempelen.(none)|tools/import/postnuke/import_pn_cleanup.php|20050412224034|11955 > voll-/[email protected]|tools/import/postnuke/import_pn_downloads_downloads.php|20050315092439|01806|2dae55ffba7e263f lion@kempelen.(none)|tools/import/postnuke/import_pn_downloads_downloads.php|20050412224035|38690 > [email protected]|tests/import/postnuke/import_pn_topicscat.php|20030620194516|48814|597433af lion@kempelen.(none)|tools/import/postnuke/import_pn_topicscat.php|20050412224035|32923 > [email protected]|tests/import/postnuke/import_pn_links_links.php|20030620194515|01058|59515baa lion@kempelen.(none)|tools/import/postnuke/import_pn_links_links.php|20050412224035|31060 > [email protected]|BitKeeper/etc/logging_ok|20020928132559|02556|36872ac13653ac68 lion@kempelen.(none)|BitKeeper/etc/logging_ok|20050412225946|62922 lion@kempelen.(none)|ChangeSet|20050412225947|08118 D 1.1922 05/04/15 21:17:28+02:00 lion@kempelen.(none) +0 -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Merge http://xaraya.com:15000/core/stable c into kempelen.(none):/home/lion/bk/core i [email protected]|ChangeSet|20050413072112|09945 i [email protected]|ChangeSet|20050413073444|09961 i ccorliss-tp0iMJ/[email protected]|ChangeSet|20050413201336|11389 i [email protected]|ChangeSet|20050413231035|11364 i jojodee-CZ0/[email protected]|ChangeSet|20050414201211|11793 i jojodee-CZ0/[email protected]|ChangeSet|20050415033317|11802 i John.Cox@mcnabb.|ChangeSet|20050415103956|11805 K 9620 M John.Cox@mcnabb.|ChangeSet|20050415103956|11805 P ChangeSet ------------------------------------------------ lion@kempelen.(none)|ChangeSet|20050415191728|09620 D 1.1923 05/04/19 01:44:28+02:00 lion@kempelen.(none) +0 -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Merge http://xaraya.com:15000/core/stable c into kempelen.(none):/home/lion/bk/core i [email protected]|ChangeSet|20050415194423|26849 i [email protected]|ChangeSet|20050415204029|28306 i John.Cox@mcnabb.|ChangeSet|20050415232058|27530 i caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|ChangeSet|20050416010614|27828 i [email protected]|ChangeSet|20050416171535|29629 i [email protected]|ChangeSet|20050416173843|29643 i [email protected]|ChangeSet|20050416204455|31573 i [email protected]|ChangeSet|20050417045206|31566 i [email protected]|ChangeSet|20050418033910|31694 K 29509 M [email protected]|ChangeSet|20050418033910|31694 P ChangeSet ------------------------------------------------ lion@kempelen.(none)|ChangeSet|20050418234428|29509 D 1.1924 05/04/19 01:56:20+02:00 lion@kempelen.(none) +1 -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Creates doctype "ContentExpress" instead overwriting "Documents" c Charset encoding conversion possible using xarCharset class. K 28657 P ChangeSet ------------------------------------------------ 0a0 > mikespub-FogMEOs31dotat4ziPANHlKoq+OfwspIAL8bYrjMMd8@public.gmane.org|tests/import/import_ce124.php|20030505193959|57498|6f9bcf0d1d5880f lion@kempelen.(none)|tools/import/contentexpress/import_ce124.php|20050418235617|10801 lion@kempelen.(none)|ChangeSet|20050418235620|28657 D 1.1925 05/04/19 02:01:35+02:00 lion@kempelen.(none) +1 -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c An update of my previous patch: Uses the new xarCharset class for c encoding conversion (insead the external recode in my first patch). c Now it lists all available encodings thus anything-to-anything is possible. c In general, makes it possible to import non-utf-8 PN sites to utf-8 xaraya. K 28644 P ChangeSet ------------------------------------------------ 0a0 > BK|tests/import8.php|19700101030959|03976|86a864223597f23a lion@kempelen.(none)|tools/import/postnuke/import_pn.php|20050419000133|20313 lion@kempelen.(none)|ChangeSet|20050419000135|28644 D 1.1926 05/04/19 02:13:12+02:00 lion@kempelen.(none) +7 -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Charset conversion when importing from different encoding PN->Xar. c Nonexisitng forum users' posts are imported as Anonymous (instead die()ing). c Master categoriy IDs are now correcly assinged, thus if you had 2 main forums 2 master categories will be assinged. c An ORDER BY was missing thus unlucky categories got just lost (when no parent yet imported). c The current behavior is still a bit odd for me, importing categories+forums (duplicating result), no idea why. c Also TODO: no configuration default gets created, thus admin must go into each forum and press save! K 27286 P ChangeSet ------------------------------------------------ 0a0 > [email protected]|tests/import/xforum/import_xforum_users.php|20031130210353|41979|edeb29da lion@kempelen.(none)|tools/import/xforum/import_xforum_users.php|20050419001308|04159 > [email protected]|tests/import/xforum/import_xforum_topics.php|20031130210352|49535|ede0975f lion@kempelen.(none)|tools/import/xforum/import_xforum_topics.php|20050419001308|54027 > [email protected]|tests/import/xforum/import_xforum_categories.php|20031130210352|38439|edb5c257 lion@kempelen.(none)|tools/import/xforum/import_xforum_categories.php|20050419001308|22330 > [email protected]|tests/import/xforum/import_xforum_forums.php|20031130210352|57705|edcb599f lion@kempelen.(none)|tools/import/xforum/import_xforum_forums.php|20050419001308|00277 > [email protected]|tests/import/xforum/import_xforum_cleanup.php|20031130210352|51520|edc099a7 lion@kempelen.(none)|tools/import/xforum/import_xforum_cleanup.php|20050419001308|14268 > [email protected]|tests/import/xforum/import_xforum_posts.php|20031130210352|53354|edd5f748 lion@kempelen.(none)|tools/import/xforum/import_xforum_posts.php|20050419001308|33164 > [email protected]|tests/import/xforum/import_xforum.php|20031130210351|42380|edab10eb lion@kempelen.(none)|tools/import/xforum/import_xforum.php|20050419001308|31232 == tools/import/postnuke/import_pn.php == BK|tests/import8.php|19700101030959|03976|86a864223597f23a voll-/[email protected]|tools/import/postnuke/import_pn.php|20050315092517|50266 D 1.49 05/04/13 00:40:34+02:00 lion@kempelen.(none) +45 -1 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 51816 O -rw-rw-r-- P tools/import/postnuke/import_pn.php ------------------------------------------------ I14 12 // Little function which converts the charset encoding if the user wanted // Otherwise returns the original string, all normal text fields must call this // while moving content from PN to Xar. /Lion function charconv($text) { if (xarModGetVar('installer','recode') == "on") { return recode(xarModGetVar('installer','recode_from')."..".xarModGetVar('installer','recode_to'), $text); } else { return $text; } } \ \ I47 5 \ if (!xarVarFetch('recode', 'isset', $recode, NULL, XARVAR_NOT_REQUIRED)) {return;} if (!xarVarFetch('recode_from', 'isset', $recode_from, NULL, XARVAR_NOT_REQUIRED)) {return;} if (!xarVarFetch('recode_to', 'isset', $recode_to, NULL, XARVAR_NOT_REQUIRED)) {return;} \ I48 1 \ I57 7 \ // Disable charset conversion fields if recode() not available. if (!function_exists("recode")) { $norecode = " disabled"; } else { $norecode = ""; } I77 14 <tr><td align="right">Convert charset (requires GNU recode installed)</td> <td><input type="checkbox" name="recode" <? echo $norecode ?>> From: <select name="recode_from" <? echo $norecode ?>> <option value="l2">iso-8859-2</option> <option value="l1">iso-8859-1</option> <option value="utf8">utf-8</option> </select> To: <select name="recode_to" <? echo $norecode ?>> <option value="utf8">utf-8</option> <option value="l2">iso-8859-2</option> <option value="l1">iso-8859-1</option> </select> </td></tr> \ I113 5 \ if (!isset($recode)) { $recode = 0; } xarModSetVar('installer','recode',$recode); xarModSetVar('installer','recode_from',$recode_from); xarModSetVar('installer','recode_to',$recode_to); D252 1 I252 1 ?> lion@kempelen.(none)|tools/import/postnuke/import_pn.php|20050412224034|51816 D 1.50 05/04/19 02:01:33+02:00 lion@kempelen.(none) +33 -24 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Changed to use the internal xarCharset class instead my first version which used "recode()" for charset conversion. c Lists the avaiable encoding names instead hardcoding just a few. c This is an update of the patch I sent a few days ago. K 20313 O -rw-rw-r-- P tools/import/postnuke/import_pn.php ------------------------------------------------ D19 5 I23 7 global $CharConverter; if (xarModGetVar('installer','recode') == "on") { return $CharConverter->convert($text, xarModGetVar('installer','recode_from'), xarModGetVar('installer','recode_to'), 0); //return recode(xarModGetVar('installer','recode_from')."..".xarModGetVar('installer','recode_to'), $text); } else { return $text; } I30 5 // Load charset converter API require_once "includes/transforms/xarCharset.php"; $CharConverter = new xarCharset; $encodings = $CharConverter->getEncodings(); \ D77 6 I82 1 \ D103 13 I115 20 \ <tr><td colspan="2"> </td></tr> <tr><td align="right" valign="top">Convert charset encoding</td> <td><input type="checkbox" name="recode"></td></tr> <tr><td align="right">Postnuke encoding</td><td><select name="recode_from"> <option value="iso-8859-2">iso-8859-2</option> <option value="">----------</option> <? foreach ($encodings as $enc) { echo "<option value=\"$enc\">$enc</option>\n"; } ?> </select></td></tr> <tr><td align="right">Xaraya encoding</td><td><select name="recode_to"> <option value="utf-8">utf-8</option> <option value="">----------</option> <? foreach ($encodings as $enc) { echo "<option value=\"$enc\">$enc</option>\n"; } ?> </select> </td></tr> == tools/import/postnuke/import_pn_cleanup.php == [email protected]|tests/import/postnuke/import_pn_cleanup.php|20030620194515|23714|593cdc98 voll-/[email protected]|tools/import/postnuke/import_pn_cleanup.php|20050315093107|63860 D 1.7 05/04/13 00:40:34+02:00 lion@kempelen.(none) +6 -1 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 11955 O -rw-rw-rw- P tools/import/postnuke/import_pn_cleanup.php ------------------------------------------------ I40 5 // Recode charconverter cleanup xarModDelVar('installer','recode'); xarModDelVar('installer','recode_from'); xarModDelVar('installer','recode_to'); \ D68 1 I68 1 ?> == tools/import/postnuke/import_pn_comments.php == [email protected]|tests/import/postnuke/import_pn_comments.php|20030620194515|26754|5940f71c [email protected]|tools/import/postnuke/import_pn_comments.php|20040817172333|12086 D 1.7 05/04/13 00:40:34+02:00 lion@kempelen.(none) +5 -5 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 63581 O -rw-rw-rw- P tools/import/postnuke/import_pn_comments.php ------------------------------------------------ D94 2 I95 2 $data['title'] = charconv($subject); $data['comment'] = charconv($comment); D103 1 I103 1 echo "Failed inserting comment ($sid $pid) ".charconv($uname)." - ".charconv($subject)." : ".$dbconn->ErrorMsg()."<br/>\n"; D105 1 I105 1 echo "Inserted comment ($sid $pid) ".charconv($uname)." - ".charconv($subject)."<br/>\n"; D128 1 I128 1 ?> == tools/import/postnuke/import_pn_faqanswer.php == [email protected]|tests/import/postnuke/import_pn_faqanswer.php|20030620194515|60449|59450e7f [email protected]|tools/import/postnuke/import_pn_faqanswer.php|20050129022915|08576 D 1.6 05/04/13 00:40:35+02:00 lion@kempelen.(none) +6 -6 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 13571 O -rw-rw-rw- P tools/import/postnuke/import_pn_faqanswer.php ------------------------------------------------ D52 1 I52 1 array('title' => charconv($title), D54 2 I55 2 'body' => charconv($content), 'notes' => charconv($notes), D66 1 I66 1 echo "Insert FAQ ($id) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; D68 1 I68 1 echo "Inserted FAQ ($id) ".charconv($title)."<br/>\n"; D82 1 I82 1 ?> == tools/import/postnuke/import_pn_faqcategories.php == [email protected]|tests/import/postnuke/import_pn_faqcategories.php|20030620194515|30207|59492b30 [email protected]|tools/import/postnuke/import_pn_faqcategories.php|20040817172333|14205 D 1.5 05/04/13 00:40:35+02:00 lion@kempelen.(none) +5 -5 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 4815 O -rw-rw-rw- P tools/import/postnuke/import_pn_faqcategories.php ------------------------------------------------ D51 1 I51 1 echo "Oops, missing parent $parent for FAQ ($id) ".charconv($name)."<br/>\n"; D54 2 I55 2 array('name' => charconv($name), 'description' => charconv($name), D57 1 I57 1 echo "Creating FAQ ($id) ".charconv($name)." [parent $parent]<br/>\n"; D69 1 I69 1 ?> == tools/import/postnuke/import_pn_links_categories.php == [email protected]|tests/import/postnuke/import_pn_links_categories.php|20030620194515|32145|594d404c [email protected]|tools/import/postnuke/import_pn_links_categories.php|20040817172333|15296 D 1.7 05/04/13 00:40:35+02:00 lion@kempelen.(none) +4 -4 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 12704 O -rw-rw-rw- P tools/import/postnuke/import_pn_links_categories.php ------------------------------------------------ D49 2 I50 2 'name' => charconv($title), 'description' => charconv($descr), D54 1 I54 1 echo "Creating web link category ($id) ".charconv($title)." - ".charconv($descr)."<br/>\n"; D72 1 I72 1 ?> == tools/import/postnuke/import_pn_links_links.php == [email protected]|tests/import/postnuke/import_pn_links_links.php|20030620194515|01058|59515baa [email protected]|tools/import/postnuke/import_pn_links_links.php|20050129022915|26065 D 1.7 05/04/13 00:40:35+02:00 lion@kempelen.(none) +6 -6 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 31060 O -rw-rw-rw- P tools/import/postnuke/import_pn_links_links.php ------------------------------------------------ D78 2 I79 2 array('title' => charconv($title), 'summary' => charconv($descr), D81 1 I81 1 'notes' => charconv($name) . $email, D92 1 I92 1 echo "Insert web link ($lid) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; D94 1 I94 1 echo "Inserted web link ($lid) ".charconv($title)."<br/>\n"; D109 1 I109 1 ?> == tools/import/postnuke/import_pn_poll_data.php == [email protected]|tests/import/postnuke/import_pn_poll_data.php|20030620194515|35231|59557612 [email protected]|tools/import/postnuke/import_pn_poll_data.php|20050129022915|18375 D 1.6 05/04/13 00:40:35+02:00 lion@kempelen.(none) +4 -4 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion but untested on this file K 21504 O -rw-rw-rw- P tools/import/postnuke/import_pn_poll_data.php ------------------------------------------------ D48 1 I48 1 'option' => charconv($text), D51 1 I51 1 echo "Insert poll option ($pid $vid) ".charconv($text)." failed : " . xarErrorRender('text') . "<br/>\n"; D53 1 I53 1 echo "Inserted poll option ($pid $vid) ".charconv($text)."<br/>\n"; D65 1 I65 1 ?> == tools/import/postnuke/import_pn_poll_desc.php == [email protected]|tests/import/postnuke/import_pn_poll_desc.php|20030620194515|33954|59597d70 [email protected]|tools/import/postnuke/import_pn_poll_desc.php|20050129022915|10912 D 1.8 05/04/13 00:40:35+02:00 lion@kempelen.(none) +4 -4 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion but untested in this file K 14041 O -rw-rw-rw- P tools/import/postnuke/import_pn_poll_desc.php ------------------------------------------------ D69 1 I69 1 array('title' => charconv($title), D75 1 I75 1 echo "Insert poll ($pid) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; D77 1 I77 1 echo "Inserted poll ($pid) ".charconv($title)."<br/>\n"; D90 1 I90 1 ?> == tools/import/postnuke/import_pn_pollcomments.php == [email protected]|tests/import/postnuke/import_pn_pollcomments.php|20030620194515|31158|595e083f [email protected]|tools/import/postnuke/import_pn_pollcomments.php|20040817172333|19681 D 1.6 05/04/13 00:40:35+02:00 lion@kempelen.(none) +5 -5 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion but untested on this file K 38750 O -rw-rw-rw- P tools/import/postnuke/import_pn_pollcomments.php ------------------------------------------------ D120 2 I121 2 $data['title'] = charconv($subject); $data['comment'] = charconv($comment); D129 1 I129 1 echo "Failed inserting poll comment ($sid $pid) ".charconv($uname)." - ".charconv($subject)." : ".$dbconn->ErrorMsg()."<br/>\n"; D131 1 I131 1 echo "Inserted poll comment ($sid $pid) ".charconv($uname)." - ".charconv($subject)."<br/>\n"; D149 1 I149 1 ?> == tools/import/postnuke/import_pn_queue.php == [email protected]|tests/import/postnuke/import_pn_queue.php|20030620194515|20981|596276f5 [email protected]|tools/import/postnuke/import_pn_queue.php|20050129022915|49848 D 1.7 05/04/13 00:40:35+02:00 lion@kempelen.(none) +7 -7 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 55776 O -rw-rw-rw- P tools/import/postnuke/import_pn_queue.php ------------------------------------------------ D92 4 I95 4 array('title' => charconv($title), 'summary' => charconv($summary), 'body' => charconv($body), 'notes' => charconv($notes), D106 1 I106 1 echo "Insert queued article ($qid) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; D108 1 I108 1 echo "Inserted queued article ($qid) ".charconv($title)."<br/>\n"; D126 1 I126 1 ?> == tools/import/postnuke/import_pn_seccont.php == [email protected]|tests/import/postnuke/import_pn_seccont.php|20030620194515|61722|5966a849 [email protected]|tools/import/postnuke/import_pn_seccont.php|20050129022915|14829 D 1.6 05/04/13 00:40:35+02:00 lion@kempelen.(none) +5 -5 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 18891 O -rw-rw-rw- P tools/import/postnuke/import_pn_seccont.php ------------------------------------------------ D53 1 I53 1 array('title' => charconv($title), D55 1 I55 1 'body' => charconv($content), D67 1 I67 1 echo "Insert section content ($artid) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; D69 1 I69 1 echo "Inserted section content ($artid) ".charconv($title)."<br/>\n"; D82 1 I82 1 ?> == tools/import/postnuke/import_pn_sections.php == [email protected]|tests/import/postnuke/import_pn_sections.php|20030620194516|40873|596ae90a [email protected]|tools/import/postnuke/import_pn_sections.php|20040817172333|22993 D 1.5 05/04/13 00:40:35+02:00 lion@kempelen.(none) +4 -4 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 57431 O -rw-rw-rw- P tools/import/postnuke/import_pn_sections.php ------------------------------------------------ D45 2 I46 2 'name' => charconv($name), 'description' => charconv($name), D49 1 I49 1 echo "Creating section ($id) ".charconv($name)." [$image]<br/>\n"; D60 1 I60 1 ?> == tools/import/postnuke/import_pn_stories.php == [email protected]|tests/import/postnuke/import_pn_stories.php|20030620194516|05000|596ff3d7 [email protected]|tools/import/postnuke/import_pn_stories.php|20050129022915|51191 D 1.8 05/04/13 00:40:35+02:00 lion@kempelen.(none) +7 -7 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 57119 O -rw-rw-rw- P tools/import/postnuke/import_pn_stories.php ------------------------------------------------ D107 4 I110 4 'title' => charconv($title), 'summary' => charconv($summary), 'body' => charconv($body), 'notes' => charconv($notes), D121 1 I121 1 echo "Insert article ($aid) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; D123 1 I123 1 echo "Inserted article ($aid) ".charconv($title)."<br/>\n"; D147 1 I147 1 ?> == tools/import/postnuke/import_pn_topicscat.php == [email protected]|tests/import/postnuke/import_pn_topicscat.php|20030620194516|48814|597433af [email protected]|tools/import/postnuke/import_pn_topicscat.php|20040817172333|25267 D 1.6 05/04/13 00:40:35+02:00 lion@kempelen.(none) +7 -7 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 32923 O -rw-rw-rw- P tools/import/postnuke/import_pn_topicscat.php ------------------------------------------------ D74 2 I75 2 'name' => charconv($text), 'description' => charconv($text), D78 1 I78 1 echo "Creating topic ($id) ".charconv($text)." - ".charconv($name)." [$image]<br/>\n"; D101 2 I102 2 'name' => charconv($title), 'description' => charconv($title), D104 1 I104 1 echo "Creating category ($id) ".charconv($title)." - ".charconv($title)."<br/>\n"; D128 1 I128 1 ?> == tools/import/postnuke/import_pn_users.php == [email protected]|tests/import/postnuke/import_pn_users.php|20030620194516|23697|59796346 [email protected]|tools/import/postnuke/import_pn_users.php|20050129022915|57155 D 1.8 05/04/13 00:40:35+02:00 lion@kempelen.(none) +17 -17 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 7810 O -rw-rw-rw- P tools/import/postnuke/import_pn_users.php ------------------------------------------------ D113 4 I116 4 'uname' => charconv($uname), 'realname' => charconv($name), 'email' => charconv($email), 'cryptpass' => charconv($pass), D154 1 I154 1 echo "Inserted user ($uid) ".charconv($name)." - ".charconv($uname)."<br/>\n"; D173 1 I173 1 'website' => empty($url) ? null : charconv($url), D175 10 I184 10 'avatar' => empty($avatar) ? null : charconv($avatar), 'icq' => empty($icq) ? null : charconv($icq), 'aim' => empty($aim) ? null : charconv($aim), 'yim' => empty($yim) ? null : charconv($yim), 'msnm' => empty($msnm) ? null : charconv($msnm), 'location' => empty($location) ? null : charconv($location), 'occupation' => empty($occupation) ? null : charconv($occupation), 'interests' => empty($interests) ? null : charconv($interests), 'signature' => empty($signature) ? null : charconv($signature), 'extra_info' => empty($extra_info) ? null : charconv($extra_info), D221 1 I221 1 ?> == tools/import/xforum/import_xforum.php == [email protected]|tests/import/xforum/import_xforum.php|20031130210351|42380|edab10eb [email protected]|tools/import/xforum/import_xforum.php|20050129021456|44005 D 1.9 05/04/19 02:13:08+02:00 lion@kempelen.(none) +58 -5 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Character encoding conversion functions added to import a different encoding site. K 31232 O -rw-rw-rw- P tools/import/xforum/import_xforum.php ------------------------------------------------ I18 14 // Little function which converts the charset encoding if the user wanted // Otherwise returns the original string, all normal text fields must call this // while moving content from PN to Xar. /Lion function charconv($text) { global $CharConverter; if (xarModGetVar('installer','recode') == "on") { return $CharConverter->convert($text, xarModGetVar('installer','recode_from'), xarModGetVar('installer','recode_to'), 0); //return recode(xarModGetVar('installer','recode_from')."..".xarModGetVar('installer','recode_to'), $text); } else { return $text; } } \ \ D23 2 I24 8 // Load charset converter API require_once "includes/transforms/xarCharset.php"; $CharConverter = new xarCharset; $encodings = $CharConverter->getEncodings(); \ if(!xarVarFetch('step', 'isset', $step, NULL, XARVAR_NOT_REQUIRED)) {return;} if(!xarVarFetch('startnum', 'isset', $startnum, NULL, XARVAR_NOT_REQUIRED)) {return;} \ D41 2 I42 7 if (!xarVarFetch('oldprefix', 'isset', $oldprefix, NULL, XARVAR_NOT_REQUIRED)) {return;} if (!xarVarFetch('importusers', 'isset', $importusers, NULL, XARVAR_NOT_REQUIRED)) {return;} \ if (!xarVarFetch('recode', 'isset', $recode, NULL, XARVAR_NOT_REQUIRED)) {return;} if (!xarVarFetch('recode_from', 'isset', $recode_from, NULL, XARVAR_NOT_REQUIRED)) {return;} if (!xarVarFetch('recode_to', 'isset', $recode_to, NULL, XARVAR_NOT_REQUIRED)) {return;} \ I44 2 $importusers = xarModGetVar('installer','importusers'); \ D64 1 I64 1 <option value="0">Assume all users already exist in Xaraya (add other posts as Anonymous)</option> I67 20 <tr><td colspan="2"> </td></tr> <tr><td align="right" valign="top">Convert charset encoding</td> <td><input type="checkbox" name="recode"></td></tr> <tr><td align="right">Postnuke encoding</td><td><select name="recode_from"> <option value="iso-8859-2">iso-8859-2</option> <option value="">----------</option> <? foreach ($encodings as $enc) { echo "<option value=\"$enc\">$enc</option>\n"; } ?> </select></td></tr> <tr><td align="right">Xaraya encoding</td><td><select name="recode_to"> <option value="utf-8">utf-8</option> <option value="">----------</option> <? foreach ($encodings as $enc) { echo "<option value=\"$enc\">$enc</option>\n"; } ?> </select> </td></tr> \ I83 6 \ if (!isset($recode)) { $recode = 0; } xarModSetVar('installer','recode',$recode); xarModSetVar('installer','recode_from',$recode_from); xarModSetVar('installer','recode_to',$recode_to); \ == tools/import/xforum/import_xforum_categories.php == [email protected]|tests/import/xforum/import_xforum_categories.php|20031130210352|38439|edb5c257 [email protected]|tools/import/xforum/import_xforum_categories.php|20040817172333|30981 D 1.6 05/04/19 02:13:08+02:00 lion@kempelen.(none) +19 -11 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Charencoding calls. c Mastercids handled a different way now (which works better for me, it really does assign the master categories even if there are more) c ORDER BY added to make sure no categories get lost when no parent yet converted. K 22330 O -rw-rw-rw- P tools/import/xforum/import_xforum_categories.php ------------------------------------------------ D33 2 I34 3 //xarModSetVar('xarbb', 'number_of_categories.1', 1); // 2 lines replaced by Lion below //xarModSetVar('xarbb', 'mastercids.1', $xarbbcats); D40 1 I40 1 $query = 'SELECT type , fid, name, displayorder, fup D42 1 I42 1 WHERE TYPE = \'group\' OR TYPE = \'forum\' ORDER BY fup, displayorder'; I47 1 $mastercids = array(); D51 3 I53 3 $catid[$id] = xarModAPIFunc('categories', 'admin', 'create', array('name' => charconv($title), 'description' => charconv($title), D55 1 I55 2 echo "Creating category ($id) ".charconv($title)."<br/>\n"; $mastercids[] = $catid[$id]; D57 3 I59 3 $catid[$id] = xarModAPIFunc('categories', 'admin', 'create', array('name' => charconv($title), 'description' => charconv($title), I60 1 echo "Creating subcategory ($id) ".charconv($title)."<br/>\n"; I66 4 \ // Make master cids on a new way /Lion xarModSetVar('xarbb','mastercids',join(';',$mastercids)); xarModSetVar('xarbb','number_of_categories', count($mastercids)); == tools/import/xforum/import_xforum_cleanup.php == [email protected]|tests/import/xforum/import_xforum_cleanup.php|20031130210352|51520|edc099a7 [email protected]|tools/import/xforum/import_xforum_cleanup.php|20040817172333|32064 D 1.4 05/04/19 02:13:08+02:00 lion@kempelen.(none) +10 -3 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Charconversion clean up functions added. c Wrong Mastercid calculation removed. K 14268 O -rw-rw-rw- P tools/import/xforum/import_xforum_cleanup.php ------------------------------------------------ D23 2 I24 4 //$basecat=xarModGetVar('xarbb','mastercids'); //xarModSetVar('xarbb', 'mastercids', $basecat); // replaced by Lion I32 5 xarModDelVar('installer','recode'); xarModDelVar('installer','recode_from'); xarModDelVar('installer','recode_to'); \ D45 1 I45 1 ?> == tools/import/xforum/import_xforum_forums.php == [email protected]|tests/import/xforum/import_xforum_forums.php|20031130210352|57705|edcb599f [email protected]|tools/import/xforum/import_xforum_forums.php|20040817172333|33222 D 1.7 05/04/19 02:13:08+02:00 lion@kempelen.(none) +5 -5 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Charconversion calls. c Wrong mastercid removed. K 277 O -rw-rw-rw- P tools/import/xforum/import_xforum_forums.php ------------------------------------------------ D105 2 I106 2 array('fname' => charconv($name), 'fdesc' => charconv($descr), D116 1 I116 1 echo "Creating forum ($fup) ->$forumid[$id] - ".charconv($name)." - ".charconv($descr)."<br/>\n"; D128 2 I129 2 //xarModSetVar('xarbb', 'number_of_categories.1', 1); // Repalaced by Lion, maybe thats the answer to your "why?"! //xarModSetVar('xarbb', 'mastercids.1', $xarbbcats); == tools/import/xforum/import_xforum_posts.php == [email protected]|tests/import/xforum/import_xforum_posts.php|20031130210352|53354|edd5f748 [email protected]|tools/import/xforum/import_xforum_posts.php|20040817172333|34368 D 1.7 05/04/19 02:13:08+02:00 lion@kempelen.(none) +6 -6 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Several charconversion calls. K 33164 O -rw-rw-rw- P tools/import/xforum/import_xforum_posts.php ------------------------------------------------ D126 2 I127 2 $data['title'] = charconv($subject); $data['comment'] = charconv($message); D136 1 I136 1 "ttitle" => charconv($subject), D141 1 I141 1 echo "Post $cid for post ".charconv($subject)." imported.<br />"; D146 1 I146 1 echo "Failed inserting post ($ppid $tid) $uname - ".charconv($subject)." : ".$dbconn->ErrorMsg()."<br/>\n"; D148 1 I148 1 echo "Inserted post ($ppid $tid) $uname - ".charconv($subject)."<br/>\n"; == tools/import/xforum/import_xforum_topics.php == [email protected]|tests/import/xforum/import_xforum_topics.php|20031130210352|49535|ede0975f [email protected]|tools/import/xforum/import_xforum_topics.php|20050129022915|49331 D 1.8 05/04/19 02:13:08+02:00 lion@kempelen.(none) +4 -4 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Charconversion calls. K 54027 O -rw-rw-rw- P tools/import/xforum/import_xforum_topics.php ------------------------------------------------ D29 1 I29 1 //xarModSetVar('xarbb', 'mastercids', $categories); //replaced by Lion D145 2 I146 2 'ttitle' => charconv($title), 'tpost' => charconv($text), D154 1 I154 1 echo "The new topic for ".charconv($title)." is ". $newtid."<br />"; == tools/import/xforum/import_xforum_users.php == [email protected]|tests/import/xforum/import_xforum_users.php|20031130210353|41979|edeb29da [email protected]|tools/import/xforum/import_xforum_users.php|20050129022915|42478 D 1.8 05/04/19 02:13:08+02:00 lion@kempelen.(none) +22 -16 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Charconversion calls. c Unknown users don't die the import now, they import as Anonymous. K 4159 O -rw-rw-rw- P tools/import/xforum/import_xforum_users.php ------------------------------------------------ D124 6 I129 12 $userinfo=xarUFindRole("$name"); if (isset($userinfo)) { $realuid = $userinfo->getID(); \ echo "<br />"; echo "Checking: user name ".$name." exists and has id : ".$realuid."<br />"; $userid[$uid] = $realuid; } else { // If user is not found, assume Anonymous $userid[$uid] = 0; echo "Checking: user name ".$name.". Not exists, assuming Anonymous.<br />"; } D135 2 I136 2 'uname' => charconv($uname), 'realname' => charconv($uname), D138 1 I138 1 'cryptpass' => charconv($pass), D156 1 I156 1 echo "Insert user ($uid) ".charconv($uname)." failed - "; D176 1 I176 1 echo "Inserted user ($uid) ->$newuid is ".charconv($uname)."<br/>\n"; D197 5 I201 5 'location' => empty($location) ? null : charconv($location), 'occupation' => empty($occupation) ? null : charconv($occupation), 'interests' => empty($interests) ? null : charconv($interests), 'signature' => empty($signature) ? null : charconv($signature), 'extra_info' => empty($extra_info) ? null : charconv($extra_info), == tools/import/contentexpress/import_ce124.php == mikespub-FogMEOs31dotat4ziPANHlKoq+OfwspIAL8bYrjMMd8@public.gmane.org|tests/import/import_ce124.php|20030505193959|57498|6f9bcf0d1d5880f [email protected]|tools/import/contentexpress/import_ce124.php|20050129022914|32927 D 1.14 05/04/19 01:56:17+02:00 lion@kempelen.(none) +248 -222 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Creates new "ContentExpress" doctype instead overwriting "Documents" c Able to import from "ContentExpress" "contentexpress" tables (1.2.4/1.2) c Charset encoding can be converted on user configuration using xarCharset c Unusused comments/hitcounts code removed (was not necessary) K 10801 O -rw-rw-r-- P tools/import/contentexpress/import_ce124.php ------------------------------------------------ I13 7 * * CHANGELOG: * 2005-04-18 (Lion): Creates new pubtype instead overwriting "Documents" * Functionality to convert charset encoding added * UpperCase and lowercase CE table names now supported * Unused comments/hitcount code removed (these were not hookable to CE that time) * Long time ago (Lion): Initial release I15 13 // Little function which converts the charset encoding if the user wanted // Otherwise returns the original string, all normal text fields must call this // while moving content from PN to Xar. /Lion function charconv($text) { global $CharConverter; if (xarModGetVar('installer','recode') == "on") { return $CharConverter->convert($text, xarModGetVar('installer','recode_from'), xarModGetVar('installer','recode_to'), 0); //return recode(xarModGetVar('installer','recode_from')."..".xarModGetVar('installer','recode_to'), $text); } else { return $text; } } \ D20 2 I21 9 \ // Load charset converter API require_once "includes/transforms/xarCharset.php"; $CharConverter = new xarCharset; $encodings = $CharConverter->getEncodings(); \ \ if(!xarVarFetch('step', 'isset', $step, NULL, XARVAR_NOT_REQUIRED)) {return;} if(!xarVarFetch('startnum', 'isset', $startnum, NULL, XARVAR_NOT_REQUIRED)) {return;} D33 1 I33 1 <h3>ContentExpress VERSION 1.2/1.2.4 ONLY import from an existing PN site</h3> D43 2 I44 9 if (!xarVarFetch('oldprefix', 'isset', $oldprefix, NULL, XARVAR_NOT_REQUIRED)) {return;} if (!xarVarFetch('ceversion', 'isset', $ceversion, NULL, XARVAR_NOT_REQUIRED)) {return;} \ if (!xarVarFetch('recode', 'isset', $recode, NULL, XARVAR_NOT_REQUIRED)) {return;} if (!xarVarFetch('recode_from', 'isset', $recode_from, NULL, XARVAR_NOT_REQUIRED)) {return;} if (!xarVarFetch('recode_to', 'isset', $recode_to, NULL, XARVAR_NOT_REQUIRED)) {return;} $cetablename = ($ceversion == "1.2" ? "contentexpress" : "ContentExpress"); \ I45 1 \ I46 2 $ceversion = xarModGetVar('installer','ceversion'); $cetablename = ($ceversion == "1.2" ? "contentexpress" : "ContentExpress"); I49 1 \ D53 1 I53 3 <p>Requirement: Postnuke and Xaraya must be in the same database but different prefix. For other CE versions find a different script (their database changes are hectik).</p> I58 28 <tr><td align="right">ContentExpress version</td><td><select name="ceversion"> <option value="1.2">1.2 tables: _contentexpress_</option> <option value="1.2.4">1.2.4 tables: _ContentExpress_</option> </select> </td></tr> <tr><td colspan="2"> </td></tr> <tr><td align="right" valign="top">Convert charset encoding</td> <td><input type="checkbox" name="recode"></td></tr> <tr><td align="right">Postnuke encoding</td><td><select name="recode_from"> <option value="iso-8859-2">iso-8859-2</option> <option value="">----------</option> <? foreach ($encodings as $enc) { echo "<option value=\"$enc\">$enc</option>\n"; } ?> </select></td></tr> <tr><td align="right">Xaraya encoding</td><td><select name="recode_to"> <option value="utf-8">utf-8</option> <option value="">----------</option> <? foreach ($encodings as $enc) { echo "<option value=\"$enc\">$enc</option>\n"; } ?> </select> </td></tr> \ \ D65 1 I65 2 <p>Note : you must at least activate the 'categories' and 'articles' modules first. This script will create a new pubtype for your ContentExpress content.</p> I71 6 xarModSetVar('installer','ceversion',$ceversion); if (!isset($recode)) { $recode = 0; } xarModSetVar('installer','recode',$recode); xarModSetVar('installer','recode_from',$recode_from); xarModSetVar('installer','recode_to',$recode_to); D74 7 D113 1 I113 1 echo "<strong>1. Importing menus into categories</strong><br/>\n"; D115 17 D133 2 I134 34 // Create a new pubtype for this stuff $newptid = xarModAPIFunc('articles', 'admin', 'createpubtype', array('name' => "ce", 'descr' => "ContentExpress", 'config' => array('title' => array('label' => 'Title', 'format' => 'textbox', 'input' => 1), 'summary' => array('label' => '', 'format' => 'textarea_medium', 'input' => 0), 'body' => array('label' => 'Body', 'format' => 'textarea_large', 'input' => 1), 'notes' => array('label' => '', 'format' => 'textarea_small', 'input' => 0), 'authorid' => array('label' => '', 'format' => 'username', 'input' => 0), 'pubdate' => array('label' => '', 'format' => 'calendar', 'input' => 0), 'authorid' => array('label' => '', 'format' => 'textarea_medium', 'input' => 0), 'status' => array('label' => 'Status', 'format' => 'status', 'input' => 0)) ) ); D136 2 I137 3 if ($newptid == false) { die("Oops, cannot create new pubtype 'contentexpress'."); } D139 2 I140 27 $regid = xarModGetIDFromName('articles'); echo "Creating root for old ContentExpress<br/>\n"; $contentexpress = xarModAPIFunc('categories', 'admin', 'create', array( 'name' => 'ContentExpress', 'description' => 'ContentExpress Articles', 'parent_id' => 0)); \ // Reset the Document pubtype to have only this category. If you also // need Sections, add it manually later (or tell me how to get its ID) \ $settings = unserialize(xarModGetVar('articles', 'settings.2')); $settings['number_of_categories'] = 1; $settings['cids'] = array($contentexpress); $settings['defaultview'] = 'c'.$contentexpress; xarModSetVar('articles', 'settings.'.$newptid, serialize($settings)); xarModSetVar('articles', 'number_of_categories.'.$newptid, 1); xarModSetVar('articles', 'mastercids.'.$newptid, $contentexpress); \ // This array connects the old menu IDs to the new category IDs $ce_menus = Array(); \ // Copy ce menutree's content-items starting from root (-1) walk_ce_menutree(-1); \ xarModSetVar('installer','contentexpress',$contentexpress); xarModSetVar('installer','ce_menus', serialize($ce_menus)); xarModSetVar('installer','ce_ptid', $newptid); D142 2 I143 2 echo '<a href="import_ce124.php">Return to start</a> <a href="import_ce124.php?step=' . ($step+1) . '&module=articles">Go to step ' . ($step+1) . '</a><br/>'; D152 2 I153 3 $contentexpress = xarModGetVar('installer','contentexpress'); $newptid = xarModGetVar('installer','ce_ptid'); $ce_menus = unserialize(xarModGetVar('installer','ce_menus')); D155 25 I179 2 echo "<strong>2. Importing articles</strong><br/>\n"; $query = 'SELECT COUNT(*) FROM ' . $oldprefix . '_'.$cetablename.'_contentitems'; D181 14 I194 21 if (!$result) { die("Oops, count stories failed : " . $dbconn->ErrorMsg()); } $count = $result->fields[0]; $result->Close(); $regid = xarModGetIDFromName('articles'); \ // Get content imtems // Ignores items linked to another items, coz actually I have no CE and no such // article in my dumpfile. \ $query = 'SELECT mc_id, mc_parent_id, mc_menu_id, mc_title, mc_text, mc_media_url, mc_media_width, mc_media_height, mc_layout_id, mc_weight, mc_active FROM ' . $oldprefix . '_'.$cetablename.'_contentitems WHERE mc_parent_id = -1 ORDER BY mc_weight ASC'; $numitems = 1000; if (!isset($startnum)) { $startnum = 0; } if ($count > $numitems) { $result =& $dbconn->SelectLimit($query, $numitems, $startnum); D196 1 I196 1 $result =& $dbconn->Execute($query); D198 26 I223 2 if (!$result) { die("Oops, select contentitems failed : " . $dbconn->ErrorMsg()); D225 47 D273 14 I286 40 $num = 1; while (!$result->EOF) { list($id, $parent_id, $menu_id, $title, $text, $media_url, $media_width, $media_height, $layout_id, $weight, $active) = $result->fields; \ // Category id from the ce_menus array (or set to ce root) $cids = array(); if ($menu_id > 0 && isset($ce_menus[$menu_id])) { $cids[] = $ce_menus[$menu_id]; } else { $cids[] = $contentexpress; } \ $newaid = xarModAPIFunc('articles', 'admin', 'create', array(//'aid' => $id, 'title' => charconv($title), //'summary' => $summary, 'body' => charconv($text), //'notes' => $notes, 'status' => ($active == 1 ? 3 : 0), 'ptid' => $newptid, //'pubdate' => $pubdate, (defaults to NOW) //'authorid' => $authorid, //'language' => $language, what was this? 'cids' => $cids, //'hits' => $counter ) ); //if (!isset($newaid) || $newaid != $aid) if (!isset($newaid)) { // Not empty articles, ID will not be the same echo "Insert article ($id) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; } elseif ($count < 200) { echo "Inserted article ($id) ".charconv($title)." into $cids[0]<br/>\n"; } elseif ($num % 100 == 0) { echo "Inserted article " . ($num + $startnum) . "<br/>\n"; flush(); } $num++; D288 2 I289 1 $result->MoveNext(); D291 26 I316 9 $result->Close(); echo '<a href="import_ce124.php">Return to start</a> '; if ($count > $numitems && $startnum + $numitems < $count) { $startnum += $numitems; echo '<a href="import_ce124.php?step=' . $step . '&module=articles&startnum=' . $startnum . '">Go to step ' . $step . ' - contentitems ' . $startnum . '+ of ' . $count . '</a><br/>'; } else { echo '<a href="import_ce124.php?step=' . ($step+1) . '&module=articles">Go to step ' . ($step+1) . '</a><br/>'; D318 16 I334 1 I335 1 // STEP 3 D337 1 I337 1 // Clean up D339 1 I339 1 if ($step == 3) { D353 1 I353 3 echo "<strong>INFO: That's all for now...</strong><br/><br/>\n"; echo "You must make a pubtype template for this pubtype manually. Copying user-display-docs.xt to user-display-ce.xt and user-summary-docs.xt to user-summary-ce.xt would do for start, but probably I don't have the permissions to do that.<br/><br/>\n."; \ I358 7 xarModDelVar('installer','ce_ptid'); \ xarModDelVar('installer','ceversion'); xarModDelVar('installer','recode'); xarModDelVar('installer','recode_from'); xarModDelVar('installer','recode_to'); \ D399 1 I399 1 GLOBAL $dbconn, $oldprefix, $contentexpress, $ce_menus,$cetablename; D407 1 I407 1 FROM ' . $oldprefix . '_'.$cetablename.'_menuitems D419 1 I419 1 $count_sql = 'SELECT COUNT(*) FROM '.$oldprefix.'_'.$cetablename.'_menuitems D434 2 I435 2 'name' => charconv($title), 'description' => charconv($title), D439 1 I439 1 echo "Creating item ($id) ".charconv($title)." - Parent: $parent_id<br/>\n"; == BitKeeper/etc/logging_ok == [email protected]|BitKeeper/etc/logging_ok|20020928132559|02556|36872ac13653ac68 [email protected]|BitKeeper/etc/logging_ok|20050412090557|61006 D 1.179 05/04/13 00:59:46+02:00 lion@kempelen.(none) +1 -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Logging to [email protected] accepted K 62922 O -rw-rw-r-- P BitKeeper/etc/logging_ok ------------------------------------------------ I96 1 lion@kempelen.(none) == tools/import/postnuke/import_pn_downloads_categories.php == voll-/[email protected]|tools/import/postnuke/import_pn_downloads_categories.php|20050315092438|16541|f1662ddf6ac94932 voll-/[email protected]|tools/import/postnuke/import_pn_downloads_categories.php|20050315092439|44984 D 1.2 05/04/13 00:40:34+02:00 lion@kempelen.(none) +4 -4 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 49046 O -rw-rw-r-- P tools/import/postnuke/import_pn_downloads_categories.php ------------------------------------------------ D40 2 I41 2 'name' => charconv($title), 'description' => charconv($descr), D44 1 I44 1 echo "Creating downloads category ($id) ".charconv($title)." - ".charconv($descr)."<br/>\n"; D62 1 I62 1 ?> == tools/import/postnuke/import_pn_downloads_downloads.php == voll-/[email protected]|tools/import/postnuke/import_pn_downloads_downloads.php|20050315092439|01806|2dae55ffba7e263f voll-/[email protected]|tools/import/postnuke/import_pn_downloads_downloads.php|20050315092440|33695 D 1.2 05/04/13 00:40:35+02:00 lion@kempelen.(none) +6 -6 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion K 38690 O -rw-rw-r-- P tools/import/postnuke/import_pn_downloads_downloads.php ------------------------------------------------ D78 2 I79 2 array('title' => charconv($title), 'summary' => charconv($descr), D81 1 I81 1 'notes' => charconv($name) . $email, D92 1 I92 1 echo "Insert download ($lid) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; D94 1 I94 1 echo "Inserted download ($lid) ".charconv($title)."<br/>\n"; D109 1 I109 1 ?> == tools/import/postnuke/import_pn_phpbb14_forums.php == voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_forums.php|20050315092439|02206|9c6dd2197c3b37e3 voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_forums.php|20050315092440|59816 D 1.2 05/04/13 00:40:35+02:00 lion@kempelen.(none) +6 -6 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding conversion but untested coz I dont have phpbb! K 208 O -rw-rw-rw- P tools/import/postnuke/import_pn_phpbb14_forums.php ------------------------------------------------ D49 2 I50 2 'name' => charconv($name), 'description' => charconv($descr), D62 2 I63 2 array('fname' => charconv($name), 'fdesc' => charconv($descr), D73 1 I73 1 echo "Creating forum ($fid) ".charconv($name)." - ".charconv($descr)." in category $catid[$cid]<br/>\n"; D85 1 I85 1 ?> == tools/import/postnuke/import_pn_phpbb14_posts.php == voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_posts.php|20050315092439|02407|b4cb994b6cb4b7d3 voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_posts.php|20050315092440|19993 D 1.2 05/04/13 00:40:35+02:00 lion@kempelen.(none) +7 -7 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding converison but untested coz I dont have phpbb! K 28427 O -rw-rw-rw- P tools/import/postnuke/import_pn_phpbb14_posts.php ------------------------------------------------ D107 1 I107 1 echo "Unknown topic id $sid for post ($tid) ".charconv($subject)."<br/>\n"; D112 1 I112 1 echo "Unknown forum id $fid for post ($tid) ".charconv($subject)."<br/>\n"; D146 2 I147 2 $data['title'] = charconv($subject); $data['comment'] = charconv($comment); D155 1 I155 1 echo "Failed inserting post ($sid $pid) ".charconv($uname)." - ".charconv($subject)." : ".$dbconn->ErrorMsg()."<br/>\n"; D157 1 I157 1 echo "Inserted post ($sid $pid - $cid) ".charconv($uname)." - ".charconv($subject)."<br/>\n"; D185 1 I185 1 ?> == tools/import/postnuke/import_pn_phpbb14_topics.php == voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_topics.php|20050315092439|02842|b38150fe39030d voll-/[email protected]|tools/import/postnuke/import_pn_phpbb14_topics.php|20050315092440|59598 D 1.2 05/04/13 00:40:35+02:00 lion@kempelen.(none) +9 -9 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c charset encoding converison but untested coz I dont have phpBB! K 2016 O -rw-rw-rw- P tools/import/postnuke/import_pn_phpbb14_topics.php ------------------------------------------------ D144 3 I146 3 'title' => charconv($title), 'summary' => charconv($uname), 'body' => charconv($text), D160 1 I160 1 echo "Invalid forum id $fid for topic ($tid) ".charconv($title)."<br/>\n"; D172 2 I173 2 'ttitle' => charconv($title), 'tpost' => charconv($text), D185 1 I185 1 echo "Insert topic ($tid) ".charconv($title)." failed : " . xarErrorRender('text') . "<br/>\n"; D187 1 I187 1 echo "Inserted topic ($tid - $newaid) ".charconv($title)."<br/>\n"; D227 1 I227 1 ?> # Patch checksum=8d6435f2