Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:28
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb/templates/subSilver Modified Files: kb_post_body.tpl Log Message: Finalizing this module Index: kb_post_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_post_body.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kb_post_body.tpl 5 Apr 2006 21:19:50 -0000 1.7 --- kb_post_body.tpl 17 Jun 2006 20:11:24 -0000 1.8 *************** *** 73,100 **** ! function checkForm() { ! formErrors = false; ! if (document.post.article_name.value.length < 2) { ! formErrors = "{L_EMPTY_ARTICLE_NAME}\r"; ! } ! if (document.post.article_desc.value.length < 2) { ! formErrors = "{L_EMPTY_ARTICLE_DESC}\r"; ! } ! if (document.post.message.value.length < 2) { ! formErrors = "{L_EMPTY_MESSAGE}\r"; ! } ! if (document.post.type_id.value=='select_one') { ! formErrors = "{L_EMPTY_TYPE}\r"; ! } ! if (formErrors) { ! alert(formErrors); ! return false; ! } else { ! bbstyle(-1); ! //formObj.preview.disabled = true; ! //formObj.submit.disabled = true; ! return true; ! } } --- 73,100 ---- ! function checkForm() { ! formErrors = false; ! if (document.post.article_name.value.length < 2) { ! formErrors = "{L_EMPTY_ARTICLE_NAME}\r"; ! } ! if (document.post.article_desc.value.length < 2) { ! formErrors = "{L_EMPTY_ARTICLE_DESC}\r"; ! } ! if (document.post.message.value.length < 2) { ! formErrors = "{L_EMPTY_MESSAGE}\r"; ! } ! if (document.post.type_id.value=='select_one') { ! formErrors = "{L_EMPTY_TYPE}\r"; ! } ! if (formErrors) { ! alert(formErrors); ! return false; ! } else { ! bbstyle(-1); ! //formObj.preview.disabled = true; ! //formObj.submit.disabled = true; ! return true; ! } } *************** *** 175,179 **** return; } ! // Find last occurance of an open tag the same as the one just clicked for (i = 0; i < bbcode.length; i++) { --- 175,179 ---- return; } ! // Find last occurance of an open tag the same as the one just clicked for (i = 0; i < bbcode.length; i++) { *************** *** 195,199 **** return; } else { // Open tags ! if (imageTag && (bbnumber != 14)) { // Close image tag before adding another txtarea.value += bbtags[15]; --- 195,199 ---- return; } else { // Open tags ! if (imageTag && (bbnumber != 14)) { // Close image tag before adding another txtarea.value += bbtags[15]; *************** *** 202,206 **** imageTag = false; } ! // Open tag txtarea.value += bbtags[bbnumber]; --- 202,206 ---- imageTag = false; } ! // Open tag txtarea.value += bbtags[bbnumber]; *************** *** 220,224 **** var selStart = txtarea.selectionStart; var selEnd = txtarea.selectionEnd; ! if (selEnd == 1 || selEnd == 2) selEnd = selLength; --- 220,224 ---- var selStart = txtarea.selectionStart; var selEnd = txtarea.selectionEnd; ! if (selEnd == 1 || selEnd == 2) selEnd = selLength; *************** *** 243,251 **** <script language="javascript" type="text/javascript"> tinyMCE.init({ ! mode : "textareas", ! theme : "advanced", ! theme_advanced_toolbar_location : "top", ! plugins : "table", ! theme_advanced_buttons3_add_before : "tablecontrols, separator" }); </script> --- 243,263 ---- <script language="javascript" type="text/javascript"> tinyMCE.init({ ! mode : "textareas", ! theme : "advanced", ! language : "{tinyMCE.LANG}", ! docs_language : "{tinyMCE.LANG}", ! plugins : "table,advhr,advimage,advlink,emotions,insertdatetime,preview,zoom,flash,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable", ! theme_advanced_buttons1_add_before : "newdocument,separator", ! theme_advanced_buttons1_add : "fontselect,fontsizeselect", ! theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor,backcolor", ! theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator", ! theme_advanced_buttons3_add_before : "tablecontrols,separator", ! theme_advanced_buttons3_add : "emotions,flash,advhr,separator,print,separator,ltr,rtl,separator,fullscreen", ! theme_advanced_toolbar_location : "top", ! theme_advanced_toolbar_align : "left", ! theme_advanced_path_location : "bottom", ! content_css : "{tinyMCE.TEMPLATE}", ! relative_urls : false, ! extended_valid_elements : "td[*],div[*],form[*],input[*]" }); </script> *************** *** 268,292 **** </tr> <!-- BEGIN switch_name --> ! <tr> <td class="row1"><span class="gen"><b><nobr>{L_NAME}</nobr></b></span></td> ! <td class="row2"> <span class="gen"> <input type="text" name="username" size="45" maxlength="100" style="width:450px" class="post" value="{USERNAME}" /></span></td> </tr> <!-- END switch_name --> ! <tr> <td class="row1"><span class="gen"><b><nobr>{L_ARTICLE_TITLE}</nobr></b></span></td> ! <td class="row2"> <span class="gen"> <input type="text" name="article_name" size="45" maxlength="100" style="width:450px" class="post" value="{ARTICLE_TITLE}" /></span></td> </tr> ! <tr> <td class="row1"><span class="gen"><b>{L_ARTICLE_DESCRIPTION}</b></span></td> ! <td class="row2"> <span class="gen"> <input type="text" name="article_desc" size="45" maxlength="255" style="width:450px" class="post" value="{ARTICLE_DESC}" /></span></td> </tr> ! <!-- BEGIN custom_data_fields --> <tr> <td class="cat" colspan="2" align="center"><span class="cattitle">{custom_data_fields.L_ADDTIONAL_FIELD}</span></td> ! </tr> ! <!-- END custom_data_fields --> <!-- BEGIN input --> --- 280,304 ---- </tr> <!-- BEGIN switch_name --> ! <tr> <td class="row1"><span class="gen"><b><nobr>{L_NAME}</nobr></b></span></td> ! <td class="row2"> <span class="gen"> <input type="text" name="username" size="45" maxlength="100" style="width:450px" class="post" value="{USERNAME}" /></span></td> </tr> <!-- END switch_name --> ! <tr> <td class="row1"><span class="gen"><b><nobr>{L_ARTICLE_TITLE}</nobr></b></span></td> ! <td class="row2"> <span class="gen"> <input type="text" name="article_name" size="45" maxlength="100" style="width:450px" class="post" value="{ARTICLE_TITLE}" /></span></td> </tr> ! <tr> <td class="row1"><span class="gen"><b>{L_ARTICLE_DESCRIPTION}</b></span></td> ! <td class="row2"> <span class="gen"> <input type="text" name="article_desc" size="45" maxlength="255" style="width:450px" class="post" value="{ARTICLE_DESC}" /></span></td> </tr> ! <!-- BEGIN custom_data_fields --> <tr> <td class="cat" colspan="2" align="center"><span class="cattitle">{custom_data_fields.L_ADDTIONAL_FIELD}</span></td> ! </tr> ! <!-- END custom_data_fields --> <!-- BEGIN input --> *************** *** 312,320 **** <td class="row1"><span class="genmed">{radio.FIELD_NAME}</span><br><span class="gensmall">{radio.FIELD_DESCRIPTION}</span></td> <td class="row2"> ! <!-- BEGIN row --> <input type="radio" name="field[{radio.FIELD_ID}]" value="{radio.row.FIELD_VALUE}" {radio.row.FIELD_SELECTED} /><span class="gensmall">{radio.row.FIELD_VALUE}</span> <!-- END row --> </td> ! </tr> <!-- END radio --> <!-- SPILT --> --- 324,332 ---- <td class="row1"><span class="genmed">{radio.FIELD_NAME}</span><br><span class="gensmall">{radio.FIELD_DESCRIPTION}</span></td> <td class="row2"> ! <!-- BEGIN row --> <input type="radio" name="field[{radio.FIELD_ID}]" value="{radio.row.FIELD_VALUE}" {radio.row.FIELD_SELECTED} /><span class="gensmall">{radio.row.FIELD_VALUE}</span> <!-- END row --> </td> ! </tr> <!-- END radio --> <!-- SPILT --> *************** *** 324,333 **** <td class="row2"> <select name="field[{select.FIELD_ID}]" class="post"> ! <!-- BEGIN row --> <option value="{select.row.FIELD_VALUE}"{radio.row.FIELD_SELECTED}>{select.row.FIELD_VALUE}</option> <!-- END row --> </select> </td> ! </tr> <!-- END select --> <!-- SPILT --> --- 336,345 ---- <td class="row2"> <select name="field[{select.FIELD_ID}]" class="post"> ! <!-- BEGIN row --> <option value="{select.row.FIELD_VALUE}"{radio.row.FIELD_SELECTED}>{select.row.FIELD_VALUE}</option> <!-- END row --> </select> </td> ! </tr> <!-- END select --> <!-- SPILT --> *************** *** 337,346 **** <td class="row2"> <select name="field[{select_multiple.FIELD_ID}][]" multiple="multiple" size="4" class="post"> ! <!-- BEGIN row --> <option value="{select_multiple.row.FIELD_VALUE}"{select_multiple.row.FIELD_SELECTED}>{select_multiple.row.FIELD_VALUE}</option> <!-- END row --> </select> </td> ! </tr> <!-- END select_multiple --> <!-- SPILT --> --- 349,358 ---- <td class="row2"> <select name="field[{select_multiple.FIELD_ID}][]" multiple="multiple" size="4" class="post"> ! <!-- BEGIN row --> <option value="{select_multiple.row.FIELD_VALUE}"{select_multiple.row.FIELD_SELECTED}>{select_multiple.row.FIELD_VALUE}</option> <!-- END row --> </select> </td> ! </tr> <!-- END select_multiple --> <!-- SPILT --> *************** *** 349,366 **** <td class="row1"><span class="genmed">{checkbox.FIELD_NAME}</span><br><span class="gensmall">{checkbox.FIELD_DESCRIPTION}</span></td> <td class="row2"> ! <!-- BEGIN row --> <input type="checkbox" name="field[{checkbox.FIELD_ID}][{checkbox.row.FIELD_VALUE}]" value="{checkbox.row.FIELD_VALUE}" {checkbox.row.FIELD_CHECKED}><span class="gensmall">{checkbox.row.FIELD_VALUE}</span> <!-- END row --> </td> ! </tr> <!-- END checkbox --> ! <tr> <td class="row1" valign="top"><span class="gen"><b><nobr>{L_ARTICLE_TEXT}</nobr></b><br /><br /> <table width="100" border="0" cellspacing="0" cellpadding="5" align="center"> ! <tr align="center"> <td colspan="{S_SMILIES_COLSPAN}" class="gensmall"><b>{L_EMOTICONS}</b></td> </tr> <!-- BEGIN smilies_row --> ! <tr align="center" valign="middle"> <!-- BEGIN smilies_col --> <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td> --- 361,378 ---- <td class="row1"><span class="genmed">{checkbox.FIELD_NAME}</span><br><span class="gensmall">{checkbox.FIELD_DESCRIPTION}</span></td> <td class="row2"> ! <!-- BEGIN row --> <input type="checkbox" name="field[{checkbox.FIELD_ID}][{checkbox.row.FIELD_VALUE}]" value="{checkbox.row.FIELD_VALUE}" {checkbox.row.FIELD_CHECKED}><span class="gensmall">{checkbox.row.FIELD_VALUE}</span> <!-- END row --> </td> ! </tr> <!-- END checkbox --> ! <tr> <td class="row1" valign="top"><span class="gen"><b><nobr>{L_ARTICLE_TEXT}</nobr></b><br /><br /> <table width="100" border="0" cellspacing="0" cellpadding="5" align="center"> ! <tr align="center"> <td colspan="{S_SMILIES_COLSPAN}" class="gensmall"><b>{L_EMOTICONS}</b></td> </tr> <!-- BEGIN smilies_row --> ! <tr align="center" valign="middle"> <!-- BEGIN smilies_col --> <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td> *************** *** 369,373 **** <!-- END smilies_row --> <!-- BEGIN switch_smilies_extra --> ! <tr align="center"> <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td> </tr> --- 381,385 ---- <!-- END smilies_row --> <!-- BEGIN switch_smilies_extra --> ! <tr align="center"> <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td> </tr> *************** *** 378,416 **** <td class="row2" valign="top"><span class="gen"> <table width="450" border="0" cellspacing="0" cellpadding="2"> ! <!-- BEGIN switch_bbcodes --> ! <tr align="center" valign="middle"> ! <td><span class="genmed"> <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" onMouseOver="helpline('c')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" onMouseOver="helpline('o')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> </span></td> </tr> ! <tr> ! <td colspan="9"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="genmed"> {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]');this.selectedIndex=0;" onMouseOver="helpline('s')"> <option style="color:black; background-color: {T_TD_COLOR1}" value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> --- 390,428 ---- <td class="row2" valign="top"><span class="gen"> <table width="450" border="0" cellspacing="0" cellpadding="2"> ! <!-- BEGIN switch_bbcodes --> ! <tr align="center" valign="middle"> ! <td><span class="genmed"> <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" onMouseOver="helpline('c')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" onMouseOver="helpline('o')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> </span></td> </tr> ! <tr> ! <td colspan="9"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="genmed"> {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]');this.selectedIndex=0;" onMouseOver="helpline('s')"> <option style="color:black; background-color: {T_TD_COLOR1}" value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> *************** *** 443,449 **** </td> </tr> ! ! <tr> ! <td colspan="9"> <span class="gensmall"> <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> </span> --- 455,461 ---- </td> </tr> ! ! <tr> ! <td colspan="9"> <span class="gensmall"> <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> </span> *************** *** 451,456 **** </tr> <!-- END switch_bbcodes --> ! ! <tr> <td colspan="9"><span class="gen"><textarea name="message" rows="30" cols="35" wrap="virtual" style="width:450px" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{ARTICLE_BODY}</textarea></span> <!-- BEGIN formatting --> --- 463,468 ---- </tr> <!-- END switch_bbcodes --> ! ! <tr> <td colspan="9"><span class="gen"><textarea name="message" rows="30" cols="35" wrap="virtual" style="width:450px" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{ARTICLE_BODY}</textarea></span> <!-- BEGIN formatting --> *************** *** 459,468 **** </td> </tr> ! </table> </span></td> </tr> ! ! <tr> <td class="row1" valign="top"><span class="gen"><b><nobr>{L_ARTICLE_TYPE}</nobr></b></span></td> <td class="row2"><span class="gen"> --- 471,480 ---- </td> </tr> ! </table> </span></td> </tr> ! ! <tr> <td class="row1" valign="top"><span class="gen"><b><nobr>{L_ARTICLE_TYPE}</nobr></b></span></td> <td class="row2"><span class="gen"> *************** *** 473,477 **** <!-- END types --> </select> ! </span> </td> </tr> --- 485,489 ---- <!-- END types --> </select> ! </span> </td> </tr> *************** *** 486,495 **** </tr> <!-- END switch_edit --> ! <tr> <td class="cat" colspan="2" align="center" height="28">{S_HIDDEN_FIELDS}<input type="submit" name="preview" value="{L_PREVIEW}" class="mainoption"> <input type="submit" name="article_submit" class="mainoption" value="{L_SUBMIT}" /></td> ! </tr> </table> </form> ! --- 498,507 ---- </tr> <!-- END switch_edit --> ! <tr> <td class="cat" colspan="2" align="center" height="28">{S_HIDDEN_FIELDS}<input type="submit" name="preview" value="{L_PREVIEW}" class="mainoption"> <input type="submit" name="article_submit" class="mainoption" value="{L_SUBMIT}" /></td> ! </tr> </table> </form> ! |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:28
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb/templates/subSilver/admin Modified Files: kb_config_body.tpl Log Message: Finalizing this module Index: kb_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_config_body.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** kb_config_body.tpl 5 Apr 2006 21:19:50 -0000 1.13 --- kb_config_body.tpl 17 Jun 2006 20:11:24 -0000 1.14 *************** *** 24,28 **** <!-- TITLE ------------------------------------------------------------------------------------------- --> <th class="thHead" colspan="2"> {L_ARTICLE_TITLE}</th> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_WYSIWYG}<br /><span class="gensmall">{L_ALLOW_WYSIWYG_EXPLAIN}</span></td> --- 24,28 ---- <!-- TITLE ------------------------------------------------------------------------------------------- --> <th class="thHead" colspan="2"> {L_ARTICLE_TITLE}</th> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_WYSIWYG}<br /><span class="gensmall">{L_ALLOW_WYSIWYG_EXPLAIN}</span></td> *************** *** 36,48 **** <td class="row1" width="50%">{L_ALLOWED_HTML_TAGS}<br /><span class="gensmall">{L_ALLOWED_HTML_TAGS_EXPLAIN}</span></td> <td class="row2" width="50%"><input text="text" name="allowed_html_tags" value="{ALLOWED_HTML_TAGS}" size="15" maxlength="50" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_BBCODE}<br /><span class="gensmall">{L_ALLOW_BBCODE_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_bbcode" value="1" {S_ALLOW_BBCODE_YES} /> {L_YES} <input type="radio" name="allow_bbcode" value="0" {S_ALLOW_BBCODE_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_SMILIES}<br /><span class="gensmall">{L_ALLOW_SMILIES_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_smilies" value="1" {S_ALLOW_SMILIES_YES} /> {L_YES} <input type="radio" name="allow_smilies" value="0" {S_ALLOW_SMILIES_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_IMAGES}<br /><span class="gensmall">{L_ALLOW_IMAGES_EXPLAIN}</span></td> --- 36,48 ---- <td class="row1" width="50%">{L_ALLOWED_HTML_TAGS}<br /><span class="gensmall">{L_ALLOWED_HTML_TAGS_EXPLAIN}</span></td> <td class="row2" width="50%"><input text="text" name="allowed_html_tags" value="{ALLOWED_HTML_TAGS}" size="15" maxlength="50" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_BBCODE}<br /><span class="gensmall">{L_ALLOW_BBCODE_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_bbcode" value="1" {S_ALLOW_BBCODE_YES} /> {L_YES} <input type="radio" name="allow_bbcode" value="0" {S_ALLOW_BBCODE_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_SMILIES}<br /><span class="gensmall">{L_ALLOW_SMILIES_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_smilies" value="1" {S_ALLOW_SMILIES_YES} /> {L_YES} <input type="radio" name="allow_smilies" value="0" {S_ALLOW_SMILIES_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_IMAGES}<br /><span class="gensmall">{L_ALLOW_IMAGES_EXPLAIN}</span></td> *************** *** 52,60 **** <td class="row1">{L_IMAGES_MESSAGE}<br><span class="gensmall">{L_IMAGES_MESSAGE_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="no_image_message" value="{MESSAGE_IMAGE}" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_LINKS}<br /><span class="gensmall">{L_ALLOW_LINKS_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_links" value="1" {S_ALLOW_LINKS_YES} /> {L_YES} <input type="radio" name="allow_links" value="0" {S_ALLOW_LINKS_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1">{L_LINKS_MESSAGE}<br><span class="gensmall">{L_LINKS_MESSAGE_EXPLAIN}</span></td> --- 52,60 ---- <td class="row1">{L_IMAGES_MESSAGE}<br><span class="gensmall">{L_IMAGES_MESSAGE_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="no_image_message" value="{MESSAGE_IMAGE}" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_LINKS}<br /><span class="gensmall">{L_ALLOW_LINKS_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_links" value="1" {S_ALLOW_LINKS_YES} /> {L_YES} <input type="radio" name="allow_links" value="0" {S_ALLOW_LINKS_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1">{L_LINKS_MESSAGE}<br><span class="gensmall">{L_LINKS_MESSAGE_EXPLAIN}</span></td> *************** *** 64,68 **** <td class="row1" width="50%">{L_FORMAT_WORDWRAP}<br /><span class="gensmall">{L_FORMAT_WORDWRAP_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="formatting_wordwrap" value="1" {S_FORMAT_WORDWRAP_YES} /> {L_YES} <input type="radio" name="formatting_wordwrap" value="0" {S_FORMAT_WORDWRAP_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1">{L_FORMAT_IMAGE_RESIZE}<br><span class="gensmall">{L_FORMAT_IMAGE_RESIZE_EXPLAIN}</span></td> --- 64,68 ---- <td class="row1" width="50%">{L_FORMAT_WORDWRAP}<br /><span class="gensmall">{L_FORMAT_WORDWRAP_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="formatting_wordwrap" value="1" {S_FORMAT_WORDWRAP_YES} /> {L_YES} <input type="radio" name="formatting_wordwrap" value="0" {S_FORMAT_WORDWRAP_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1">{L_FORMAT_IMAGE_RESIZE}<br><span class="gensmall">{L_FORMAT_IMAGE_RESIZE_EXPLAIN}</span></td> *************** *** 76,88 **** <td class="row1">{L_MAX_SUBJECT_CHAR}<br><span class="gensmall">{L_MAX_SUBJECT_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_subject_chars" value="{MAX_SUBJECT_CHAR}" /></td> ! </tr> <tr> <td class="row1">{L_MAX_DESC_CHAR}<br><span class="gensmall">{L_MAX_DESC_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_desc_chars" value="{MAX_DESC_CHAR}" /></td> ! </tr> <tr> <td class="row1">{L_MAX_CHAR}<br><span class="gensmall">{L_MAX_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_chars" value="{MAX_CHAR}" /></td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> --- 76,88 ---- <td class="row1">{L_MAX_SUBJECT_CHAR}<br><span class="gensmall">{L_MAX_SUBJECT_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_subject_chars" value="{MAX_SUBJECT_CHAR}" /></td> ! </tr> <tr> <td class="row1">{L_MAX_DESC_CHAR}<br><span class="gensmall">{L_MAX_DESC_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_desc_chars" value="{MAX_DESC_CHAR}" /></td> ! </tr> <tr> <td class="row1">{L_MAX_CHAR}<br><span class="gensmall">{L_MAX_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_chars" value="{MAX_CHAR}" /></td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> *************** *** 92,104 **** <td class="row1" width="50%">{L_STATS_LIST}<br /><span class="gensmall">{L_STATS_LIST_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="stats_list" value="1" {S_STATS_LIST_YES} /> {L_YES} <input type="radio" name="stats_list" value="0" {S_STATS_LIST_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_HEADER_BANNER}<br /><span class="gensmall">{L_HEADER_BANNER_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="header_banner" value="1" {S_HEADER_BANNER_YES} /> {L_YES} <input type="radio" name="header_banner" value="0" {S_HEADER_BANNER_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_PAGINATION}<br /><span class="gensmall">{L_PAGINATION_EXPLAIN}</span></td> <td class="row2" width="50%"><input class="post" type="text" name="pagination" value="{PAGINATION}" size="5" maxlength="4" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_SORT_METHOD}<br /><span class="gensmall">{L_SORT_METHOD_EXPLAIN}</span></td> --- 92,104 ---- <td class="row1" width="50%">{L_STATS_LIST}<br /><span class="gensmall">{L_STATS_LIST_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="stats_list" value="1" {S_STATS_LIST_YES} /> {L_YES} <input type="radio" name="stats_list" value="0" {S_STATS_LIST_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_HEADER_BANNER}<br /><span class="gensmall">{L_HEADER_BANNER_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="header_banner" value="1" {S_HEADER_BANNER_YES} /> {L_YES} <input type="radio" name="header_banner" value="0" {S_HEADER_BANNER_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_PAGINATION}<br /><span class="gensmall">{L_PAGINATION_EXPLAIN}</span></td> <td class="row2" width="50%"><input class="post" type="text" name="pagination" value="{PAGINATION}" size="5" maxlength="4" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_SORT_METHOD}<br /><span class="gensmall">{L_SORT_METHOD_EXPLAIN}</span></td> *************** *** 108,112 **** <td class="row1" width="50%">{L_SORT_ORDER}<br /><span class="gensmall">{L_SORT_ORDER_EXPLAIN}</span></td> <td class="row2" width="50%">{SORT_ORDER} </td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> --- 108,112 ---- <td class="row1" width="50%">{L_SORT_ORDER}<br /><span class="gensmall">{L_SORT_ORDER_EXPLAIN}</span></td> <td class="row2" width="50%">{SORT_ORDER} </td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> *************** *** 116,136 **** <td class="row1" width="50%">{L_USE_COMMENTS}<br /><span class="gensmall">{L_USE_COMMENTS_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="use_comments" value="1" {S_USE_COMMENTS_YES} /> {L_YES} <input type="radio" name="use_comments" value="0" {S_USE_COMMENTS_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} /> {L_INTERNAL_COMMENTS_PHPBB}</td> ! </tr> <tr> <td class="row1" width="50%">{L_COMMENTS_PAG}<br /><span class="gensmall">{L_COMMENTS_PAG_EXPLAIN}</span></td> <td class="row2" width="50%"><input class="post" type="text" name="comments_pagination" value="{COMMENTS_PAG}" size="5" maxlength="4" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_AUTOGENERATE_COMMENTS}<br /><span class="gensmall">{L_AUTOGENERATE_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="autogenerate_comments" value="1" {S_AUTOGENERATE_COMMENTS_YES} /> {L_YES} <input type="radio" name="autogenerate_comments" value="0" {S_AUTOGENERATE_COMMENTS_NO} /> {L_NO}</td> </tr> <tr> <td class="row1" width="50%">{L_DEL_TOPIC}<br /><span class="gensmall">{L_DEL_TOPIC_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="del_topic" value="1" {S_DEL_TOPIC_YES} /> {L_YES} <input type="radio" name="del_topic" value="0" {S_DEL_TOPIC_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_WYSIWYG}<br /><span class="gensmall">{L_ALLOW_COMMENT_WYSIWYG_EXPLAIN}</span></td> --- 116,140 ---- <td class="row1" width="50%">{L_USE_COMMENTS}<br /><span class="gensmall">{L_USE_COMMENTS_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="use_comments" value="1" {S_USE_COMMENTS_YES} /> {L_YES} <input type="radio" name="use_comments" value="0" {S_USE_COMMENTS_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} /> {L_INTERNAL_COMMENTS_PHPBB}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_FORUM_ID}<br /><span class="gensmall">{L_FORUM_ID_EXPLAIN}</span></td> ! <td class="row2" width="50%">{FORUM_LIST}</td> ! </tr> <tr> <td class="row1" width="50%">{L_COMMENTS_PAG}<br /><span class="gensmall">{L_COMMENTS_PAG_EXPLAIN}</span></td> <td class="row2" width="50%"><input class="post" type="text" name="comments_pagination" value="{COMMENTS_PAG}" size="5" maxlength="4" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_AUTOGENERATE_COMMENTS}<br /><span class="gensmall">{L_AUTOGENERATE_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="autogenerate_comments" value="1" {S_AUTOGENERATE_COMMENTS_YES} /> {L_YES} <input type="radio" name="autogenerate_comments" value="0" {S_AUTOGENERATE_COMMENTS_NO} /> {L_NO}</td> </tr> <tr> <td class="row1" width="50%">{L_DEL_TOPIC}<br /><span class="gensmall">{L_DEL_TOPIC_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="del_topic" value="1" {S_DEL_TOPIC_YES} /> {L_YES} <input type="radio" name="del_topic" value="0" {S_DEL_TOPIC_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_WYSIWYG}<br /><span class="gensmall">{L_ALLOW_COMMENT_WYSIWYG_EXPLAIN}</span></td> *************** *** 144,156 **** <td class="row1" width="50%">{L_ALLOWED_COMMENT_HTML_TAGS}<br /><span class="gensmall">{L_ALLOWED_HTML_TAGS_EXPLAIN}</span></td> <td class="row2" width="50%"><input text="text" name="allowed_comment_html_tags" value="{ALLOWED_COMMENT_HTML_TAGS}" size="15" maxlength="50" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_BBCODE}<br /><span class="gensmall">{L_ALLOW_BBCODE_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_comment_bbcode" value="1" {S_ALLOW_COMMENT_BBCODE_YES} /> {L_YES} <input type="radio" name="allow_comment_bbcode" value="0" {S_ALLOW_COMMENT_BBCODE_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_SMILIES}<br /><span class="gensmall">{L_ALLOW_SMILIES_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_comment_smilies" value="1" {S_ALLOW_COMMENT_SMILIES_YES} /> {L_YES} <input type="radio" name="allow_comment_smilies" value="0" {S_ALLOW_COMMENT_SMILIES_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_IMAGES}<br /><span class="gensmall">{L_ALLOW_IMAGES_EXPLAIN}</span></td> --- 148,160 ---- <td class="row1" width="50%">{L_ALLOWED_COMMENT_HTML_TAGS}<br /><span class="gensmall">{L_ALLOWED_HTML_TAGS_EXPLAIN}</span></td> <td class="row2" width="50%"><input text="text" name="allowed_comment_html_tags" value="{ALLOWED_COMMENT_HTML_TAGS}" size="15" maxlength="50" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_BBCODE}<br /><span class="gensmall">{L_ALLOW_BBCODE_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_comment_bbcode" value="1" {S_ALLOW_COMMENT_BBCODE_YES} /> {L_YES} <input type="radio" name="allow_comment_bbcode" value="0" {S_ALLOW_COMMENT_BBCODE_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_SMILIES}<br /><span class="gensmall">{L_ALLOW_SMILIES_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_comment_smilies" value="1" {S_ALLOW_COMMENT_SMILIES_YES} /> {L_YES} <input type="radio" name="allow_comment_smilies" value="0" {S_ALLOW_COMMENT_SMILIES_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_IMAGES}<br /><span class="gensmall">{L_ALLOW_IMAGES_EXPLAIN}</span></td> *************** *** 160,168 **** <td class="row1">{L_COMMENT_IMAGES_MESSAGE}<br><span class="gensmall">{L_COMMENT_IMAGES_MESSAGE_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="no_comment_image_message" value="{COMMENT_MESSAGE_IMAGE}" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_LINKS}<br /><span class="gensmall">{L_ALLOW_COMMENT_LINKS_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_comment_links" value="1" {S_ALLOW_COMMENT_LINKS_YES} /> {L_YES} <input type="radio" name="allow_comment_links" value="0" {S_ALLOW_COMMENT_LINKS_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1">{L_COMMENT_LINKS_MESSAGE}<br><span class="gensmall">{L_COMMENT_LINKS_MESSAGE_EXPLAIN}</span></td> --- 164,172 ---- <td class="row1">{L_COMMENT_IMAGES_MESSAGE}<br><span class="gensmall">{L_COMMENT_IMAGES_MESSAGE_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="no_comment_image_message" value="{COMMENT_MESSAGE_IMAGE}" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_ALLOW_COMMENT_LINKS}<br /><span class="gensmall">{L_ALLOW_COMMENT_LINKS_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="allow_comment_links" value="1" {S_ALLOW_COMMENT_LINKS_YES} /> {L_YES} <input type="radio" name="allow_comment_links" value="0" {S_ALLOW_COMMENT_LINKS_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1">{L_COMMENT_LINKS_MESSAGE}<br><span class="gensmall">{L_COMMENT_LINKS_MESSAGE_EXPLAIN}</span></td> *************** *** 172,176 **** <td class="row1" width="50%">{L_COMMENT_FORMAT_WORDWRAP}<br /><span class="gensmall">{L_COMMENT_FORMAT_WORDWRAP_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="formatting_comment_wordwrap" value="1" {S_COMMENT_FORMAT_WORDWRAP_YES} /> {L_YES} <input type="radio" name="formatting_comment_wordwrap" value="0" {S_COMMENT_FORMAT_WORDWRAP_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1">{L_COMMENT_FORMAT_IMAGE_RESIZE}<br><span class="gensmall">{L_COMMENT_FORMAT_IMAGE_RESIZE_EXPLAIN}</span></td> --- 176,180 ---- <td class="row1" width="50%">{L_COMMENT_FORMAT_WORDWRAP}<br /><span class="gensmall">{L_COMMENT_FORMAT_WORDWRAP_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="formatting_comment_wordwrap" value="1" {S_COMMENT_FORMAT_WORDWRAP_YES} /> {L_YES} <input type="radio" name="formatting_comment_wordwrap" value="0" {S_COMMENT_FORMAT_WORDWRAP_NO} /> {L_NO}</td> ! </tr> <tr> <td class="row1">{L_COMMENT_FORMAT_IMAGE_RESIZE}<br><span class="gensmall">{L_COMMENT_FORMAT_IMAGE_RESIZE_EXPLAIN}</span></td> *************** *** 184,192 **** <td class="row1">{L_COMMENT_MAX_SUBJECT_CHAR}<br><span class="gensmall">{L_COMMENT_MAX_SUBJECT_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_comment_subject_chars" value="{COMMENT_MAX_SUBJECT_CHAR}" /></td> ! </tr> <tr> <td class="row1">{L_COMMENT_MAX_CHAR}<br><span class="gensmall">{L_COMMENT_MAX_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_comment_chars" value="{COMMENT_MAX_CHAR}" /></td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> --- 188,196 ---- <td class="row1">{L_COMMENT_MAX_SUBJECT_CHAR}<br><span class="gensmall">{L_COMMENT_MAX_SUBJECT_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_comment_subject_chars" value="{COMMENT_MAX_SUBJECT_CHAR}" /></td> ! </tr> <tr> <td class="row1">{L_COMMENT_MAX_CHAR}<br><span class="gensmall">{L_COMMENT_MAX_CHAR_EXPLAIN}</span></td> <td class="row2"><input type="text" class="post" size="50" name="max_comment_chars" value="{COMMENT_MAX_CHAR}" /></td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> *************** *** 204,208 **** <td class="row1" width="50%">{L_VOTES_CHECK_USERID}<br /><span class="gensmall">{L_VOTES_CHECK_USERID_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="votes_check_userid" value="1" {S_VOTES_CHECK_USERID_YES} /> {L_YES} <input type="radio" name="votes_check_userid" value="0" {S_VOTES_CHECK_USERID_NO} /> {L_NO}</td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> --- 208,212 ---- <td class="row1" width="50%">{L_VOTES_CHECK_USERID}<br /><span class="gensmall">{L_VOTES_CHECK_USERID_EXPLAIN}</span></td> <td class="row2" width="50%"><input type="radio" name="votes_check_userid" value="1" {S_VOTES_CHECK_USERID_YES} /> {L_YES} <input type="radio" name="votes_check_userid" value="0" {S_VOTES_CHECK_USERID_NO} /> {L_NO}</td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> *************** *** 220,224 **** <td class="row1" width="50%">{L_PRE_TEXT_BODY}</td> <td class="row2" width="50%"><textarea name="pt_body" cols="40" rows="5">{L_PT_BODY}</textarea></td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> --- 224,228 ---- <td class="row1" width="50%">{L_PRE_TEXT_BODY}</td> <td class="row2" width="50%"><textarea name="pt_body" cols="40" rows="5">{L_PT_BODY}</textarea></td> ! </tr> <tr> <!-- TITLE ------------------------------------------------------------------------------------------- --> |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:28
|
Update of /cvsroot/mxbb/mx_kb/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb/language/lang_english Modified Files: lang_admin.php lang_main.php Log Message: Finalizing this module Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_main.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** lang_main.php 7 Jun 2006 20:28:54 -0000 1.9 --- lang_main.php 17 Jun 2006 20:11:24 -0000 1.10 *************** *** 41,46 **** $lang['Edit_article'] = 'Edit Article'; ! $lang['KB_title'] = 'Knowledge Base'; ! $lang['KB_notify_subject_new'] = 'New Article!'; $lang['KB_notify_subject_edited'] = 'Edited Article!'; --- 41,47 ---- $lang['Edit_article'] = 'Edit Article'; ! // ! // Notification ! // $lang['KB_notify_subject_new'] = 'New Article!'; $lang['KB_notify_subject_edited'] = 'Edited Article!'; *************** *** 54,58 **** --- 55,65 ---- $lang['KB_notify_unapproved_body'] = 'An article has been unapproved.'; $lang['KB_notify_deleted_body'] = 'An article has been deleted.'; + $lang['Edited_Article_info'] = 'Article updated by '; + + $lang['Read_full_article'] = '>> Read Full Article'; + // + // Auth Can + // $lang['KB_Rules_post_can'] = 'You <b>can</b> post new articles in this category'; $lang['KB_Rules_post_cannot'] = 'You <b>cannot</b> post new articles in this category'; *************** *** 79,83 **** $lang['Empty_article_desc'] = 'You must fill out the article description'; - $lang['Read_full_article'] = '>> Read Full Article'; $lang['Comments'] = 'Comments'; --- 86,89 ---- *************** *** 91,95 **** // added - $lang['Edited_Article_info'] = 'Article updated by '; $lang['No_Articles'] = 'There are no articles in this cateogry!'; $lang['Not_authorized'] = 'Sorry, but you are not authorized!'; --- 97,100 ---- *************** *** 190,193 **** --- 195,199 ---- // Comments + $lang['KB_comment_prefix'] = '[ KB ] '; $lang['Comments'] = 'Comments'; $lang['Comments_title'] = 'Comments Title'; Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_admin.php 5 Apr 2006 22:34:49 -0000 1.3 --- lang_admin.php 17 Jun 2006 20:11:24 -0000 1.4 *************** *** 20,24 **** $lang['6_Custom_Field'] = 'Custom Fields'; $lang['7_Optimize_tables'] = 'Optimize Search Table'; ! // // Parameter Types --- 20,24 ---- $lang['6_Custom_Field'] = 'Custom Fields'; $lang['7_Optimize_tables'] = 'Optimize Search Table'; ! // // Parameter Types *************** *** 44,183 **** $lang['Panel_config_explain'] = 'Change the configuration of your Knowledge Base'; ! // ! // General ! // ! $lang['General_title'] = 'General'; ! ! $lang['Module_name'] = 'Module name'; ! $lang['Module_name_explain'] = ''; ! $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'Let users view and post new articles on in your Knowledge Base.'; ! $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; ! $lang['Wysiwyg_path_explain'] = 'This is the path (from mxBB/phpBB root) to the WYSIWYG software folder, eg \'modules/mx_shared/\' if you have uploaded, for example, TinyMCE in modules/mx_shared/tinymce.'; ! ! // ! // Article ! // ! $lang['Article_title'] = 'Article'; ! ! // ! // Appearance ! // ! $lang['Appearance_title'] = 'Appearance'; ! ! $lang['Article_pag'] = 'Article pagination'; ! $lang['Article_pag_explain'] = 'The number of articles to show in a (stats) category before pagination.'; ! ! $lang['Sort_method'] = 'Sorting method'; ! $lang['Sort_method_explain'] = 'Define how articles are sorted within its category.'; ! ! $lang['Sort_order'] = 'ASC or DESC sorting'; ! $lang['Sort_order_explain'] = ''; ! ! $lang['Stats_list'] = 'Show KB Stats links'; ! $lang['Stats_list_explain'] = 'Show KB stats links in the header.'; ! ! $lang['Header_banner'] = 'Show Top Logo'; ! $lang['Header_banner_explain'] = 'Show KB logo in the header.'; ! // ! // Comments ! // ! $lang['Comments_title'] = 'Comments'; ! $lang['Comments_title_explain'] = 'Some comments settings are default settings, and can be overridden per category'; ! ! $lang['Use_comments'] = 'Comments'; ! $lang['Use_comments_explain'] = 'Enable comments for articles, to be inserted in the forum'; ! $lang['Internal_comments'] = 'Internal or phpBB Comments'; ! $lang['Internal_comments_explain'] = 'Use internal comments, or phpBB comments'; ! $lang['Internal_comments_phpBB'] = 'phpBB Comments'; ! $lang['Internal_comments_internal'] = 'Internal Comments'; ! ! $lang['Forum_id'] = 'phpBB Forum ID'; ! $lang['Forum_id_explain'] = 'If phpBB comments are used, this is the forum where the comments will be kept'; ! ! $lang['Autogenerate_comments'] = 'Autogenerate comments when articles are managed'; ! $lang['Autogenerate_comments_explain'] = 'When editing/adding an article, a notifying reply is posted in the article topic.'; ! $lang['Del_topic'] = 'Delete Topic'; ! $lang['Del_topic_explain'] = 'When you delete an article, do you want its comments topic to be deleted also?'; ! $lang['Comments_pag'] = 'Comments pagination'; ! $lang['Comments_pag_explain'] = 'The number of comments to show for the article before pagination.'; ! ! $lang['Allow_Wysiwyg'] = 'Use WYSIWYG editor'; ! $lang['Allow_Wysiwyg_explain'] = 'If enabled, the standard BBCode/HTML/Smilies input dialog is replaced by a WYSIWYG editor.'; ! $lang['Allow_links'] = 'Allow Links'; ! $lang['Allow_links_message'] = 'Default \'No Links\' Message'; ! $lang['Allow_links_explain'] = 'If links are not allowed this text will be displayed instead'; ! ! $lang['Allow_images'] = 'Allow Images'; ! $lang['Allow_images_message'] = 'Default \'No Images\' Message'; ! $lang['Allow_images_explain'] = 'If images are not allowed this text will be displayed instead'; ! ! $lang['Max_subject_char'] = 'Maximum Number of charcters in subject'; ! $lang['Max_subject_char_explain'] = 'If to big, you get an error message (Limit the subject).'; ! $lang['Max_desc_char'] = 'Maximum Number of charcters in description'; ! $lang['Max_desc_char_explain'] = 'If to big, you get an error message (Limit the subject).'; ! ! $lang['Max_char'] = 'Maximum Number of charcters in text'; ! $lang['Max_char_explain'] = 'If to big, you get an error message (Limit the comment).'; ! ! $lang['Format_wordwrap'] = 'Word wrapping'; ! $lang['Format_wordwrap_explain'] = 'Text control filter'; ! ! $lang['Format_truncate_links'] = 'Truncate Links'; ! $lang['Format_truncate_links_explain'] = 'Links are shortened, eg t ex \'www.mxbb-portal...\''; ! ! $lang['Format_image_resize'] = 'Image resize'; ! $lang['Format_image_resize_explain'] = 'Resize images to this width (pixels)'; ! ! // ! // Ratings ! // ! $lang['Ratings_title'] = 'Ratings'; ! $lang['Ratings_title_explain'] = 'Some ratings settings are default settings, and can be overridden per category'; ! $lang['Use_ratings'] = 'Ratings'; ! $lang['Use_ratings_explain'] = 'Enable ratings'; ! ! $lang['Votes_check_ip'] = 'Validate ratings - IP'; ! $lang['Votes_check_ip_explain'] = 'Only one vote per IP address is permitted.'; ! ! $lang['Votes_check_userid'] = 'Validate ratings - User'; ! $lang['Votes_check_userid_explain'] = 'Users may only vote once.'; ! ! // ! // Instructions ! // ! $lang['Instructions_title'] = 'User Instructions'; ! ! $lang['Pre_text_name'] = 'Article Submission Instructions'; ! $lang['Pre_text_explain'] = 'Activate Submission Instructions displayed to users at the top of the submission forum.'; ! ! $lang['Pre_text_header'] = 'Article Submission Instructions Header'; ! $lang['Pre_text_body'] = 'Article Submission Instructions Body'; ! ! $lang['Show'] = 'Show'; ! $lang['Hide'] = 'Hide'; ! ! // ! // Notifications ! // ! $lang['Notifications_title'] = 'Notification'; ! ! $lang['Notify'] = 'Notify admin by'; ! $lang['Notify_explain'] = 'Choose which way to receive notices that new articles have been posted'; ! $lang['PM'] = 'PM'; ! $lang['Notify_group'] = 'and groupmembers '; ! $lang['Notify_group_explain'] = 'Also send notification to members in this group'; $lang['Click_return_kb_config'] = 'Click %sHere%s to return to Knowledge Base Configuration'; --- 44,183 ---- $lang['Panel_config_explain'] = 'Change the configuration of your Knowledge Base'; ! // ! // General ! // ! $lang['General_title'] = 'General'; ! $lang['Module_name'] = 'Module name'; ! $lang['Module_name_explain'] = ''; ! $lang['Enable_module'] = 'Enable this module'; ! $lang['Enable_module_explain'] = 'Let users view and post new articles on in your Knowledge Base.'; ! $lang['Wysiwyg_path'] = 'Path to WYSIWYG software'; ! $lang['Wysiwyg_path_explain'] = 'This is the path (from mxBB/phpBB root) to the WYSIWYG software folder, eg \'modules/mx_shared/\' if you have uploaded, for example, TinyMCE in modules/mx_shared/tinymce.'; ! // ! // Article ! // ! $lang['Article_title'] = 'Article'; ! // ! // Appearance ! // ! $lang['Appearance_title'] = 'Appearance'; ! $lang['Article_pag'] = 'Article pagination'; ! $lang['Article_pag_explain'] = 'The number of articles to show in a (stats) category before pagination.'; ! $lang['Sort_method'] = 'Sorting method'; ! $lang['Sort_method_explain'] = 'Define how articles are sorted within its category.'; ! $lang['Sort_order'] = 'ASC or DESC sorting'; ! $lang['Sort_order_explain'] = ''; ! $lang['Stats_list'] = 'Show KB Stats links'; ! $lang['Stats_list_explain'] = 'Show KB stats links in the header.'; ! $lang['Header_banner'] = 'Show Top Logo'; ! $lang['Header_banner_explain'] = 'Show KB logo in the header.'; ! // ! // Comments ! // ! $lang['Comments_title'] = 'Comments'; ! $lang['Comments_title_explain'] = 'Some comments settings are default settings, and can be overridden per category'; ! ! $lang['Use_comments'] = 'Comments'; ! $lang['Use_comments_explain'] = 'Enable comments for articles, to be inserted in the forum'; ! ! $lang['Internal_comments'] = 'Internal or phpBB Comments'; ! $lang['Internal_comments_explain'] = 'Use internal comments, or phpBB comments'; ! ! $lang['Internal_comments_phpBB'] = 'phpBB Comments'; ! $lang['Internal_comments_internal'] = 'Internal Comments'; ! ! $lang['Select_topic_id'] = 'Select phpBB Comments Topic!'; ! ! $lang['Forum_id'] = 'phpBB Forum ID'; ! $lang['Forum_id_explain'] = 'If phpBB comments are used, this is the forum where the comments will be kept'; ! ! $lang['Autogenerate_comments'] = 'Autogenerate comments when articles are managed'; ! $lang['Autogenerate_comments_explain'] = 'When editing/adding an article, a notifying reply is posted in the article topic.'; ! ! $lang['Del_topic'] = 'Delete Topic'; ! $lang['Del_topic_explain'] = 'When you delete an article, do you want its comments topic to be deleted also?'; ! ! $lang['Comments_pag'] = 'Comments pagination'; ! $lang['Comments_pag_explain'] = 'The number of comments to show for the article before pagination.'; ! ! $lang['Allow_Wysiwyg'] = 'Use WYSIWYG editor'; ! $lang['Allow_Wysiwyg_explain'] = 'If enabled, the standard BBCode/HTML/Smilies input dialog is replaced by a WYSIWYG editor.'; ! ! $lang['Allow_links'] = 'Allow Links'; ! $lang['Allow_links_message'] = 'Default \'No Links\' Message'; ! $lang['Allow_links_explain'] = 'If links are not allowed this text will be displayed instead'; + $lang['Allow_images'] = 'Allow Images'; + $lang['Allow_images_message'] = 'Default \'No Images\' Message'; + $lang['Allow_images_explain'] = 'If images are not allowed this text will be displayed instead'; + + $lang['Max_subject_char'] = 'Maximum Number of charcters in subject'; + $lang['Max_subject_char_explain'] = 'If to big, you get an error message (Limit the subject).'; + + $lang['Max_desc_char'] = 'Maximum Number of charcters in description'; + $lang['Max_desc_char_explain'] = 'If to big, you get an error message (Limit the subject).'; + + $lang['Max_char'] = 'Maximum Number of charcters in text'; + $lang['Max_char_explain'] = 'If to big, you get an error message (Limit the comment).'; + + $lang['Format_wordwrap'] = 'Word wrapping'; + $lang['Format_wordwrap_explain'] = 'Text control filter'; + + $lang['Format_truncate_links'] = 'Truncate Links'; + $lang['Format_truncate_links_explain'] = 'Links are shortened, eg t ex \'www.mxbb-portal...\''; + + $lang['Format_image_resize'] = 'Image resize'; + $lang['Format_image_resize_explain'] = 'Resize images to this width (pixels)'; + + // + // Ratings + // + $lang['Ratings_title'] = 'Ratings'; + $lang['Ratings_title_explain'] = 'Some ratings settings are default settings, and can be overridden per category'; + + $lang['Use_ratings'] = 'Ratings'; + $lang['Use_ratings_explain'] = 'Enable ratings'; + + $lang['Votes_check_ip'] = 'Validate ratings - IP'; + $lang['Votes_check_ip_explain'] = 'Only one vote per IP address is permitted.'; + + $lang['Votes_check_userid'] = 'Validate ratings - User'; + $lang['Votes_check_userid_explain'] = 'Users may only vote once.'; + + // + // Instructions + // + $lang['Instructions_title'] = 'User Instructions'; + + $lang['Pre_text_name'] = 'Article Submission Instructions'; + $lang['Pre_text_explain'] = 'Activate Submission Instructions displayed to users at the top of the submission forum.'; + + $lang['Pre_text_header'] = 'Article Submission Instructions Header'; + $lang['Pre_text_body'] = 'Article Submission Instructions Body'; + + $lang['Show'] = 'Show'; + $lang['Hide'] = 'Hide'; + + // + // Notifications + // + $lang['Notifications_title'] = 'Notification'; + + $lang['Notify'] = 'Notify admin by'; + $lang['Notify_explain'] = 'Choose which way to receive notices that new articles have been posted'; + $lang['PM'] = 'PM'; + $lang['Notify_group'] = 'and groupmembers '; + $lang['Notify_group_explain'] = 'Also send notification to members in this group'; $lang['Click_return_kb_config'] = 'Click %sHere%s to return to Knowledge Base Configuration'; *************** *** 227,231 **** $lang['Delete'] = 'Delete'; $lang['Confirm_art_delete'] = 'Are you sure you want to delete this article?'; ! $lang['Confirm_art_delete_yes'] = '%sYes, I want to delete this article%s'; $lang['Confirm_art_delete_no'] = '%sNo, I don\'t want to delete this article%s'; $lang['Article_deleted'] = 'Article Deleted Successfully.'; --- 227,231 ---- $lang['Delete'] = 'Delete'; $lang['Confirm_art_delete'] = 'Are you sure you want to delete this article?'; ! $lang['Confirm_art_delete_yes'] = '%sYes, I want to delete this article%s'; $lang['Confirm_art_delete_no'] = '%sNo, I don\'t want to delete this article%s'; $lang['Article_deleted'] = 'Article Deleted Successfully.'; |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:28
|
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb/kb/modules Modified Files: kb_article.php kb_cat.php kb_moderator.php kb_post.php kb_post_comment.php Log Message: Finalizing this module Index: kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_cat.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb_cat.php 7 Jun 2006 20:28:54 -0000 1.3 --- kb_cat.php 17 Jun 2006 20:11:24 -0000 1.4 *************** *** 78,82 **** // Validate Comments Setup // ! if ( $this->comments[$category_id]['activated'] && !$this->comments[$category_id]['internal_comments'] && $this->cat_rowset[$category_id]['comments_forum_id'] < 1 ) { // --- 78,82 ---- // Validate Comments Setup // ! if ( $this->comments[$category_id]['activated'] && !$this->comments[$category_id]['internal_comments'] && $this->comments[$category_id]['comments_forum_id'] < 1 ) { // Index: kb_article.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_article.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_article.php 7 Jun 2006 20:28:54 -0000 1.4 --- kb_article.php 17 Jun 2006 20:11:24 -0000 1.5 *************** *** 538,544 **** } ! // =================================================== // assign var for top navigation ! // =================================================== $this->generate_navigation( $article_category_id ); --- 538,544 ---- } ! // // assign var for top navigation ! // $this->generate_navigation( $article_category_id ); Index: kb_post.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_post.php 7 Jun 2006 20:28:54 -0000 1.4 --- kb_post.php 17 Jun 2006 20:11:24 -0000 1.5 *************** *** 29,33 **** global $template, $mx_kb_functions, $lang, $board_config, $phpEx, $kb_config, $db, $images, $userdata, $_POST; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; ! global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; global $HTTP_POST_VARS; --- 29,33 ---- global $template, $mx_kb_functions, $lang, $board_config, $phpEx, $kb_config, $db, $images, $userdata, $_POST; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; ! global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars, $theme; global $HTTP_POST_VARS; *************** *** 85,89 **** $html_entities_replace = array( ); ! $template->assign_block_vars( "tinyMCE", array() ); } else --- 85,94 ---- $html_entities_replace = array( ); ! $langcode = mx_get_langcode(); ! $template->assign_block_vars( "tinyMCE", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $phpbb_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); } else *************** *** 111,116 **** } ! $article_title = ( !empty( $_POST['article_name'] ) ) ? htmlspecialchars( trim ( $_POST['article_name'] ) ) : ''; ! $article_description = ( !empty( $_POST['article_desc'] ) ) ? htmlspecialchars( trim ( $_POST['article_desc'] ) ) : ''; $bbcode_uid = $mx_request_vars->request('bbcode_uid', MX_TYPE_NO_TAGS, ''); --- 116,121 ---- } ! $article_title = ( !empty( $_POST['article_name'] ) ) ? addslashes( htmlspecialchars( trim ( $_POST['article_name'] ) ) ) : ''; ! $article_description = ( !empty( $_POST['article_desc'] ) ) ? addslashes( htmlspecialchars( trim ( $_POST['article_desc'] ) ) ) : ''; $bbcode_uid = $mx_request_vars->request('bbcode_uid', MX_TYPE_NO_TAGS, ''); *************** *** 266,290 **** // Notification // ! if ( $this->notification[$category_id]['activated'] > 0 ) // -1, 0, 1, 2 ! { ! // ! // Instatiate notification ! // ! $mx_kb_notification = new mx_kb_notification(); ! $mx_kb_notification->init( $article_id ); ! ! // ! // Now send notification ! // ! $mx_notification_mode = $this->notification[$category_id]['activated'] == 1 ? MX_PM_MODE : MX_MAIL_MODE; ! $mx_notification_action = $kb_post_mode == 'add' ? MX_NEW_NOTIFICATION : MX_EDITED_NOTIFICATION; ! ! $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action ); ! ! if ( $this->notification[$category_id]['notify_group'] > 0 ) ! { ! $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action, - intval($this->notification[$category_id]['notify_group']) ); ! } ! } // --- 271,275 ---- // Notification // ! $this->update_add_article_notify($article_id, $kb_post_mode); // *************** *** 296,313 **** // Autogenerate comment (duplicate the notification message) // ! if (!is_object($mx_kb_notification)) ! { ! // ! // Instatiate notification ! // ! $mx_kb_notification = new mx_kb_notification(); ! $mx_kb_notification->init( $article_id ); ! $mx_kb_notification->_compose_auto_note(); ! } // // Generate comment // ! $this->update_add_comment('', $article_id, 0, $mx_kb_notification->subject, $mx_kb_notification->message); } --- 281,292 ---- // Autogenerate comment (duplicate the notification message) // ! $mx_kb_notification = new mx_kb_notification(); ! $mx_kb_notification->init( $article_id ); ! $mx_kb_notification->_compose_auto_note($kb_post_mode == 'add' ? MX_NEW_NOTIFICATION : MX_EDITED_NOTIFICATION); // // Generate comment // ! $this->update_add_comment('', $article_id, 0, addslashes(trim($mx_kb_notification->subject)), addslashes(trim($mx_kb_notification->message)) ); } *************** *** 615,618 **** --- 594,602 ---- } + if ( $bbcode_on ) + { + $template->assign_block_vars( 'switch_bbcodes', array()); + } + // =================================================== // assign var for top navigation Index: kb_moderator.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_moderator.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb_moderator.php 7 Jun 2006 20:28:54 -0000 1.3 --- kb_moderator.php 17 Jun 2006 20:11:24 -0000 1.4 *************** *** 113,116 **** --- 113,121 ---- $this->_kb(); + // + // Notification + // + $this->update_add_article_notify($article_id, 'approve'); + $message = $lang['Article_approved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start" ) ) . '">', '</a>' ) ; *************** *** 130,133 **** --- 135,143 ---- $this->_kb(); + // + // Notification + // + $this->update_add_article_notify($article_id, 'unapprove'); + $message = $lang['Article_unapproved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; *************** *** 149,160 **** $article_info = $db->sql_fetchrow( $result ); ! if ( $this->comments[$article_info['article_category_id']]['activated'] && !$this->comments[$article_info['article_category_id']]['internal_comments'] && $kb_config['del_topic'] && $article_info['topic_id'] ) { ! include( $module_root_path . 'kb/includes/functions_comment.' . $phpEx ); ! $mx_kb_comments = new mx_kb_comments(); ! $mx_kb_comments->init( $article_info, 'phpbb' ); ! $mx_kb_comments->post('delete', $article_info['topic_id']); } $sql = "DELETE FROM " . KB_ARTICLES_TABLE . " WHERE article_id = " . $article_id; --- 159,193 ---- $article_info = $db->sql_fetchrow( $result ); ! // ! // Comments ! // ! if ( $this->comments[$article_info['article_category_id']]['activated'] && $kb_config['del_topic']) { ! if ( $this->comments[$article_info['article_category_id']]['internal_comments'] ) ! { ! $sql = "DELETE FROM " . KB_COMMENTS_TABLE . " WHERE article_id = " . $article_id; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, "Could not delete article comments data", '', __LINE__, __FILE__, $sql ); ! } ! } ! else ! { ! if ( $article_info['topic_id'] ) ! { ! include( $module_root_path . 'kb/includes/functions_comment.' . $phpEx ); ! $mx_kb_comments = new mx_kb_comments(); ! $mx_kb_comments->init( $article_info, 'phpbb' ); ! $mx_kb_comments->post('delete_all', $article_info['topic_id']); ! } ! } } + // + // Notification + // + $this->update_add_article_notify($article_id, 'delete'); + $sql = "DELETE FROM " . KB_ARTICLES_TABLE . " WHERE article_id = " . $article_id; *************** *** 167,171 **** $this->_kb(); ! $message = $lang['Article_unapproved'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; } --- 200,204 ---- $this->_kb(); ! $message = $lang['Article_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_article_manager'], '<a href="' . append_sid( this_kb_mxurl( "page=$page_id&mode=cat&cat=$category_id&start=$start") ) . '">', '</a>' ) ; } *************** *** 181,224 **** } - // - // Notification - // - if ( $this->notification[$category_id]['activated'] > 0 ) // -1, 0, 1, 2 - { - // - // Instatiate notification - // - $mx_kb_notification = new mx_kb_notification(); - $mx_kb_notification->init( $article_id ); - - // - // Now send notification - // - $mx_notification_mode = $this->notification[$category_id]['activated'] == 1 ? MX_PM_MODE : MX_MAIL_MODE; - - switch ( $action ) - { - case 'approve': - $mx_notification_action = MX_APPROVED_NOTIFICATION; - break; - case 'unapprove': - $mx_notification_action = MX_UNAPPROVED_NOTIFICATION; - break; - case 'delete': - $mx_notification_action = MX_DELETED_NOTIFICATION; - break; - } - - $html_entities_match = array( ); - $html_entities_replace = array( ); - - $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action ); - - if ( $this->notification[$category_id]['notify_group'] > 0 ) - { - $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action, - intval($this->notification[$category_id]['notify_group']) ); - } - } - mx_message_die( GENERAL_MESSAGE, $message ); --- 214,217 ---- Index: kb_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post_comment.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb_post_comment.php 7 Jun 2006 20:28:54 -0000 1.3 --- kb_post_comment.php 17 Jun 2006 20:11:24 -0000 1.4 *************** *** 9,14 **** --- 9,28 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + + /** + * Enter description here... + * + */ class mx_kb_post_comment extends mx_kb_public { + /** + * Enter description here... + * + * @param unknown_type $action + */ function main( $action ) { *************** *** 335,339 **** if (!$kb_config['allow_comment_images'] || !$kb_config['allow_comment_links']) { ! $article = $mx_kb_text_tools->remove_images_links( $article, $kb_config['allow_comment_images'], $kb_config['no_comment_image_message'], $kb_config['allow_comment_links'], $kb_config['no_comment_link_message'] ); } --- 349,353 ---- if (!$kb_config['allow_comment_images'] || !$kb_config['allow_comment_links']) { ! $comments_text = $mx_kb_text_tools->remove_images_links( $comments_text, $kb_config['allow_comment_images'], $kb_config['no_comment_image_message'], $kb_config['allow_comment_links'], $kb_config['no_comment_link_message'] ); } |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:27
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb/kb/includes Modified Files: functions.php functions_admin.php functions_comment.php functions_kb.php Log Message: Finalizing this module Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** functions.php 7 Jun 2006 20:28:54 -0000 1.5 --- functions.php 17 Jun 2006 20:11:23 -0000 1.6 *************** *** 784,787 **** --- 784,793 ---- define('MX_DELETED_NOTIFICATION' , 14); + // + // Includes + // + include_once( $phpbb_root_path . 'includes/bbcode.'.$phpEx); + include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); + /** * mx_kb_notification. *************** *** 834,843 **** global $db, $lang, $mx_kb_custom_field, $module_root_path, $phpbb_root_path, $phpEx, $mx_kb, $userdata; - // - // Includes - // - include_once( $phpbb_root_path . 'includes/bbcode.'.$phpEx); - include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); - $mx_kb->debug('notification->init (id='.$item_id.')', basename( __FILE__ )); --- 840,843 ---- *************** *** 1008,1095 **** $this->smilies_on = $smilies_on; ! // ! // Compose Subject ! // ! if (empty($subject)) ! { ! // ! // Auto generated subject ! // ! switch ( $action ) ! { ! case MX_NEW_NOTIFICATION: ! $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_new']; ! break; ! ! case MX_EDITED_NOTIFICATION: ! $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited']; ! break; ! ! case MX_APPROVED_NOTIFICATION: ! $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_approved']; ! break; ! ! case MX_UNAPPROVED_NOTIFICATION: ! $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_unapproved']; ! break; ! ! case MX_DELETED_NOTIFICATION: ! $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_deleted']; ! break; ! ! default: ! mx_message_die(GENERAL_ERROR, 'Bad notify action'); ! } ! } ! else ! { ! // ! // Custom subject ! // ! $this->subject = $subject; ! } // ! // Compose Message // ! if (empty($message)) { - // - // Auto generated message - // $this->_compose_auto_note($action); - - switch ( $action ) - { - case MX_NEW_NOTIFICATION: - $this->message = $this->langs['notify_new_body'] . '\n\n' . $this->auto_message; - break; - - case MX_EDITED_NOTIFICATION: - $this->message = $this->langs['notify_edited_body'] . '\n\n' . $this->auto_message_update . '\n' . $this->auto_message; - break; - - case MX_APPROVED_NOTIFICATION: - $this->message = $this->langs['notify_approved_body'] . '\n\n' . $this->auto_message; - break; - - case MX_UNAPPROVED_NOTIFICATION: - $this->message = $this->langs['notify_unapproved_body'] . '\n\n' . $this->auto_message; - break; - - case MX_DELETED_NOTIFICATION: - $this->message = $this->langs['notify_deleted_body'] . '\n\n' . $this->auto_message; - break; - - default: - mx_message_die(GENERAL_ERROR, 'Bad notify action'); - } - } - else - { - // - // Custom message - // - $this->message = $message; } --- 1008,1020 ---- $this->smilies_on = $smilies_on; ! $this->subject = $subject; ! $this->message = $message; // ! // Compose Subject // ! if (empty($this->subject) || empty($this->message)) { $this->_compose_auto_note($action); } *************** *** 1174,1178 **** } ! $privmsg_message = prepare_message($this->message, $this->html_on, $this->bbcode_on, $this->smilies_on, $bbcode_uid); $privmsg_message = str_replace('\\\n', '\n', $privmsg_message); } --- 1099,1103 ---- } ! $privmsg_message = prepare_message(addslashes($this->message), $this->html_on, $this->bbcode_on, $this->smilies_on, $bbcode_uid); $privmsg_message = str_replace('\\\n', '\n', $privmsg_message); } *************** *** 1406,1421 **** $mx_kb->debug('notification->_compose_auto_note', basename( __FILE__ )); - $search = array ( "'&(quot|#34);'i", // Replace HTML entities - "'&(amp|#38);'i", - "'&(lt|#60);'i", - "'&(gt|#62);'i" - ); - - $replace = array ( "\"", - "&", - "<", - ">" - ); - // // Compose phpBB post header --- 1331,1334 ---- *************** *** 1423,1429 **** $temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true); ! $this->auto_message = "[b]" . $this->langs['item_title'] . ":[/b] " . preg_replace( $search, $replace, $this->data['item_title'] ) . "\n"; $this->auto_message .= "[b]" . $this->langs['author'] . ":[/b] " . $this->data['item_author'] . "\n"; ! $this->auto_message .= "[b]" . $this->langs['item_description'] . ":[/b] [i]" . preg_replace( $search, $replace, $this->data['item_desc'] ) . "[/i]\n\n"; //$this->auto_message .= "[b]" . $this->langs['category'] . ":[/b] " . $this->data['item_category_name'] . "\n"; --- 1336,1342 ---- $temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true); ! $this->auto_message = "[b]" . $this->langs['item_title'] . ":[/b] " . $this->data['item_title'] . "\n"; $this->auto_message .= "[b]" . $this->langs['author'] . ":[/b] " . $this->data['item_author'] . "\n"; ! $this->auto_message .= "[b]" . $this->langs['item_description'] . ":[/b] [i]" . $this->data['item_desc'] . "[/i]\n\n"; //$this->auto_message .= "[b]" . $this->langs['category'] . ":[/b] " . $this->data['item_category_name'] . "\n"; *************** *** 1441,1444 **** --- 1354,1391 ---- // $this->auto_message_update = "[i]" . $this->langs['edited_item_info'] . $this->data['item_editor'] . "[/i]" . "\n\n"; + + // + // Auto generated subject and message + // + switch ( $action ) + { + case MX_NEW_NOTIFICATION: + $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_new']; + $this->message = $this->langs['notify_new_body'] . "\n\n" . $this->auto_message; + break; + + case MX_EDITED_NOTIFICATION: + $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited']; + $this->message = $this->langs['notify_edited_body'] . "\n\n" . $this->auto_message_update . $this->auto_message; + break; + + case MX_APPROVED_NOTIFICATION: + $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_approved']; + $this->message = $this->langs['notify_approved_body'] . "\n\n". $this->auto_message; + break; + + case MX_UNAPPROVED_NOTIFICATION: + $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_unapproved']; + $this->message = $this->langs['notify_unapproved_body'] . "\n\n" . $this->auto_message; + break; + + case MX_DELETED_NOTIFICATION: + $this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_deleted']; + $this->message = $this->langs['notify_deleted_body'] . "\n\n" . $this->auto_message; + break; + + default: + mx_message_die(GENERAL_ERROR, 'Bad notify action'); + } } *************** *** 1661,1663 **** --- 1608,1684 ---- $mx_kb_cache->unload(); } + + /** + * url rewrites. + * + * @param unknown_type $args + * @param unknown_type $force_standalone_mode + * @param unknown_type $non_html_amp + * @return unknown + */ + function this_kb_mxurl( $args = '', $force_standalone_mode = false, $non_html_amp = false ) + { + global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block; + + if ( !MXBB_MODULE ) + { + $mxurl = $module_root_path . 'kb.' . $phpEx . ( $args == '' ? '' : '?' . $args ); + return $mxurl; + } + + if ( $force_standalone_mode || !$is_block ) + { + $mxurl = $mx_root_path . 'modules/mx_kb/kb.' . $phpEx . ( $args == '' ? '' : '?' . $args ); + } + else + { + $mxurl = $mx_root_path . 'index.' . $phpEx; + if ( is_numeric( $page_id ) ) + { + $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args ); + } + else + { + $mxurl .= ( $args == '' ? '' : '?' . $args ); + } + } + return $mxurl; + } + + /** + * Enter description here... + * + * @param unknown_type $args + * @param unknown_type $force_standalone_mode + * @param unknown_type $non_html_amp + * @return unknown + */ + function this_kb_mxurl_search( $args = '', $force_standalone_mode = false, $non_html_amp = false ) + { + global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block; + + if ( !MXBB_MODULE ) + { + $mxurl = $module_root_path . 'kb_search.' . $phpEx . ( $args == '' ? '' : '?' . $args ); + return $mxurl; + } + + if ( $force_standalone_mode || !$is_block ) + { + $mxurl = $mx_root_path . 'modules/mx_kb/kb_search.' . $phpEx . ( $args == '' ? '' : '?' . $args ); + } + else + { + $mxurl = $mx_root_path . 'index.' . $phpEx; + if ( is_numeric( $page_id ) ) + { + $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args ); + } + else + { + $mxurl .= ( $args == '' ? '' : '?' . $args ); + } + } + return $mxurl; + } ?> \ No newline at end of file Index: functions_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_admin.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** functions_admin.php 7 Jun 2006 20:28:54 -0000 1.5 --- functions_admin.php 17 Jun 2006 20:11:23 -0000 1.6 *************** *** 74,82 **** * * @param unknown_type $sel_id * @return unknown */ ! function get_forums( $sel_id = 0 ) { ! global $db; $sql = "SELECT forum_id, forum_name --- 74,84 ---- * * @param unknown_type $sel_id + * @param unknown_type $use_default_option + * @param unknown_type $select_name * @return unknown */ ! function get_forums( $sel_id = 0, $use_default_option = false, $select_name = 'forum_id' ) { ! global $db, $lang; $sql = "SELECT forum_id, forum_name *************** *** 88,96 **** } ! $forumlist = '<select name="forum_id">'; if ( $sel_id == 0 ) { ! $forumlist .= '<option value="0" selected > Select a Forum !</option>'; } --- 90,104 ---- } ! $forumlist = '<select name="'.$select_name.'">'; if ( $sel_id == 0 ) { ! $forumlist .= '<option value="0" selected >'.$lang['Select_topic_id'].'</option>'; ! } ! ! if ( $use_default_option ) ! { ! $status = $sel_id == "-1" ? "selected" : ""; ! $forumlist .= '<option value="-1" '.$status.' >::'.$lang['Use_default'].'::</option>'; } *************** *** 112,114 **** --- 120,159 ---- return $forumlist; } + + /** + * Enter description here... + * + * @param unknown_type $id + * @param unknown_type $select + * @return unknown + */ + function get_list_kb( $id, $select ) + { + global $db; + + $idfield = 'id'; + $namefield = 'type'; + + $sql = "SELECT * + FROM " . KB_TYPES_TABLE; + + if ( $select == 0 ) + { + $sql .= " WHERE $idfield <> $id"; + } + + if ( !$result = $db->sql_query( $sql ) ) + { + mx_message_die( GENERAL_ERROR, "Couldn't get list of types", "", __LINE__, __FILE__, $sql ); + } + + $typelist = ""; + + while ( $row = $db->sql_fetchrow( $result ) ) + { + $typelist .= "<option value=\"$row[$idfield]\"$s>" . $row[$namefield] . "</option>\n"; + } + + return( $typelist ); + } ?> \ No newline at end of file Index: functions_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_comment.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** functions_comment.php 7 Jun 2006 20:28:54 -0000 1.5 --- functions_comment.php 17 Jun 2006 20:11:23 -0000 1.6 *************** *** 92,96 **** // This is specific for pafileDB // ! $this->forum_id = $mx_kb->modules[$mx_kb->module_name]->cat_rowset[$this->cat_id]['comments_forum_id']; $this->auth['auth_view'] = $mx_kb->modules[$mx_kb->module_name]->auth_user[$this->cat_id]['auth_comment']; --- 92,96 ---- // This is specific for pafileDB // ! $this->forum_id = $mx_kb->modules[$mx_kb->module_name]->comments[$this->cat_id]['comments_forum_id']; $this->auth['auth_view'] = $mx_kb->modules[$mx_kb->module_name]->auth_user[$this->cat_id]['auth_comment']; *************** *** 186,190 **** // Get all comments // ! $this->get_internal_comments(); $ranksrow = array(); --- 186,190 ---- // Get all comments // ! $result = $this->get_internal_comments(); $ranksrow = array(); *************** *** 424,428 **** // Get all comments // ! $this->get_phpbb_comments(); $ranksrow = array(); --- 424,428 ---- // Get all comments // ! $result = $this->get_phpbb_comments(); $ranksrow = array(); *************** *** 731,734 **** --- 731,736 ---- )); } + + return $result; } *************** *** 778,781 **** --- 780,785 ---- )); } + + return $result; } *************** *** 1323,1327 **** --- 1327,1355 ---- mx_message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } + } + /** + * Enter description here... + * + * @param unknown_type $topic_id + */ + function delete_phpbb_topic($topic_id) + { + global $board_config, $lang, $db, $phpbb_root_path, $phpEx; + global $userdata, $user_ip; + + $sql = "SELECT * + FROM " . POSTS_TABLE . " + WHERE topic_id = '$topic_id'"; + + if ( !( $result = $db->sql_query( $sql ) ) ) + { + mx_message_die( GENERAL_ERROR, "Could not obtain topic data", '', __LINE__, __FILE__, $sql ); + } + + while( $row = $db->sql_fetchrow( $result ) ) + { + $this->delete_phpbb_post($row['forum_id'], $row['topic_id'], $row['post_id']); + } } *************** *** 1386,1389 **** --- 1414,1422 ---- switch ($mode) { + case 'delete_all': + $return_data = $this->delete_phpbb_topic($this->topic_id ); + $this->validate_topic_id(); + break; + case 'delete': $return_data = $this->delete_phpbb_post($this->forum_id, $this->topic_id, $cid ); Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** functions_kb.php 7 Jun 2006 20:28:54 -0000 1.5 --- functions_kb.php 17 Jun 2006 20:11:23 -0000 1.6 *************** *** 137,145 **** $this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($kb_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments $this->comments[$cat_rowset[$i]['category_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($kb_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] == -1 ? ($kb_config['comments_forum_id'] == 1 ? true : false ) : ( $cat_rowset[$i]['comments_forum_id'] == 1 ? true : false ); // phpBB target forum (only used for phpBB comments) if (!$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id']) < 1) { ! //mx_message_die(GENERAL_ERROR, 'Init Failure, phpBB comments with no target forum_id :('); } --- 137,145 ---- $this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($kb_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments $this->comments[$cat_rowset[$i]['category_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($kb_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] < 1 ? ( intval($kb_config['comments_forum_id']) ) : ( intval($cat_rowset[$i]['comments_forum_id']) ); // phpBB target forum (only used for phpBB comments) if (!$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id']) < 1) { ! mx_message_die(GENERAL_ERROR, 'Init Failure, phpBB comments with no target forum_id :(<br> Category: ' . $cat_rowset[$i]['category_name'] . ' Forum_id: ' . $this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id']); } *************** *** 1295,1319 **** * * @param unknown_type $article_id ! * @return unknown */ ! function get_cat_id($article_id) { global $db; ! $this->debug('mx_kb->get_cat_id', basename( __FILE__ )); ! $sql = "SELECT article_category_id ! FROM " . KB_ARTICLES_TABLE . " ! WHERE article_id = $article_id"; ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql ); ! } ! $kb_row = $db->sql_fetchrow( $result ); ! $category_id = $kb_row['article_category_id']; ! return $category_id; } --- 1295,1382 ---- * * @param unknown_type $article_id ! * @param unknown_type $cat_id ! * @param unknown_type $mode_notification */ ! function update_add_article_notify( $article_id = false, $mode_notification = 'edit' ) { global $db; ! if ( in_array( $mode_notification, array( 'add', 'edit', 'approve', 'unapprove', 'delete' ) ) ) ! { ! if (!$article_id) ! { ! die('bad update_add_article_notify arg'); ! } ! if (is_array( $article_id ) && !empty( $article_id )) ! { ! $articleIdsArray = $article_id; ! } ! else ! { ! $articleIdsArray[] = $article_id; ! } ! foreach($articleIdsArray as $articleId) ! { ! $sql = "SELECT article_category_id ! FROM " . KB_ARTICLES_TABLE . " ! WHERE article_id = '" . $articleId . "'"; ! if ( !$result = $db->sql_query( $sql ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t get article info', '', __LINE__, __FILE__, $sql ); ! } ! $row = $db->sql_fetchrow( $result ); ! $catId = $row['article_category_id']; ! ! // ! // Notification ! // ! if ( $this->notification[$catId]['activated'] > 0 ) // -1, 0, 1, 2 ! { ! // ! // Instatiate notification ! // ! $mx_kb_notification = new mx_kb_notification(); ! $mx_kb_notification->init( $articleId ); ! ! // ! // Now send notification ! // ! $mx_notification_mode = $this->notification[$catId]['activated'] == 1 ? MX_PM_MODE : MX_MAIL_MODE; ! ! switch ( $mode_notification ) ! { ! case 'add': ! $mx_notification_action = MX_NEW_NOTIFICATION; ! break; ! case 'edit': ! $mx_notification_action = MX_EDITED_NOTIFICATION; ! break; ! case 'approve': ! $mx_notification_action = MX_APPROVED_NOTIFICATION; ! break; ! case 'unapprove': ! $mx_notification_action = MX_UNAPPROVED_NOTIFICATION; ! break; ! case 'delete': ! $mx_notification_action = MX_DELETED_NOTIFICATION; ! break; ! } ! ! $html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#', '#"#'); ! $html_entities_replace = array('&', '<', '>', '"'); ! ! $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action ); ! ! if ( $this->notification[$cat_id]['notify_group'] > 0 ) ! { ! $mx_kb_notification->notify( $mx_notification_mode, $mx_notification_action, - intval($this->notification[$catId]['notify_group']) ); ! } ! } ! } ! } } *************** *** 1332,1336 **** function update_add_comment($article_data = '', $item_id, $cid, $subject = '', $message = '', $html_on = false, $bbcode_on = true, $smilies_on = false) { ! global $template, $mx_kb_functions, $lang, $board_config, $phpEx, $kb_config, $db, $images, $userdata, $_POST; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; --- 1395,1399 ---- function update_add_comment($article_data = '', $item_id, $cid, $subject = '', $message = '', $html_on = false, $bbcode_on = true, $smilies_on = false) { ! global $template, $mx_kb_functions, $lang, $board_config, $phpEx, $kb_config, $db, $images, $userdata; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; *************** *** 1455,1458 **** --- 1518,1548 ---- } } + + /** + * Enter description here... + * + * @param unknown_type $article_id + * @return unknown + */ + function get_cat_id($article_id) + { + global $db; + + $this->debug('mx_kb->get_cat_id', basename( __FILE__ )); + + $sql = "SELECT article_category_id + FROM " . KB_ARTICLES_TABLE . " + WHERE article_id = $article_id"; + + if ( !( $result = $db->sql_query( $sql ) ) ) + { + mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql ); + } + + $kb_row = $db->sql_fetchrow( $result ); + $category_id = $kb_row['article_category_id']; + + return $category_id; + } } |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:27
|
Update of /cvsroot/mxbb/mx_kb/kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb/kb Modified Files: kb_common.php Log Message: Finalizing this module Index: kb_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/kb_common.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_common.php 7 Jun 2006 20:28:54 -0000 1.4 --- kb_common.php 17 Jun 2006 20:11:24 -0000 1.5 *************** *** 86,90 **** $mx_kb_user = new mx_kb_user_info(); - // // options --- 86,89 ---- *************** *** 108,184 **** $smilies_on = $kb_config['allow_smilies'] ? true : false; } - - /** - * url rewrites. - * - * @param unknown_type $args - * @param unknown_type $force_standalone_mode - * @param unknown_type $non_html_amp - * @return unknown - */ - function this_kb_mxurl( $args = '', $force_standalone_mode = false, $non_html_amp = false ) - { - global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block; - - if ( !MXBB_MODULE ) - { - $mxurl = $module_root_path . 'kb.' . $phpEx . ( $args == '' ? '' : '?' . $args ); - return $mxurl; - } - - if ( $force_standalone_mode || !$is_block ) - { - $mxurl = $mx_root_path . 'modules/mx_kb/kb.' . $phpEx . ( $args == '' ? '' : '?' . $args ); - } - else - { - $mxurl = $mx_root_path . 'index.' . $phpEx; - if ( is_numeric( $page_id ) ) - { - $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args ); - } - else - { - $mxurl .= ( $args == '' ? '' : '?' . $args ); - } - } - return $mxurl; - } - - /** - * Enter description here... - * - * @param unknown_type $args - * @param unknown_type $force_standalone_mode - * @param unknown_type $non_html_amp - * @return unknown - */ - function this_kb_mxurl_search( $args = '', $force_standalone_mode = false, $non_html_amp = false ) - { - global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block; - - if ( !MXBB_MODULE ) - { - $mxurl = $module_root_path . 'kb_search.' . $phpEx . ( $args == '' ? '' : '?' . $args ); - return $mxurl; - } - - if ( $force_standalone_mode || !$is_block ) - { - $mxurl = $mx_root_path . 'modules/mx_kb/kb_search.' . $phpEx . ( $args == '' ? '' : '?' . $args ); - } - else - { - $mxurl = $mx_root_path . 'index.' . $phpEx; - if ( is_numeric( $page_id ) ) - { - $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args ); - } - else - { - $mxurl .= ( $args == '' ? '' : '?' . $args ); - } - } - return $mxurl; - } ?> \ No newline at end of file --- 107,109 ---- |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:27
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb Modified Files: db_install.php db_upgrade.php kb.php Log Message: Finalizing this module Index: kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** kb.php 2 May 2006 23:27:19 -0000 1.30 --- kb.php 17 Jun 2006 20:11:23 -0000 1.31 *************** *** 114,117 **** --- 114,119 ---- // ------------------------------------------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------------------------------------------- + // Start + // ------------------------------------------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------------------------------------------- *************** *** 122,136 **** // =================================================== ! // Get action variable other wise set it to the main // =================================================== $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, 'main'); - - // - // Get more variables - // $print_version = $mx_request_vars->request('print', MX_TYPE_NO_TAGS, ''); $is_admin = ( ( $userdata['user_level'] == ADMIN ) && $userdata['session_logged_in'] ) ? true : 0; - $reader_mode = false; // =================================================== --- 124,137 ---- // =================================================== ! // Get mode variables, otherwise set it to the main // =================================================== $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, 'main'); $print_version = $mx_request_vars->request('print', MX_TYPE_NO_TAGS, ''); + $reader_mode = false; + // =================================================== + // Is admin? + // =================================================== $is_admin = ( ( $userdata['user_level'] == ADMIN ) && $userdata['session_logged_in'] ) ? true : 0; // =================================================== Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** db_install.php 2 May 2006 23:27:19 -0000 1.37 --- db_install.php 17 Jun 2006 20:11:23 -0000 1.38 *************** *** 30,34 **** } ! $mx_module_version = '2.0.2'; $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon</a> :: Adapted for mxBB by <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; --- 30,34 ---- } ! $mx_module_version = '2.8.0'; $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon</a> :: Adapted for mxBB by <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; *************** *** 136,140 **** "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('enable_module', '1')", // allow_new "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('module_name', 'Knowledge Base')", // NEW ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg_path', 'modules/')", // Articles --- 136,140 ---- "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('enable_module', '1')", // allow_new "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('module_name', 'Knowledge Base')", // NEW ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg_path', 'modules/mx_shared/')", // Articles *************** *** 182,185 **** --- 182,186 ---- "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('autogenerate_comments', '1')", // bump_post "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('comments_pagination', '5')", + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('comments_forum_id', '0')", // New // Ratings Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** db_upgrade.php 2 May 2006 23:27:19 -0000 1.30 --- db_upgrade.php 17 Jun 2006 20:11:23 -0000 1.31 *************** *** 30,34 **** } ! $mx_module_version = '2.0.2'; $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon</a> :: Adapted for mxBB by <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; --- 30,34 ---- } ! $mx_module_version = '2.8.0'; $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon</a> :: Adapted for mxBB by <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; *************** *** 58,61 **** --- 58,62 ---- $upgrade_201 = 0; $upgrade_202 = 0; + $upgrade_280 = 0; // mxBB 2.8 branch -> $message = "<b>Upgrading!</b><br/><br/>"; *************** *** 152,155 **** --- 153,168 ---- } + // validate before 2.8.0 + $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "kb_config WHERE config_name = 'comments_forum_id'" ); + if ( $db->sql_numrows( $result ) == 0 ) + { + $upgrade_280 = 1; + $message .= "<b>Upgrading to v. 2.8.0...ok</b><br/><br/>"; + } + else + { + $message .= "<b>Validating v. 2.8.0...ok</b><br/><br/>"; + } + // ------------------------------------------------------------------------------------------------------ if ( $upgrade_105 == 1 ) *************** *** 380,383 **** --- 393,408 ---- $sql[] = "DROP TABLE " . $mx_table_prefix . "kb_wordmatch "; + // + // New + // + $sql[] = "UPDATE " . $mx_table_prefix . "kb_config" . " + SET config_value = 'modules/mx_shared/' + WHERE config_name = 'wysiwyg_path'"; + + } + + if ( $upgrade_280 == 1 ) + { + $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('comments_forum_id', '0')"; } else |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:26
|
Update of /cvsroot/mxbb/mx_kb/kb/cache In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb/kb/cache Modified Files: data_global.php Log Message: Finalizing this module Index: data_global.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/cache/data_global.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** data_global.php 7 Jun 2006 20:28:54 -0000 1.2 --- data_global.php 17 Jun 2006 20:11:23 -0000 1.3 *************** *** 1,2 **** ! <?php $this->vars=array('ranks'=>array('0'=>array('0'=>'1','rank_id'=>'1','1'=>'Site Admin','rank_title'=>'Site Admin','2'=>'-1','rank_min'=>'-1','3'=>'-1','rank_max'=>'-1','4'=>'1','rank_special'=>'1','5'=>'images/smiles/icon_cool.gif','rank_image'=>'images/smiles/icon_cool.gif'),'1'=>array('0'=>'2','rank_id'=>'2','1'=>'Skolledare','rank_title'=>'Skolledare','2'=>'-1','rank_min'=>'-1','3'=>'-1','rank_max'=>'-1','4'=>'1','rank_special'=>'1','5'=>'','rank_image'=>''),'2'=>array('0'=>'3','rank_id'=>'3','1'=>'Lärare','rank_title'=>'Lärare','2'=>'-1','rank_min'=>'-1','3'=>'-1','rank_max'=>'-1','4'=>'1','rank_special'=>'1','5'=>'','rank_image'=>''),'3'=>array('0'=>'4','rank_id'=>'4','1'=>'Ordf. Elevrådet','rank_title'=>'Ordf. Elevrådet','2'=>'-1','rank_min'=>'-1','3'=>'-1','rank_max'=>'-1','4'=>'1','rank_special'=>'1','5'=>'','rank_image'=>''),'4'=>array('0'=>'5','rank_id'=>'5','1'=>'Redaktör Sambladet','rank_title'=>'Redaktör Sambladet','2'=>'-1','rank_min'=>'-1','3'=>'-1','rank_max'=>'-1','4'=>'1','rank_special'=>'1','5'=>'','rank_image'=>''),'5'=>array('0'=>'6','rank_id'=>'6','1'=>'Nätguru','rank_title'=>'Nätguru','2'=>'-1','rank_min'=>'-1','3'=>'-1','rank_max'=>'-1','4'=>'1','rank_special'=>'1','5'=>'','rank_image'=>'')),'config'=>array('enable_module'=>'1','notify'=>'1','notify_group'=>'13','show_pretext'=>'1','pt_header'=>'Regler','pt_body'=>'Tänk på vad du skriver i dina artiklar...','use_comments'=>'1','del_topic'=>'1','use_ratings'=>'1','allow_wysiwyg'=>'1','autogenerate_comments'=>'1','stats_list'=>'1','header_banner'=>'0','votes_check_userid'=>'0','votes_check_ip'=>'0','pagination'=>'5','comments_pagination'=>'5','sort_method'=>'Latest','sort_order'=>'DESC','allow_html'=>'1','allow_bbcode'=>'1','allow_smilies'=>'1','allowed_html_tags'=>'b,i,u,a','wysiwyg_path'=>'modules/mx_shared/','module_name'=>'Knowledge Base','formatting_comment_wordwrap'=>'1','formatting_image_resize'=>'300','formatting_truncate_links'=>'1','internal_comments'=>'0','formatting_comment_image_resize'=>'3002','formatting_comment_truncate_links'=>'1','max_comment_subject_chars'=>'50','max_comment_chars'=>'5000','allowed_comment_html_tags'=>'b,i,u,a','allow_comment_wysiwyg'=>'1','allow_comment_html'=>'1','allow_comment_bbcode'=>'1','allow_comment_smilies'=>'1','allow_comment_links'=>'1','allow_comment_images'=>'1','no_comment_image_message'=>'[No image please]','no_comment_link_message'=>'[No links please]','allow_links'=>'0','allow_images'=>'0','no_image_message'=>'[No image please]','no_link_message'=>'[No links please]','formatting_wordwrap'=>'1','max_chars'=>'0','max_desc_chars'=>'500','max_subject_chars'=>'100','wysiwyg'=>'0')); ! $this->vars_ts=array('ranks'=>1132520068,'config'=>1149531275) ?> \ No newline at end of file --- 1,2 ---- ! <?php $this->vars=array('ranks'=>array('0'=>array('rank_id'=>'1','rank_title'=>'Site Admin','rank_min'=>'-1','rank_max'=>'-1','rank_special'=>'1','rank_image'=>'images/smiles/icon_cool.gif'),'1'=>array('rank_id'=>'2','rank_title'=>'Skolledare','rank_min'=>'-1','rank_max'=>'-1','rank_special'=>'1','rank_image'=>''),'2'=>array('rank_id'=>'3','rank_title'=>'Lärare','rank_min'=>'-1','rank_max'=>'-1','rank_special'=>'1','rank_image'=>''),'3'=>array('rank_id'=>'4','rank_title'=>'Ordf. Elevrådet','rank_min'=>'-1','rank_max'=>'-1','rank_special'=>'1','rank_image'=>''),'4'=>array('rank_id'=>'5','rank_title'=>'Redaktör Sambladet','rank_min'=>'-1','rank_max'=>'-1','rank_special'=>'1','rank_image'=>''),'5'=>array('rank_id'=>'6','rank_title'=>'Nätguru','rank_min'=>'-1','rank_max'=>'-1','rank_special'=>'1','rank_image'=>'')),'config'=>array('enable_module'=>'1','notify'=>'1','notify_group'=>'13','show_pretext'=>'1','pt_header'=>'Regler','pt_body'=>'Tänk på vad du skriver i dina artiklar...','use_comments'=>'1','del_topic'=>'1','use_ratings'=>'1','allow_wysiwyg'=>'1','autogenerate_comments'=>'1','stats_list'=>'1','header_banner'=>'0','votes_check_userid'=>'0','votes_check_ip'=>'0','pagination'=>'5','comments_pagination'=>'5','sort_method'=>'Latest','sort_order'=>'DESC','allow_html'=>'1','allow_bbcode'=>'1','allow_smilies'=>'1','allowed_html_tags'=>'b,i,u,a','wysiwyg_path'=>'modules/mx_shared/','module_name'=>'Knowledge Base','formatting_comment_wordwrap'=>'1','formatting_image_resize'=>'300','formatting_truncate_links'=>'1','internal_comments'=>'0','formatting_comment_image_resize'=>'3002','formatting_comment_truncate_links'=>'1','max_comment_subject_chars'=>'50','max_comment_chars'=>'5000','allowed_comment_html_tags'=>'b,i,u,a','allow_comment_wysiwyg'=>'1','allow_comment_html'=>'1','allow_comment_bbcode'=>'1','allow_comment_smilies'=>'1','allow_comment_links'=>'1','allow_comment_images'=>'1','no_comment_image_message'=>'[No image please]','no_comment_link_message'=>'[No links please]','allow_links'=>'1','allow_images'=>'1','no_image_message'=>'[No image please]','no_link_message'=>'[No links please]','formatting_wordwrap'=>'1','max_chars'=>'0','max_desc_chars'=>'500','max_subject_chars'=>'100','wysiwyg'=>'0','comments_forum_id'=>'2')); ! $this->vars_ts=array('ranks'=>1150145195,'config'=>1150147653) ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:10:21
|
Update of /cvsroot/mxbb/mx_act/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21181/modules/mx_act/includes Modified Files: act_cat_play.php act_challenges.php act_challenges_main.php act_constants.php act_functions.php act_games.php act_main.php act_scores.php act_stats.php act_top_scores.php act_top_scores_search.php act_trophy.php act_trophy_comments.php rewards_api.php Log Message: Syncronizing...and code cleanup Index: act_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_constants.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** act_constants.php 5 Apr 2006 22:03:55 -0000 1.12 --- act_constants.php 17 Jun 2006 20:10:12 -0000 1.13 *************** *** 8,12 **** * */ ! // ---------------------------------------------------------------------START // This file defines specific constants for the module --- 8,17 ---- * */ ! ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! // ---------------------------------------------------------------------START // This file defines specific constants for the module *************** *** 59,64 **** // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE // ------------------------------------------------------------------------- ! $mx_user->extend(); ! $mx_page->add_copyright( 'mxBB Activity Games Module' ); } --- 64,69 ---- // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE // ------------------------------------------------------------------------- ! $mx_user->extend(); ! $mx_page->add_copyright( 'mxBB Activity Games Module' ); } Index: act_top_scores_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_top_scores_search.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** act_top_scores_search.php 5 Apr 2006 22:03:55 -0000 1.5 --- act_top_scores_search.php 17 Jun 2006 20:10:12 -0000 1.6 *************** *** 9,12 **** --- 9,17 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + /* Start Restriction Checks */ /* Start Ban Check */ *************** *** 72,76 **** if ( $user_rank == "0" ) { ! $where = "WHERE rank_min <= '$user_posts' AND rank_special = '0' LIMIT 1"; --- 77,81 ---- if ( $user_rank == "0" ) { ! $where = "WHERE rank_min <= '$user_posts' AND rank_special = '0' LIMIT 1"; *************** *** 135,139 **** "BOTTOM_FOUR" => $user_level, "HEADER_ONE" => $lang['game'], ! "HEADER_TWO" => $lang['score_2'] . "<br>" . $lang['date_took'] ) ); --- 140,144 ---- "BOTTOM_FOUR" => $user_level, "HEADER_ONE" => $lang['game'], ! "HEADER_TWO" => $lang['score_2'] . "<br>" . $lang['date_took'] ) ); *************** *** 161,165 **** "ROW_CLASS" => $row_class, "GAMES" => $game_image, ! "SCORE_DATE" => $score . "<br>" . $date ) ); $i++; --- 166,170 ---- "ROW_CLASS" => $row_class, "GAMES" => $game_image, ! "SCORE_DATE" => $score . "<br>" . $date ) ); $i++; Index: act_challenges_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_challenges_main.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** act_challenges_main.php 5 Apr 2006 22:03:55 -0000 1.4 --- act_challenges_main.php 17 Jun 2006 20:10:12 -0000 1.5 *************** *** 8,12 **** * */ ! $who = $_GET['user']; $who_id = $_GET['user']; --- 8,17 ---- * */ ! ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! $who = $_GET['user']; $who_id = $_GET['user']; Index: act_trophy_comments.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_trophy_comments.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** act_trophy_comments.php 5 Apr 2006 22:03:55 -0000 1.5 --- act_trophy_comments.php 17 Jun 2006 20:10:13 -0000 1.6 *************** *** 8,12 **** * */ ! /* Start Restriction Checks */ /* Start Ban Check */ --- 8,17 ---- * */ ! ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! /* Start Restriction Checks */ /* Start Ban Check */ *************** *** 60,64 **** $comment = $_GET['user']; // Get game_id ! $sql = "SELECT * FROM " . iNA_GAMES . " WHERE game_name = '" . $game_comment . "'"; --- 65,69 ---- $comment = $_GET['user']; // Get game_id ! $sql = "SELECT * FROM " . iNA_GAMES . " WHERE game_name = '" . $game_comment . "'"; *************** *** 75,79 **** $game_for_comment = $_POST['comment_game_name']; ! $sql = "SELECT * FROM " . INA_TROPHY . " WHERE game_name = '" . $game_for_comment . "'"; --- 80,84 ---- $game_for_comment = $_POST['comment_game_name']; ! $sql = "SELECT * FROM " . INA_TROPHY . " WHERE game_name = '" . $game_for_comment . "'"; *************** *** 101,105 **** } ! $sql = "SELECT * FROM " . iNA_TROPHY_COMMENTS . " WHERE game = '" . $game_for_comment . "' --- 106,110 ---- } ! $sql = "SELECT * FROM " . iNA_TROPHY_COMMENTS . " WHERE game = '" . $game_for_comment . "' *************** *** 193,197 **** $template->set_filenames( array( 'body' => 'trophy_comments_body.tpl' ) ); ! $sql = "SELECT * FROM " . INA_TROPHY . " WHERE game_name = '" . $game_comment . "'"; --- 198,202 ---- $template->set_filenames( array( 'body' => 'trophy_comments_body.tpl' ) ); ! $sql = "SELECT * FROM " . INA_TROPHY . " WHERE game_name = '" . $game_comment . "'"; *************** *** 222,226 **** "POST_GAME" => $_GET['game'], "POST_LINK" => this_act_mxurl( "mode=act_trophy_comments" ), ! "POST_IMAGE" => $game_link ) ); } --- 227,231 ---- "POST_GAME" => $_GET['game'], "POST_LINK" => this_act_mxurl( "mode=act_trophy_comments" ), ! "POST_IMAGE" => $game_link ) ); } *************** *** 231,235 **** $check_comments = $_GET['game']; ! $sql = "SELECT * FROM " . iNA_TROPHY_COMMENTS . " WHERE game = '" . $check_comments . "'"; --- 236,240 ---- $check_comments = $_GET['game']; ! $sql = "SELECT * FROM " . iNA_TROPHY_COMMENTS . " WHERE game = '" . $check_comments . "'"; *************** *** 267,274 **** "L_PLAY_AGAIN" => $lang['Play_again'], "L_RETURN_ACT" => $lang['Return_act'], ! "MAIN_IMAGE" => $game_link ) ); ! $sql = "SELECT * FROM " . iNA_GAMES . " WHERE game_name = '" . $check_comments . "'"; --- 272,279 ---- "L_PLAY_AGAIN" => $lang['Play_again'], "L_RETURN_ACT" => $lang['Return_act'], ! "MAIN_IMAGE" => $game_link ) ); ! $sql = "SELECT * FROM " . iNA_GAMES . " WHERE game_name = '" . $check_comments . "'"; *************** *** 288,292 **** } ! $sql = "SELECT * FROM " . iNA_TROPHY_COMMENTS . " WHERE game = '" . $check_comments . "' --- 293,297 ---- } ! $sql = "SELECT * FROM " . iNA_TROPHY_COMMENTS . " WHERE game = '" . $check_comments . "' *************** *** 342,346 **** "SCORE" => $score, "COMMENT" => $row['comment'], ! "DATE" => $date ) ); $i++; --- 347,351 ---- "SCORE" => $score, "COMMENT" => $row['comment'], ! "DATE" => $date ) ); $i++; Index: act_trophy.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_trophy.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** act_trophy.php 5 Apr 2006 22:03:55 -0000 1.6 --- act_trophy.php 17 Jun 2006 20:10:12 -0000 1.7 *************** *** 9,12 **** --- 9,17 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + /* Start Restriction Checks */ /* Start Ban Check */ *************** *** 55,59 **** "L_USER_SEARCH" => $lang['trophy_count_3'], "L_PM_PROFILE" => $lang['trophy_count_4'], ! "L_LINK" => $lang['trophy_count_link'] ) ); --- 60,64 ---- "L_USER_SEARCH" => $lang['trophy_count_3'], "L_PM_PROFILE" => $lang['trophy_count_4'], ! "L_LINK" => $lang['trophy_count_link'] ) ); *************** *** 88,92 **** "TROPHIES" => $trophies, "USER_SEARCH" => "<a href='" . this_act_mxurl( 'mode=act_top_scores_search' ) . "&user=$user_n&sid=" . $userdata['session_id'] . "'>$user_n</a>", ! "PM_PROFILE" => $pm . " " . $profile ) ); $i++; --- 93,97 ---- "TROPHIES" => $trophies, "USER_SEARCH" => "<a href='" . this_act_mxurl( 'mode=act_top_scores_search' ) . "&user=$user_n&sid=" . $userdata['session_id'] . "'>$user_n</a>", ! "PM_PROFILE" => $pm . " " . $profile ) ); $i++; Index: act_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_main.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** act_main.php 5 Apr 2006 22:03:55 -0000 1.7 --- act_main.php 17 Jun 2006 20:10:12 -0000 1.8 *************** *** 1,3 **** ! <?php /** * --- 1,3 ---- ! <?php /** * *************** *** 9,12 **** --- 9,17 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + /* First Time Use, Transfer The Highest Scores To The New activity.php */ *************** *** 100,105 **** { $q = "SELECT COUNT(session_id) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '0' AND session_page = '" . PAGE_ACTIVITY . "' GROUP BY session_ip"; --- 105,110 ---- { $q = "SELECT COUNT(session_id) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '0' AND session_page = '" . PAGE_ACTIVITY . "' GROUP BY session_ip"; *************** *** 109,114 **** $q = "SELECT COUNT(session_id) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '0' AND session_page = '" . PAGE_PLAYING_GAMES . "' GROUP BY session_ip"; --- 114,119 ---- $q = "SELECT COUNT(session_id) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '0' AND session_page = '" . PAGE_PLAYING_GAMES . "' GROUP BY session_ip"; *************** *** 135,140 **** $q = "SELECT COUNT(*) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '1' AND session_page = '" . PAGE_ACTIVITY . "' GROUP BY session_user_id"; --- 140,145 ---- $q = "SELECT COUNT(*) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '1' AND session_page = '" . PAGE_ACTIVITY . "' GROUP BY session_user_id"; *************** *** 144,149 **** $q = "SELECT COUNT(*) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '1' AND session_page = '" . PAGE_PLAYING_GAMES . "' GROUP BY session_user_id"; --- 149,154 ---- $q = "SELECT COUNT(*) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '1' AND session_page = '" . PAGE_PLAYING_GAMES . "' GROUP BY session_user_id"; *************** *** 179,183 **** "MAIN_COLOR1" => "[ <font color=" . $theme['fontcolor2'] . ">" . $lang['online_viewing_games'] . "</font> ]", "MAIN_SEPERATOR" => "<b> :: </b>", ! "MAIN_COLOR2" => "[ <font color=" . $theme['fontcolor3'] . ">" . $lang['online_playing_games'] . "</font> ]" ) ); --- 184,188 ---- "MAIN_COLOR1" => "[ <font color=" . $theme['fontcolor2'] . ">" . $lang['online_viewing_games'] . "</font> ]", "MAIN_SEPERATOR" => "<b> :: </b>", ! "MAIN_COLOR2" => "[ <font color=" . $theme['fontcolor3'] . ">" . $lang['online_playing_games'] . "</font> ]" ) ); *************** *** 222,226 **** $template->assign_block_vars( "playing", array( "USERNAME" => $username_link, "USER_NUMBER" => " ", ! "MAIN_SEPERATOR" => " " ) ); } --- 227,231 ---- $template->assign_block_vars( "playing", array( "USERNAME" => $username_link, "USER_NUMBER" => " ", ! "MAIN_SEPERATOR" => " " ) ); } *************** *** 267,271 **** "L_SCORES" => $lang['game_score'], "L_INFO" => $lang['game_info'], ! "L_PLAYER" => $lang['game_best_player'] ) ); --- 272,276 ---- "L_SCORES" => $lang['game_score'], "L_INFO" => $lang['game_info'], ! "L_PLAYER" => $lang['game_best_player'] ) ); *************** *** 482,486 **** "L_PLAY_GAME_NOW" => $lang['Play_again'], "L_SAME_W" => $lang['same_window'], ! "L_NEW_W" => $lang['new_window'] ) ); } --- 487,491 ---- "L_PLAY_GAME_NOW" => $lang['Play_again'], "L_SAME_W" => $lang['same_window'], ! "L_NEW_W" => $lang['new_window'] ) ); } *************** *** 502,506 **** $template->assign_block_vars( "drop", array( "D_SELECT_1" => $game_i2, ! "D_SELECT_2" => $game_n2 ) ); } --- 507,511 ---- $template->assign_block_vars( "drop", array( "D_SELECT_1" => $game_i2, ! "D_SELECT_2" => $game_n2 ) ); } *************** *** 524,528 **** $template->assign_block_vars( "cat", array( "C_SELECT_1" => "(" . $row['total'] . ") " . $cat, ! "C_SELECT_2" => this_act_mxurl( "mode=category_play&cat=" . $cat_id . "&sid=" . $userdata['session_id'] ) ) ); } --- 529,533 ---- $template->assign_block_vars( "cat", array( "C_SELECT_1" => "(" . $row['total'] . ") " . $cat, ! "C_SELECT_2" => this_act_mxurl( "mode=category_play&cat=" . $cat_id . "&sid=" . $userdata['session_id'] ) ) ); } *************** *** 537,543 **** } ! $sql = "SELECT * FROM " . iNA_GAMES . " ! $where_clause ORDER BY $order_by"; if ( !$result = $db->sql_query( $sql ) ) --- 542,548 ---- } ! $sql = "SELECT * FROM " . iNA_GAMES . " ! $where_clause ORDER BY $order_by"; if ( !$result = $db->sql_query( $sql ) ) *************** *** 753,757 **** "L_PLAY_GAME_NOW" => $lang['Play_again'], "L_SAME_W" => $lang['same_window'], ! "L_NEW_W" => $lang['new_window'] ) ); } --- 758,762 ---- "L_PLAY_GAME_NOW" => $lang['Play_again'], "L_SAME_W" => $lang['same_window'], ! "L_NEW_W" => $lang['new_window'] ) ); } *************** *** 803,807 **** "L_SUBMIT" => $lang['Sort'], "L_SELECT_SORT_METHOD" => $lang['Select_sort_method'], ! "L_GOTO_PAGE" => $lang['Goto_page'] ) ); --- 808,812 ---- "L_SUBMIT" => $lang['Sort'], "L_SELECT_SORT_METHOD" => $lang['Select_sort_method'], ! "L_GOTO_PAGE" => $lang['Goto_page'] ) ); Index: act_top_scores.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_top_scores.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** act_top_scores.php 5 Apr 2006 22:03:55 -0000 1.6 --- act_top_scores.php 17 Jun 2006 20:10:12 -0000 1.7 *************** *** 1,3 **** ! <?php /** * --- 1,3 ---- ! <?php /** * *************** *** 9,12 **** --- 9,17 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + /* Start Restriction Checks */ /* Start Ban Check */ *************** *** 120,124 **** "L_DELETE_SINGLE" => $lang['delete_this_button'], "L_DELETE_ALL" => $lang['delete_all'], ! "L_DELETE_ALL_MSG" => $lang['delete_all_button'] ) ); --- 125,129 ---- "L_DELETE_SINGLE" => $lang['delete_this_button'], "L_DELETE_ALL" => $lang['delete_all'], ! "L_DELETE_ALL_MSG" => $lang['delete_all_button'] ) ); *************** *** 132,136 **** $game_name = $row['game_name']; ! $template->assign_block_vars( "admin_drop_one", array( "GAME_NAME" => $game_name ) ); } --- 137,141 ---- $game_name = $row['game_name']; ! $template->assign_block_vars( "admin_drop_one", array( "GAME_NAME" => $game_name ) ); } *************** *** 143,147 **** "HEADER_TWO" => $lang['trophy_holder'], "HEADER_THREE" => $lang['score_owned_on'], ! "HEADER_FOUR" => $lang['contacts'] ) ); --- 148,152 ---- "HEADER_TWO" => $lang['trophy_holder'], "HEADER_THREE" => $lang['score_owned_on'], ! "HEADER_FOUR" => $lang['contacts'] ) ); *************** *** 183,187 **** "USER_SEARCH" => "<a href='" . this_act_mxurl( 'mode=act_top_scores_search' ) . "&user=$user_n&sid=" . $userdata['session_id'] . "'>$user_n</a>", "SCORE_DATE" => $score . "<br>" . $date, ! "PM_PROFILE" => $pm . " " . $profile ) ); $i++; --- 188,192 ---- "USER_SEARCH" => "<a href='" . this_act_mxurl( 'mode=act_top_scores_search' ) . "&user=$user_n&sid=" . $userdata['session_id'] . "'>$user_n</a>", "SCORE_DATE" => $score . "<br>" . $date, ! "PM_PROFILE" => $pm . " " . $profile ) ); $i++; Index: act_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** act_functions.php 5 Apr 2006 22:03:55 -0000 1.6 --- act_functions.php 17 Jun 2006 20:10:12 -0000 1.7 *************** *** 9,12 **** --- 9,17 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + function UpdateTrophyStats() { *************** *** 89,93 **** $privmsg_subject = trim( strip_tags( $subject ) ); $bbcode_uid = make_bbcode_uid(); ! $privmsg_message = trim( strip_tags( $message ) ); // APM compliance if ( defined( 'PRIVMSGA_TABLE' ) ) --- 94,98 ---- $privmsg_subject = trim( strip_tags( $subject ) ); $bbcode_uid = make_bbcode_uid(); ! $privmsg_message = trim( strip_tags( $message ) ); // APM compliance if ( defined( 'PRIVMSGA_TABLE' ) ) *************** *** 111,115 **** FROM " . PRIVMSGS_TABLE . " WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " ! OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) AND privmsgs_to_userid = '$dest_user'"; --- 116,120 ---- FROM " . PRIVMSGS_TABLE . " WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " ! OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) AND privmsgs_to_userid = '$dest_user'"; *************** *** 125,129 **** if ( $inbox_info['inbox_items'] >= $board_config['max_inbox_privmsgs'] ) { ! $sql = "SELECT privmsgs_id FROM " . PRIVMSGS_TABLE . " WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " --- 130,134 ---- if ( $inbox_info['inbox_items'] >= $board_config['max_inbox_privmsgs'] ) { ! $sql = "SELECT privmsgs_id FROM " . PRIVMSGS_TABLE . " WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " *************** *** 139,143 **** $old_privmsgs_id = $old_privmsgs_id['privmsgs_id']; ! $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " WHERE privmsgs_id = '$old_privmsgs_id'"; --- 144,148 ---- $old_privmsgs_id = $old_privmsgs_id['privmsgs_id']; ! $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " WHERE privmsgs_id = '$old_privmsgs_id'"; *************** *** 147,151 **** } ! $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TEXT_TABLE . " WHERE privmsgs_text_id = '$old_privmsgs_id'"; --- 152,156 ---- } ! $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TEXT_TABLE . " WHERE privmsgs_text_id = '$old_privmsgs_id'"; *************** *** 157,161 **** } ! $sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies) VALUES ( 1 , '" . str_replace( "\'", "''", addslashes( $privmsg_subject ) ) . "' , " . $from_id . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip' , $html_on, $bbcode_on, $smilies_on)"; --- 162,166 ---- } ! $sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies) VALUES ( 1 , '" . str_replace( "\'", "''", addslashes( $privmsg_subject ) ) . "' , " . $from_id . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip' , $html_on, $bbcode_on, $smilies_on)"; *************** *** 175,179 **** $sql = "UPDATE " . USERS_TABLE . " ! SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . time() . " WHERE user_id = '" . $to_userdata['user_id'] . "'"; if ( !$status = $db->sql_query( $sql ) ) --- 180,184 ---- $sql = "UPDATE " . USERS_TABLE . " ! SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . time() . " WHERE user_id = '" . $to_userdata['user_id'] . "'"; if ( !$status = $db->sql_query( $sql ) ) *************** *** 183,187 **** if ( $to_userdata['user_notify_pm'] && !empty( $to_userdata['user_email'] ) && $to_userdata['user_active'] ) ! { // have the mail sender infos $script_name = preg_replace( '/^\/?(.*?)\/?$/', "\\1", trim( $board_config['script_path'] ) ); --- 188,192 ---- if ( $to_userdata['user_notify_pm'] && !empty( $to_userdata['user_email'] ) && $to_userdata['user_active'] ) ! { // have the mail sender infos $script_name = preg_replace( '/^\/?(.*?)\/?$/', "\\1", trim( $board_config['script_path'] ) ); *************** *** 212,216 **** 'SITENAME' => $board_config['sitename'], 'EMAIL_SIG' => ( !empty( $board_config['board_email_sig'] ) ) ? str_replace( '<br />', "\n", "-- \n" . $board_config['board_email_sig'] ) : '', ! 'U_INBOX' => $server_protocol . $server_name . $server_port . $script_name . '?folder=inbox' ) ); --- 217,221 ---- 'SITENAME' => $board_config['sitename'], 'EMAIL_SIG' => ( !empty( $board_config['board_email_sig'] ) ) ? str_replace( '<br />', "\n", "-- \n" . $board_config['board_email_sig'] ) : '', ! 'U_INBOX' => $server_protocol . $server_name . $server_port . $script_name . '?folder=inbox' ) ); Index: act_cat_play.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_cat_play.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** act_cat_play.php 5 Apr 2006 22:03:55 -0000 1.5 --- act_cat_play.php 17 Jun 2006 20:10:12 -0000 1.6 *************** *** 8,12 **** * */ ! $cat = $_GET['cat']; --- 8,17 ---- * */ ! ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! $cat = $_GET['cat']; *************** *** 29,34 **** { $q = "SELECT COUNT(session_id) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '0' AND session_page = '" . PAGE_ACTIVITY . "' GROUP BY session_ip"; --- 34,39 ---- { $q = "SELECT COUNT(session_id) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '0' AND session_page = '" . PAGE_ACTIVITY . "' GROUP BY session_ip"; *************** *** 38,43 **** $q = "SELECT COUNT(session_id) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '0' AND session_page = '" . PAGE_PLAYING_GAMES . "' GROUP BY session_ip"; --- 43,48 ---- $q = "SELECT COUNT(session_id) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '0' AND session_page = '" . PAGE_PLAYING_GAMES . "' GROUP BY session_ip"; *************** *** 64,69 **** $q = "SELECT COUNT(*) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '1' AND session_page = '" . PAGE_ACTIVITY . "' GROUP BY session_user_id"; --- 69,74 ---- $q = "SELECT COUNT(*) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '1' AND session_page = '" . PAGE_ACTIVITY . "' GROUP BY session_user_id"; *************** *** 73,78 **** $q = "SELECT COUNT(*) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '1' AND session_page = '" . PAGE_PLAYING_GAMES . "' GROUP BY session_user_id"; --- 78,83 ---- $q = "SELECT COUNT(*) AS total ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = '1' AND session_page = '" . PAGE_PLAYING_GAMES . "' GROUP BY session_user_id"; *************** *** 108,112 **** "MAIN_COLOR1" => "[ <font color=" . $theme['fontcolor2'] . ">" . $lang['online_viewing_games'] . "</font> ]", "MAIN_SEPERATOR" => "<b> :: </b>", ! "MAIN_COLOR2" => "[ <font color=" . $theme['fontcolor3'] . ">" . $lang['online_playing_games'] . "</font> ]" ) ); --- 113,117 ---- "MAIN_COLOR1" => "[ <font color=" . $theme['fontcolor2'] . ">" . $lang['online_viewing_games'] . "</font> ]", "MAIN_SEPERATOR" => "<b> :: </b>", ! "MAIN_COLOR2" => "[ <font color=" . $theme['fontcolor3'] . ">" . $lang['online_playing_games'] . "</font> ]" ) ); *************** *** 151,155 **** $template->assign_block_vars( "playing", array( "USERNAME" => $username_link, "USER_NUMBER" => " ", ! "MAIN_SEPERATOR" => " " ) ); } --- 156,160 ---- $template->assign_block_vars( "playing", array( "USERNAME" => $username_link, "USER_NUMBER" => " ", ! "MAIN_SEPERATOR" => " " ) ); } *************** *** 172,176 **** $template->assign_block_vars( "drop", array( "D_SELECT_1" => $game_i2, ! "D_SELECT_2" => $game_n2 ) ); } --- 177,181 ---- $template->assign_block_vars( "drop", array( "D_SELECT_1" => $game_i2, ! "D_SELECT_2" => $game_n2 ) ); } *************** *** 194,198 **** $template->assign_block_vars( "cat", array( "C_SELECT_1" => "(" . $row['total'] . ") " . $cat_n, ! "C_SELECT_2" => "activity." . $phpEx . "?mode=category_play&cat=" . $cat_id . "&sid=" . $userdata['session_id'] ) ); } --- 199,203 ---- $template->assign_block_vars( "cat", array( "C_SELECT_1" => "(" . $row['total'] . ") " . $cat_n, ! "C_SELECT_2" => "activity." . $phpEx . "?mode=category_play&cat=" . $cat_id . "&sid=" . $userdata['session_id'] ) ); } *************** *** 239,245 **** } ! $sql = "SELECT * FROM " . iNA_GAMES . " ! $where_clause ORDER BY $order_by"; if ( !$result = $db->sql_query( $sql ) ) --- 244,250 ---- } ! $sql = "SELECT * FROM " . iNA_GAMES . " ! $where_clause ORDER BY $order_by"; if ( !$result = $db->sql_query( $sql ) ) *************** *** 442,446 **** "L_SAME_W" => $lang['same_window'], "L_PLAY_GAME_NOW" => $lang['Play_again'], ! "L_NEW_W" => $lang['new_window'] ) ); } --- 447,451 ---- "L_SAME_W" => $lang['same_window'], "L_PLAY_GAME_NOW" => $lang['Play_again'], ! "L_NEW_W" => $lang['new_window'] ) ); } *************** *** 490,494 **** "L_SUBMIT" => $lang['Sort'], "L_SELECT_SORT_METHOD" => $lang['Select_sort_method'], ! "L_GOTO_PAGE" => $lang['Goto_page'] ) ); --- 495,499 ---- "L_SUBMIT" => $lang['Sort'], "L_SELECT_SORT_METHOD" => $lang['Select_sort_method'], ! "L_GOTO_PAGE" => $lang['Goto_page'] ) ); Index: act_scores.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_scores.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** act_scores.php 5 Apr 2006 22:03:55 -0000 1.4 --- act_scores.php 17 Jun 2006 20:10:12 -0000 1.5 *************** *** 8,15 **** * */ ! $game_name = ( !empty( $HTTP_POST_VARS['game_name'] ) ) ? $HTTP_POST_VARS['game_name'] : $HTTP_GET_VARS['game_name']; ! $sql = "SELECT * FROM " . iNA_GAMES . " WHERE game_name = '" . $game_name . "'"; if ( !$result = $db->sql_query( $sql ) ) --- 8,20 ---- * */ ! ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! $game_name = ( !empty( $HTTP_POST_VARS['game_name'] ) ) ? $HTTP_POST_VARS['game_name'] : $HTTP_GET_VARS['game_name']; ! $sql = "SELECT * FROM " . iNA_GAMES . " WHERE game_name = '" . $game_name . "'"; if ( !$result = $db->sql_query( $sql ) ) *************** *** 40,53 **** if ( !empty( $highscore_limit ) ) { ! $sql = "SELECT *, MAX(score) AS hscore FROM " . iNA_SCORES . " ! WHERE game_name = '" . $game_name . "' GROUP BY player ! ORDER BY score $list_type LIMIT 0, $highscore_limit"; } else { ! $sql = "SELECT *, MAX(score) AS hscore FROM " . iNA_SCORES . " ! WHERE game_name = '" . $game_name . "' GROUP BY player ORDER BY score $list_type"; --- 45,58 ---- if ( !empty( $highscore_limit ) ) { ! $sql = "SELECT *, MAX(score) AS hscore FROM " . iNA_SCORES . " ! WHERE game_name = '" . $game_name . "' GROUP BY player ! ORDER BY score $list_type LIMIT 0, $highscore_limit"; } else { ! $sql = "SELECT *, MAX(score) AS hscore FROM " . iNA_SCORES . " ! WHERE game_name = '" . $game_name . "' GROUP BY player ORDER BY score $list_type"; *************** *** 71,75 **** "NAME" => $row['player'], "SCORE" => $row['hscore'], ! "DATE" => create_date( $board_config['default_dateformat'], $row['date'], $board_config['board_timezone'] ) ) ); $i++; --- 76,80 ---- "NAME" => $row['player'], "SCORE" => $row['hscore'], ! "DATE" => create_date( $board_config['default_dateformat'], $row['date'], $board_config['board_timezone'] ) ) ); $i++; Index: act_stats.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_stats.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** act_stats.php 5 Apr 2006 22:03:55 -0000 1.5 --- act_stats.php 17 Jun 2006 20:10:12 -0000 1.6 *************** *** 8,13 **** * */ ! ! $game_id = ( isset( $HTTP_GET_VARS['id'] ) ) ? intval( $HTTP_GET_VARS['id'] ) : 0; // Grab Game info from game_id $sql = "SELECT * FROM " . iNA_GAMES . " --- 8,18 ---- * */ ! ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! ! $game_id = ( isset( $HTTP_GET_VARS['id'] ) ) ? intval( $HTTP_GET_VARS['id'] ) : 0; // Grab Game info from game_id $sql = "SELECT * FROM " . iNA_GAMES . " *************** *** 88,92 **** "BEST_SCORE" => $lang['Best_score'], "L_INSTRUCTIONS" => $lang['Instructions'], ! "INSTRUCTIONS" => $instructions ) ); --- 93,97 ---- "BEST_SCORE" => $lang['Best_score'], "L_INSTRUCTIONS" => $lang['Instructions'], ! "INSTRUCTIONS" => $instructions ) ); Index: rewards_api.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/rewards_api.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** rewards_api.php 5 Apr 2006 22:03:55 -0000 1.6 --- rewards_api.php 17 Jun 2006 20:10:13 -0000 1.7 *************** *** 8,12 **** * */ ! // give rewards to the user function add_reward( $user_id, $amount ) --- 8,17 ---- * */ ! ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! // give rewards to the user function add_reward( $user_id, $amount ) *************** *** 93,97 **** // Get the rewards dbfield (API-internal function) function get_db_reward() ! { // All rewards mods must store their default database field in the config table ... // 'default_reward_dbfield' --- 98,102 ---- // Get the rewards dbfield (API-internal function) function get_db_reward() ! { // All rewards mods must store their default database field in the config table ... // 'default_reward_dbfield' Index: act_challenges.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_challenges.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** act_challenges.php 5 Apr 2006 22:03:55 -0000 1.4 --- act_challenges.php 17 Jun 2006 20:10:12 -0000 1.5 *************** *** 9,12 **** --- 9,17 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + /* Start Restriction Checks */ /* Start Ban Check */ *************** *** 56,60 **** "CHALLENGE_NAME" => $lang['challenge_username'], "CHALLENGE_SPOT" => $lang['challenge_position'], ! "CHALLENGE_COUNT" => $lang['challenge_challenges'] ) ); --- 61,65 ---- "CHALLENGE_NAME" => $lang['challenge_username'], "CHALLENGE_SPOT" => $lang['challenge_position'], ! "CHALLENGE_COUNT" => $lang['challenge_challenges'] ) ); *************** *** 93,97 **** "LINK" => $link, "PLACE" => $i, ! "COUNT" => $count ) ); $i++; --- 98,102 ---- "LINK" => $link, "PLACE" => $i, ! "COUNT" => $count ) ); $i++; *************** *** 112,116 **** "USER_TO_COUNT" => $lang['challenge_page_2'], "USER" => $sender . "'s" . $lang['challenge_page_3'], ! "RANKING" => $lang['challenge_page_4'] ) ); --- 117,121 ---- "USER_TO_COUNT" => $lang['challenge_page_2'], "USER" => $sender . "'s" . $lang['challenge_page_3'], ! "RANKING" => $lang['challenge_page_4'] ) ); *************** *** 142,146 **** "USER_TO" => $receiver, "USER_TO_COUNT" => $count, ! "RANKING" => $c ) ); $c++; --- 147,151 ---- "USER_TO" => $receiver, "USER_TO_COUNT" => $count, ! "RANKING" => $c ) ); $c++; Index: act_games.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_games.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** act_games.php 5 Apr 2006 22:03:55 -0000 1.6 --- act_games.php 17 Jun 2006 20:10:12 -0000 1.7 *************** *** 8,13 **** * */ ! ! $game_id = ( isset( $HTTP_GET_VARS['id'] ) ) ? intval( $HTTP_GET_VARS['id'] ) : 0; // Grab Game info from game_id $sql = "SELECT * FROM " . iNA_GAMES . " --- 8,18 ---- * */ ! ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! ! $game_id = ( isset( $HTTP_GET_VARS['id'] ) ) ? intval( $HTTP_GET_VARS['id'] ) : 0; // Grab Game info from game_id $sql = "SELECT * FROM " . iNA_GAMES . " *************** *** 48,52 **** mx_message_die( GENERAL_MESSAGE, $lang['not_enough_reward'], '', __LINE__, __FILE__, $sql ); } ! } // Update Game Played amount. $sql = "UPDATE " . iNA_GAMES . " --- 53,57 ---- mx_message_die( GENERAL_MESSAGE, $lang['not_enough_reward'], '', __LINE__, __FILE__, $sql ); } ! } // Update Game Played amount. $sql = "UPDATE " . iNA_GAMES . " *************** *** 105,109 **** SET session_page = '" . PAGE_PLAYING_GAMES . "' WHERE user_id = '" . $userdata['user_id'] . "'"; ! $r = $db->sql_query( $q ); // $header_location = ( @preg _match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; // header($header_location . append_sid($gamepath, true)); --- 110,114 ---- SET session_page = '" . PAGE_PLAYING_GAMES . "' WHERE user_id = '" . $userdata['user_id'] . "'"; ! $r = $db->sql_query( $q ); // $header_location = ( @preg _match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; // header($header_location . append_sid($gamepath, true)); *************** *** 176,180 **** mx_message_die( GENERAL_ERROR, $lang['no_game_data'], "", __LINE__, __FILE__, $sql ); } ! $game_info = $db->sql_fetchrow( $result ); // Extra Vars $game_name = $game_info['game_name']; --- 181,185 ---- mx_message_die( GENERAL_ERROR, $lang['no_game_data'], "", __LINE__, __FILE__, $sql ); } ! $game_info = $db->sql_fetchrow( $result ); // Extra Vars $game_name = $game_info['game_name']; *************** *** 190,194 **** { $gen_simple_header = true; ! $template->set_filenames( array( 'body' => 'flash_body.tpl' ) ); // Generate page $template->assign_vars( array( 'TITLE' => $game_name, --- 195,199 ---- { $gen_simple_header = true; ! $template->set_filenames( array( 'body' => 'flash_body.tpl' ) ); // Generate page $template->assign_vars( array( 'TITLE' => $game_name, *************** *** 197,201 **** 'SWFNAME' => $game_name . '.swf', 'BASE_PATH' => $base_path, ! 'PATH' => $game_path ) ); $template->pparse( 'body' ); --- 202,206 ---- 'SWFNAME' => $game_name . '.swf', 'BASE_PATH' => $base_path, ! 'PATH' => $game_path ) ); $template->pparse( 'body' ); *************** *** 242,246 **** 'SWFNAME' => $game_name . '.swf', 'BASE_PATH' => $base_path, ! 'PATH' => $game_path ) ); --- 247,251 ---- 'SWFNAME' => $game_name . '.swf', 'BASE_PATH' => $base_path, ! 'PATH' => $game_path ) ); *************** *** 258,262 **** WHERE game_name = '$game_name' GROUP BY player ! ORDER BY score $order LIMIT 0,10"; $r2 = $db->sql_query( $q2 ); --- 263,267 ---- WHERE game_name = '$game_name' GROUP BY player ! ORDER BY score $order LIMIT 0,10"; $r2 = $db->sql_query( $q2 ); *************** *** 272,276 **** $template->assign_block_vars( "runner", array( 'R_U_NAME' => $runner_up_name, ! 'R_U_SCORE' => $runner_up_score ) ); --- 277,281 ---- $template->assign_block_vars( "runner", array( 'R_U_NAME' => $runner_up_name, ! 'R_U_SCORE' => $runner_up_score ) ); *************** *** 278,282 **** } while ( $row = $db->sql_fetchrow( $r2 ) ); ! } // include($mx_root_path . 'includes/page_header.'. $phpEx); // $template->pparse('body'); --- 283,287 ---- } while ( $row = $db->sql_fetchrow( $r2 ) ); ! } // include($mx_root_path . 'includes/page_header.'. $phpEx); // $template->pparse('body'); *************** *** 291,295 **** 'BASE_PATH' => $base_path, 'GAMELIB' => $module_root_path . $act_config['games_path'] . "/" . $act_config['gamelib_path'] . "/", ! 'S_GAME_ACTION' => append_sid( $base_path . 'newscore.' . $phpEx . '?mode=check_score&game_name=' . $game_name ) ) ); } --- 296,300 ---- 'BASE_PATH' => $base_path, 'GAMELIB' => $module_root_path . $act_config['games_path'] . "/" . $act_config['gamelib_path'] . "/", ! 'S_GAME_ACTION' => append_sid( $base_path . 'newscore.' . $phpEx . '?mode=check_score&game_name=' . $game_name ) ) ); } |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:09:14
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20300/modules/mx_textblocks/admin Modified Files: mx_module_defs.php Log Message: Clean up... Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_module_defs.php 29 May 2006 15:37:04 -0000 1.16 --- mx_module_defs.php 17 Jun 2006 20:09:07 -0000 1.17 *************** *** 9,12 **** --- 9,17 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + /********************************************************************************\ | Class: mx_module_defs |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:09:12
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20300/includes Modified Files: mx_constants.php mx_functions.php mx_functions_admincp.php mx_functions_blockcp.php mx_functions_core.php mx_functions_phpbb.php mx_functions_style.php mx_functions_tools.php page_header.php page_tail.php Log Message: Clean up... Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** page_tail.php 2 May 2006 23:22:16 -0000 1.24 --- page_tail.php 17 Jun 2006 20:09:07 -0000 1.25 *************** *** 127,130 **** } exit; - ?> \ No newline at end of file --- 127,129 ---- Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_functions_blockcp.php 2 May 2006 23:22:16 -0000 1.12 --- mx_functions_blockcp.php 17 Jun 2006 20:09:07 -0000 1.13 *************** *** 183,187 **** // JS // - $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_mode'; $cookie_blockCP = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 'settings'; --- 183,186 ---- Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** mx_functions_core.php 29 May 2006 15:37:04 -0000 1.30 --- mx_functions_core.php 17 Jun 2006 20:09:07 -0000 1.31 *************** *** 84,87 **** --- 84,88 ---- $db->sql_freeresult($result); $this->put('phpbb_config', $config); + return ( $config ); } *************** *** 120,123 **** --- 121,125 ---- $db->sql_freeresult( $result ); $this->put('mxbb_config', $config); + return ( $config ); } *************** *** 230,250 **** $block_row = array( ! "block_id" => $row['block_id'], ! "block_title" => $row['block_title'], ! "block_desc" => $row['block_desc'], ! "auth_view" => $row['auth_view'], ! "auth_view_group" => $row['auth_view_group'], ! "auth_edit" => $row['auth_edit'], ! "auth_edit_group" => $row['auth_edit_group'], ! "auth_moderator_group" => $row['auth_moderator_group'], ! "show_block" => $row['show_block'], ! "show_title" => $row['show_title'], ! "show_stats" => $row['show_stats'], ! "block_time" => $row['block_time'], ! "block_editor_id" => $row['block_editor_id'], ! "module_root_path" => $row['module_path'], ! "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); --- 232,252 ---- $block_row = array( ! "block_id" => $row['block_id'], ! "block_title" => $row['block_title'], ! "block_desc" => $row['block_desc'], ! "auth_view" => $row['auth_view'], ! "auth_view_group" => $row['auth_view_group'], ! "auth_edit" => $row['auth_edit'], ! "auth_edit_group" => $row['auth_edit_group'], ! "auth_moderator_group" => $row['auth_moderator_group'], ! "show_block" => $row['show_block'], ! "show_title" => $row['show_title'], ! "show_stats" => $row['show_stats'], ! "block_time" => $row['block_time'], ! "block_editor_id" => $row['block_editor_id'], ! "module_root_path" => $row['module_path'], ! "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); *************** *** 288,321 **** $block_row = array( ! "block_id" => $row['block_id'], ! "block_title" => $row['block_title'], ! "block_desc" => $row['block_desc'], ! "column_id" => $row['column_id'], ! "auth_view" => $row['auth_view'], ! "auth_view_group" => $row['auth_view_group'], ! "auth_edit" => $row['auth_edit'], ! "auth_edit_group" => $row['auth_edit_group'], ! "auth_moderator_group" => $row['auth_moderator_group'], ! "show_block" => $row['show_block'], ! "show_title" => $row['show_title'], ! "show_stats" => $row['show_stats'], ! "block_time" => $row['block_time'], ! "block_editor_id" => $row['block_editor_id'], ! "module_root_path" => $row['module_path'], ! "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); $param_row = array( ! "parameter_id" => $row['parameter_id'], ! "function_id" => $row['function_id'], ! "parameter_name" => $row['parameter_name'], ! "parameter_type" => $row['parameter_type'], ! "parameter_auth" => $row['parameter_auth'], ! "parameter_value" => $row['parameter_value'], ! "parameter_default" => $row['parameter_default'], ! "parameter_function" => $row['parameter_function'], ! "parameter_opt" => $row['parameter_opt'] ); --- 290,323 ---- $block_row = array( ! "block_id" => $row['block_id'], ! "block_title" => $row['block_title'], ! "block_desc" => $row['block_desc'], ! "column_id" => $row['column_id'], ! "auth_view" => $row['auth_view'], ! "auth_view_group" => $row['auth_view_group'], ! "auth_edit" => $row['auth_edit'], ! "auth_edit_group" => $row['auth_edit_group'], ! "auth_moderator_group" => $row['auth_moderator_group'], ! "show_block" => $row['show_block'], ! "show_title" => $row['show_title'], ! "show_stats" => $row['show_stats'], ! "block_time" => $row['block_time'], ! "block_editor_id" => $row['block_editor_id'], ! "module_root_path" => $row['module_path'], ! "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); $param_row = array( ! "parameter_id" => $row['parameter_id'], ! "function_id" => $row['function_id'], ! "parameter_name" => $row['parameter_name'], ! "parameter_type" => $row['parameter_type'], ! "parameter_auth" => $row['parameter_auth'], ! "parameter_value" => $row['parameter_value'], ! "parameter_default" => $row['parameter_default'], ! "parameter_function" => $row['parameter_function'], ! "parameter_opt" => $row['parameter_opt'] ); Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_constants.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_constants.php 3 May 2006 09:17:28 -0000 1.20 --- mx_constants.php 17 Jun 2006 20:09:06 -0000 1.21 *************** *** 37,40 **** --- 37,41 ---- */ define('PORTAL_TABLE', $mx_table_prefix . 'portal'); + define('MENU_NAV_TABLE', $mx_table_prefix . 'menu_nav'); define('MENU_CAT_TABLE', $mx_table_prefix . 'menu_categories'); Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_functions_phpbb.php 3 May 2006 10:02:22 -0000 1.23 --- mx_functions_phpbb.php 17 Jun 2006 20:09:07 -0000 1.24 *************** *** 267,273 **** else { ! $template->set_filenames(array( ! 'message_body' => 'admin/admin_message_body.tpl') ! ); } --- 267,271 ---- else { ! $template->set_filenames(array( 'message_body' => 'admin/admin_message_body.tpl') ); } Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_functions_tools.php 3 May 2006 10:02:22 -0000 1.1 --- mx_functions_tools.php 17 Jun 2006 20:09:07 -0000 1.2 *************** *** 697,699 **** --- 697,716 ---- } } + + class mx_post + { + function decode($text, $bbcode_uid = '', $html_on = false, $bbcode_on = true, $smilies_on = false, $links_on = true, $images_on = true) + { + global $board_config; + + return $text; + } + + function encode($text, $bbcode_uid = '', $html_on = false, $bbcode_on = true, $smilies_on = false, $links_on = true, $images_on = true) + { + global $board_config; + + return $text; + } + } ?> \ No newline at end of file Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** page_header.php 29 May 2006 15:37:04 -0000 1.36 --- page_header.php 17 Jun 2006 20:09:07 -0000 1.37 *************** *** 61,65 **** // If mxBB frame template is not set, instantiate it // ! if (!is_object($layouttemplate)) { // --- 61,65 ---- // If mxBB frame template is not set, instantiate it // ! if ( is_object($layouttemplate) == FALSE ) { // *************** *** 191,195 **** --- 191,197 ---- } + // // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility + // $l_timezone = explode( '.', $board_config['board_timezone'] ); $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $board_config['board_timezone'] )] : $lang[number_format( $board_config['board_timezone'] )]; Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_functions_style.php 29 May 2006 15:37:04 -0000 1.4 --- mx_functions_style.php 17 Jun 2006 20:09:07 -0000 1.5 *************** *** 18,22 **** // Including phpBB version of the Template class // ! include_once($phpbb_root_path . "includes/template.$phpEx"); /** --- 18,22 ---- // Including phpBB version of the Template class // ! include_once($phpbb_root_path . 'includes/template.' . $phpEx); /** *************** *** 68,72 **** --- 68,74 ---- if( file_exists($module_root_path . 'templates/' . $style_path . $filename) ) { + // // First check current template + // $filename = $module_root_path . 'templates/' . $style_path . $filename; $this->module_template_path = 'templates/' . $style_path; *************** *** 74,78 **** --- 76,82 ---- else if( file_exists($module_root_path . 'templates/subSilver/' . $filename) ) { + // // Then check subSilver + // $filename = $module_root_path . 'templates/subSilver/' . $filename; $this->module_template_path = 'templates/subSilver/'; *************** *** 80,84 **** --- 84,90 ---- else if( file_exists($module_root_path . 'templates/' . $filename) ) { + // // Finally check the tenmplate root (for compatibility with some old modules) + // $filename = $module_root_path . 'templates/' . $filename; $this->module_template_path = 'templates/'; *************** *** 90,99 **** --- 96,109 ---- else if( file_exists($mx_root_path . 'templates/' . $style_path . $filename) ) { + // // First check current template + // $filename = $mx_root_path . 'templates/' . $style_path . $filename; } else if( file_exists($mx_root_path . 'templates/subSilver/' . $filename) ) { + // // Then check subSilver + // $filename = $mx_root_path . 'templates/subSilver/' . $filename; } *************** *** 101,105 **** --- 111,117 ---- else if( file_exists($mx_root_path . 'templates/' . $filename) ) { + // // Finally check the template root + // $filename = $mx_root_path . 'templates/' . $filename; } *************** *** 116,125 **** --- 128,141 ---- if( file_exists($phpbb_root_path . 'templates/' . $style_path . $filename) ) { + // // First check current template + // $filename = $phpbb_root_path . 'templates/' . $style_path . $filename; } else if( file_exists($phpbb_root_path . 'templates/subSilver/' . $filename) ) { + // // Then check subSilver + // $filename = $phpbb_root_path . 'templates/subSilver/' . $filename; } *************** *** 130,134 **** --- 146,152 ---- else if( file_exists($this->root . '/' . $filename) ) { + // // Check if it's an absolute or relative path. + // if( substr($filename, 0, 1) != '/' ) { *************** *** 225,229 **** $userdata = session_pagestart($user_ip, - ( 1000 + $page_id )); // Use native phpBB 2.0.x session handling $this->is_admin = $userdata['user_level'] == ADMIN && $userdata['session_logged_in']; - } --- 243,246 ---- *************** *** 263,267 **** // Is the lang installed? // ! if ( !file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) || !file_exists($pbpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx)) { $board_config['default_lang'] = 'english'; --- 280,284 ---- // Is the lang installed? // ! if ( !file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) || !file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx)) { $board_config['default_lang'] = 'english'; *************** *** 474,478 **** // Is this a cloned temmplate - defined by main *.cfg? // - $template_config_row['cloned_template'] = trim(htmlspecialchars($mx_template_settings['cloned_template'])); $template_config_row['border_graphics'] = $mx_template_settings['border_graphics']; --- 491,494 ---- Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_functions_admincp.php 3 May 2006 09:17:28 -0000 1.21 --- mx_functions_admincp.php 17 Jun 2006 20:09:06 -0000 1.22 *************** *** 135,139 **** // // No update needed ;) - $message['text'] = $lang['AdminCP_action'] . ": " . $lang['Module'] . ' (' . $mx_request_vars->post('module_name', MX_TYPE_NO_TAGS, 'error - no name given') . ') ' . $lang['was_inserted']; $message['new_module_id'] = $module_id_new; --- 135,138 ---- *************** *** 240,244 **** // This function also updates the cache // - $message_tmp = $this->update_block_parameter_data($function_id); $message_tmp = !empty($message_tmp) ? '<br /><br />' . $message_tmp : ''; --- 239,242 ---- *************** *** 320,323 **** --- 318,322 ---- $message['text'] = $lang['AdminCP_action'] . ": " . $lang['Block'] . ' (' . $mx_request_vars->post('block_title', MX_TYPE_NO_TAGS, 'error - no name given') . ') ' . $lang['was_inserted']; $message['new_id'] = $next_id; + break; *************** *** 3809,3811 **** --- 3808,3832 ---- return $message; } + + /** + * Enter description here... + * + * @param unknown_type $default + * @param unknown_type $select_name + * @return unknown + */ + function mx_generate_meta_select($default, $select_name) + { + global $lang; + + $select = '<select name="' . $select_name . '">'; + foreach( $lang['mx_meta'][$select_name] as $key => $value ) + { + $selected = ( $key == $default ) ? ' selected="selected"' : ''; + $select .= '<option value="' . $key . '"' . $selected . '>' . $value . "</option>\n"; + } + $select .= '</select>'; + + return $select; + } ?> \ No newline at end of file Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** mx_functions.php 29 May 2006 15:37:03 -0000 1.67 --- mx_functions.php 17 Jun 2006 20:09:06 -0000 1.68 *************** *** 490,503 **** $url .= implode('&', $url_array); ! /* for ($j = 0; $j < count($url_array); $j++) ! { ! if( $j < count($url_array) -1 ) ! { ! $url .= $url_array[$j] . "&" ; ! } ! else { ! $url .= $url_array[$j]; ! } } */ --- 490,504 ---- $url .= implode('&', $url_array); ! /* ! for ($j = 0; $j < count($url_array); $j++) { ! if( $j < count($url_array) -1 ) ! { ! $url .= $url_array[$j] . "&" ; ! } ! else ! { ! $url .= $url_array[$j]; ! } } */ |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:09:12
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20300/admin Modified Files: admin_mx_block_cp.php admin_mx_chkobjs.php admin_mx_gen_cache.php admin_mx_meta.php admin_mx_module.php admin_mx_module_cp.php admin_mx_page_cp.php admin_mx_phpinfo.php admin_mx_portal.php index.php page_footer_admin.php page_header_admin.php pagestart.php Log Message: Clean up... Index: admin_mx_phpinfo.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_phpinfo.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_mx_phpinfo.php 2 May 2006 23:22:15 -0000 1.9 --- admin_mx_phpinfo.php 17 Jun 2006 20:09:06 -0000 1.10 *************** *** 23,27 **** require('./pagestart.' . $phpEx); - // // Capture the phpInfo output --- 23,26 ---- *************** *** 70,73 **** // include_once('page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 69,71 ---- Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_mx_chkobjs.php 2 May 2006 23:22:15 -0000 1.17 --- admin_mx_chkobjs.php 17 Jun 2006 20:09:05 -0000 1.18 *************** *** 86,90 **** ); - // ====================================================== // [ MAIN PROCESS ] --- 86,89 ---- *************** *** 117,120 **** --- 116,120 ---- $main_title ); } + $mode = $HTTP_GET_VARS['mode']; $tb = $HTTP_GET_VARS['table']; *************** *** 126,129 **** --- 126,130 ---- $tab1 = $check_args[$tb]['fkeys'][1][0]; $key1 = $check_args[$tb]['fkeys'][1][1]; + switch($mode) { *************** *** 168,179 **** exit; - // ====================================================== // [ FUNCTIONS ] // ====================================================== ! // ------------ ! // ! // function check_relationship($tb) { --- 169,181 ---- exit; // ====================================================== // [ FUNCTIONS ] // ====================================================== ! /** ! * Enter description here... ! * ! * @param unknown_type $tb ! */ function check_relationship($tb) { *************** *** 272,275 **** --- 274,286 ---- } + /** + * Enter description here... + * + * @param unknown_type $td + * @param unknown_type $class + * @param unknown_type $colspan + * @param unknown_type $text + * @return unknown + */ function tbHead($td, $class, $colspan, $text) { *************** *** 277,284 **** } function tbItem($td, $class, $align, $text) { return "\t\t" . '<'.$td.' class="'.$class.'" align="'.$align.'">'.$text.'</'.$td.'>' . "\n"; - // return '<'.$td.' class="'.$class.'" align="'.$align.'"><span class="gen">'.$text.'</span></'.$td.'>' . "\n"; } --- 288,303 ---- } + /** + * Enter description here... + * + * @param unknown_type $td + * @param unknown_type $class + * @param unknown_type $align + * @param unknown_type $text + * @return unknown + */ function tbItem($td, $class, $align, $text) { return "\t\t" . '<'.$td.' class="'.$class.'" align="'.$align.'">'.$text.'</'.$td.'>' . "\n"; } *************** *** 286,289 **** --- 305,317 ---- // DB Utilities // + + /** + * Enter description here... + * + * @param unknown_type $tbname + * @param unknown_type $where + * @param unknown_type $field + * @return unknown + */ function chkobjs_dbFetchField($tbname, $where, $field) { *************** *** 294,297 **** --- 322,331 ---- } + /** + * Enter description here... + * + * @param unknown_type $sql + * @return unknown + */ function chkobjs_dbFetchRow($sql) { *************** *** 304,307 **** --- 338,347 ---- } + /** + * Enter description here... + * + * @param unknown_type $sql + * @return unknown + */ function chkobjs_dbQuery($sql) { *************** *** 311,314 **** return $result; } - ?> \ No newline at end of file --- 351,353 ---- Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_gen_cache.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** admin_mx_gen_cache.php 2 May 2006 23:22:15 -0000 1.22 --- admin_mx_gen_cache.php 17 Jun 2006 20:09:05 -0000 1.23 *************** *** 24,28 **** require('./pagestart.' . $phpEx); - // // Getting mode of operation --- 24,27 ---- *************** *** 33,39 **** // Load default template for install // ! $template->set_filenames(array( ! 'body' => 'admin/admin_message_body.tpl') ! ); // --- 32,36 ---- // Load default template for install // ! $template->set_filenames(array( 'body' => 'admin/admin_message_body.tpl' )); // *************** *** 73,76 **** $template->pparse('body'); include_once("./page_footer_admin.$phpEx"); - ?> \ No newline at end of file --- 70,72 ---- Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** admin_mx_page_cp.php 3 May 2006 09:17:28 -0000 1.16 --- admin_mx_page_cp.php 17 Jun 2006 20:09:06 -0000 1.17 *************** *** 176,182 **** $field_names = array('auth_view' => $lang['View']); ! $template->set_filenames(array( ! 'body' => 'admin/mx_pagecp_admin_body.tpl') ! ); // --- 176,180 ---- $field_names = array('auth_view' => $lang['View']); ! $template->set_filenames(array( 'body' => 'admin/mx_pagecp_admin_body.tpl') ); // *************** *** 733,737 **** --- 731,737 ---- 'U_PREVIEW' => append_sid($mx_root_path . "index.$phpEx" . '?page=' . $page_id), + // // Page subpanel - edit + // 'L_CHOOSE_PAGE_TEMPLATE' => $l_choose_page_template, *************** *** 758,762 **** --- 758,764 ---- 'PAGELIST' => $pagelist, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, *************** *** 950,988 **** $visible_column_delete = in_array('adminColumnDelete_' . $page_id . '_' . $column_id, $cookie_states); $template->assign_block_vars('pages.columnrow', array( ! 'L_TITLE' => $lang['Column_admin'], ! 'L_TITLE_EXPLAIN' => $lang['Column_admin_explain'], ! 'L_COLUMN' => $lang['Column'], ! 'COLUMN_ID' => $column_id, ! 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! // ! // Column Edit ! // ! 'L_DELETE' => $new_column ? '' : $lang['Delete'], ! 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], ! 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], ! 'L_COLUMN' => $lang['Column'], ! 'L_COLUMN_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'VISIBLE_DELETE' => $visible_column_delete ? 'block' : 'none', ! 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'E_COLUMN_TITLE' => $column_title, ! 'E_COLUMN_SIZE' => $column_size, ! // Quick Panels ! 'MESSAGE_DELETE' => $message_delete, ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! 'S_HIDDEN_FIELDS' => $s_hidden_column_fields )); --- 952,992 ---- $visible_column_delete = in_array('adminColumnDelete_' . $page_id . '_' . $column_id, $cookie_states); $template->assign_block_vars('pages.columnrow', array( ! 'L_TITLE' => $lang['Column_admin'], ! 'L_TITLE_EXPLAIN' => $lang['Column_admin_explain'], ! 'L_COLUMN' => $lang['Column'], ! 'COLUMN_ID' => $column_id, ! 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! // ! // Column Edit ! // ! 'L_DELETE' => $new_column ? '' : $lang['Delete'], ! 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], ! 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], ! 'L_COLUMN' => $lang['Column'], ! 'L_COLUMN_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'VISIBLE_DELETE' => $visible_column_delete ? 'block' : 'none', ! 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'E_COLUMN_TITLE' => $column_title, ! 'E_COLUMN_SIZE' => $column_size, ! // ! // Quick Panels ! // ! 'MESSAGE_DELETE' => $message_delete, ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! 'S_HIDDEN_FIELDS' => $s_hidden_column_fields )); *************** *** 1021,1076 **** for( $block = 0; $block < $total_blocks; $block++ ) { ! $block_id = $block_rows[$block]['block_id']; ! $mx_block->init( $block_id, true ); ! $block_order = $block_rows[$block]['block_order']; ! $editor_name_tmp = get_userdata($mx_block->editor_id); ! $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $mx_block->block_time, $board_config['board_timezone'] ); ! $mode = MX_PAGE_BLOCK_TYPE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=15'; ! $syncmode = '?mode=' . $mode . '&action=' . MX_DO_SYNC . '&id=' . $block_id . '&column_id=' . $column_id; ! if( !empty($mx_block->block_edit_file) ) ! { ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid(PORTAL_URL . $mx_block->block_edit_file . "?block_id=$block_id"); ! } ! else ! { ! $u_setting = ''; ! $l_setting = ''; ! // ! // Show Block Settings even if no BLOCK_SYSTEM_PARAMETER_TABLE row exists. ! // admin_mx_block.php will populate them if necessary (see B4). ! // ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); ! } ! $template->assign_block_vars('pages.columnrow.blockrow', array( ! 'L_SETTING' => $l_setting, ! 'L_REMOVE' => $lang['Remove'], ! 'BLOCK_ID' => $block_id, ! 'BLOCK_TITLE' => $mx_block->block_title, ! 'BLOCK_DESC' => ( $mx_block->block_desc != '' ) ? '<br /> ' . $mx_block->block_desc : '', ! 'BLOCK_LAST_EDITED' => ( $editor_name != '' ) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', ! 'ROW_COLOR' => $row_color, ! 'U_BLOCK_EDIT' => $u_setting, ! 'U_BLOCK_SETTING' => $u_setting, ! 'U_BLOCK_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_BLOCK_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_BLOCK_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! 'U_BLOCK_RESYNC' => append_sid("admin_mx_page_cp.$phpEx" . $syncmode) ! )); } // for ... blocks --- 1025,1080 ---- for( $block = 0; $block < $total_blocks; $block++ ) { ! $block_id = $block_rows[$block]['block_id']; ! $mx_block->init( $block_id, true ); ! $block_order = $block_rows[$block]['block_order']; ! $editor_name_tmp = get_userdata($mx_block->editor_id); ! $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $mx_block->block_time, $board_config['board_timezone'] ); ! $mode = MX_PAGE_BLOCK_TYPE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=15'; ! $syncmode = '?mode=' . $mode . '&action=' . MX_DO_SYNC . '&id=' . $block_id . '&column_id=' . $column_id; ! if( !empty($mx_block->block_edit_file) ) ! { ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid(PORTAL_URL . $mx_block->block_edit_file . "?block_id=$block_id"); ! } ! else ! { ! $u_setting = ''; ! $l_setting = ''; ! // ! // Show Block Settings even if no BLOCK_SYSTEM_PARAMETER_TABLE row exists. ! // admin_mx_block.php will populate them if necessary (see B4). ! // ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); ! } ! $template->assign_block_vars('pages.columnrow.blockrow', array( ! 'L_SETTING' => $l_setting, ! 'L_REMOVE' => $lang['Remove'], ! 'BLOCK_ID' => $block_id, ! 'BLOCK_TITLE' => $mx_block->block_title, ! 'BLOCK_DESC' => ( $mx_block->block_desc != '' ) ? '<br /> ' . $mx_block->block_desc : '', ! 'BLOCK_LAST_EDITED' => ( $editor_name != '' ) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', ! 'ROW_COLOR' => $row_color, ! 'U_BLOCK_EDIT' => $u_setting, ! 'U_BLOCK_SETTING' => $u_setting, ! 'U_BLOCK_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_BLOCK_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_BLOCK_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! 'U_BLOCK_RESYNC' => append_sid("admin_mx_page_cp.$phpEx" . $syncmode) ! )); } // for ... blocks *************** *** 1125,1128 **** $template->pparse('body'); include_once('./page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 1129,1131 ---- Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** index.php 2 May 2006 23:22:15 -0000 1.25 --- index.php 17 Jun 2006 20:09:06 -0000 1.26 *************** *** 80,84 **** ); ! $admincp_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons']; $template->assign_vars(array( --- 80,84 ---- ); ! $admincp_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons']; $template->assign_vars(array( *************** *** 91,95 **** "U_FORUM_INDEX" => append_sid(PHPBB_URL . "index.$phpEx"), "U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"), ! //+MOD: DHTML Menu for ACP 'COOKIE_NAME' => $board_config['cookie_name'], 'COOKIE_PATH' => $board_config['cookie_path'], --- 91,95 ---- "U_FORUM_INDEX" => append_sid(PHPBB_URL . "index.$phpEx"), "U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"), ! //+MOD: DHTML Menu for ACP 'COOKIE_NAME' => $board_config['cookie_name'], 'COOKIE_PATH' => $board_config['cookie_path'], *************** *** 98,102 **** 'IMG_URL_CONTRACT' => $admincp_nav_icon_url . '/contract.gif', 'IMG_URL_EXPAND' => $admincp_nav_icon_url . '/expand.gif', ! //-MOD: DHTML Menu for ACP "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], --- 98,102 ---- 'IMG_URL_CONTRACT' => $admincp_nav_icon_url . '/contract.gif', 'IMG_URL_EXPAND' => $admincp_nav_icon_url . '/expand.gif', ! //-MOD: DHTML Menu for ACP "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], *************** *** 117,123 **** ksort($module_portal); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_portal) ) --- 117,123 ---- ksort($module_portal); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_portal) ) *************** *** 126,133 **** $template->assign_block_vars('module_portal.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); --- 126,133 ---- $template->assign_block_vars('module_portal.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); *************** *** 146,152 **** "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid(PORTAL_URL . $file) --- 146,152 ---- "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid(PORTAL_URL . $file) *************** *** 154,160 **** $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } --- 154,160 ---- $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } *************** *** 169,175 **** ksort($module_phpbb); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_phpbb) ) --- 169,175 ---- ksort($module_phpbb); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_phpbb) ) *************** *** 178,185 **** $template->assign_block_vars('module_phpbb.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); --- 178,185 ---- $template->assign_block_vars('module_phpbb.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); *************** *** 198,204 **** "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid(PHPBB_URL . 'admin/' . $file)) --- 198,204 ---- "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid(PHPBB_URL . 'admin/' . $file)) *************** *** 206,212 **** $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } --- 206,212 ---- $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } *************** *** 234,237 **** --- 234,251 ---- { $module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/"; + $module_path_root = $mx_root_path . $module_rows[$module_cnt]['module_path']; + + // ********************************************************************** + // Read language definition + // ********************************************************************** + if ( file_exists( $module_path_root . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) + { + include( $module_path_root . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); + } + else if ( file_exists( $module_path_root . 'language/lang_english/lang_admin.' . $phpEx ) ) + { + include( $module_path_root . 'language/lang_english/lang_admin.' . $phpEx ); + } + $module_mx = array_merge_recursive($module_mx, read_admin($module_path_admin)); } *************** *** 242,248 **** ksort($module_mx); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_mx) ) --- 256,262 ---- ksort($module_mx); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_mx) ) *************** *** 251,258 **** $template->assign_block_vars('module_mx.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); --- 265,272 ---- $template->assign_block_vars('module_mx.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); *************** *** 271,277 **** "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, --- 285,291 ---- "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, *************** *** 280,286 **** $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } // ----------------------------------------------------------------------------------- --- 294,300 ---- $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } // ----------------------------------------------------------------------------------- Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** page_header_admin.php 2 May 2006 23:22:15 -0000 1.16 --- page_header_admin.php 17 Jun 2006 20:09:06 -0000 1.17 *************** *** 57,63 **** **********/ ! $template->set_filenames(array( ! 'header' => 'admin/page_header.tpl') ! ); // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility --- 57,61 ---- **********/ ! $template->set_filenames(array( 'header' => 'admin/page_header.tpl') ); // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility *************** *** 67,71 **** $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], ! // 'PAGE_TITLE' => $page_title, 'L_ADMIN' => $lang['Admin'], --- 65,69 ---- $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], ! // 'PAGE_TITLE' => $page_title, 'L_ADMIN' => $lang['Admin'], *************** *** 155,158 **** $template->pparse('header'); - ?> \ No newline at end of file --- 153,155 ---- Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** admin_mx_module.php 2 May 2006 23:22:15 -0000 1.43 --- admin_mx_module.php 17 Jun 2006 20:09:05 -0000 1.44 *************** *** 98,104 **** // ! $template->set_filenames(array( ! 'body' => 'admin/mx_module_admin_body.tpl') ! ); // --- 98,102 ---- // ! $template->set_filenames(array( 'body' => 'admin/mx_module_admin_body.tpl') ); // *************** *** 361,367 **** $module_select_box = get_list_static('module_id', $module_rows_select, $nav_module_id, false); ! $template->assign_vars(array( ! 'MODULE_SELECT_BOX' => $module_select_box ! )); // --- 359,363 ---- $module_select_box = get_list_static('module_id', $module_rows_select, $nav_module_id, false); ! $template->assign_vars(array( 'MODULE_SELECT_BOX' => $module_select_box )); // *************** *** 371,374 **** $template->pparse('body'); include('./page_footer_admin.php'); - ?> \ No newline at end of file --- 367,369 ---- Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_mx_module_cp.php 2 May 2006 23:22:15 -0000 1.14 --- admin_mx_module_cp.php 17 Jun 2006 20:09:05 -0000 1.15 *************** *** 169,175 **** ); ! $template->set_filenames(array( ! 'admin_block' => 'admin/mx_modulecp_admin_body.tpl') ! ); // --- 169,173 ---- ); ! $template->set_filenames(array( 'admin_block' => 'admin/mx_modulecp_admin_body.tpl') ); // *************** *** 180,184 **** $admin_icon['contract'] = $module_nav_icon_url . 'contract.gif'; $admin_icon['expand'] = $module_nav_icon_url . 'expand.gif'; - $admin_icon['module'] = $module_nav_icon_url . 'icon_module.gif'; $admin_icon['function'] = $module_nav_icon_url . 'icon_function.gif'; --- 178,181 ---- *************** *** 223,227 **** 'L_INCLUDE_BLOCK_PRIVATE' => $lang['Include_block_private'], - 'S_SUBMIT' => $lang['Update'], --- 220,223 ---- *************** *** 257,261 **** --- 253,259 ---- 'L_MODULE_INCLUDE_ADMIN' => $lang['Module_include_admin'], + // // Block + // 'L_AUTH_TITLE' => $lang['Auth_Block'], 'L_AUTH_TITLE_EXPLAIN' => $lang['Auth_Block_explain'], *************** *** 476,480 **** $type_row['Function'] = !empty($lang['ParType_Function']) ? $lang['ParType_Function'] : "Function"; - $type_row['Separator'] = !empty($lang['ParType_Separator']) ? $lang['ParType_Separator'] : "-Separator-"; --- 474,477 ---- *************** *** 778,786 **** 'E_PARAMETER_DEFAULT' => $parameter_default, // Quick Panels 'MESSAGE_DELETE' => $message_delete, 'S_HIDDEN_FIELDS' => $s_hidden_parameter_fields, - 'S_SUBMIT' => $new_parameter ? $lang['Create_parameter'] : $lang['Update'] )); --- 775,784 ---- 'E_PARAMETER_DEFAULT' => $parameter_default, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, 'S_HIDDEN_FIELDS' => $s_hidden_parameter_fields, 'S_SUBMIT' => $new_parameter ? $lang['Create_parameter'] : $lang['Update'] )); *************** *** 948,952 **** --- 946,952 ---- 'S_SHOW_STATS_NO' => $show_stats_no, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, *************** *** 1062,1072 **** $module_select_box = get_list_static('module_id', $module_rows_select, $nav_module_id, false); ! $template->assign_vars(array( ! 'MODULE_SELECT_BOX' => $module_select_box ! )); include_once('./page_header_admin.' . $phpEx); $template->pparse('admin_block'); include_once('./page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 1062,1069 ---- $module_select_box = get_list_static('module_id', $module_rows_select, $nav_module_id, false); ! $template->assign_vars(array( 'MODULE_SELECT_BOX' => $module_select_box )); include_once('./page_header_admin.' . $phpEx); $template->pparse('admin_block'); include_once('./page_footer_admin.' . $phpEx); ?> \ No newline at end of file Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_footer_admin.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** page_footer_admin.php 29 May 2006 15:37:03 -0000 1.12 --- page_footer_admin.php 17 Jun 2006 20:09:06 -0000 1.13 *************** *** 19,25 **** // Show the overall footer. // ! $template->set_filenames(array( ! 'page_footer' => 'admin/page_footer.tpl') ! ); // --- 19,23 ---- // Show the overall footer. // ! $template->set_filenames(array( 'page_footer' => 'admin/page_footer.tpl' )); // *************** *** 75,78 **** exit; - ?> \ No newline at end of file --- 73,75 ---- Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pagestart.php 2 May 2006 23:22:15 -0000 1.19 --- pagestart.php 17 Jun 2006 20:09:06 -0000 1.20 *************** *** 65,69 **** } - if( empty($no_page_header) ) { --- 65,68 ---- *************** *** 74,77 **** include($mx_root_path . 'admin/page_header_admin.' . $phpEx); } - ?> \ No newline at end of file --- 73,75 ---- Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** admin_mx_portal.php 3 May 2006 09:17:28 -0000 1.26 --- admin_mx_portal.php 17 Jun 2006 20:09:06 -0000 1.27 *************** *** 67,73 **** } ! $template->set_filenames(array( ! 'admin_portal' => 'admin/admin_mx_portal.tpl') ! ); $top_phpbb_links_yes = ( $portal_config['top_phpbb_links'] == 1 ) ? 'checked="checked"' : ''; --- 67,71 ---- } ! $template->set_filenames(array( 'admin_portal' => 'admin/admin_mx_portal.tpl') ); $top_phpbb_links_yes = ( $portal_config['top_phpbb_links'] == 1 ) ? 'checked="checked"' : ''; *************** *** 116,120 **** "NAVIGATION_BLOCK" => $navigation_block_list, - // Added in v 2.706 "L_PHPBB_RELATIVE_PATH" => $lang['Phpbb_path'], "L_PHPBB_RELATIVE_PATH_EXPLAIN" => $lang['Phpbb_path_explain'], --- 114,117 ---- *************** *** 153,156 **** include_once('page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 150,152 ---- Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_mx_block_cp.php 2 May 2006 23:22:15 -0000 1.10 --- admin_mx_block_cp.php 17 Jun 2006 20:09:05 -0000 1.11 *************** *** 16,19 **** --- 16,22 ---- } + // + // Security and Page header + // define('IN_PORTAL', 1); $mx_root_path = './../'; *************** *** 36,40 **** $blockcptemplate = new mx_Template( $mx_root_path . 'templates/'. $theme['template_name'], $board_config, $db ); - // // Load BlockCp --- 39,42 ---- *************** *** 85,88 **** --- 87,93 ---- setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + // + // Init the User BlockCP + // $mx_blockcp->init($block_id, true); *************** *** 147,150 **** --- 152,158 ---- } // if .. !empty($mode) + // + // Hidden vars + // $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $block_id . '" />'; *************** *** 195,199 **** // $blockcptemplate->set_filenames(array( ! 'body' => 'admin/mx_blockcp_admin_body.tpl' )); --- 203,207 ---- // $blockcptemplate->set_filenames(array( ! 'body' => 'admin/mx_blockcp_admin_body.tpl' )); Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_meta.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_mx_meta.php 2 May 2006 23:22:15 -0000 1.14 --- admin_mx_meta.php 17 Jun 2006 20:09:05 -0000 1.15 *************** *** 24,28 **** require('./pagestart.' . $phpEx); - // // Load language file. --- 24,27 ---- *************** *** 37,41 **** } - // // Main procedure --- 36,39 ---- *************** *** 97,101 **** } - // // Read current settings and send result to browser --- 95,98 ---- *************** *** 103,109 **** include($mx_root_path . 'mx_meta.inc'); ! $template->set_filenames(array( ! 'meta' => 'admin/admin_mx_meta.tpl') ! ); $template->assign_vars(array( --- 100,104 ---- include($mx_root_path . 'mx_meta.inc'); ! $template->set_filenames(array( 'meta' => 'admin/admin_mx_meta.tpl') ); $template->assign_vars(array( *************** *** 132,139 **** 'KEYWORDS' => $keywords, 'DESCRIPTION' => $description, ! 'LANGUAGE' => generate_meta_select($langcode, 'langcode'), ! 'RATING' => generate_meta_select($rating, 'rating'), ! 'ROBOTS_INDEX' => generate_meta_select($index, 'index'), ! 'ROBOTS_FOLLOW' => generate_meta_select($follow, 'follow'), 'ICON' => $icon, 'HEADER' => htmlspecialchars($header), --- 127,134 ---- 'KEYWORDS' => $keywords, 'DESCRIPTION' => $description, ! 'LANGUAGE' => mx_generate_meta_select($langcode, 'langcode'), ! 'RATING' => mx_generate_meta_select($rating, 'rating'), ! 'ROBOTS_INDEX' => mx_generate_meta_select($index, 'index'), ! 'ROBOTS_FOLLOW' => mx_generate_meta_select($follow, 'follow'), 'ICON' => $icon, 'HEADER' => htmlspecialchars($header), *************** *** 144,167 **** $template->pparse('meta'); include("./page_footer_admin.$phpEx"); - - - // ======================================== - // FUNCTIONS - // ======================================== - - function generate_meta_select($default, $select_name) - { - global $lang; - - $select = '<select name="' . $select_name . '">'; - foreach( $lang['mx_meta'][$select_name] as $key => $value ) - { - $selected = ( $key == $default ) ? ' selected="selected"' : ''; - $select .= '<option value="' . $key . '"' . $selected . '>' . $value . "</option>\n"; - } - $select .= '</select>'; - - return $select; - } - ?> \ No newline at end of file --- 139,141 ---- |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:09:11
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20300 Modified Files: common.php index.php Log Message: Clean up... Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** common.php 29 May 2006 15:37:03 -0000 1.53 --- common.php 17 Jun 2006 20:09:06 -0000 1.54 *************** *** 19,22 **** --- 19,32 ---- $mx_starttime = $mx_starttime[1] + $mx_starttime[0]; + // + // DEBUG AND ERROR HANDLING + // + //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php + //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. + //error_reporting(E_ALL); + error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables + include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.php'); // For nice error output + + // ================================================================================ // The following code is based on common.php from phpBB Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** index.php 29 May 2006 15:37:03 -0000 1.56 --- index.php 17 Jun 2006 20:09:06 -0000 1.57 *************** *** 13,25 **** // - // DEBUG AND ERROR HANDLING - // - //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php - //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. - //error_reporting(E_ALL); - error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables - include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.php'); // For nice error output - - // // Let's include some stuff... // --- 13,16 ---- |
|
From: Jon O. <jon...@us...> - 2006-06-17 20:09:11
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20300/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: Clean up... Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mx_module_defs.php 2 May 2006 23:22:17 -0000 1.19 --- mx_module_defs.php 17 Jun 2006 20:09:07 -0000 1.20 *************** *** 9,12 **** --- 9,17 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + /********************************************************************************\ | Class: mx_module_defs |
|
From: Jon O. <jon...@us...> - 2006-06-16 19:34:56
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26454 Modified Files: test Log Message: test Index: test =================================================================== RCS file: /cvsroot/mxbb/mx_kb/test,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test 16 Jun 2006 19:21:36 -0000 1.4 --- test 16 Jun 2006 19:34:52 -0000 1.5 *************** *** 1,2 **** ! foo2 once more ;) --- 1,2 ---- ! foo2 once more 2 ;) |
|
From: Paul S. <pf...@us...> - 2006-06-13 15:37:37
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28578 Modified Files: test Log Message: Subscribed to list, should be posted directly. Index: test =================================================================== RCS file: /cvsroot/mxbb/mx_kb/test,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test 13 Jun 2006 15:26:53 -0000 1.1 --- test 13 Jun 2006 15:37:33 -0000 1.2 *************** *** 0 **** --- 1,2 ---- + foo + |
|
From: Paul S. <pf...@us...> - 2006-06-13 15:26:55
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22069 Added Files: test Log Message: https://sourceforge.net/tracker/?func=detail&atid=200001&aid=1497105&group_id=1 . All files added during testing will be removed w/o traces to your CVS history. --- NEW FILE: test --- |
|
From: Andrew <men...@us...> - 2006-05-05 17:04:15
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25739/modules/mx_textblocks/language/lang_english Modified Files: lang_admin.php Log Message: Bug #20 Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/language/lang_english/lang_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_admin.php 5 Apr 2006 21:07:17 -0000 1.3 --- lang_admin.php 5 May 2006 17:03:57 -0000 1.4 *************** *** 4,8 **** * @package mxBB Portal Module - mx_textblocks * @version $Id$ ! * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 4,8 ---- * @package mxBB Portal Module - mx_textblocks * @version $Id$ ! * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 23,26 **** --- 23,27 ---- // $lang['block_style'] = "Block Border:"; + $lang['text_style'] = "Text Style:"; $lang['title_style'] = "Title Header Style:"; $lang['allow_bbcode'] = "Allow BBCodes:"; *************** *** 30,33 **** $lang['block_style_explain'] = "Show border around textblock:"; ! $lang['title_style_explain'] = "Use css style for title row:"; ?> \ No newline at end of file --- 31,40 ---- $lang['block_style_explain'] = "Show border around textblock:"; ! $lang['title_style_explain'] = "Use CSS style for title row:"; ! $lang['text_style_explain'] = "Style to apply at this text:"; ! $lang['allow_bbcode_explain'] = "This enable BBCode in this block:"; ! $lang['allow_html_explain'] = "This enables the use of defined HTML tags in this block:"; ! $lang['allow_smilies_explain'] = "This enable smilies in this block:"; ! $lang['html_tags_explain'] = "HTML tags can be used in this block. <br> Separate tags with commas:"; ! ?> \ No newline at end of file |
|
From: Andrew <men...@us...> - 2006-05-05 17:00:58
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24282/modules/mx_textblocks/admin Modified Files: mx_module_defs.php Log Message: Bug #19 Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mx_module_defs.php 28 Apr 2006 14:29:38 -0000 1.14 --- mx_module_defs.php 5 May 2006 17:00:54 -0000 1.15 *************** *** 220,224 **** 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => $bbcode_status, 'SMILIES_STATUS' => $smilies_status, --- 220,224 ---- 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid(PHPBB_URL . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, *************** *** 336,340 **** 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => $bbcode_status, 'SMILIES_STATUS' => $smilies_status, --- 336,340 ---- 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid(PHPBB_URL . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, *************** *** 404,408 **** $template->assign_vars(array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => $bbcode_status, 'SMILIES_STATUS' => $smilies_status, 'L_PREVIEW' => $lang['Preview'], --- 404,408 ---- $template->assign_vars(array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid(PHPBB_URL . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'L_PREVIEW' => $lang['Preview'], |
|
From: Andrew <men...@us...> - 2006-05-05 16:53:23
|
Update of /cvsroot/mxbb/core/install/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20804/install/templates Modified Files: mx_install_header.tpl Log Message: Bug #18 Index: mx_install_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_header.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_install_header.tpl 8 Mar 2005 23:43:46 -0000 1.4 --- mx_install_header.tpl 5 May 2006 16:53:10 -0000 1.5 *************** *** 5,9 **** <meta http-equiv="Content-Style-Type" content="text/css"> <title>{L_INSTALLATION}</title> ! <style type="text/css"><!-- /* The original subSilver Theme for phpBB version 2+ --- 5,10 ---- <meta http-equiv="Content-Style-Type" content="text/css"> <title>{L_INSTALLATION}</title> ! <style type="text/css"> ! <!-- /* The original subSilver Theme for phpBB version 2+ *************** *** 212,217 **** */ .helpline { background-color: #DEE3E7; border-style: none; } ! --></style> ! <script language="javascript1.2" type="text/javascript"><!-- // Import the fancy styles for IE only (NS4.x doesn't use the @import function) if( document.all ) { document.write('<sty'+'le type="text/css">\n'+ --- 213,221 ---- */ .helpline { background-color: #DEE3E7; border-style: none; } ! --> ! </style> ! ! <script language="javascript1.2" type="text/javascript"> ! <!-- // Import the fancy styles for IE only (NS4.x doesn't use the @import function) if( document.all ) { document.write('<sty'+'le type="text/css">\n'+ *************** *** 238,242 **** ' border-left-width : 1px;\n'+ '}\n<'+'/'+'sty'+'le>'); } ! //--></script> </head> <body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#5584AA"> --- 242,247 ---- ' border-left-width : 1px;\n'+ '}\n<'+'/'+'sty'+'le>'); } ! //--> ! </script> </head> <body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#5584AA"> *************** *** 249,253 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><a href="http://www.mx-system.com" target="_blank"><img src="../templates/subSilver/images/banner_mx-system.gif" border="0" alt="mxBB-Portal" vspace="1" /></a></td> <td align="center" width="100%" valign="middle"><span class="maintitle">{L_INSTALLATION}</span></td> <td align="center" valign="top" nowrap><span class="gensmall">{L_PORTAL_NAME}<br />v. {L_PORTAL_VERSION}</span></td> --- 254,258 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><a href="http://www.mx-system.com" target="_blank"><img src="../templates/subSilver/images/logo.gif" border="0" alt="mxBB-Portal" vspace="1" /></a></td> <td align="center" width="100%" valign="middle"><span class="maintitle">{L_INSTALLATION}</span></td> <td align="center" valign="top" nowrap><span class="gensmall">{L_PORTAL_NAME}<br />v. {L_PORTAL_VERSION}</span></td> |
|
From: Andrew <men...@us...> - 2006-05-03 23:16:09
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6596/includes Modified Files: page_header.php Log Message: Bug #17 Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** page_header.php 2 May 2006 23:22:16 -0000 1.34 --- page_header.php 3 May 2006 23:16:03 -0000 1.35 *************** *** 61,65 **** // If mxBB frame template is not set, instantiate it // ! if (!is_object($layouttemplate)) { // --- 61,65 ---- // If mxBB frame template is not set, instantiate it // ! if ( is_object($layouttemplate) == FALSE ) { // |
|
From: Andrew <men...@us...> - 2006-05-03 22:15:24
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11562 Modified Files: common.php index.php Log Message: - error_repoting() should be set in common.php, not index.php - if, not If - changed the mx_shared error handling include() to use $phpEx and rearranged things a bit to be more logical Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** common.php 3 May 2006 09:17:28 -0000 1.51 --- common.php 3 May 2006 22:15:20 -0000 1.52 *************** *** 15,18 **** --- 15,21 ---- define('IN_PHPBB', 1); + // Debug + error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables + $mx_starttime = explode(' ', microtime()); $mx_starttime = $mx_starttime[1] + $mx_starttime[0]; Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** index.php 3 May 2006 09:17:28 -0000 1.54 --- index.php 3 May 2006 22:15:20 -0000 1.55 *************** *** 11,15 **** define( 'IN_PORTAL', 1 ); $mx_root_path = "./"; ! // // DEBUG AND ERROR HANDLING --- 11,16 ---- define( 'IN_PORTAL', 1 ); $mx_root_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include( $mx_root_path . 'common.' . $phpEx); // // DEBUG AND ERROR HANDLING *************** *** 18,29 **** //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. //error_reporting(E_ALL); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.php'); // For nice error output ! ! // ! // Let's include some stuff... ! // ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.' . $phpEx); // --- 19,23 ---- //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. //error_reporting(E_ALL); ! include( $mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output // *************** *** 37,41 **** // AJAX // ! If ($mxAjax && $mxAjaxBlockId > 0) { define( 'IN_AJAX', 1 ); --- 31,35 ---- // AJAX // ! if ($mxAjax && $mxAjaxBlockId > 0) { define( 'IN_AJAX', 1 ); |
|
From: Andrew <men...@us...> - 2006-05-03 21:59:22
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4022/includes Modified Files: mx_functions_style.php Log Message: Bug #15 Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_functions_style.php 3 May 2006 10:02:22 -0000 1.2 --- mx_functions_style.php 3 May 2006 21:59:10 -0000 1.3 *************** *** 18,22 **** // Including phpBB version of the Template class // ! include_once($phpbb_root_path . "includes/template.$phpEx"); /** --- 18,22 ---- // Including phpBB version of the Template class // ! include_once($phpbb_root_path . 'includes/template.' . $phpEx); /** *************** *** 263,267 **** // Is the lang installed? // ! if ( !file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) || !file_exists($pbpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx)) { $board_config['default_lang'] = 'english'; --- 263,267 ---- // Is the lang installed? // ! if ( !file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) || !file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx)) { $board_config['default_lang'] = 'english'; |
|
From: Andrew <men...@us...> - 2006-01-16 15:55:03
|
Update of /cvsroot/mxbb/core/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26964/docs Modified Files: doc_navigate.html index.html Log Message: Tell me this'll work... Index: index.html =================================================================== RCS file: /cvsroot/mxbb/core/docs/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.html 15 Jan 2006 23:16:55 -0000 1.6 --- index.html 16 Jan 2006 15:54:50 -0000 1.7 *************** *** 23,27 **** <meta http-equiv="Content-Type" content="text/xhtml;" /> </head> ! <frameset cols="240,*" rows="*"> <frame name="nav" src="doc_navigate.html" frameborder="0" marginwidth="0" marginheight="0" scrolling="auto" /> --- 23,27 ---- <meta http-equiv="Content-Type" content="text/xhtml;" /> </head> ! <frameset cols="238,*" rows="*"> <frame name="nav" src="doc_navigate.html" frameborder="0" marginwidth="0" marginheight="0" scrolling="auto" /> Index: doc_navigate.html =================================================================== RCS file: /cvsroot/mxbb/core/docs/doc_navigate.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** doc_navigate.html 16 Jan 2006 00:47:48 -0000 1.4 --- doc_navigate.html 16 Jan 2006 15:54:50 -0000 1.5 *************** *** 81,88 **** <ul class="list"> <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#requirements" target="main">Requirements</a></li> </ul> - <br /> - </ul> </ul> --- 81,101 ---- <ul class="list"> <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#requirements" target="main">Requirements</a></li> + <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#download-packages" target="main">Download Packages</a></li> + + <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#upgrade-methods" target="main">Methods of upgrading:</a></li> + <ul class="folder"> + <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#full-package" target="main">Full Package</a></li> + <ul class="folder"> + <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#f-p-m1" target="main">Method #1</a></li> + <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#f-p-m2" target="main">Method #2</a></li> + </ul> + + <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#changed-files">Changed Files Package</a></li> + <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#code-changes">Code Changes Package</a></li> + </ul> + + <li class="item"><a class="genmed" href="chapters/install-upgrade/upgrading.html#confirmation" target="main">Confirmation</a></li> </ul> </ul> </ul> |
|
From: Andrew <men...@us...> - 2006-01-16 15:51:46
|
Update of /cvsroot/mxbb/core/docs/chapters/introduction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26409/docs/chapters/introduction Added Files: introduction.html Log Message: This should fix that problem... --- NEW FILE: introduction.html --- <!-- /** * * @package mxBB Portal 2.8.0 * @version $Id: introduction.html,v 1.3 2006/01/16 15:51:36 mennonitehobbit Exp $ * @copyright (c) 2002-2005 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @project_site http://www.mxbb-portal.com * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * */ --> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>mxBB Portal :: Documentation :: Introduction</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Style-Type" content="text/css" /> <link rel="stylesheet" type="text/css" href="css/subSilver.css" /> </head> <body style="color: rgb(0, 0, 0); background-color: rgb(243, 243, 243);"> <a name="top"></a> <br /> <table class="bodyline" align="center" cellpadding="8" cellspacing="0" width="98%"> <tbody> <tr> <td colspan="2"> <div style="text-align: center;"> <span class="postbody"> <span style="font-weight: bold; font-size: 18px; line-height: normal; text-decoration: underline;">mxBB Portal :: Documentation</span> <br /> <span style="font-weight: bold; font-size: 14px; line-height: normal; text-decoration: underline;">Introduction</span> </span> </div> <br /> <br /> <span class="postbody"> <span style="font-weight: bold;">Package Title:</span> mxBB Portal Documentation <br /> <span style="font-weight: bold;">Document Title:</span> Introduction <br /> <span style="font-weight: bold;">Document Version:</span> 1.0.0 <br /> <span style="font-weight: bold;">Author:</span> MHobbit (Andrew) <an...@mx...> <a href="http://www.mhobbit.net">http://www.mhobbit.net</a> <br /> <span style="font-weight: bold;">Targeted mxBB Version:</span> 2.8.0 <br /> <span style="font-weight: bold;">Last Updated:</span> January 15, 2005 <br /> <br /> <a name="about-mxbb"><span style="font-weight: bold; font-size: 14px; line-height: normal;">About mxBB</span></a> <br /> <span class="postbody">mxBB Portal is the only fully modular portal and CMS for phpBB. It features dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It works without touching phpBB by using integrated features and functions. (This makes it a lot easier to upgrade to phpBB 3.0 "Olympus" when the time comes, among other things; coding-wise, it is highly adaptable and even logical.) mxBB Portal requires phpBB to run, and currently supports the mySQL and postgreSQL databases, with planned support for other database management systems (DBMSs) such as MS-SQL and DB2. mxBB Portal is the classic phpBB portal addon, improved and enhanced for every phpBB version released since 2001.</span> <br /> <br /> <span class="postbody"> <a name="doc-overview"><span style="font-weight: bold; font-size: 14px; line-height: normal;">Documentation Overview</span></a> <br /> The mxBB Documentation Package is intended for general mxBB administrators. If you are simply a visitor to an mxBB-powered site, this document may or may not be useful for you. <br /> <br /> The documentation contains various chapters and subsections. </span> <br /> <br /> <span class="postbody"> <a name="toc"><span style="font-weight: bold; font-size: 16px; line-height: normal;">Table of Contents</span></a> <br /> <ul> <li>Introduction</li> <ul> <li>About mxBB</li> <li>What is mxBB used for?</li> </ul> <br /> <li>Installation/Upgrading</li> <ul> <li>Installing</li> <ul> <li>Requirements</li> <li>Download Packages</li> <li>Uploading</li> <li>The Installation Wizard</li> </ul> <li>Upgrading</li> <ul> <li>Requirements</li> <li>Download Packages</li> <li>Methods of upgrading:</li> <ul> <li>Full Package</li> <ul> <li>Method #1</li> <li>Method #2</li> </ul> <li>Changed Files Package</li> <li>Code Changes Package</li> </ul> <li>Confirmation</li> </ul> <li>Uninstalling</li> </ul> <br /> <li>The Administration Control Panel</li> <ul> <li>Administration</li> <ul> <li>Admin Index</li> <li>Portal Index</li> <li>Forum Index</li> <li>Preview Forum</li> <li>Preview Portal</li> </ul> <li>mxBB Portal</li> <ul> <li>General</li> <ul> <li>Configuration</li> </ul> <li>Management</li> <ul> <li>Modules Setup</li> <ul> <li>What is a module?</li> <li>General Module Installation</li> <li>General Module Upgrading</li> <li>General Module Usage</li> <li>General Module Uninstallation</li> <li>Where can I find modules? (Module Sources)</li> </ul> <li>Module Control Panel</li> <li>Block Control Panel</li> <li>Page Control Panel</li> </ul> <li>System Tools</li> <ul> <li>Regenerate Cache</li> <li>Integrity Checker</li> <li>META Tags</li> <li>phpInfo()</li> </ul> </ul> </ul> <li>Common Usage</li> <ul> <li>Core-Related</li> <ul> <li>Creating Portal Pages</li> <ul> <li>Portal Page Creation</li> <li>Page Configuration</li> <li>Adding Pre-existing Blocks</li> </ul> <li>Creating Blocks</li> <li>Styles</li> <ul> <li>"Installation"</li> </ul> </ul> </ul> <li>Troubleshooting</li> <ul> <li>Problems Installing?</li> <li>Problems with mxBB running?</li> <li>Bugs? Security Issues?</li> </ul> <li>Credits, Copyright, etc.</li> <ul> <li>Credits</li> <li>Copyright</li> <li>Terms of Use</li> </ul> </span> <br /> <br /> </span> </td> </tr> </tbody> </table> <br /> <div align="center"> <span class="copyright">mxBB Documentation Package © 2006 <a href="http://www.mhobbit.net">MHobbit</a> and the <a href="http://www.mx-system.com">mxBB Project Team</a></span> </div> <br clear="all" /> </body> </html> |
2 messages has been excluded from this view by a project administrator.
