Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2012-12-18 20:27:28
|
Revision: 10447
http://sourceforge.net/p/xoops/svn/10447
Author: beckmi
Date: 2012-12-18 20:27:25 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 1.02 Final (fixing English translation, small bug with using Break in IF statement)
Modified Paths:
--------------
XoopsModules/qrcode/trunk/qrcode/admin/footer.php
XoopsModules/qrcode/trunk/qrcode/admin/header.php
XoopsModules/qrcode/trunk/qrcode/admin/main.php
XoopsModules/qrcode/trunk/qrcode/docs/changelog.txt
XoopsModules/qrcode/trunk/qrcode/language/english/main.php
XoopsModules/qrcode/trunk/qrcode/xoops_version.php
Modified: XoopsModules/qrcode/trunk/qrcode/admin/footer.php
===================================================================
--- XoopsModules/qrcode/trunk/qrcode/admin/footer.php 2012-12-18 19:57:26 UTC (rev 10446)
+++ XoopsModules/qrcode/trunk/qrcode/admin/footer.php 2012-12-18 20:27:25 UTC (rev 10447)
@@ -1,25 +1,11 @@
<?php
-/**
- * MyLinks module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package:: mylinks
- * @subpackage:: admin
- * @since: 2.5.0
- * @author:: Magic.Shao <mag...@gm...> - Susheng Yang <ezs...@gm...>
- * @version:: $Id $
-**/
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"../images/admin/xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
-echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+global $pathIcon32;
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
-xoops_cp_footer();
-?>
\ No newline at end of file
+xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/qrcode/trunk/qrcode/admin/header.php
===================================================================
--- XoopsModules/qrcode/trunk/qrcode/admin/header.php 2012-12-18 19:57:26 UTC (rev 10446)
+++ XoopsModules/qrcode/trunk/qrcode/admin/header.php 2012-12-18 20:27:25 UTC (rev 10447)
@@ -1,57 +1,40 @@
-<?php
-/**
- * MyLinks module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package:: mylinks
- * @subpackage:: admin
- * @since:: 2.5.0
- * @author:: Magic.Shao <mag...@gm...> - Susheng Yang <ezs...@gm...>
- * @version:: $Id $
-**/
-
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include("../../../include/cp_header.php");
-include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
-
-//defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.ini.php';
-//load_functions("admin");
-
-$myts =& MyTextSanitizer::getInstance();
-
-if ($xoopsUser) {
- $moduleperm_handler =& xoops_gethandler('groupperm');
- if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
- redirect_header(XOOPS_URL, 1, _NOPERM);
- exit();
- }
-} else {
- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
- exit();
-}
-
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH."/class/template.php");
- $xoopsTpl = new XoopsTpl();
-}
-
-xoops_cp_header();
-
-// Define Stylesheet and JScript
-$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/admin.css" );
-//$xoTheme->addJavaScript( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/admin/switcher.js" );
-
-//Load languages
-xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
+<?php
+
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include("../../../include/cp_header.php");
+include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
+
+//defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.ini.php';
+//load_functions("admin");
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+
+xoops_cp_header();
+
+// Define Stylesheet and JScript
+$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/admin.css" );
+//$xoTheme->addJavaScript( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/admin/switcher.js" );
+
+//Load languages
+xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
?>
\ No newline at end of file
Modified: XoopsModules/qrcode/trunk/qrcode/admin/main.php
===================================================================
--- XoopsModules/qrcode/trunk/qrcode/admin/main.php 2012-12-18 19:57:26 UTC (rev 10446)
+++ XoopsModules/qrcode/trunk/qrcode/admin/main.php 2012-12-18 20:27:25 UTC (rev 10447)
@@ -1,331 +1,329 @@
-<?php
-// ------------------------------------------------------------------------ //
-// Author: Designburo.nl (in...@de...) //
-// http://www.designburo.nl //
-// Project: QRcode v1.0 //
-// ------------------------------------------------------------------------ //
-include '../../../include/cp_header.php';
-// if the site has no language defined, turn to English default
-if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
-include "../language/".$xoopsConfig['language']."/main.php"; } else { include "../language/english/main.php"; }
-include(XOOPS_ROOT_PATH.'/mainfile.php');
-include_once XOOPS_ROOT_PATH."/modules/qrcode/qrcode.php";
-xoops_cp_header();
-if(isset($_POST['type']))
-{
- switch ($_POST['type'])
- {
-
-
- case "phone":
- if (!$_POST['qr_phone'])
- {
- $res= _QRCODE_PHONE_F_ERROR_NR;
- }
- else
- {
- $data=array();
- $type="phone";
- $data['phonenr'] = $_POST['qr_phone'];
- $res= qrcode($type,$data);
-
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
- echo $res;
- echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
- xoops_cp_footer();
- }
- break;
-
- case "url":
- if (!$_POST['qr_url'])
- {
- $res= _QRCODE_URL_F_ERROR_URL;
- }
- else
- {
- $data=array();
- $type="url";
- $data['url'] = $_POST['qr_url'];
- $res= qrcode($type,$data);
-
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
- echo $res;
- echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
- xoops_cp_footer();
- }
- break;
- case "email":
- if (!$_POST['qr_email_to'])
- {
- $res= _QRCODE_EMAIL_F_ERROR_EMAIL;
- }
- else
- {
- $data=array();
- $type="email";
- $data['email']=$_POST['qr_email_to']; // Send email to ?
- $data['subject']=$_POST['qr_email_sub']; // Subject of the email
- $data['txt']=$_POST['qr_email_txt']; // Body of the email
- $res= qrcode($type,$data);
-
-
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
- echo $res;
- echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
- xoops_cp_footer();
- }
- break;
-
- case "sms":
- if (!$_POST['qr_sms_to'])
- {
- $res= _QRCODE_SMS_F_ERROR_NR;
- }
- else
- {
- $data=array();
- $type="sms";
- $data['phonenr']=$_POST['qr_sms_to'];
- $data['txt']=$_POST['qr_sms_txt'];
- $res= qrcode($type,$data);
-
-
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
- echo $res;
- echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
- xoops_cp_footer();
- }
- break;
-
- case "txt":
- if (!$_POST['qr_txt'])
- {
- $res= _QRCODE_TXT_F_ERROR_TXT;
- }
- else
- {
- $data=array();
- $type="txt";
- $data['txt'] = $_POST['qr_txt'];
- $res= qrcode($type,$data);
-
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
- echo $res;
- echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
- xoops_cp_footer();
-
- }
- break;
-
- case "geo":
-
- $data=array();
- $type="geo";
- $data['lat'] = $_POST['qr_latitude'];
- $data['long'] = $_POST['qr_longtitude'];
- $res= qrcode($type,$data);
-
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
- echo $res;
- echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
- xoops_cp_footer();
-
- break;
-
- case "bus":
-
- $data=array();
- $type="contact";
- $data['surname']=$_POST['qr_c_anaam'];
- $data['name']=$_POST['qr_c_vnaam'];
- $data['mobile']=$_POST['qr_c_gsm'];
- $data['phonenr']=$_POST['qr_c_phone'];
- $data['adres']=$_POST['qr_c_adres'];
- $data['state']=$_POST['qr_c_state'];
- $data['city']=$_POST['qr_c_city'];
- $data['zipcode']=$_POST['qr_c_zip'];
- $data['country']=$_POST['qr_c_land'];
- $data['email']=$_POST['qr_c_email'];
- $data['url']=$_POST['qr_c_web'];
- $data['title']=$_POST['qr_c_functie'];
- $data['company']=$_POST['qr_c_bedrijf'];
- $data['b_year']=$_POST['qr_c_gjaar'];
- $data['b_month']=$_POST['qr_c_gmaand'];
- $data['b_day']=$_POST['qr_c_gdag'];
- $res= qrcode($type,$data);
-
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
- echo $res;
- echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
- xoops_cp_footer();
-
- break;
-
-
- }
-
-
- break;
-
-}
-
-if(isset($_GET['a']))
-{
-
- switch ($_GET['a'])
- {
-
- case "url":
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_URL_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
- echo '<table><tr><td width="150" align="left"><img src="../images/create_url.png" border="0" title="'._QRCODE_URL_D.'"></td><td>';
- echo '<h2>'._QRCODE_URL_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
- echo '<form id="form1" name="form1" method="post" action="main.php">';
- echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_URL_F_URL.'</td><td><input name="qr_url" id="qr_url" type="text" size="50" value="http://" /></td><td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
- </tr></table></td></tr></table>
- </div><input type="hidden" name="type" value="url"></form></div></div></td></tr></table>';
- break;
-
- case "email":
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_EMAIL_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
- echo '<table><tr><td width="150" align="left"><img src="../images/create_email.png" border="0" title="'._QRCODE_EMAIL_D.'"></td><td>';
- echo '<h2>'._QRCODE_EMAIL_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
- echo '<form id="form1" name="form1" method="post" action="main.php">';
- echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_EMAIL_F_TO.'</td><td><input name="qr_email_to" type="text" size="50" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
- </tr>';
- echo '<tr>
- <td valign="middle">'._QRCODE_EMAIL_F_SUBJECT.'</td><td valign="top"><input name="qr_email_sub" type="text" size="50" /></td>
- </tr><tr>
- <td>'._QRCODE_EMAIL_F_TXT.'</td><td><input name="qr_email_txt" type="text" size="50" /></td>
- </tr>
-
- ';
- echo '</table></td></tr></table>
- </div><input type="hidden" name="type" value="email"></form></div></div></td></tr></table>';
- break;
-
- case "phone":
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_PHONE_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
- echo '<table><tr><td width="150" align="left"><img src="../images/create_phone.png" border="0" title="'._QRCODE_PHONE_D.'"></td><td>';
- echo '<h2>'._QRCODE_PHONE_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
- echo '<form id="form1" name="form1" method="post" action="main.php">';
- echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_PHONE_F_NR.'</td><td><input name="qr_phone" type="text" size="50" /></td><td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
- </tr></table></td></tr></table>
- </div><input type="hidden" name="type" value="phone"></form></div></div></td></tr></table>';
- break;
-
- case "sms":
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_SMS_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
- echo '<table><tr><td width="150" align="left"><img src="../images/create_sms.png" border="0" title="'._QRCODE_SMS_D.'"></td><td>';
- echo '<h2>'._QRCODE_SMS_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
- echo '<form id="form1" name="form1" method="post" action="main.php">';
- echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_SMS_F_NR.'</td><td><input name="qr_sms_to" type="text" size="50" maxsize="140" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
- </tr>';
- echo '<tr>
- <td>'._QRCODE_SMS_F_TXT.'</td><td><input name="qr_sms_txt" type="text" size="50" /></td>
- </tr>
-
- ';
- echo '</table></td></tr></table>
- </div><input type="hidden" name="type" value="sms"></form></div></div></td></tr></table>';
- break;
-
- case "txt":
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_TXT_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
- echo '<table><tr><td width="150" align="left"><img src="../images/create_txt.png" border="0" title="'._QRCODE_TXT_D.'"></td><td>';
- echo '<h2>'._QRCODE_TXT_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
- echo '<form id="form1" name="form1" method="post" action="main.php">';
- echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_TXT_F_TXT.'</td><td><textarea name="qr_txt" cols="45" rows="3" /></textarea></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
- </tr>';
-
- echo '</table></td></tr></table>
- </div><input type="hidden" name="type" value="txt"></form></div></div></td></tr></table>';
- break;
-
- case "geo":
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_GEO_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
- echo '<table><tr><td width="150" align="left"><img src="../images/create_geo.png" border="0" title="'._QRCODE_GEO_D.'"></td><td>';
- echo '<h2>'._QRCODE_GEO_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
- echo '<form id="form1" name="form1" method="post" action="main.php">';
- echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_GEO_F_LA.'</td><td><input name="qr_latitude" type="text" size="50" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
- </tr>';
- echo '<tr>
- <td>'._QRCODE_GEO_F_LO.'</td><td><input name="qr_longtitude" type="text" size="50" /></td>
- </tr>
-
- ';
- echo '</table></td></tr></table>
- </div><input type="hidden" name="type" value="geo"></form></div></div></td></tr></table>';
- break;
-
-
- case "bus":
- echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_BUS_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
- echo '<table><tr><td width="150" align="left"><img src="../images/create_contact.png" border="0" title="'._QRCODE_BUS_D.'"></td><td>';
- echo '<h2>'._QRCODE_BUS_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
- echo '<form id="form1" name="form1" method="post" action="main.php">';
- echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_BUS_F_SNAME.'</td><td><input name="qr_c_anaam" type="text" size="50" /></td><td rowspan="17"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
- </tr>';
- echo '<tr><td>'._QRCODE_BUS_F_FNAME.'</td><td><input name="qr_c_vnaam" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_COMPANY.'</td><td><input name="qr_c_bedrijf" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_TITLE.'</td><td><input name="qr_c_functie" type="text" size="50" /></td></tr>';
- echo '<tr><td colspan=2><BR><BR></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_PHONE.'</td><td><input name="qr_c_phone" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_MOB.'</td><td><input name="qr_c_gsm" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_EMAIL.'</td><td><input name="qr_c_email" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_WEB.'</td><td><input name="qr_c_web" type="text" size="50" /></td></tr>';
- echo '<tr><td colspan=2><BR><BR></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_ADRES.'</td><td><input name="qr_c_adres" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_ZIP.'</td><td><input name="qr_c_zip" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_CITY.'</td><td><input name="qr_c_city" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_STATE.'</td><td><input name="qr_c_state" type="text" size="50" /></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_COUNTRY.'</td><td><input name="qr_c_land" type="text" size="50" /></td></tr>';
- echo '<tr><td colspan=2><BR><BR></td></tr>';
- echo '<tr><td>'._QRCODE_BUS_F_BDAY.'</td><td><select name="qr_c_gdag">';
- for($rt=1;$rt<=31;$rt++){
- echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
- }
- echo '</select> / <select name="qr_c_gmaand">';
- for($rt=1;$rt<=12;$rt++){
- echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
- }
- echo '</select> / <select name="qr_c_gjaar">';
- for($rt=2011;$rt>=1920;$rt--){
- echo "<option value=\"".$rt."\">".$rt."</option>\n";
- }
- echo '</select></td></tr>';
- echo '</table></td></tr></table>
- </div><input type="hidden" name="type" value="bus"></form></div></div></td></tr></table>';
- break;
-
- }
-
-
-
-
-}
-else {
-
-
-
-
-$module_handler =& xoops_gethandler('module');
-$versioninfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$version=$versioninfo->getInfo('version');
-$description=$versioninfo->getInfo('description');
-$author=$versioninfo->getInfo('author');
-$license=$versioninfo->getInfo('license');
-$licensefile=$versioninfo->getInfo('help');
-$status=$versioninfo->getInfo('status');
-$released=$versioninfo->getInfo('releasedate');
-echo '<div style="margin:30px;padding:10px;border:1px solid #aaa;">';
-echo '<table><tr>';
-echo '<td align="center" style="border-right:0px solid #aaa;"><img src="../images/logo.png"></td>';
-echo '<td><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_DESCRIPTION.'</h3><BR><BR></div></td></tr>';
-echo '<tr><td colspan="2"><div style="margin:30px;padding:10px;border:1px solid #aaa;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">'._QRCODE_CHOOSE;
-echo '<BR><BR><table><tr><td><a href="main.php?a=url"><img src="../images/create_url.png" border="0" title="'._QRCODE_URL_D.'"></a></td><td><a href="main.php?a=email"><img src="../images/create_email.png" border="0" title="'._QRCODE_EMAIL_D.'"></a></td><td><a href="main.php?a=phone"><img src="../images/create_phone.png" border="0" title="'._QRCODE_PHONE_D.'"></a></td><td><a href="main.php?a=sms"><img src="../images/create_sms.png" border="0" title="'._QRCODE_SMS_D.'"></a></td><td><a href="main.php?a=txt"><img src="../images/create_txt.png" border="0" title="'._QRCODE_TXT_D.'"></a></td><td><a href="main.php?a=geo"><img src="../images/create_geo.png" border="0" title="'._QRCODE_GEO_D.'"></a></td><td><a href="main.php?a=bus"><img src="../images/create_contact.png" border="0" title="'._QRCODE_BUS_D.'"></a></td></tr><tr>';
-echo '<td align="center">'._QRCODE_URL_H.'</td><td align="center">'._QRCODE_EMAIL_H.'</td><td align="center">'._QRCODE_PHONE_H.'</td><td align="center">'._QRCODE_SMS_H.'</td><td align="center">'._QRCODE_TXT_H.'</td><td align="center">'._QRCODE_GEO_H.'</td><td align="center">'._QRCODE_BUS_H.'</td></tr></table>';
-
-echo '</div></td></tr></table></div>';
-}
-xoops_cp_footer();
-?>
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.0 //
+// ------------------------------------------------------------------------ //
+include '../../../include/cp_header.php';
+// if the site has no language defined, turn to English default
+if ( file_exists("../language/".$xoopsConfig['language']."/main.php") ) {
+include "../language/".$xoopsConfig['language']."/main.php"; } else { include "../language/english/main.php"; }
+include(XOOPS_ROOT_PATH.'/mainfile.php');
+include_once XOOPS_ROOT_PATH."/modules/qrcode/qrcode.php";
+xoops_cp_header();
+if(isset($_POST['type']))
+{
+ switch ($_POST['type'])
+ {
+
+
+ case "phone":
+ if (!$_POST['qr_phone'])
+ {
+ $res= _QRCODE_PHONE_F_ERROR_NR;
+ }
+ else
+ {
+ $data=array();
+ $type="phone";
+ $data['phonenr'] = $_POST['qr_phone'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+ }
+ break;
+
+ case "url":
+ if (!$_POST['qr_url'])
+ {
+ $res= _QRCODE_URL_F_ERROR_URL;
+ }
+ else
+ {
+ $data=array();
+ $type="url";
+ $data['url'] = $_POST['qr_url'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+ }
+ break;
+ case "email":
+ if (!$_POST['qr_email_to'])
+ {
+ $res= _QRCODE_EMAIL_F_ERROR_EMAIL;
+ }
+ else
+ {
+ $data=array();
+ $type="email";
+ $data['email']=$_POST['qr_email_to']; // Send email to ?
+ $data['subject']=$_POST['qr_email_sub']; // Subject of the email
+ $data['txt']=$_POST['qr_email_txt']; // Body of the email
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+ }
+ break;
+
+ case "sms":
+ if (!$_POST['qr_sms_to'])
+ {
+ $res= _QRCODE_SMS_F_ERROR_NR;
+ }
+ else
+ {
+ $data=array();
+ $type="sms";
+ $data['phonenr']=$_POST['qr_sms_to'];
+ $data['txt']=$_POST['qr_sms_txt'];
+ $res= qrcode($type,$data);
+
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+ }
+ break;
+
+ case "txt":
+ if (!$_POST['qr_txt'])
+ {
+ $res= _QRCODE_TXT_F_ERROR_TXT;
+ }
+ else
+ {
+ $data=array();
+ $type="txt";
+ $data['txt'] = $_POST['qr_txt'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ }
+ break;
+
+ case "geo":
+
+ $data=array();
+ $type="geo";
+ $data['lat'] = $_POST['qr_latitude'];
+ $data['long'] = $_POST['qr_longtitude'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ case "bus":
+
+ $data=array();
+ $type="contact";
+ $data['surname']=$_POST['qr_c_anaam'];
+ $data['name']=$_POST['qr_c_vnaam'];
+ $data['mobile']=$_POST['qr_c_gsm'];
+ $data['phonenr']=$_POST['qr_c_phone'];
+ $data['adres']=$_POST['qr_c_adres'];
+ $data['state']=$_POST['qr_c_state'];
+ $data['city']=$_POST['qr_c_city'];
+ $data['zipcode']=$_POST['qr_c_zip'];
+ $data['country']=$_POST['qr_c_land'];
+ $data['email']=$_POST['qr_c_email'];
+ $data['url']=$_POST['qr_c_web'];
+ $data['title']=$_POST['qr_c_functie'];
+ $data['company']=$_POST['qr_c_bedrijf'];
+ $data['b_year']=$_POST['qr_c_gjaar'];
+ $data['b_month']=$_POST['qr_c_gmaand'];
+ $data['b_day']=$_POST['qr_c_gdag'];
+ $res= qrcode($type,$data);
+
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:500px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;"><p>'._QRCODE_RESULT.'</p>';
+ echo $res;
+ echo '</div><BR><a href="main.php">'._QRCODE_MORE.'</a></div></td></tr><table>';
+ xoops_cp_footer();
+
+ break;
+
+ }
+
+ //break;
+ return;
+}
+
+if(isset($_GET['a']))
+{
+
+ switch ($_GET['a'])
+ {
+
+ case "url":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_URL_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_url.png" border="0" title="'._QRCODE_URL_D.'"></td><td>';
+ echo '<h2>'._QRCODE_URL_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_URL_F_URL.'</td><td><input name="qr_url" id="qr_url" type="text" size="50" value="http://" /></td><td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr></table></td></tr></table>
+ </div><input type="hidden" name="type" value="url"></form></div></div></td></tr></table>';
+ break;
+
+ case "email":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_EMAIL_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_email.png" border="0" title="'._QRCODE_EMAIL_D.'"></td><td>';
+ echo '<h2>'._QRCODE_EMAIL_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_EMAIL_F_TO.'</td><td><input name="qr_email_to" type="text" size="50" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td valign="middle">'._QRCODE_EMAIL_F_SUBJECT.'</td><td valign="top"><input name="qr_email_sub" type="text" size="50" /></td>
+ </tr><tr>
+ <td>'._QRCODE_EMAIL_F_TXT.'</td><td><input name="qr_email_txt" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="email"></form></div></div></td></tr></table>';
+ break;
+
+ case "phone":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_PHONE_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_phone.png" border="0" title="'._QRCODE_PHONE_D.'"></td><td>';
+ echo '<h2>'._QRCODE_PHONE_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_PHONE_F_NR.'</td><td><input name="qr_phone" type="text" size="50" /></td><td align=right><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr></table></td></tr></table>
+ </div><input type="hidden" name="type" value="phone"></form></div></div></td></tr></table>';
+ break;
+
+ case "sms":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_SMS_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_sms.png" border="0" title="'._QRCODE_SMS_D.'"></td><td>';
+ echo '<h2>'._QRCODE_SMS_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_SMS_F_NR.'</td><td><input name="qr_sms_to" type="text" size="50" maxsize="140" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td>'._QRCODE_SMS_F_TXT.'</td><td><input name="qr_sms_txt" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="sms"></form></div></div></td></tr></table>';
+ break;
+
+ case "txt":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_TXT_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_txt.png" border="0" title="'._QRCODE_TXT_D.'"></td><td>';
+ echo '<h2>'._QRCODE_TXT_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_TXT_F_TXT.'</td><td><textarea name="qr_txt" cols="45" rows="3" /></textarea></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="txt"></form></div></div></td></tr></table>';
+ break;
+
+ case "geo":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_GEO_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_geo.png" border="0" title="'._QRCODE_GEO_D.'"></td><td>';
+ echo '<h2>'._QRCODE_GEO_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_GEO_F_LA.'</td><td><input name="qr_latitude" type="text" size="50" /></td><td rowspan="3"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr>
+ <td>'._QRCODE_GEO_F_LO.'</td><td><input name="qr_longtitude" type="text" size="50" /></td>
+ </tr>
+
+ ';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="geo"></form></div></div></td></tr></table>';
+ break;
+
+
+ case "bus":
+ echo '<table width="400"><tr><td width="800"><div style="margin:30px;padding:10px;border:1px solid #aaa;width:700px;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.' :: '._QRCODE_BUS_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">';
+ echo '<table><tr><td width="150" align="left"><img src="../images/create_contact.png" border="0" title="'._QRCODE_BUS_D.'"></td><td>';
+ echo '<h2>'._QRCODE_BUS_D.'</h2>'._QRCODE_FORM.'<BR><BR>';
+ echo '<form id="form1" name="form1" method="post" action="main.php">';
+ echo '<div id="url_div"><table class="tabel"><tr><td>'._QRCODE_BUS_F_SNAME.'</td><td><input name="qr_c_anaam" type="text" size="50" /></td><td rowspan="17"align="right" valign="bottom"><input name="submit" id="submit" type="submit" value="'._QRCODE_FORM_SUBMIT.'" /></td>
+ </tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_FNAME.'</td><td><input name="qr_c_vnaam" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_COMPANY.'</td><td><input name="qr_c_bedrijf" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_TITLE.'</td><td><input name="qr_c_functie" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_PHONE.'</td><td><input name="qr_c_phone" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_MOB.'</td><td><input name="qr_c_gsm" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_EMAIL.'</td><td><input name="qr_c_email" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_WEB.'</td><td><input name="qr_c_web" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_ADRES.'</td><td><input name="qr_c_adres" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_ZIP.'</td><td><input name="qr_c_zip" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_CITY.'</td><td><input name="qr_c_city" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_STATE.'</td><td><input name="qr_c_state" type="text" size="50" /></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_COUNTRY.'</td><td><input name="qr_c_land" type="text" size="50" /></td></tr>';
+ echo '<tr><td colspan=2><BR><BR></td></tr>';
+ echo '<tr><td>'._QRCODE_BUS_F_BDAY.'</td><td><select name="qr_c_gdag">';
+ for($rt=1;$rt<=31;$rt++){
+ echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
+ }
+ echo '</select> / <select name="qr_c_gmaand">';
+ for($rt=1;$rt<=12;$rt++){
+ echo "<option value=\"".sprintf('%02d',$rt)."\">".sprintf('%02d',$rt)."</option>\n";
+ }
+ echo '</select> / <select name="qr_c_gjaar">';
+ for($rt=2011;$rt>=1920;$rt--){
+ echo "<option value=\"".$rt."\">".$rt."</option>\n";
+ }
+ echo '</select></td></tr>';
+ echo '</table></td></tr></table>
+ </div><input type="hidden" name="type" value="bus"></form></div></div></td></tr></table>';
+ break;
+
+ }
+
+
+
+
+}
+else {
+
+
+
+
+$module_handler =& xoops_gethandler('module');
+$versioninfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$version=$versioninfo->getInfo('version');
+$description=$versioninfo->getInfo('description');
+$author=$versioninfo->getInfo('author');
+$license=$versioninfo->getInfo('license');
+$licensefile=$versioninfo->getInfo('help');
+$status=$versioninfo->getInfo('status');
+$released=$versioninfo->getInfo('releasedate');
+echo '<div style="margin:30px;padding:10px;border:1px solid #aaa;">';
+echo '<table><tr>';
+echo '<td align="center" style="border-right:0px solid #aaa;"><img src="../images/logo.png"></td>';
+echo '<td><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_DESCRIPTION.'</h3><BR><BR></div></td></tr>';
+echo '<tr><td colspan="2"><div style="margin:30px;padding:10px;border:1px solid #aaa;"><div style="margin-bottom:5px;border-bottom:1px solid #aaa;"><h3>'._QRCODE_WIZARD_H.'</h3><font size="-2">'._QRCODE_WIZARD_D.'</font><BR><BR></div><div style="padding:10px;">'._QRCODE_CHOOSE;
+echo '<BR><BR><table><tr><td><a href="main.php?a=url"><img src="../images/create_url.png" border="0" title="'._QRCODE_URL_D.'"></a></td><td><a href="main.php?a=email"><img src="../images/create_email.png" border="0" title="'._QRCODE_EMAIL_D.'"></a></td><td><a href="main.php?a=phone"><img src="../images/create_phone.png" border="0" title="'._QRCODE_PHONE_D.'"></a></td><td><a href="main.php?a=sms"><img src="../images/create_sms.png" border="0" title="'._QRCODE_SMS_D.'"></a></td><td><a href="main.php?a=txt"><img src="../images/create_txt.png" border="0" title="'._QRCODE_TXT_D.'"></a></td><td><a href="main.php?a=geo"><img src="../images/create_geo.png" border="0" title="'._QRCODE_GEO_D.'"></a></td><td><a href="main.php?a=bus"><img src="../images/create_contact.png" border="0" title="'._QRCODE_BUS_D.'"></a></td></tr><tr>';
+echo '<td align="center">'._QRCODE_URL_H.'</td><td align="center">'._QRCODE_EMAIL_H.'</td><td align="center">'._QRCODE_PHONE_H.'</td><td align="center">'._QRCODE_SMS_H.'</td><td align="center">'._QRCODE_TXT_H.'</td><td align="center">'._QRCODE_GEO_H.'</td><td align="center">'._QRCODE_BUS_H.'</td></tr></table>';
+
+echo '</div></td></tr></table></div>';
+}
+xoops_cp_footer();
+?>
Modified: XoopsModules/qrcode/trunk/qrcode/docs/changelog.txt
===================================================================
--- XoopsModules/qrcode/trunk/qrcode/docs/changelog.txt 2012-12-18 19:57:26 UTC (rev 10446)
+++ XoopsModules/qrcode/trunk/qrcode/docs/changelog.txt 2012-12-18 20:27:25 UTC (rev 10447)
@@ -1,5 +1,7 @@
-Changelog
-======================
+v1.02
+============
++ fixed English translations (mamba)
++ fixed bug resulting in 'Cannot break/continue 1 level': you cannot use "break" in "if" statements, only in loops
v1.01
============
Modified: XoopsModules/qrcode/trunk/qrcode/language/english/main.php
===================================================================
--- XoopsModules/qrcode/trunk/qrcode/language/english/main.php 2012-12-18 19:57:26 UTC (rev 10446)
+++ XoopsModules/qrcode/trunk/qrcode/language/english/main.php 2012-12-18 20:27:25 UTC (rev 10447)
@@ -1,62 +1,62 @@
-<?php
-define('_QRCODE_FORM_SUBMIT','OK');
-define('_QRCODE_URL_H','Url');
-define('_QRCODE_TXT_H','Text');
-define('_QRCODE_SMS_H','Short Message Service (SMS)');
-define('_QRCODE_PHONE_H','Phone');
-define('_QRCODE_GEO_H','Coordinates');
-define('_QRCODE_BUS_H','Business card');
-define('_QRCODE_EMAIL_H','Email');
-define('_QRCODE_URL_D','Visit a webpage url');
-define('_QRCODE_TXT_D','Create plain text');
-define('_QRCODE_SMS_D','Send a SMS message');
-define('_QRCODE_PHONE_D','Call a phonenumber');
-define('_QRCODE_GEO_D','Visite geographical coordinates');
-define('_QRCODE_BUS_D','Create a Business card');
-define('_QRCODE_EMAIL_D','Send an email');
-
-define('_QRCODE_URL_F_URL','Url');
-define('_QRCODE_URL_F_ERROR_URL','The url given is not a valid url, please try again.');
-define('_QRCODE_TXT_F_TXT','Text');
-define('_QRCODE_TXT_F_ERROR_TXT','No text input, please try again.');
-define('_QRCODE_SMS_F_NR','Phonenumber');
-define('_QRCODE_SMS_F_ERROR_NR','Phonenumber is missing, please try again.');
-define('_QRCODE_SMS_F_TXT','Text');
-define('_QRCODE_PHONE_F_NR','Phonenumber');
-define('_QRCODE_PHONE_F_ERROR_NR','Phonenumber is missing, please try again.');
-define('_QRCODE_GEO_F_LA','Latitude');
-define('_QRCODE_GEO_F_LO','Longtitide');
-define('_QRCODE_BUS_F_SNAME','Sirname');
-define('_QRCODE_BUS_F_FNAME','First name');
-define('_QRCODE_BUS_F_COMPANY','Company');
-define('_QRCODE_BUS_F_TITLE','Title');
-define('_QRCODE_BUS_F_PHONE','Phonenumber');
-define('_QRCODE_BUS_F_MOB','Mobile number');
-define('_QRCODE_BUS_F_EMAIL','Emailaddress');
-define('_QRCODE_BUS_F_WEB','Website url');
-define('_QRCODE_BUS_F_ADRES','Adres (street + number)');
-define('_QRCODE_BUS_F_ZIP','Zipcode');
-define('_QRCODE_BUS_F_CITY','City');
-define('_QRCODE_BUS_F_STATE','State');
-define('_QRCODE_BUS_F_COUNTRY','Country');
-define('_QRCODE_BUS_F_BDAY','Birthday (D/M/Y)');
-define('_QRCODE_EMAIL_F_TO','Email to');
-define('_QRCODE_EMAIL_F_SUBJECT','Email subject');
-define('_QRCODE_EMAIL_F_TXT','Email text');
-define('_QRCODE_EMAIL_F_ERROR_EMAIL','The emailadress is missing, please try again.');
-
-define('_QRCODE_FORM','Please fill in appropiate field(s) in the form to create the qrcode.');
-define('_QRCODE_WIZARD_H','QRCode wizard');
-define('_QRCODE_WIZARD_D','This wizard guides you in creating the QRCode.');
-define('_QRCODE_CHOOSE','Please choose the type of QRCode you want to create.');
-define('_QRCODE_RESULT','Below is you QRCode. Use right mouse button to save the image.');
-define('_QRCODE_MORE','Create another one..');
-define('_QRCODE_VERSION','Version');
-define('_QRCODE_AUTHOR','Author');
-define('_QRCODE_RELEASEDATE','Releasedate');
-define('_QRCODE_DESCRIPTION',
-'<h1>Welcome to the QRCode module</h1>
-<p>This module allows other modules and developers to utilize QRCode within XOOPS.</p>
-<p>You can also use the wizard to create a QRCode right now!</p>');
-
+<?php
+define('_QRCODE_FORM_SUBMIT','OK');
+define('_QRCODE_URL_H','URL');
+define('_QRCODE_TXT_H','Text');
+define('_QRCODE_SMS_H','Short Message Service (SMS)');
+define('_QRCODE_PHONE_H','Phone');
+define('_QRCODE_GEO_H','Coordinates');
+define('_QRCODE_BUS_H','Business card');
+define('_QRCODE_EMAIL_H','Email');
+define('_QRCODE_URL_D','Visit a Web page URL');
+define('_QRCODE_TXT_D','Create plain text');
+define('_QRCODE_SMS_D','Send a SMS message');
+define('_QRCODE_PHONE_D','Call a phone number');
+define('_QRCODE_GEO_D','Visit geographical coordinates');
+define('_QRCODE_BUS_D','Create a Business card');
+define('_QRCODE_EMAIL_D','Send an email');
+
+define('_QRCODE_URL_F_URL','URL');
+define('_QRCODE_URL_F_ERROR_URL','The URL given is not a valid URL, please try again.');
+define('_QRCODE_TXT_F_TXT','Text');
+define('_QRCODE_TXT_F_ERROR_TXT','No text input, please try again.');
+define('_QRCODE_SMS_F_NR','Phone number');
+define('_QRCODE_SMS_F_ERROR_NR','Phone number is missing, please try again.');
+define('_QRCODE_SMS_F_TXT','Text');
+define('_QRCODE_PHONE_F_NR','Phone number');
+define('_QRCODE_PHONE_F_ERROR_NR','Phone number is missing, please try again.');
+define('_QRCODE_GEO_F_LA','Latitude');
+define('_QRCODE_GEO_F_LO','Longitude');
+define('_QRCODE_BUS_F_SNAME','Last name');
+define('_QRCODE_BUS_F_FNAME','First name');
+define('_QRCODE_BUS_F_COMPANY','Company');
+define('_QRCODE_BUS_F_TITLE','Title');
+define('_QRCODE_BUS_F_PHONE','Phone number');
+define('_QRCODE_BUS_F_MOB','Mobile number');
+define('_QRCODE_BUS_F_EMAIL','Email address');
+define('_QRCODE_BUS_F_WEB','Website URL');
+define('_QRCODE_BUS_F_ADRES','Address (street + number)');
+define('_QRCODE_BUS_F_ZIP','Zip code');
+define('_QRCODE_BUS_F_CITY','City');
+define('_QRCODE_BUS_F_STATE','State');
+define('_QRCODE_BUS_F_COUNTRY','Country');
+define('_QRCODE_BUS_F_BDAY','Birthday (D/M/Y)');
+define('_QRCODE_EMAIL_F_TO','Email to');
+define('_QRCODE_EMAIL_F_SUBJECT','Email subject');
+define('_QRCODE_EMAIL_F_TXT','Email text');
+define('_QRCODE_EMAIL_F_ERROR_EMAIL','The email address is missing, please try again.');
+
+define('_QRCODE_FORM','Please fill in appropriate field(s) in the form to create the QRCode.');
+define('_QRCODE_WIZARD_H','QRCode wizard');
+define('_QRCODE_WIZARD_D','This wizard guides you in creating the QRCode.');
+define('_QRCODE_CHOOSE','Please choose the type of QRCode you want to create.');
+define('_QRCODE_RESULT','Below is your QRCode. Use right mouse button to save the image.');
+define('_QRCODE_MORE','Create another one..');
+define('_QRCODE_VERSION','Version');
+define('_QRCODE_AUTHOR','Author');
+define('_QRCODE_RELEASEDATE','Release date');
+define('_QRCODE_DESCRIPTION',
+'<h1>Welcome to the QRCode module</h1>
+<p>This module allows other modules and developers to utilize QRCode within XOOPS.</p>
+<p>You can also use the wizard to create a QRCode right now!</p>');
+
?>
\ No newline at end of file
Modified: XoopsModules/qrcode/trunk/qrcode/xoops_version.php
===================================================================
--- XoopsModules/qrcode/trunk/qrcode/xoops_version.php 2012-12-18 19:57:26 UTC (rev 10446)
+++ XoopsModules/qrcode/trunk/qrcode/xoops_version.php 2012-12-18 20:27:25 UTC (rev 10447)
@@ -1,44 +1,44 @@
-<?php
-// ------------------------------------------------------------------------ //
-// Author: Designburo.nl (in...@de...) //
-// http://www.designburo.nl //
-// Project: QRcode v1.0 //
-// ------------------------------------------------------------------------ //
-
-$modversion['name'] = "QRcode";
-$modversion['version'] = 1.01;
-$modversion['description'] = "This module allows function for other modules to create QRCodes";
-$modversion['author'] = "Designburo.nl";
-$modversion['credits'] = "Designburo.nl";
-$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['official'] = 0;
-$modversion['image'] = "images/xoops_module_qrcode.png";
-$modversion['dirname'] = "qrcode";
-$modversion['releasedate'] = "Wednesday, 27th of April 2011";
-$modversion['status'] = "Stable";
-
-//about
-$modversion['release_date'] = '2011/04/20';
-$modversion["module_website_url"] = "http://ett.designburo.nl/";
-$modversion["module_website_name"] = "EasyTCPtransfer :: Designburo.nl";
-$modversion["module_status"] = "RC";
-$modversion["author_website_url"] = "http://www.designburo.nl";
-$modversion["author_website_name"] = "Designburo.nl";
-$modversion['min_php']='5.2';
-$modversion['min_xoops']="2.5";
-
-// Admin
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-
-// Menu
-$modversion['hasMain'] = 0;
-$modversion['system_menu'] = 1;
-
-// Templates
-$modversion['templates'][1]['file'] = 'help.html';
-$modversion['templates'][1]['description'] = '';
+<?php
+// ------------------------------------------------------------------------ //
+// Author: Designburo.nl (in...@de...) //
+// http://www.designburo.nl //
+// Project: QRcode v1.0 //
+// ------------------------------------------------------------------------ //
+
+$modversion['name'] = "QRcode";
+$modversion['version'] = 1.02;
+$modversion['description'] = "This module allows function for other modules to create QRCodes";
+$modversion['author'] = "Designburo.nl";
+$modversion['credits'] = "Designburo.nl";
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['official'] = 0;
+$modversion['image'] = "images/xoops_module_qrcode.png";
+$modversion['dirname'] = "qrcode";
+$modversion['releasedate'] = "Wednesday, 27th of April 2011";
+$modversion['status'] = "Stable";
+
+//about
+$modversion['release_date'] = '2011/12/18';
+$modversion["module_website_url"] = "http://ett.designburo.nl/";
+$modversion["module_website_name"] = "EasyTCPtransfer :: Designburo.nl";
+$modversion["module_status"] = "Final";
+$modversion["author_website_url"] = "http://www.designburo.nl";
+$modversion["author_website_name"] = "Designburo.nl";
+$modversion['min_php']='5.2';
+$modversion['min_xoops']="2.5";
+
+// Admin
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/index.php";
+$modversion['adminmenu'] = "admin/menu.php";
+
+// Menu
+$modversion['hasMain'] = 0;
+$modversion['system_menu'] = 1;
+
+// Templates
+$modversion['templates'][1]['file'] = 'help.html';
+$modversion['templates'][1]['description'] = '';
?>
\ No newline at end of file
|
|
From: <ma...@us...> - 2012-12-18 19:57:29
|
Revision: 10446
http://sourceforge.net/p/xoops/svn/10446
Author: mageg
Date: 2012-12-18 19:57:26 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
add conversion to pdf and somes bugs in module page
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/css/styles.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/print.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_print.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_viewpage.html
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_pdf.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php 2012-12-18 19:54:45 UTC (rev 10445)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php 2012-12-18 19:57:26 UTC (rev 10446)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
@@ -49,6 +49,7 @@
// extension
$admin_page->addConfigBoxLine(array('xoosocialnetwork', 'warning'), 'extension');
+$admin_page->addConfigBoxLine(array('pdf', 'warning'), 'extension');
$admin_page->displayIndex();
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php 2012-12-18 19:54:45 UTC (rev 10445)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php 2012-12-18 19:57:26 UTC (rev 10446)
@@ -120,7 +120,9 @@
$checkbox->addOption('ncoms', _AM_PAGE_CONTENT_DONCOMS);
$checkbox->addOption('notifications', _AM_PAGE_CONTENT_DONOTIFICATIONS);
$checkbox->addOption('pdf', _AM_PAGE_CONTENT_DOPDF);
- $checkbox->addOption('print', _AM_PAGE_CONTENT_DOPRINT);
+ if ($xoops->isActiveModule('pdf') == true) {
+ $checkbox->addOption('print', _AM_PAGE_CONTENT_DOPRINT);
+ }
$checkbox->addOption('mail', _AM_PAGE_CONTENT_DOMAIL);
if ($xoops->isActiveModule('xoosocialnetwork') == true) {
$checkbox->addOption('social', _AM_PAGE_CONTENT_DOSOCIAL);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/css/styles.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/css/styles.css 2012-12-18 19:54:45 UTC (rev 10445)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/css/styles.css 2012-12-18 19:57:26 UTC (rev 10446)
@@ -93,15 +93,3 @@
padding: 10px;
margin: 2px
}
-
-#page-logo-print {
- text-align: center;
- margin: 20px;
-}
-
-#page-footer-print {
- width: 640px;
- padding: 1px;
- text-align: center;
- margin: 20px 2px 20px 2px;
-}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/main.php 2012-12-18 19:54:45 UTC (rev 10445)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/language/english/main.php 2012-12-18 19:57:26 UTC (rev 10446)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
//generic
@@ -35,6 +35,7 @@
define("_MD_PAGE_VIEWPAGE_VOTE","votes");
define("_MD_PAGE_VIEWPAGE_SUMMARY","Summary");
define("_MD_PAGE_VIEWPAGE_PRINT","Printer page");
+define("_MD_PAGE_VIEWPAGE_PDF","PDF page");
// rating.php
define("_MD_PAGE_RATING_DONOTVOTE","Do not vote for your own files.");
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/pdf.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/pdf.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/pdf.php 2012-12-18 19:57:26 UTC (rev 10446)
@@ -0,0 +1,97 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XXX
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @since 2.6.0
+ * @author Mage Grégory (AKA Mage)
+ * @version $Id$
+ */
+include_once 'header.php';
+$xoops = Xoops::getInstance();
+$tpl = new XoopsTpl();
+
+// Get ID
+$content_id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+// Get handler
+$content_Handler = $xoops->getModuleHandler('page_content');
+$related_Handler = $xoops->getModuleHandler('page_related');
+
+$view_content = $content_Handler->get($content_id);
+
+// Test if the page exist
+if (count($view_content) == 0 || $view_content->getVar('content_status') == 0){
+ $xoops->redirect('index.php', 3, _MD_PAGE_VIEWPAGE_NOPAGE);
+ exit();
+}
+
+// Permission to view
+$perm_view = ($gperm_handler->checkRight('page_view_item', $content_id, $groups, $xoops->module->getVar('mid'), false)) ? true : false ;
+if(!$perm_view || $view_content->getVar('content_dopdf') == false) {
+ $xoops->redirect("index.php", 2, _NOPERM);
+ exit();
+}
+
+$tpl->assign('content_id' , $content_id);
+$tpl->assign('content_title' , $view_content->getVar('content_title'));
+$tpl->assign('content_shorttext' , $view_content->getVar('content_shorttext'));
+$tpl->assign('content_text' , $view_content->getVar('content_text'));
+$tpl->assign('content_author' , XoopsUser::getUnameFromId($view_content->getVar('content_author')));
+$tpl->assign('content_authorid' , $view_content->getVar('content_author'));
+$tpl->assign('content_hits' , sprintf(_MD_PAGE_VIEWPAGE_HITS, $view_content->getVar('content_hits')));
+$tpl->assign('content_date' , XoopsLocal::formatTimestamp($view_content->getVar('content_create'), $xoops->getModuleConfig('page_dateformat')));
+$tpl->assign('content_time' , XoopsLocal::formatTimestamp($view_content->getVar('content_create'), $xoops->getModuleConfig('page_timeformat')));
+$tpl->assign('content_comments' , $view_content->getVar('content_comments'));
+$tpl->assign('content_rating' , number_format($view_content->getVar('content_rating'), 1));
+$tpl->assign('content_votes' , $view_content->getVar('content_votes'));
+$tpl->assign('content_doauthor', $view_content->getVar('content_doauthor'));
+$tpl->assign('content_dodate', $view_content->getVar('content_dodate'));
+$tpl->assign('content_domail', $view_content->getVar('content_domail'));
+$tpl->assign('content_dohits', $view_content->getVar('content_dohits'));
+$tpl->assign('content_dorating', $view_content->getVar('content_dorating'));
+$tpl->assign('content_dotitle', $view_content->getVar('content_dotitle'));
+if ($view_content->getVar('content_docoms') == false){
+ $ncoms = false;
+} elseif ($view_content->getVar('content_doncoms') == false){
+ $ncoms = false;
+} else {
+ $ncoms = true;
+}
+$tpl->assign('content_doncoms', $ncoms);
+if ($view_content->getVar('content_dotitle') == false && $view_content->getVar('content_dorating') == false) {
+ $header = false;
+} else {
+ $header = true;
+}
+$tpl->assign('content_doheader', $header);
+if ($view_content->getVar('content_doauthor') == false && $view_content->getVar('content_dodate') == false && $view_content->getVar('content_dohits') == false && $ncoms == false) {
+ $footer = false;
+} else {
+ $footer = true;
+}
+$tpl->assign('content_dofooter', $footer);
+
+$page = new Page();
+
+$related = $page->menu_related($content_id);
+
+if ($related['domenu'] ) {
+ $tpl->assign('summary', $related['summary']);
+}
+
+$content = $tpl->fetch('module:page|page_pdf.html');
+
+$pdf = new Pdf();
+$pdf->writeHtml($content, false);
+$pdf->Output('example.pdf');
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/pdf.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/print.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/print.php 2012-12-18 19:54:45 UTC (rev 10445)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/print.php 2012-12-18 19:57:26 UTC (rev 10446)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
@@ -41,7 +41,7 @@
// Permission to view
$perm_view = ($gperm_handler->checkRight('page_view_item', $content_id, $groups, $xoops->module->getVar('mid'), false)) ? true : false ;
if(!$perm_view || $view_content->getVar('content_doprint') == false) {
- $xoops->redirect("javascript:history.go(-1)", 2, _NOPERM);
+ $xoops->redirect("index.php", 2, _NOPERM);
exit();
}
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_pdf.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_pdf.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_pdf.html 2012-12-18 19:57:26 UTC (rev 10446)
@@ -0,0 +1,73 @@
+<page backtop="20mm" backleft="15mm" backright="15mm" backbottom="20mm">
+ <page_footer>
+ <table style="width: 100%;">
+ <tr>
+ <td style="border-top:1px;text-align: center;width: 100%;">
+ <{$smarty.const._MD_PAGE_PRINT_COMES}> <{$xoops_sitename}>
+ <br />
+ <a href="<{$xoops_url}>" title="<{$xoops_sitename}>"><{$xoops_url}></a>
+ <br />
+ <br />
+ <{$smarty.const._MD_PAGE_PRINT_URL}>
+ <br />
+ <a href="<{$xoops_url}>/modules/page/viewpage.php?id=<{$content_id}>" title="<{$xoops_sitename}>"><{$xoops_url}>/modules/page/viewpage.php?id=<{$content_id}></a>
+ </td>
+ </tr>
+ </table>
+ </page_footer>
+ <table style="width: 100%;">
+ <tr >
+ <td colspan="2" style="text-align: center;">
+ <img src="<{$xoops_url}>/images/logo.png" alt="<{$xoops_sitename}>" />
+ <br />
+ <br />
+ <br />
+ <br />
+ </td>
+ </tr>
+ <{if $content_doheader}>
+ <tr>
+ <td style="border-bottom:1px;width:50%;text-align: left;">
+ <{if $content_dotitle}>
+ <h3><{$content_title}></h3>
+ <{/if}>
+ </td>
+ <td style="border-bottom:1px;width:50%;text-align: right;">
+ <{if $content_dorating}>
+ <{$smarty.const._MD_PAGE_VIEWPAGE_RATING}>: <{$content_rating}> (<{$content_votes}> <{$smarty.const._MD_PAGE_VIEWPAGE_VOTE}>)
+ <{/if}>
+ </td>
+ </tr>
+ <{/if}>
+ <tr >
+ <td colspan="2">
+ <{if $summary}>
+ <h4><{$smarty.const._MD_PAGE_VIEWPAGE_SUMMARY}>:</h4>
+ <ul>
+ <{foreach item=summary from=$summary}>
+ <li><{$summary}></li>
+ <{/foreach}>
+ </ul>
+ <{/if}>
+ <{$content_shorttext}>
+ <br />
+ <{$content_text}>
+ <br />
+ <br />
+ </td>
+ </tr>
+ <{if $content_dofooter}>
+ <tr>
+ <td style="border-top:1px;width:50%;text-align: left;">
+ <em><{if $content_doauthor}><{$smarty.const._MD_PAGE_VIEWPAGE_POSTEDBY}> <a href="<{$xoops_url}>/userinfo.php?uid=<{$content_authorid}>"><{$content_author}></a> <{/if}><{if $content_dodate}><{$smarty.const._MD_PAGE_VIEWPAGE_ON}> <{$content_date}> <{$content_time}> <{/if}><{if $content_dohits}><{$content_hits}><{/if}></em>
+ </td>
+ <td style="border-top:1px;width:50%;text-align: right;">
+ <{if $content_doncoms}>
+ <em><img src="<{$xoops_url}>/modules/page/images/comments.png" alt="<{$content_comments}>"/> (<{$content_comments}> <{$smarty.const._MD_PAGE_VIEWPAGE_COMMENTS}>)</em>
+ <{/if}>
+ </td>
+ </tr>
+ <{/if}>
+ </table>
+</page>
+
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_print.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_print.html 2012-12-18 19:54:45 UTC (rev 10445)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_print.html 2012-12-18 19:57:26 UTC (rev 10446)
@@ -25,66 +25,83 @@
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
-
+
</head>
<body class="<{$xoops_langcode}>" onload="window.print()">
<div id="page-print">
- <div id="page-logo-print">
- <img src="<{$xoops_url}>/images/logo.png" alt="<{$xoops_sitename}>" />
- </div>
- <{if $content_doheader}>
- <div class="page_header">
-
- <{if $content_dotitle}>
- <div class="page_headerleft">
- <{$content_title}>
- </div>
+ <table style="width: 100%;">
+ <tr >
+ <td colspan="2" style="text-align: center;">
+ <img src="<{$xoops_url}>/images/logo.png" alt="<{$xoops_sitename}>" />
+ <br />
+ <br />
+ <br />
+ <br />
+ </td>
+ </tr>
+ <{if $content_doheader}>
+ <tr>
+ <td style="border-bottom:1px;width:50%;text-align: left;">
+ <{if $content_dotitle}>
+ <h3><{$content_title}></h3>
+ <{/if}>
+ </td>
+ <td style="border-bottom:1px;width:50%;text-align: right;">
+ <{if $content_dorating}>
+ <{$smarty.const._MD_PAGE_VIEWPAGE_RATING}>: <{$content_rating}> (<{$content_votes}> <{$smarty.const._MD_PAGE_VIEWPAGE_VOTE}>)
+ <{/if}>
+ </td>
+ </tr>
<{/if}>
- </div>
- <{if $content_dorating}>
- <div class="page_vote">
- <{$smarty.const._MD_PAGE_VIEWPAGE_RATING}>: <{$content_rating}> (<{$content_votes}> <{$smarty.const._MD_PAGE_VIEWPAGE_VOTE}>)
- </div>
- <{/if}>
- <{/if}>
- <div class="page_content">
- <{if $summary}>
- <h4><{$smarty.const._MD_PAGE_VIEWPAGE_SUMMARY}>:</h4>
- <div>
- <ul>
- <{foreach item=summary from=$summary}>
- <li><{$summary}></li>
- <{/foreach}>
- </ul>
- </div>
+ <tr >
+ <td colspan="2">
+ <{if $summary}>
+ <h4><{$smarty.const._MD_PAGE_VIEWPAGE_SUMMARY}>:</h4>
+ <ul>
+ <{foreach item=summary from=$summary}>
+ <li><{$summary}></li>
+ <{/foreach}>
+ </ul>
+ <{/if}>
+ <{$content_shorttext}>
+ <br />
+ <{$content_text}>
+ <br />
+ <br />
+ </td>
+ </tr>
+ <{if $content_dofooter}>
+ <tr>
+ <td style="border-top:1px;width:50%;text-align: left;">
+ <em><{if $content_doauthor}><{$smarty.const._MD_PAGE_VIEWPAGE_POSTEDBY}> <a href="<{$xoops_url}>/userinfo.php?uid=<{$content_authorid}>"><{$content_author}></a> <{/if}><{if $content_dodate}><{$smarty.const._MD_PAGE_VIEWPAGE_ON}> <{$content_date}> <{$content_time}> <{/if}><{if $content_dohits}><{$content_hits}><{/if}></em>
+ </td>
+ <td style="border-top:1px;width:50%;text-align: right;">
+ <{if $content_doncoms}>
+ <em><img src="<{$xoops_url}>/modules/page/images/comments.png" alt="<{$content_comments}>"/> (<{$content_comments}> <{$smarty.const._MD_PAGE_VIEWPAGE_COMMENTS}>)</em>
+ <{/if}>
+ </td>
+ </tr>
<{/if}>
- <{$content_shorttext}>
- <br />
- <{$content_text}>
- </div>
- <{if $content_dofooter}>
- <div class="page_footer">
-
- <div class="page_footerleft">
- <{if $content_doauthor}><{$smarty.const._MD_PAGE_VIEWPAGE_POSTEDBY}> <a href="<{$xoops_url}>/userinfo.php?uid=<{$content_authorid}>"><{$content_author}></a> <{/if}><{if $content_dodate}><{$smarty.const._MD_PAGE_VIEWPAGE_ON}> <{$content_date}> <{$content_time}> <{/if}><{if $content_dohits}><{$content_hits}><{/if}>
- </div>
- <{if $content_doncoms}>
- <div class="page_footerright">
- <img src="<{$xoops_url}>/modules/page/images/comments.png" alt="<{$content_comments}>"/> (<{$content_comments}> <{$smarty.const._MD_PAGE_VIEWPAGE_COMMENTS}>)
- </div>
- <{/if}>
- </div>
- <{/if}>
- </div>
- <div id="page-footer-print">
- <{$smarty.const._MD_PAGE_PRINT_COMES}> <{$xoops_sitename}>
+ </table>
<br />
- <a href="<{$xoops_url}>" title="<{$xoops_sitename}>"><{$xoops_url}></a>
<br />
<br />
- <{$smarty.const._MD_PAGE_PRINT_URL}>
<br />
- <a href="<{$xoops_url}>/modules/page/viewpage.php?id=<{$content_id}>" title="<{$xoops_sitename}>"><{$xoops_url}>/modules/page/viewpage.php?id=<{$content_id}></a>
+ <br />
+ <table style="width: 100%;">
+ <tr>
+ <td style="border-top:1px;text-align: center;width: 100%;">
+ <{$smarty.const._MD_PAGE_PRINT_COMES}> <{$xoops_sitename}>
+ <br />
+ <a href="<{$xoops_url}>" title="<{$xoops_sitename}>"><{$xoops_url}></a>
+ <br />
+ <br />
+ <{$smarty.const._MD_PAGE_PRINT_URL}>
+ <br />
+ <a href="<{$xoops_url}>/modules/page/viewpage.php?id=<{$content_id}>" title="<{$xoops_sitename}>"><{$xoops_url}>/modules/page/viewpage.php?id=<{$content_id}></a>
+ </td>
+ </tr>
+ </table>
</div>
</body>
</html>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_viewpage.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_viewpage.html 2012-12-18 19:54:45 UTC (rev 10445)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_viewpage.html 2012-12-18 19:57:26 UTC (rev 10446)
@@ -1,7 +1,7 @@
<script>
$(function(){
$('.star_rating').rating({
- callback: function(value, link){
+ callback: function(value, link){
//if (confirm("The value selected was '" + value + "'\n <{$title}>")) {
this.form.submit();
//}
@@ -48,11 +48,14 @@
<{includeq file="module:page|page_navigation.html"}>
<div class="clear"></div>
<{/if}>
-
+
<div class="right">
- <{if $content_doprint}>
+ <{if $content_doprint}>
<a href="<{$xoops_url}>/modules/page/print.php?id=<{$content_id}>" title="<{$smarty.const._MD_PAGE_VIEWPAGE_PRINT}>"><img src="<{xoAppUrl media/xoops/images/icons/16/printer.png}>" alt="<{$smarty.const._MD_PAGE_VIEWPAGE_PRINT}>" /></a>
<{/if}>
+ <{if $content_dopdf}>
+ <a href="<{$xoops_url}>/modules/page/pdf.php?id=<{$content_id}>" title="<{$smarty.const._MD_PAGE_VIEWPAGE_PDF}>"><img src="<{xoAppUrl media/xoops/images/icons/16/pdf.png}>" alt="<{$smarty.const._MD_PAGE_VIEWPAGE_PDF}>" /></a>
+ <{/if}>
</div>
</div>
<{if $content_dofooter}>
|
|
From: <ma...@us...> - 2012-12-18 19:54:51
|
Revision: 10445
http://sourceforge.net/p/xoops/svn/10445
Author: mageg
Date: 2012-12-18 19:54:45 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Deletion of the last version of TCPDF. Htm2pdf work only with version 5.0.002
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/html2pdf.class.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/2dbarcodes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/CHANGELOG.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/LICENSE.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/README.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/barcodes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/cache/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/cache/chapter_demo_1.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/cache/chapter_demo_2.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/cache/table_data_demo.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/cache/utf8test.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/lang/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/lang/bra.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/lang/eng.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/lang/ger.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/lang/ita.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/tcpdf_config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/config/tcpdf_config_alt.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/doc/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/doc/read_me.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/examples/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/examples/read_me.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/README.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/ZarBold.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/ZarBold.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/almohanad.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/almohanad.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/almohanad.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/arialunicid0.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/courier.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/AUTHORS
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/BUGS
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/LICENSE
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/NEWS
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/README
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/langcover.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/status.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavu-fonts-ttf-2.30/unicover.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusans.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusans.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusans.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensed.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensed.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensed.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusanscondensedi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmono.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmono.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmono.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonob.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonob.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonob.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonobi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonobi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonobi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonoi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonoi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavusansmonoi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserif.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserif.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserif.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensed.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensed.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensed.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifcondensedi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/dejavuserifi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/AUTHORS
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/COPYING
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/CREDITS
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/ChangeLog
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/INSTALL
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freefont-20090104/README
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemono.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemono.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemono.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonob.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonob.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonob.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonobi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonobi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonobi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonoi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonoi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freemonoi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesans.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesans.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesans.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freesansi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserif.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserif.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserif.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifb.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifb.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifbi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifbi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifi.ctg.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/freeserifi.z
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/helvetica.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/helveticab.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/helveticabi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/helveticai.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/hysmyeongjostdmedium.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/kozgopromedium.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/kozminproregular.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/msungstdlight.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/stsongstdlight.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/symbol.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/times.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/timesb.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/timesbi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/timesi.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/uni2cid_ac15.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/uni2cid_ag15.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/uni2cid_aj16.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/uni2cid_ak12.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/README.TXT
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1250.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1251.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1252.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1253.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1254.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1255.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1257.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp1258.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/cp874.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-1.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-11.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-15.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-16.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-2.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-4.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-5.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-7.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/iso-8859-9.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/koi8-r.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/enc/koi8-u.map
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/freetype6.dll
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/makeallttffonts.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/makefont.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/pfm2afm
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/pfm2afm.exe
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/src/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/src/pfm2afm-src.tar.gz
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/src/readme.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/src/ttf2ufm-src.tar.gz
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/ttf2ufm
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/ttf2ufm.exe
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/utils/zlib1.dll
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/zapfdingbats.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/fonts/zarbold.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/htmlcolors.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/images/read_me.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/qrcode.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/tcpdf.crt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/tcpdf.fdf
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/tcpdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/unicode_data.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.9.201/
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/2dbarcodes.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/2dbarcodes.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/2dbarcodes.php 2012-12-18 19:54:45 UTC (rev 10445)
@@ -0,0 +1,155 @@
+<?php
+//============================================================+
+// File name : 2dbarcodes.php
+// Begin : 2009-04-07
+// Last Update : 2010-04-30
+// Version : 1.0.003
+// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
+// ----------------------------------------------------------------------------
+// Copyright (C) 2008-2009 Nicola Asuni - Tecnick.com S.r.l.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// See LICENSE.TXT file for more information.
+// ----------------------------------------------------------------------------
+//
+// Description : PHP class to creates array representations for
+// 2D barcodes to be used with TCPDF.
+//
+// Author: Nicola Asuni
+//
+// (c) Copyright:
+// Nicola Asuni
+// Tecnick.com S.r.l.
+// Via della Pace, 11
+// 09044 Quartucciu (CA)
+// ITALY
+// www.tecnick.com
+// in...@te...
+//============================================================+
+
+/**
+ * PHP class to creates array representations for 2D barcodes to be used with TCPDF.
+ * @package com.tecnick.tcpdf
+ * @abstract Functions for generating string representation of 2D barcodes.
+ * @author Nicola Asuni
+ * @copyright 2008-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - in...@te...
+ * @link http://www.tcpdf.org
+ * @license http://www.gnu.org/copyleft/lesser.html LGPL
+ * @version 1.0.003
+ */
+
+ /**
+ * PHP class to creates array representations for 2D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
+ * @name TCPDFBarcode
+ * @package com.tecnick.tcpdf
+ * @version 1.0.003
+ * @author Nicola Asuni
+ * @link http://www.tcpdf.org
+ * @license http://www.gnu.org/copyleft/lesser.html LGPL
+ */
+class TCPDF2DBarcode {
+
+ /**
+ * @var array representation of barcode.
+ * @access protected
+ */
+ protected $barcode_array = false;
+
+ /**
+ * This is the class constructor.
+ * Return an array representations for 2D barcodes:<ul>
+ * <li>$arrcode['code'] code to be printed on text label</li>
+ * <li>$arrcode['num_rows'] required number of rows</li>
+ * <li>$arrcode['num_cols'] required number of columns</li>
+ * <li>$arrcode['bcode'][$r][$c] value of the cell is $r row and $c column (0 = transparent, 1 = black)</li></ul>
+ * @param string $code code to print
+ * @param string $type type of barcode: <ul>li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>QRCODE : QR-CODE Low error correction</li><li>QRCODE,L : QR-CODE Low error correction</li><li>QRCODE,M : QR-CODE Medium error correction</li><li>QRCODE,Q : QR-CODE Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li></ul>
+ */
+ public function __construct($code, $type) {
+ $this->setBarcode($code, $type);
+ }
+
+ /**
+ * Return an array representations of barcode.
+ * @return array
+ */
+ public function getBarcodeArray() {
+ return $this->barcode_array;
+ }
+
+ /**
+ * Set the barcode.
+ * @param string $code code to print
+ * @param string $type type of barcode: <ul><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>QRCODE : QR-CODE Low error correction</li><li>QRCODE,L : QR-CODE Low error correction</li><li>QRCODE,M : QR-CODE Medium error correction</li><li>QRCODE,Q : QR-CODE Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li></ul>
+ * @return array
+ */
+ public function setBarcode($code, $type) {
+ $mode = explode(',', $type);
+ $qrtype = strtoupper($mode[0]);
+ switch ($qrtype) {
+ case 'QRCODE': { // QR-CODE
+ require_once(dirname(__FILE__).'/qrcode.php');
+ if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) {
+ $mode[1] = 'L'; // Ddefault: Low error correction
+ }
+ $qrcode = new QRcode($code, strtoupper($mode[1]));
+ $this->barcode_array = $qrcode->getBarcodeArray();
+ break;
+ }
+ case 'RAW':
+ case 'RAW2': { // RAW MODE
+ // remove spaces
+ $code = preg_replace('/[\s]*/si', '', $code);
+ if (strlen($code) < 3) {
+ break;
+ }
+ if ($qrtype == 'RAW') {
+ // comma-separated rows
+ $rows = explode(',', $code);
+ } else {
+ // rows enclosed in square parethesis
+ $code = substr($code, 1, -1);
+ $rows = explode('][', $code);
+ }
+ $this->barcode_array['num_rows'] = count($rows);
+ $this->barcode_array['num_cols'] = strlen($rows[0]);
+ $this->barcode_array['bcode'] = array();
+ foreach ($rows as $r) {
+ $this->barcode_array['bcode'][] = str_split($r, 1);
+ }
+ break;
+ }
+ case 'TEST': { // TEST MODE
+ $this->barcode_array['num_rows'] = 5;
+ $this->barcode_array['num_cols'] = 15;
+ $this->barcode_array['bcode'] = array(
+ array(1,1,1,0,1,1,1,0,1,1,1,0,1,1,1),
+ array(0,1,0,0,1,0,0,0,1,0,0,0,0,1,0),
+ array(0,1,0,0,1,1,0,0,1,1,1,0,0,1,0),
+ array(0,1,0,0,1,0,0,0,0,0,1,0,0,1,0),
+ array(0,1,0,0,1,1,1,0,1,1,1,0,0,1,0));
+ break;
+ }
+ default: {
+ $this->barcode_array = false;
+ }
+ }
+ }
+} // end of class
+
+//============================================================+
+// END OF FILE
+//============================================================+
+?>
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/2dbarcodes.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/CHANGELOG.TXT
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/CHANGELOG.TXT (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/html2pdf/_tcpdf_5.0.002/CHANGELOG.TXT 2012-12-18 19:54:45 UTC (rev 10445)
@@ -0,0 +1,1384 @@
+5.0.002 (2010-05-06)
+ - Bookmark() and related methods were fixed to accept HTML code.
+ - A problem on HTML links was fixed.
+
+5.0.001 (2010-05-06)
+ - Protected method _putstream was re-added for backward compatibility.
+ - The following method were added to display HTML Table Of Content (see example n. 59):
+ addTOCPage(), endTOCPage(), addHTMLTOC().
+
+5.0.000 (2010-05-05)
+ - Method ImageSVG() was added to embedd SVG images (see example n. 58). Note that not all SVG images are supported.
+ - Method setRasterizeVectorImages() was added to enable/disable rasterization for vector images via ImageMagick library.
+ - Method RoundedRectXY() was added.
+ - Method PieSectorXY() was added.
+ - Gradient() method is now public and support new features.
+ - Shading to transparency is now supported.
+ - Image alignments were fixed.
+ - Support for dynamic images were improved.
+ - PDF_IMAGE_SCALE_RATIO has been changed to 1.25 for better compatibility with SVG.
+ - RAW and RAW2 modes were added to 2D Barcodes (see example n. 50).
+ - Automatic padding feature was added on barcodes (see examples n. 27 and 50).
+ - Bug #2995003 "Reproduced thead bug" was fixed.
+ - The Output() method now accepts FI and FD destinations to save the document on server before sending it to the client.
+ - Ellipse() method was improved and fixed (see page 2 of example n. 12).
+
+--------------------------------------------------------------------------------
+
+4.9.018 (2010-04-21)
+ - Bug item #2990356 "Current font size not respected with more than two HTML <p>" was fixed.
+
+4.9.017 (2010-04-21)
+ - Bug item #2990224 "Different behaviour for equivalent HTML strings" was fixed.
+ - Bug item #2990314 "Dash is not appearing with SHY character" was fixed.
+
+4.9.016 (2010-04-20)
+ - An error on htmlcolors.php was fixed.
+ - getImageFileType() method was improved.
+ - GIF images with transparency are now better supported.
+ - Automatic page orientation was improved.
+
+4.9.015 (2010-04-20)
+ - A new method copyPage() was added to clone pages (see example n. 44).
+ - Support for text overline was added.
+ - Underline and linethrough methods were fixed.
+ - Bug #2989058 "SHY character causes unnecessary word-wrapping" was fixed.
+
+4.9.014 (2010-04-18)
+ - Bug item #2988845 was fixed.
+
+4.9.013 (2010-04-15)
+ - Image() and ImageEPS() methods were fixed and improved; $fitonpage parameter was added.
+
+4.9.012 (2010-04-12)
+ - The hyphenateText() method was added to automatically hyphenate text (see example n. 46).
+
+4.9.011 (2010-04-07)
+ - Vertical alignments for Cell() method were improved (see example n. 57).
+
+4.9.010 (2010-04-06)
+ - Signature of Cell() method now includes new parameters for vertical alignment (see example n. 57).
+ - Text() method was extended to include all Cell() parameters.
+ - HTML line alignment procedure was changed to fix some bugs.
+
+4.9.009 (2010-04-05)
+ - Text() method was fixed for backward compatibility.
+
+4.9.008 (2010-04-03)
+ - Additional line space after table header was removed.
+ - Support for HTML lists in multicolumn mode was added.
+ - The method setTextRenderingMode() was added to set text rendering modes (see the example n. 26).
+ - The following HTML attributes were added to set text rendering modes (see the example n. 26): stroke, strokecolor, fill.
+
+4.9.007 (2010-04-03)
+ - Font Descent computation was fixed (patch #2981441).
+
+4.9.006 (2010-04-02)
+ - The constant K_TCPDF_CALLS_IN_HTML was added on configuration file to enable/disable the ability to call TCPDF methods in HTML.
+ - The usage of tcpdf tag in HTML mode was changed to remove the possible security flaw offered by the eval() function (thanks to Matthias Hecker for spotting this security problem). See the new example n. 49 for further information.
+
+4.9.005 (2010-04-01)
+ - Bug# 2980354 "Wrong File attachment description with security" was fixed.
+ - Several problems with HTML line alignment were fixed.
+ - The constant K_THAI_TOPCHAR was added on configuration file to enable/disable the special procedure used to avoid the overlappind of symbols on Thai language.
+ - A problem with font name directory was fixed.
+ - A bug on _destroy() method was fixed.
+
+4.9.004 (2010-03-31)
+ - Patch #979681 "GetCharWidth - default character width" was applied (bugfix).
+
+4.9.003 (2010-03-30)
+ - Problem of first <br /> on multiple columns was fixed.
+ - HTML line alignment was fixed.
+ - A QR-code bug was fixed.
+
+4.9.002 (2010-03-29)
+ - Patch #2978349 "$ignore_min_height is ignored in function Cell()" was applied.
+ - Bug #2978607 "2D Barcodes are wrong" was fixed.
+ - A problem with HTML block tags was fixed.
+ - Artificial italic for CID-0 fonts was added.
+ - Several multicolumn bugs were fixed.
+ - Support for HTML tables on multicolumn was added.
+
+4.9.001 (2010-03-28)
+ - QR Code minor bug was fixed.
+ - Multicolumn mode was added (see the new example n. 10).
+ - The following methods were added: setEqualColumns(), setColumnsArray(), selectColumn().
+ - Thai diacritics support were changed (note that this is incompatible with html justification).
+
+4.9.000 (2010-03-27)
+ - QR Code (2D barcode) support was added (see example n. 50).
+ - The following methods were added to print crop and registration marks (see example n. 56): colorRegistrationBar(), cropMark(), registrationMark().
+ - Limited support for CSS line-height property was added.
+ - Gradient method now supports Gray, RGB and CMYK space color.
+ - Example n. 51 was updated.
+ - Vertical alignment of font inside cell was fixed.
+ - Support for multiple Thai diacritics was added.
+ - Bug item #2974929 "Duplicate case values" was fixed.
+ - Bug item #2976729 "File attachment not working with security" was fixed.
+
+--------------------------------------------------------------------------------
+
+4.8.039 (2010-03-20)
+ - Problems related to custom locale settings were fixed.
+ - Problems related to HTML on Header and Footer were fixed.
+
+4.8.038 (2010-03-13)
+ - Various bugs related to page-break in HTML mode were fixed.
+ - Bug item #2968974 "Another <thead> pagebreak problem" was fixed.
+ - Bug item #2969276 "justification problem" was fixed.
+ - Bug item #2969289 "bug when using justified text and custom headers" was fixed.
+ - Images are now automatically resized to be contained on the page.
+ - Some HTML line alignments were fixed.
+ - Signature of AddPage() and SetMargins() methods were changed to include an option to set default page margins.
+
+4.8.037 (2010-03-03)
+ - Bug item #2962068 was fixed.
+ - Bug item #2967017 "Problems with <thead> and pagebreaks" was fixed.
+ - Bug item #2967023 "table header lost with pagebreak" was fixed.
+ - Bug item #2967032 "Header lost with nested tables" was fixed.
+
+4.8.036 (2010-02-24)
+ - Automatic page break for HTML images was improved.
+ - Example 10 was updated.
+ - Japanese was removed from example 8 because the freeserif font doesn't contain japanese (you can display it using arialunicid0 font).
+
+4.8.035 (2010-02-23)
+ - Automatic page break for HTML images was added.
+ - Support for multicolumn HTML was added (example 10 was updated).
+
+4.8.034 (2010-02-17)
+ - Language files were updated.
+
+4.8.033 (2010-02-12)
+ - A bug related to protection mode with links was fixed.
+
+4.8.032 (2010-02-04)
+ - A bug related to $maxh parameter on Write() and MultiCell() was fixed.
+ - Support for body tag was added.
+
+4.8.031 (2010-01-30)
+ - Bug item #2941589 "paragraph justify not working on some non-C locales" was fixed.
+
+4.8.030 (2010-01-27)
+ - Some text alignment cases were fixed.
+
+4.8.029 (2010-01-27)
+ - Bug item #2941057 "TOC Error in PDF File Output" was fixed.
+ - Some text alignment cases were fixed.
+
+4.8.028 (2010-01-26)
+ - Text alignment for RTL mode was fixed.
+
+4.8.027 (2010-01-25)
+ - Bug item #2938412 "Table related problems - thead, nobr, table width" was fixed.
+
+4.8.026 (2010-01-19)
+ - The misspelled word "lenght" was replaced with "length" in some variables and comments.
+
+4.8.025 (2010-01-18)
+ - addExtGState() method was improved to reuse existing ExtGState objects.
+
+4.8.024 (2010-01-15)
+ - Justification mode for HTML was fixed (Bug item #2932470).
+
+4.8.023 (2010-01-15)
+ - Bug item #2932470 "Some HTML entities breaks justification" was fixed.
+
+4.8.022 (2010-01-14)
+ - Source code documentation was fixed.
+
+4.8.021 (2010-01-03)
+ - A Bug relative to Table Of Content index was fixed.
+
+4.8.020 (2009-12-21)
+ - Bug item #2918545 "Display problem of the first row of a table with larger font" was fixed.
+ - A Bug relative to table rowspan mode was fixed.
+
+4.8.019 (2009-12-16)
+ - Bug item #2915684 "Image size" was fixed.
+ - Bug item #2914995 "Image jpeg quality" was fixed.
+ - The signature of the Image() method was changed (check the documentation for the $resize parameter).
+
+4.8.018 (2009-12-15)
+ - Bug item #2914352 "write error" was fixed.
+
+4.8.017 (2009-11-27)
+ - THEAD problem when table is used on header/footer was fixed.
+ - A first line alignment on HTML justification was fixed.
+ - Method getImageFileType() was added.
+ - Images with unknown extension and type are now supported via ImageMagick PHP extension.
+
+4.8.016 (2009-11-21)
+ - Document Information Dictionary was fixed.
+ - CSS attributes 'page-break-before', 'page-break-after' and 'page-break-inside' are now supported.
+ - Problem of unclosed last page was fixed.
+ - Problem of 'thead' unnecessarily repeated on the next page was fixed.
+
+4.8.015 (2009-11-20)
+ - A problem with some PNG transparency images was fixed.
+ - Bug #2900762 "Sort issues in Bookmarks" was fixed.
+ - Text justification was fixed for various modes: underline, strikeout and background.
+
+4.8.014 (2009-11-04)
+ - Bug item #2891316 "writeHTML, underlining replacing spaces" was fixed.
+ - The handling of temporary RTL text direction mode was fixed.
+
+4.8.013 (2009-10-26)
+ - Bug item #2884729 "Problem with word-wrap and hyphen" was fixed.
+
+4.8.012 (2009-10-23)
+ - Table cell alignments for RTL booklet mode were fixed.
+ - Images and barcode alignments for booklet mode were fixed.
+
+4.8.011 (2009-10-22)
+ - DejaVu fonts were updated to latest version.
+
+4.8.010 (2009-10-21)
+ - Bookmark for TOC page was added.
+ - Signature of addTOC() method is changed.
+ - Bookmarks are now automatically sorted by page and Y position.
+ - Example n. 45 was updated.
+ - Example n. 55 was added to display all charactes available on core fonts.
+
+4.8.009 (2009-09-30)
+ - Compatibility with PHP 5.3 was improved.
+ - All examples were updated.
+ - Index file for examples was added.
+
+4.8.008 (2009-09-29)
+ - Example 49 was updated.
+ - Underline and linethrough now works with cell stretching mode.
+
+4.8.007 (2009-09-23)
+ - Infinite loop problem caused by nobr attribute was fixed.
+
+4.8.006 (2009-09-23)
+ - Bug item #2864522 "No images if DOCUMENT_ROOT=='/'" was fixed.
+ - Support for text-indent CSS attribute was added.
+ - Method rollbackTransaction() was changed to support self-reassigment of previous object (check source code documentation).
+ - Support for the HTML "nobr" attribute was added to avoid splitting a table or a table row on two pages (i.e.: <tr nobr="true">...</tr>).
+
+4.8.005 (2009-09-17)
+ - A bug relative to multiple transformations and annotations was fixed.
+
+4.8.004 (2009-09-16)
+ - A bug on _putannotsrefs() method was fixed.
+
+4.8.003 (2009-09-15)
+ - Bug item #2858754 "Division by zero" was fixed.
+ - A bug relative to HTML list items was fixed.
+ - A bug relative to form fields on multiple pages was fixed.
+ - PolyLine() method was added (see example n. 12).
+ - Signature of Polygon() method was changed.
+
+4.8.002 (2009-09-12)
+ - A problem related to CID-0 fonts offset was fixed: if the $cw[1] entry on the CID-0 font file is not defined, then a CID keys offset is introduced.
+
+4.8.001 (2009-09-09)
+ - The appearance streams (AP) for anotations form fields was fixed (see examples n. 14 and 54).
+ - Radiobuttons were fixed.
+
+4.8.000 (2009-09-07)
+ - This version includes some support for Forms fields (see example n. 14) and XHTML forms (see example n. 54).
+ - The following methods were changed to work without JavaScript: TextField(), RadioButton(), ListBox(), ComboBox(), CheckBox(), Button().
+ - Support for Widget annotations was improved.
+ - Alignment of annotation objects was fixed (examples 36 and 41 were updated).
+ - addJavascriptObject() method was added.
+ - Signature of Image() method was changed.
+ - htmlcolors.php file was updated.
+
+--------------------------------------------------------------------------------
+
+4.7.003 (2009-09-03)
+ - Support for TCPDF methods on HTML was improved (see example n. 49).
+
+4.7.002 (2009-09-02)
+ - Bug item #2848892 "writeHTML + table: Gaps between rows" was fixed.
+ - JavaScript support was fixed (see example n. 53).
+
+4.7.001 (2009-08-30)
+ - The Polygon() and Arrow() methods were fixed and improved (see example n. 12).
+
+4.7.000 (2009-08-29)
+ - This is a major release.
+ - Some procedures were internally optimized.
+ - The problem of mixed signature and annotations was fixed (example n. 52).
+
+4.6.030 (2009-08-29)
+ - IMPORTANT: percentages on table cell widths are now relative to the full table width (as in standard HTML).
+ - Various minor bugs were fixed.
+ - Example n. 52 (digital signature) was updated.
+
+4.6.029 (2009-08-26)
+ - PHP4 version was fixed.
+
+4.6.028 (2009-08-25)
+ - Signature algorithm was finally fixed (see example n. 52).
+
+4.6.027 (2009-08-24)
+ - TCPDF now supports unembedded TrueTypeUnicode Fonts (just comment the $file entry on the fonts' php file.
+
+4.6.026 (2009-08-21)
+ - Bug #2841693 "Problem with MultiCell and ishtml and justification" was fixed.
+ - Signature functions were improved but not yet fixed (tcpdf.crt and example n. 52 were updated).
+
+4.6.025 (2009-08-17)
+ - Carriage returns (\r) were removed from source code.
+ - Problem related to set_magic_quotes_runtime() depracated was fixed.
+
+4.6.024 (2009-08-07)
+ - Bug item #2833556 "justification using other units than mm" was fixed.
+ - Documentation was fixed/updated.
+
+4.6.023 (2009-08-02)
+ - Bug item #2830537 "MirrorH can show mask for transparent PNGs" was fixed.
+
+4.6.022 (2009-07-24)
+ - A bug relative to single line printing when using WriteHTMLCell() was fixed.
+ - Signature support were improved but is still experimental.
+ - Fonts Free and Dejavu were updated to latest versions.
+
+4.6.021 (2009-07-20)
+ - Bug item #2824015 "XHTML Ampersand & in hyperlink bug" was fixed.
+ - Bug item #2824036 "Image as hyperlink in table, text displaced at page break" was fixed.
+ - Links alignment on justified text was fixed.
+ - Unicode "\u" modifier was added to re_spaces variable by default.
+
+4.6.020 (2009-07-16)
+ - Bug item #2821921 "issue in example 18" was fixed.
+ - Signature of SetRTL() method was changed.
+
+4.6.019 (2009-07-13)
+ - Bug item #2820703 "xref table broken" was fixed.
+
+4.6.018 (2009-07-10)
+ - Bug item #2819319 "Text over text" was fixed.
+ - Method Arrow() was added to print graphic arrows (example 12 was updated).
+
+4.6.017 (2009-07-05)
+ - Bug item #2816079 "Example 48 not working" was fixed.
+ - The signature of the checkPageBreak() was changed. The parameter $addpage was added to turn off the automatic page creation.
+
+4.6.016 (2009-06-16)
+ - Method setSpacesRE() was added to set the regular expression used for detecting withespaces or word separators. If you are using chinese, try: setSpacesRE('/[\s\p{Z}\p{Lo}]/');, otherwise you can use setSpacesRE('/[\s\p{Z}]/');
+ - The method _putinfo() now automatically fills the metadata with '?' in case of empty string.
+
+4.6.015 (2009-06-11)
+ - Bug #2804667 "word wrap bug" was fixed.
+
+4.6.014 (2009-06-04)
+ - Bug #2800931 "Table thead tag bug" was fixed.
+ - A bug related to <pre> tag was fixed.
+
+4.6.013 (2009-05-28)
+ - List bullets position was fixed for RTL languages.
+
+4.6.012 (2009-05-23)
+ - setUserRights() method doesn't work anymore unless you call the setSignature() method with the Adobe private key!
+
+4.6.011 (2009-05-18)
+ - Signature of the Image() method was changed to include the new $fitbox parameter (see source code documentation).
+
+4.6.010 (2009-05-17)
+ - Image() method was improved: now is possible to specify the maximum dimensions for a constraint box defined by $w and $h parameters, and setting the $resize parameter to null.
+ - <tcpdf> tag indent problem was fixed.
+ - $y parameter was added to checkPageBreak() method.
+ - Bug n. 2791773 "writeHTML" was fixed.
+
+4.6.009 (2009-05-13)
+ - xref table for embedded files was fixed.
+
+4.6.008 (2009-05-07)
+ - setSignature() method was improved (but is still experimental).
+ - Example n. 52 was added.
+
+4.6.007 (2009-05-05)
+ - Bug #2786685 "writeHtmlCell and <br /> in custom footer" was fixed.
+ - Table header repeating bug was fixed.
+ - Some newlines and tabs are now automatically removed from HTML strings.
+
+4.6.006 (2009-04-28)
+ - Support for "<a name="...">...</a>" was added.
+ - By default TCPDF requires PCRE Unicode support turned on but now works also without it (with limited ability to detect some Unicode blank spaces).
+
+4.6.005 (2009-04-25)
+ - Points (pt) conversion in getHTMLUnitToUnits() was fixed.
+ - Default tcpdf.pem certificate file was added.
+ - Experimental support for signing document was added but it is not yet completed (some help is needed - I think that the calculation of the ByteRange is OK and the problem is on the signature calculation).
+
+4.6.004 (2009-04-23)
+ - Method deletePage() was added to delete pages (see example n. 44).
+
+4.6.003 (2009-04-21)
+ - The caching mechanism of the UTF8StringToArray() method was fixed.
+
+4.6.002 (2009-04-20)
+ - Documentation of rollbackTransaction() method was fixed.
+ - The setImageScale() and getImageScale() methods now set and get the adjusting parameter used by pixelsToUnits() method.
+ - HTML images now support other units of measure than pixels (getHTMLUnitToUnits() is now used instead of pixelsToUnits()).
+ - WARNING: PDF_IMAGE_SCALE_RATIO has been changed by default to 1.
+
+4.6.001 (2009-04-17)
+ - Spaces between HTML block tags are now automatically removed.
+ - The bug related to cMargin changes between tables was fixed.
+
+4.6.000 (2009-04-16)
+ - WARNING: THIS VERSION CHANGES THE BEHAVIOUR OF $x and $y parameters for several TCPDF methods:
+ zero coordinates for $x and $y are now valid coordinates;
+ set $x and $y as empty strings to get the current value.
+ - Some error caused by 'empty' funtion were fixed.
+ - Default color for convertHTMLColorToDec() method was changed to white and the return value for invalid color is false.
+ - HTML on footer bug was fixed.
+ - The following examples were fixed: 5,7,10,17,19,20,21,33,42,43.
+
+4.5.043 (2009-04-15)
+ - Barcode class (barcode.php) was extended to include new linear barcode types (see example n. 27):
+ C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9
+ C39+ : CODE 39 with checksum
+ C39E : CODE 39 EXTENDED
+ C39E+ : CODE 39 EXTENDED + CHECKSUM
+ C93 : CODE 93 - USS-93
+ S25 : Standard 2 of 5
+ S25+ : Standard 2 of 5 + CHECKSUM
+ I25 : Interleaved 2 of 5
+ I25+ : Interleaved 2 of 5 + CHECKSUM
+ C128A : CODE 128 A
+ C128B : CODE 128 B
+ C128C : CODE 128 C
+ EAN2 : 2-Digits UPC-Based Extention
+ EAN5 : 5-Digits UPC-Based Extention
+ EAN8 : EAN 8
+ EAN13 : EAN 13
+ UPCA : UPC-A
+ UPCE : UPC-E
+ MSI : MSI (Variation of Plessey code)
+ MSI+ : MSI + CHECKSUM (modulo 11)
+ POSTNET : POSTNET
+ PLANET : PLANET
+ RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)
+ KIX : KIX (Klant index - Customer index)
+ IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200 (NOTE: requires BCMath PHP extension)
+ CODABAR : CODABAR
+ CODE11 : CODE 11
+ PHARMA : PHARMACODE
+ PHARMA2T : PHARMACODE TWO-TRACKS
+
+4.5.042 (2009-04-15)
+ - Method Write() was fixed for the strings containing only zero value.
+
+4.5.041 (2009-04-14)
+ - Barcode methods were fixed.
+
+4.5.040 (2009-04-14)
+ - Method Write() was fixed to handle empty strings.
+
+4.5.039 (2009-04-11)
+ - Support for linear barcodes was extended (see example n. 27 and barcodes.php documentation).
+
+4.5.038 (2009-04-10)
+ - Write() method was improved to support separators for Japanese, Korean, Chinese Traditional and Chinese Simplified.
+
+4.5.037 (2009-04-09)
+ - General performances were improved.
+ - The signature of the method utf8Bidi() was changed.
+ - The method UniArrSubString() was added.
+ - Experimental support for 2D barcodes were added (see example n. 50 and 2dbarcodes.php class).
+
+4.5.036 (2009-04-03)
+ - TCPDF methods can be called inside the HTML code (see example n. 49).
+ - All tag attributes, such as <p align="center"> must be enclosed within double quotes.
+
+4.5.035 (2009-03-28)
+ - Bug #2717436 "writeHTML rowspan problem (continued)" was fixed.
+ - Bug #2719090 "writeHTML fix follow up" was fixed.
+ - The method _putuserrights() was changed to avoid Adobe Reader 9.1 crash. This broken the 'trick' that was used to display forms in Acrobat Reader.
+
+4.5.034 (2009-03-27)
+ - Bug #2716914 "Bug writeHTML of a table in body and footer related with pb" was fixed.
+ - Bug #2717056 ] "writeHTML problem when setting tr style" was fixed.
+ - The signature of the Cell() method was changed.
+
+4.5.033 (2009-03-27)
+ - The support for rowspan/colspan on HTML tables was improved (see example n. 48).
+
+4.5.032 (2009-03-23)
+ - setPrintFooter(false) bug was fixed.
+
+4.5.031 (2009-03-20)
+ - Table header support was extended to multiple pages.
+
+4.5.030 (2009-03-20)
+ - thead tag is now supported on HTML tables (header rows are repeated after page breaks).
+ - The startTransaction() was improved to autocommit.
+ - List bullets now uses the foreground color (putHtmlListBullet()).
+
+4.5.029 (2009-03-19)
+ - The following methods were added to UNDO commands (see example 47): startTransaction(), commitTransaction(), rollbackTransaction().
+ - All examples were updated.
+
+4.5.028 (2009-03-18)
+ - Bug #2690945 "List Bugs" was fixed.
+ - HTML text alignment on lists was fixed.
+ - The constant PDF_FONT_MONOSPACED was added to the configuration file to define the default monospaced font.
+ - The following methods were fixed: getPageWidth(), getPageHeight(), getBreakMargin().
+ - All examples were updated.
+
+4.5.027 (2009-03-16)
+ - Method getPageDimensions() was added to get page dimensions.
+ - The signature of the following methos were changed: getPageWidth(), getPageHeight(), getBreakMargin().
+ - _parsepng() method was fixed for PNG URL images (fread bug).
+
+4.5.026 (2009-03-11)
+ - Bug #2681793 affecting URL images with spaces was fixed.
+
+4.5.025 (2009-03-10)
+ - A small bug affecting hyphenation support was fixed.
+ - The method SetDefaultMonospacedFont() was added to define the default monospaced font.
+
+4.5.024 (2009-03-07)
+ - The bug #2666493 was fixed "Footer corrupts document".
+
+4.5.023 (2009-03-06)
+ - The bug #2666688 was fixed "Rowspan in tables".
+
+4.5.022 (2009-03-05)
+ - The bug #2659676 was fixed "refer to #2157099 test 4 < BR > problem still not fixed".
+ - addTOC() function bug was fixed.
+
+4.5.020 (2009-03-03)
+ - The following bug was fixed: "function removeSHY corrupts unicode".
+
+4.5.019 (2009-02-28)
+ - The problem of decimal separator using different locale was fixed.
+ - The text hyphenation is now supported (see example n. 46).
+
+4.5.018 (2009-02-26)
+ - The _destroy() method was added to unset all class variables and frees memory.
+ - Now it's possible to call Output() method multiple times.
+
+4.5.017 (2009-02-24)
+ - A minor bug that raises a PHP warning was fixed.
+
+4.5.016 (2009-02-24)
+ - Bug item #2631200 "getNumLines() counts wrong" was fixed.
+ - Multiple attachments bug was fixed.
+ - All class variables are now cleared on Output() for memory otpimization.
+
+4.5.015 (2009-02-18)
+ - Bug item #2612553 "function Write() must not break a line on character" was fixed.
+
+4.5.014 (2009-02-13)
+ - Bug item #2595015 "POSTNET Barcode Checksum Error" was fixed (on barcode.php).
+ - Pagebreak bug for barcode was fixed.
+
+4.5.013 (2009-02-12)
+ - border attribute is now supported on HTML images (only accepts the same values accepted by Cell()).
+
+4.5.012 (2009-02-12)
+ - An error on image border feature was fixed.
+
+4.5.011 (2009-02-12)
+ - HTML links for images are now supported.
+ - height attribute is now supported on HTML cells.
+ - $border parameter was added to Image() and ImageEps() methods.
+ - The method getNumLines() was added to estimate the number of lines required for the specified text.
+
+4.5.010 (2009-01-29)
+ - Bug n. 2546108 "BarCode Y position" was fixed.
+
+4.5.009 (2009-01-26)
+ - Bug n. 2538094 "Empty pdf file created" was fixed.
+
+4.5.008 (2009-01-26)
+ - setPage() method was fixed to correctly restore graphic states.
+ - Source code was cleaned up for performances.
+
+4.5.007 (2009-01-24)
+ - checkPageBreak() and write1DBarcode() methods were fixed.
+ - Source code was cleaned up for performances.
+ - barcodes.php was updated.
+
+4.5.006 (2009-01-23)
+ - getHTMLUnitToPoints() method was replaced by getHTMLUnitToUnits() to fix HTML units bugs.
+
+4.5.005 (2009-01-23)
+ - Page closing bug was fixed.
+
+4.5.004 (2009-01-21)
+ - The access of convertHTMLColorToDec() method was changed to public
+ - Fixed bug on UL tag.
+
+4.5.003 (2009-01-19)
+ - Fonts on different folders are now supported.
+
+4.5.002 (2009-01-07)
+ - addTOC() function was improved (see example n. 45).
+
+4.5.001 (2009-01-04)
+ - The signature of startPageGroup() function was changed.
+ - Method Footer() was improved to automatically print page or page-group number (see example n. 23).
+ - Protected method formatTOCPageNumber() was added to customize the format of page numbers on the Table Of Content.
+ - The signature of addTOC() was changed to include the font used for page numbers.
+
+4.5.000 (2009-01-03)
+ - A new $diskcache parameter was added to class constructor to enable disk caching and reduce RAM memory usage (see example n. 43).
+ - The method movePageTo() was added to move pages to previous positions (see example n. 44).
+ - The methods getAliasNumPage() and getPageNumGroupAlias() were added to get the alias for page number (needed when using movepageTo()).
+ - The methods addTOC() was added to print a Table Of Content (see example n. 45).
+ - Imagick class constant was removed for better compatibility with PHP4.
+ - All existing examples were updated and new examples were added.
+
+4.4.009 (2008-12-29)
+ - Examples 1 and 35 were fixed.
+
+4.4.008 (2008-12-28)
+ - Bug #2472169 "Unordered bullet size not adjusted for unit type" was fixed.
+
+4.4.007 (2008-12-23)
+ - Bug #2459935 "no unit conversion for header line" was fixed.
+ - Example n. 42 for image alpha channel was added.
+ - All examples were updated.
+
+4.4.006 (2008-12-11)
+ - Method setLIsymbol() was changed to reflect latest changes in HTML list handling.
+
+4.4.005 (2008-12-10)
+ - Bug item #2413870 "ordered list override value" was fixed.
+
+4.4.004 (2008-12-10)
+ - The protected method getHTMLUnitToPoints() was added to accept various HTML units of measure (em, ex, px, in, cm, mm, pt, pc, %).
+ - The method intToRoman() was added to convert integer number to Roman representation.
+ - Support fot HTML lists was improved: the CSS property list-style-type is now supported.
+
+4.4.003 (2008-12-09)
+ - Bug item #2412147 "Warning on line 3367" was fixed.
+ - Method setHtmlLinksStyle() was added to set default HTML link colors and font style.
+ - Method addHtmlLink() was changed to use color and style defined on the inline CSS.
+
+4.4.002 (2008-12-09)
+ - Borders on Multicell() were fixed.
+ - Problem of Multicell() on Header function (Bug item #2407579) was fixed.
+ - Problem on graphics tranformations applied to Multicell() was fixed.
+ - Support for ImageMagick was added.
+ - Width calculation for nested tables was fixed.
+
+4.4.001 (2008-12-08)
+ - Some missing core fonts were added on fonts directory.
+ - CID0 fonts rendering was fixed.
+ - HTML support was improved (<pre> and <tt> tags are now supported).
+ - Bug item #2406022 "Left padding bug in MultiCell with maxh" was fixed.
+
+4.4.000 (2008-12-07)
+ - File attachments are now supported (see example n. 41).
+ - Font functions were optimized to reduce document size.
+ - makefont.php was updated.
+ - Linux binaries were added on /fonts/utils
+ - All fonts were updated.
+ - $autopadding parameter was added to Multicell() to disable automatic padding features.
+ - $maxh parameter was added to Multicell() and Write() to set a maximum height.
+
+4.3.009 (2008-12-05)
+ - Bug item #2392989 (Custom header + setlinewidth + cell border bug) was fixed.
+
+4.3.008 (2008-12-05)
+ - Bug item #2390566 "rect bug" was fixed.
+ - File path was fixed for font embedded files.
+ - SetFont() method signature was changed to include the font filename.
+ - Some font-related methods were improved.
+ - Methods getFontFamily() and getFontStyle() were added.
+
+4.3.007 (2008-12-03)
+ - PNG alpha channel is now supported (GD library is required).
+ - AddFont() function now support custom font file path on $file parameter.
+ - The default width variable ($dw) is now always defined for any font.
+ - The 'Style' attribute on CID-0 fonts was removed because of protection bug.
+
+4.3.006 (2008-12-01)
+ - A regular expression on getHtmlDomArray() to find HTML tags was fixed.
+
+4.3.005 (2008-11-25)
+ - makefont.php was fixed.
+ - Bug item #2339877 was fixed (false loop condition detected on WriteHTML()).
+ - Bug item #2336733 was fixed (lasth value update on Multicell() when border and fill are disabled).
+ - Bug item #2342303 was fixed (automatic page-break on Image() and ImageEPS()).
+
+4.3.004 (2008-11-19)
+ - Function _textstring() was fixed (bug 2309051).
+ - All examples were updated.
+
+4.3.003 (2008-11-18)
+ - CID-0 font bug was fixed.
+ - Some functions were optimized.
+ - Function getGroupPageNoFormatted() was added.
+ - Example n. 23 was updated.
+
+4.3.002 (2008-11-17)
+ - Bug item #2305518 "CID-0 font don't work with encryption" was fixed.
+
+4.3.001 (2008-11-17)
+ - Bug item #2300007 "download mimetype pdf" was fixed.
+ - Double quotes were replaced by single quotes to improve PHP performances.
+ - A bug relative to HTML cell borders was fixed.
+
+4.3.000 (2008-11-14)
+ - The function setOpenCell() was added to set the top/bottom cell sides to be open or closed when the cell cross the page.
+ - A bug relative to list items indentation was fixed.
+ - A bug relative to borders on HTML tables and Multicell was fixed.
+ - A bug relative to rowspanned cells was fixed.
+ - A bug relative to html images across pages was fixed.
+
+4.2.009 (2008-11-13)
+ - Spaces between li tags are now automatically removed.
+
+4.2.008 (2008-11-12)
+ - A bug relative to fill color on next page was fixed.
+
+4.2.007 (2008-11-12)
+ - The function setListIndentWidth() was added to set custom indentation widht for HTML lists.
+
+4.2.006 (2008-11-06)
+ - A bug relative to HTML justification was fixed.
+
+4.2.005 (2008-11-06)
+ - A bug relative to HTML justification was fixed.
+ - The methods formatPageNumber() and PageNoFormatted() were added to format page numbers.
+ - Default Footer() method was changed to use PageNoFormatted() instead of PageNo().
+ - Example 6 was updated.
+
+4.2.004 (2008-11-04)
+ - Bug item n. 2217039 "filename handling improvement" was fixed.
+
+4.2.003 (2008-10-31)
+ - Font style bug was fixed.
+
+4.2.002 (2008-10-31)
...
[truncated message content] |
|
From: <be...@us...> - 2012-12-18 15:59:07
|
Revision: 10444
http://sourceforge.net/p/xoops/svn/10444
Author: beckmi
Date: 2012-12-18 15:59:04 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Removing News module
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/
|
|
From: <be...@us...> - 2012-12-18 15:55:45
|
Revision: 10443
http://sourceforge.net/p/xoops/svn/10443
Author: beckmi
Date: 2012-12-18 15:55:42 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Merging changes done in XOOPS 2.6.0 trunk
Modified Paths:
--------------
XoopsModules26/news/trunk/news/backendt.php
XoopsModules26/news/trunk/news/blocks/news_archives.php
XoopsModules26/news/trunk/news/blocks/news_bigstory.php
XoopsModules26/news/trunk/news/blocks/news_moderate.php
XoopsModules26/news/trunk/news/blocks/news_randomnews.php
XoopsModules26/news/trunk/news/blocks/news_top.php
XoopsModules26/news/trunk/news/blocks/news_topics.php
XoopsModules26/news/trunk/news/blocks/news_topicsnav.php
XoopsModules26/news/trunk/news/include/install_function.php
XoopsModules26/news/trunk/news/include/search.inc.php
XoopsModules26/news/trunk/news/templates/blocks/news_tag_block_cloud.html
XoopsModules26/news/trunk/news/templates/blocks/news_tag_block_top.html
XoopsModules26/news/trunk/news/templates/news_article.html
XoopsModules26/news/trunk/news/templates/news_by_topic.html
XoopsModules26/news/trunk/news/templates/news_index.html
Property Changed:
----------------
XoopsModules26/news/trunk/news/
Property changes on: XoopsModules26/news/trunk/news
___________________________________________________________________
Added: svn:mergeinfo
+ /XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news:10416-10442
Modified: XoopsModules26/news/trunk/news/backendt.php
===================================================================
--- XoopsModules26/news/trunk/news/backendt.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/backendt.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -68,7 +68,7 @@
$tpl = new XoopsTpl();
$tpl->caching=2;
$tpl->xoops_setCacheTime(3600); // Change this to the value you want
-if (!$tpl->is_cached('db:news_rss.html', $topicid)) {
+if (!$tpl->is_cached('module:news|news_rss.html', $topicid)) {
$xt = new NewsTopic($topicid);
$sarray = $story->getAllPublished($newsnumber, 0, $restricted, $topicid);
if (is_array($sarray) && count($sarray)>0) {
@@ -106,5 +106,5 @@
}
}
}
-$tpl->display('db:news_rss.html', $topicid);
+$tpl->display('module:news|news_rss.html', $topicid);
?>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/blocks/news_archives.php
===================================================================
--- XoopsModules26/news/trunk/news/blocks/news_archives.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/blocks/news_archives.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -50,7 +50,7 @@
} else {
include_once XOOPS_ROOT_PATH.'/modules/news/language/english/main.php';
}
-
+
$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
$block = array();
$sort_order = $options[0] == 0 ? 'ASC' : 'DESC';
@@ -167,7 +167,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_archives.html');
+ $tpl->display('block:news|news_block_archives.html');
}
?>
Modified: XoopsModules26/news/trunk/news/blocks/news_bigstory.php
===================================================================
--- XoopsModules26/news/trunk/news/blocks/news_bigstory.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/blocks/news_bigstory.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -49,7 +49,7 @@
$htmltitle=' title="'.$block['infotips'].'"';
} else {
$htmltitle=' title="'.$story->title('Show').'"';
- }
+ }
$block['htmltitle']=$htmltitle;
$block['message'] = _MB_NEWS_TMRSI;
$block['story_title'] = $story->title('Show');
@@ -76,7 +76,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_bigstory.html');
+ $tpl->display('block:news|news_block_bigstory.html');
}
?>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/blocks/news_moderate.php
===================================================================
--- XoopsModules26/news/trunk/news/blocks/news_moderate.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/blocks/news_moderate.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -85,6 +85,6 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_moderate.html');
+ $tpl->display('block:news|news_block_moderate.html');
}
?>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/blocks/news_randomnews.php
===================================================================
--- XoopsModules26/news/trunk/news/blocks/news_randomnews.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/blocks/news_randomnews.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -70,7 +70,7 @@
$news['topic_color']= '#'.$myts->displayTarea($story->topic_color);
$news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture();
$news['pictureinfo'] = $story->pictureinfo();
-
+
if ($options[3] > 0) {
$html = $story->nohtml() == 1 ? 0 : 1;
$news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext, $html), $options[3]+3);
@@ -144,7 +144,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_moderate.html');
+ $tpl->display('block:news|news_block_moderate.html');
}
?>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/blocks/news_top.php
===================================================================
--- XoopsModules26/news/trunk/news/blocks/news_top.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/blocks/news_top.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -355,7 +355,7 @@
$news['topic_color'] = '#'.$myts->displayTarea($story->topic_color);
$news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture();
$news['pictureinfo'] = $story->pictureinfo();
-
+
if($displayname!=3) {
$news['author'] = sprintf("%s %s",_POSTEDBY,$story->uname());
} else {
@@ -473,7 +473,7 @@
$news['topic_color'] = '#'.$myts->displayTarea($story->topic_color);
$news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture();
$news['pictureinfo'] = $story->pictureinfo();
-
+
if($displayname!=3) {
$news['author']= sprintf("%s %s",_POSTEDBY,$story->uname());
} else {
@@ -481,7 +481,7 @@
}
if ($options[3] > 0) {
$html = $story->nohtml() == 1 ? 0 : 1;
- $news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext(), $html), $options[3]+3);
+ $news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext(), $html), $options[3]+3);
$news['infotips'] = '';
} else {
$news['teaser'] = '';
@@ -694,7 +694,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_top.html');
+ $tpl->display('block:news|news_block_top.html');
}
?>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/blocks/news_topics.php
===================================================================
--- XoopsModules26/news/trunk/news/blocks/news_topics.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/blocks/news_topics.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -54,7 +54,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_topics.html');
+ $tpl->display('block:news|news_block_topics.html');
}
?>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/blocks/news_topicsnav.php
===================================================================
--- XoopsModules26/news/trunk/news/blocks/news_topicsnav.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/blocks/news_topicsnav.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -94,7 +94,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_topicnav.html');
+ $tpl->display('block:news|news_block_topicnav.html');
}
?>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/include/install_function.php
===================================================================
--- XoopsModules26/news/trunk/news/include/install_function.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/include/install_function.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -17,11 +17,11 @@
*/
function xoops_module_pre_install_news(&$xoopsModule) {
-
+
// Check if this XOOPS version is supported
$minSupportedVersion = explode('.', '2.5.0');
$currentVersion = explode('.', substr(XOOPS_VERSION,6));
-
+
if($currentVersion[0] > $minSupportedVersion[0]) {
return true;
} elseif($currentVersion[0] == $minSupportedVersion[0]) {
@@ -35,26 +35,27 @@
}
}
}
-
+
return false;
-}
+}
function xoops_module_install_news(&$xoopsModule) {
-
+
+ $xoops = Xoops::getInstance();
$module_id = $xoopsModule->getVar('mid');
$gpermHandler = $xoops->getHandlerGroupperm();
$configHandler =& xoops_gethandler('config');
-
+
/**
* Default public category permission mask
*/
-
+
// Access right
$gpermHandler->addRight('news_approve', 1, XOOPS_GROUP_ADMIN, $module_id);
$gpermHandler->addRight('news_submit', 1, XOOPS_GROUP_ADMIN, $module_id);
$gpermHandler->addRight('news_view', 1, XOOPS_GROUP_ADMIN, $module_id);
-
+
$gpermHandler->addRight('news_view', 1, XOOPS_GROUP_USERS, $module_id);
$gpermHandler->addRight('news_view', 1, XOOPS_GROUP_ANONYMOUS, $module_id);
@@ -67,18 +68,18 @@
if(!is_dir($dir))
mkdir($dir, 0777);
chmod($dir, 0777);
-
+
$dir = XOOPS_ROOT_PATH."/uploads/news/image";
if(!is_dir($dir))
mkdir($dir, 0777);
chmod($dir, 0777);
-
+
// Copy index.html files on uploads folders
$indexFile = XOOPS_ROOT_PATH."/modules/news/include/index.html";
copy($indexFile, XOOPS_ROOT_PATH."/uploads/news/index.html");
copy($indexFile, XOOPS_ROOT_PATH."/uploads/news/file/index.html");
copy($indexFile, XOOPS_ROOT_PATH."/uploads/news/image/index.html");
-
+
return true;
}
?>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/include/search.inc.php
===================================================================
--- XoopsModules26/news/trunk/news/include/search.inc.php 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/include/search.inc.php 2012-12-18 15:55:42 UTC (rev 10443)
@@ -30,6 +30,7 @@
function news_search($queryarray, $andor, $limit, $offset, $userid){
global $xoopsDB, $xoopsUser;
+ $xoops = Xoops::getInstance();
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
$restricted=news_getmoduleoption('restrictindex');
$highlight = false;
Modified: XoopsModules26/news/trunk/news/templates/blocks/news_tag_block_cloud.html
===================================================================
--- XoopsModules26/news/trunk/news/templates/blocks/news_tag_block_cloud.html 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/templates/blocks/news_tag_block_cloud.html 2012-12-18 15:55:42 UTC (rev 10443)
@@ -1 +1 @@
-<{include file="db:tag_block_cloud.html"}>
\ No newline at end of file
+<{include file="block:tag|tag_block_cloud.html"}>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/templates/blocks/news_tag_block_top.html
===================================================================
--- XoopsModules26/news/trunk/news/templates/blocks/news_tag_block_top.html 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/templates/blocks/news_tag_block_top.html 2012-12-18 15:55:42 UTC (rev 10443)
@@ -1 +1 @@
-<{include file="db:tag_block_top.html"}>
+<{include file="block:tag|tag_block_top.html"}>
Modified: XoopsModules26/news/trunk/news/templates/news_article.html
===================================================================
--- XoopsModules26/news/trunk/news/templates/news_article.html 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/templates/news_article.html 2012-12-18 15:55:42 UTC (rev 10443)
@@ -1,7 +1,7 @@
<div class="news-article">
-
- <div class="marg2 pad2"><{include file="db:news_item.html" story=$story}>
+ <div class="marg2 pad2"><{include file="module:news|news_item.html" story=$story}>
+
<{if $xoops_isadmin}>
<a href="<{$xoops_url}>/modules/news/submit.php?op=edit&storyid=<{$story.id}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>"></a>
<a href="<{$xoops_url}>/modules/news/admin/index.php?op=delete&storyid=<{$story.id}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>"></a>
@@ -14,8 +14,8 @@
<{/if}>
</div>
-
+
<{if $attached_files_count>0}>
<div class="itemInfo"><{$lang_attached_files}>
<{foreach item=onefile from=$attached_files}>
@@ -23,21 +23,21 @@
<{/foreach}>
</div>
<{/if}>
-
+
<{if $pagenav}><div class="pagenav"><{$smarty.const._NW_PAGE}> <{$pagenav}></div><{/if}>
-
+
<{if $tags}>
- <div class="marg10 tagbar"><{include file="db:tag_bar.html"}></div>
+ <div class="marg10 tagbar"><{include file="block:tag|tag_bar.html"}></div>
<{/if}>
-
+
<div class="pad5 marg5">
<{if $nav_links}>
<{if $previous_story_id != -1}><a href='<{$xoops_url}>/modules/news/article.php?storyid=<{$previous_story_id}>' title="<{$previous_story_title}>"><{$lang_previous_story}></a> - <{/if}>
<{if $next_story_id!= -1}><a href='<{$xoops_url}>/modules/news/article.php?storyid=<{$next_story_id}>' title="<{$next_story_title}>"><{$lang_next_story}></a><{/if}>
- <{/if}>
+ <{/if}>
</div>
-
+
<{if $showsummary == true && $summary_count>0}>
<div class="marg10">
<table width='50%' cellspacing='0' cellpadding='1'>
@@ -52,7 +52,7 @@
</table>
</div>
<{/if}>
-
+
<{if $bookmarkme == true}>
<div class="item-bookmarkme">
<div class="head item-bookmarkme-title"><{$smarty.const._NW_BOOKMARK_ME}></div>
@@ -96,21 +96,21 @@
<div id="fb-root"></div><script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script><fb:comments href="<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" num_posts="5" width="500"></fb:comments>
<{/if}>
-
+
<div class="pad2 marg2">
<{$commentsnav}>
<{$lang_notice}>
</div>
-
+
<div class="pad2 marg2">
<{if $comment_mode == "flat"}>
- <{include file="db:system_comments_flat.html"}>
+ <{include file="module:system|system_comments_flat.html"}>
<{elseif $comment_mode == "thread"}>
- <{include file="db:system_comments_thread.html"}>
+ <{include file="module:system|system_comments_thread.html"}>
<{elseif $comment_mode == "nest"}>
- <{include file="db:system_comments_nest.html"}>
+ <{include file="module:system|system_comments_nest.html"}>
<{/if}>
</div>
- <{include file='db:system_notification_select.html'}>
+ <{include file='module:system|system_notification_select.html'}>
</div>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/templates/news_by_topic.html
===================================================================
--- XoopsModules26/news/trunk/news/templates/news_by_topic.html 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/templates/news_by_topic.html 2012-12-18 15:55:42 UTC (rev 10443)
@@ -9,7 +9,7 @@
<{counter start=0 print=false assign=storynum}>
<{foreach item=story from=$topic.stories}>
<{if $storynum == 0}>
- <{include file="db:news_item.html" story=$story}><br />
+ <{include file="module:news|news_item.html" story=$story}><br />
<{else}>
<{if $storynum == 1}>
<ul>
@@ -29,4 +29,4 @@
</tr>
</table>
</div>
-<{include file='db:system_notification_select.html'}>
\ No newline at end of file
+<{include file='module:system|system_notification_select.html'}>
\ No newline at end of file
Modified: XoopsModules26/news/trunk/news/templates/news_index.html
===================================================================
--- XoopsModules26/news/trunk/news/templates/news_index.html 2012-12-18 15:40:51 UTC (rev 10442)
+++ XoopsModules26/news/trunk/news/templates/news_index.html 2012-12-18 15:55:42 UTC (rev 10443)
@@ -2,7 +2,7 @@
<{if $topic_rssfeed_link != ""}>
<div align='right'><{$topic_rssfeed_link}></div>
<{/if}>
-
+
<{if $displaynav == true}>
<div style="text-align: center;">
<form name="form1" action="<{$xoops_url}>/modules/news/index.php" method="get">
@@ -10,20 +10,20 @@
<hr />
</div>
<{/if}>
-
+
<{if $topic_description != ''}>
<div style="text-align: center;"><{$topic_description}></div>
<{/if}>
-
+
<div style="margin: 10px;"><{$pagenav}></div>
<table width='100%' border='0'>
<tr>
<{section name=i loop=$columns}>
- <td width="<{$columnwidth}>%"><{foreach item=story from=$columns[i]}><{include file="db:news_item.html" story=$story}><{/foreach}></td>
+ <td width="<{$columnwidth}>%"><{foreach item=story from=$columns[i]}><{include file="module:news|news_item.html" story=$story}><{/foreach}></td>
<{/section}>
</tr>
</table>
-
+
<div class="pagenav"><{$pagenav}></div>
- <{include file='db:system_notification_select.html'}>
+ <{include file='module:system|system_notification_select.html'}>
</div>
\ No newline at end of file
|
|
From: <txm...@us...> - 2012-12-18 15:40:55
|
Revision: 10442
http://sourceforge.net/p/xoops/svn/10442
Author: txmodxoops
Date: 2012-12-18 15:40:51 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Added missing defines
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php 2012-12-18 09:33:49 UTC (rev 10441)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php 2012-12-18 15:40:51 UTC (rev 10442)
@@ -64,6 +64,15 @@
define("_AM_SYSTEM_MAINTENANCE","Maintenance");
define("_AM_SYSTEM_MAINTENANCE_DESC","Maintenance tools for database tables, <br /> clean cache folder and session table");
+define("_AM_SYSTEM_BANS","Banners");
+define("_AM_SYSTEM_BANS_DESC","_AM_SYSTEM_BANS_DESC");
+define("_AM_SYSTEM_PLUGINS","Plugins");
+define("_AM_SYSTEM_PLUGINS_DESC","_AM_SYSTEM_PLUGINS_DESC");
+define("_AM_SYSTEM_SMLS","Smilies");
+define("_AM_SYSTEM_SMLS_DESC","_AM_SYSTEM_SMLS_DESC");
+define("_AM_SYSTEM_RANK","Rank");
+define("_AM_SYSTEM_RANK_DESC","_AM_SYSTEM_RANK_DESC");
+
// Messages
define("_AM_SYSTEM_DBUPDATED","Database Updated Successfully!");
define("_AM_SYSTEM_DBERROR","Database was not updated due to some error!");
|
|
From: <be...@us...> - 2012-12-18 09:33:54
|
Revision: 10441
http://sourceforge.net/p/xoops/svn/10441
Author: beckmi
Date: 2012-12-18 09:33:49 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 2.31 Final (Removed Cache Lite, PEAR.php, fixed upload folder bug)
Modified Paths:
--------------
XoopsModules/obituaries/trunk/obituaries/admin/admin_footer.php
XoopsModules/obituaries/trunk/obituaries/admin/main.php
XoopsModules/obituaries/trunk/obituaries/admin/menu.php
XoopsModules/obituaries/trunk/obituaries/class/users_obituaries.php
XoopsModules/obituaries/trunk/obituaries/docs/changelog.txt
XoopsModules/obituaries/trunk/obituaries/include/common.php
XoopsModules/obituaries/trunk/obituaries/xoops_version.php
Removed Paths:
-------------
XoopsModules/obituaries/trunk/obituaries/class/PEAR.php
XoopsModules/obituaries/trunk/obituaries/class/PEAR5.php
XoopsModules/obituaries/trunk/obituaries/class/PersistableObjectHandler.php
XoopsModules/obituaries/trunk/obituaries/class/lite.php
XoopsModules/obituaries/trunk/obituaries/doc/
Modified: XoopsModules/obituaries/trunk/obituaries/admin/admin_footer.php
===================================================================
--- XoopsModules/obituaries/trunk/obituaries/admin/admin_footer.php 2012-12-18 09:17:27 UTC (rev 10440)
+++ XoopsModules/obituaries/trunk/obituaries/admin/admin_footer.php 2012-12-18 09:33:49 UTC (rev 10441)
@@ -19,7 +19,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
Modified: XoopsModules/obituaries/trunk/obituaries/admin/main.php
===================================================================
--- XoopsModules/obituaries/trunk/obituaries/admin/main.php 2012-12-18 09:17:27 UTC (rev 10440)
+++ XoopsModules/obituaries/trunk/obituaries/admin/main.php 2012-12-18 09:33:49 UTC (rev 10441)
@@ -1,166 +1,178 @@
-<?php
-/**
- * ****************************************************************************
- * Obituaries - MODULE FOR XOOPS
- * Copyright (c) Herv� Thouzard of Instant Zero (http://www.instant-zero.com)
- * Created on 10 juil. 08 at 11:38:52
- * Version : $Id:
- * ****************************************************************************
- */
-require_once '../../../include/cp_header.php';
-require_once '../include/common.php';
-require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
-include_once 'admin_header.php';
-
-$indexAdmin = new ModuleAdmin();
-
-$op = 'default';
-if (isset($_POST['op'])) {
- $op = $_POST['op'];
-} elseif ( isset($_GET['op'])) {
- $op = $_GET['op'];
-}
-
-// Lecture de certains param�tres de l'application ********************************************************************
-$limit = obituaries_utils::getModuleOption('perpage'); // Nombre maximum d'�l�ments � afficher
-$baseurl = OBITUARIES_URL.'admin/'.basename(__FILE__); // URL de ce script
-$conf_msg = obituaries_utils::javascriptLinkConfirm(_AM_OBITUARIES_CONF_DELITEM);
-$images_width = obituaries_utils::getModuleOption('images_width');
-$images_height = obituaries_utils::getModuleOption('images_height');
-$destname = '';
-
-$cacheFolder = XOOPS_UPLOAD_PATH.'/'.OBITUARIES_DIRNAME;
-if(!is_dir($cacheFolder)) {
- mkdir($cacheFolder, 0777);
- file_put_contents($cacheFolder.'/index.html', '<script>history.go(-1);</script>');
-}
-
-
-switch($op)
-{
- // ****************************************************************************************************************
- case 'default': // List obituariess and show form to add a someone
- // ****************************************************************************************************************
- xoops_cp_header();
- // echo '<h1>'.obituaries_utils::getModuleName().'</h1>';
- echo $indexAdmin->addNavigation('main.php');
- $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
- $itemsCount = $hBdUsersObituaries->getCount();
- if($itemsCount > $limit) {
- $pagenav = new XoopsPageNav($itemsCount, $limit, $start, 'start');
- }
- if(isset($pagenav) && is_object($pagenav)) {
- echo "<div align='right'>".$pagenav->renderNav()."</div>";
- }
- if($itemsCount > 0) {
- $class = '';
- $items = $hBdUsersObituaries->getItems($start, $limit, 'obituaries_lastname');
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- echo "<tr><th align='center'>"._AM_OBITUARIES_DATE."</th><th align='center'>"._AM_OBITUARIES_USERNAME."</th><th align='center'>"._AM_OBITUARIES_LASTNAME.', '._AM_OBITUARIES_FIRSTNAME."</th><th align='center'>"._AM_OBITUARIES_ACTION."</th></tr>";
- foreach ($items as $item) {
- $class = ($class == 'even') ? 'odd' : 'even';
- $id = $item->getVar('obituaries_id');
- $user = null;
- $user = $item->getXoopsUser();
- $uname = '';
- if(is_object($user)) {
- $uname = $user->getVar('uname');
- }
- $action_edit = "<a href='$baseurl?op=edit&id=".$id."' title='"._EDIT."'>".$birdthday_icones['edit'].'</a>';
- $action_delete = "<a href='$baseurl?op=delete&id=".$id."' title='"._DELETE."'".$conf_msg.">".$birdthday_icones['delete'].'</a>';
-
- echo "<tr class='".$class."'>\n";
- echo "<td align='center'>".obituaries_utils::SQLDateToHuman($item->getVar('obituaries_date'))."</td>";
- echo "<td align='center'>".$uname.'</td>';
- echo "<td align='center'>".$item->getFullName().'</td>';
- echo "<td align='center'>".$action_edit.' '.$action_delete.'</td>';
- echo "</tr>\n";
- }
- echo "</table>\n";
- if(isset($pagenav) && is_object($pagenav)) {
- echo "<div align='left'>".$pagenav->renderNav()."</div>";
- }
- echo "<br /><br />\n";
- }
- $item = $hBdUsersObituaries->create(true);
- $form = $hBdUsersObituaries->getForm($item, $baseurl);
- $form->display();
- break;
-
- // ****************************************************************************************************************
- case 'maintain': // Maintenance des tables et du cache
- // ****************************************************************************************************************
- xoops_cp_header();
- echo $indexAdmin->addNavigation('main.php');
- require_once '../xoops_version.php';
- $tables = array();
- foreach ($modversion['tables'] as $table) {
- $tables[] = $xoopsDB->prefix($table);
- }
- if(count($tables) > 0) {
- $list = implode(',', $tables);
- $xoopsDB->queryF('CHECK TABLE '.$list);
- $xoopsDB->queryF('ANALYZE TABLE '.$list);
- $xoopsDB->queryF('OPTIMIZE TABLE '.$list);
- }
- obituaries_utils::updateCache();
- $hBdUsersObituaries->forceCacheClean();
- obituaries_utils::redirect(_AM_OBITUARIES_SAVE_OK, $baseurl, 2);
- break;
-
- // ****************************************************************************************************************
- case 'edit': // Edition d'un utilisateur existant
- // ****************************************************************************************************************
- xoops_cp_header();
- echo $indexAdmin->addNavigation('main.php');
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
- if(empty($id)) {
- obituaries_utils::redirect(_AM_OBITUARIES_ERROR_1, $baseurl, 5);
- }
- // Item exits ?
- $item = null;
- $item = $hBdUsersObituaries->get($id);
- if(!is_object($item)) {
- obituaries_utils::redirect(_AM_OBITUARIES_NOT_FOUND, $baseurl, 5);
- }
- $form = $hBdUsersObituaries->getForm($item, $baseurl);
- $form->display();
- break;
-
- // ****************************************************************************************************************
- case 'saveedit': // Enregistrement des modifications
- // ****************************************************************************************************************
- xoops_cp_header();
- echo $indexAdmin->addNavigation('main.php');
- $result = $hBdUsersObituaries->saveUser();
- if($result) {
- obituaries_utils::redirect(_AM_OBITUARIES_SAVE_OK, $baseurl, 1);
- } else {
- obituaries_utils::redirect(_AM_OBITUARIES_SAVE_PB, $baseurl, 3);
- }
- break;
-
- // ****************************************************************************************************************
- case 'delete': // Suppression d'un utilisateur
- // ****************************************************************************************************************
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
- if(empty($id)) {
- obituaries_utils::redirect(_AM_OBITUARIES_ERROR_1, $baseurl, 5);
- }
- // Item exits ?
- $item = null;
- $item = $hBdUsersObituaries->get($id);
- if(!is_object($item)) {
- obituaries_utils::redirect(_AM_OBITUARIES_NOT_FOUND, $baseurl, 5);
- }
- $result = $hBdUsersObituaries->deleteUser($item);
- if($result) {
- obituaries_utils::redirect(_AM_OBITUARIES_SAVE_OK, $baseurl, 1);
- } else {
- obituaries_utils::redirect(_AM_OBITUARIES_SAVE_PB, $baseurl, 3);
- }
-
-}
-xoops_cp_footer();
+<?php
+/**
+ * ****************************************************************************
+ * Obituaries - MODULE FOR XOOPS
+ * Copyright (c) Herv� Thouzard of Instant Zero (http://www.instant-zero.com)
+ * Created on 10 juil. 08 at 11:38:52
+ * Version : $Id:
+ * ****************************************************************************
+ */
+require_once '../../../include/cp_header.php';
+require_once '../include/common.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+include_once 'admin_header.php';
+
+$indexAdmin = new ModuleAdmin();
+
+$op = 'default';
+if (isset($_POST['op'])) {
+ $op = $_POST['op'];
+} elseif ( isset($_GET['op'])) {
+ $op = $_GET['op'];
+}
+
+// Lecture de certains param�tres de l'application ********************************************************************
+$limit = obituaries_utils::getModuleOption('perpage'); // Nombre maximum d'�l�ments � afficher
+$baseurl = OBITUARIES_URL.'admin/'.basename(__FILE__); // URL de ce script
+$conf_msg = obituaries_utils::javascriptLinkConfirm(_AM_OBITUARIES_CONF_DELITEM);
+$images_width = obituaries_utils::getModuleOption('images_width');
+$images_height = obituaries_utils::getModuleOption('images_height');
+$destname = '';
+
+$cacheFolder = XOOPS_UPLOAD_PATH.'/'.OBITUARIES_DIRNAME;
+if(!is_dir($cacheFolder)) {
+ mkdir($cacheFolder, 0777);
+ file_put_contents($cacheFolder.'/index.html', '<script>history.go(-1);</script>');
+}
+
+
+switch($op)
+{
+ // ****************************************************************************************************************
+ case 'default': // List obituariess and show form to add a someone
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ // echo '<h1>'.obituaries_utils::getModuleName().'</h1>';
+ echo $indexAdmin->addNavigation('main.php');
+ $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
+ $itemsCount = $hBdUsersObituaries->getCount();
+ if($itemsCount > $limit) {
+ $pagenav = new XoopsPageNav($itemsCount, $limit, $start, 'start');
+ }
+ if(isset($pagenav) && is_object($pagenav)) {
+ echo "<div align='right'>".$pagenav->renderNav()."</div>";
+ }
+ if($itemsCount > 0) {
+ $class = '';
+// $items = $hBdUsersObituaries->getItems($start, $limit, 'obituaries_lastname');
+
+ $tblItems = array();
+ //$critere = new Criteria($this->keyName, 0 ,'<>');
+ $critere = new Criteria('obituaries_id', 0 ,'<>');
+ $critere->setLimit($limit);
+ $critere->setStart($start);
+ $critere->setSort('obituaries_lastname');
+// $critere->setOrder($order);
+// $tblItems = $this->getObjects($critere, $idAsKey);
+ $items = $hBdUsersObituaries->getObjects($start, $limit, 'obituaries_lastname');
+
+
+ echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+ echo "<tr><th align='center'>"._AM_OBITUARIES_DATE."</th><th align='center'>"._AM_OBITUARIES_USERNAME."</th><th align='center'>"._AM_OBITUARIES_LASTNAME.', '._AM_OBITUARIES_FIRSTNAME."</th><th align='center'>"._AM_OBITUARIES_ACTION."</th></tr>";
+ foreach ($items as $item) {
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $id = $item->getVar('obituaries_id');
+ $user = null;
+ $user = $item->getXoopsUser();
+ $uname = '';
+ if(is_object($user)) {
+ $uname = $user->getVar('uname');
+ }
+ $action_edit = "<a href='$baseurl?op=edit&id=".$id."' title='"._EDIT."'>".$birdthday_icones['edit'].'</a>';
+ $action_delete = "<a href='$baseurl?op=delete&id=".$id."' title='"._DELETE."'".$conf_msg.">".$birdthday_icones['delete'].'</a>';
+
+ echo "<tr class='".$class."'>\n";
+ echo "<td align='center'>".obituaries_utils::SQLDateToHuman($item->getVar('obituaries_date'))."</td>";
+ echo "<td align='center'>".$uname.'</td>';
+ echo "<td align='center'>".$item->getFullName().'</td>';
+ echo "<td align='center'>".$action_edit.' '.$action_delete.'</td>';
+ echo "</tr>\n";
+ }
+ echo "</table>\n";
+ if(isset($pagenav) && is_object($pagenav)) {
+ echo "<div align='left'>".$pagenav->renderNav()."</div>";
+ }
+ echo "<br /><br />\n";
+ }
+ $item = $hBdUsersObituaries->create(true);
+ $form = $hBdUsersObituaries->getForm($item, $baseurl);
+ $form->display();
+ break;
+
+ // ****************************************************************************************************************
+ case 'maintain': // Maintenance des tables et du cache
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('main.php');
+ require_once '../xoops_version.php';
+ $tables = array();
+ foreach ($modversion['tables'] as $table) {
+ $tables[] = $xoopsDB->prefix($table);
+ }
+ if(count($tables) > 0) {
+ $list = implode(',', $tables);
+ $xoopsDB->queryF('CHECK TABLE '.$list);
+ $xoopsDB->queryF('ANALYZE TABLE '.$list);
+ $xoopsDB->queryF('OPTIMIZE TABLE '.$list);
+ }
+ obituaries_utils::updateCache();
+ $hBdUsersObituaries->forceCacheClean();
+ obituaries_utils::redirect(_AM_OBITUARIES_SAVE_OK, $baseurl, 2);
+ break;
+
+ // ****************************************************************************************************************
+ case 'edit': // Edition d'un utilisateur existant
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('main.php');
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if(empty($id)) {
+ obituaries_utils::redirect(_AM_OBITUARIES_ERROR_1, $baseurl, 5);
+ }
+ // Item exits ?
+ $item = null;
+ $item = $hBdUsersObituaries->get($id);
+ if(!is_object($item)) {
+ obituaries_utils::redirect(_AM_OBITUARIES_NOT_FOUND, $baseurl, 5);
+ }
+ $form = $hBdUsersObituaries->getForm($item, $baseurl);
+ $form->display();
+ break;
+
+ // ****************************************************************************************************************
+ case 'saveedit': // Enregistrement des modifications
+ // ****************************************************************************************************************
+ xoops_cp_header();
+ echo $indexAdmin->addNavigation('main.php');
+ $result = $hBdUsersObituaries->saveUser();
+ if($result) {
+ obituaries_utils::redirect(_AM_OBITUARIES_SAVE_OK, $baseurl, 1);
+ } else {
+ obituaries_utils::redirect(_AM_OBITUARIES_SAVE_PB, $baseurl, 3);
+ }
+ break;
+
+ // ****************************************************************************************************************
+ case 'delete': // Suppression d'un utilisateur
+ // ****************************************************************************************************************
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if(empty($id)) {
+ obituaries_utils::redirect(_AM_OBITUARIES_ERROR_1, $baseurl, 5);
+ }
+ // Item exits ?
+ $item = null;
+ $item = $hBdUsersObituaries->get($id);
+ if(!is_object($item)) {
+ obituaries_utils::redirect(_AM_OBITUARIES_NOT_FOUND, $baseurl, 5);
+ }
+ $result = $hBdUsersObituaries->deleteUser($item);
+ if($result) {
+ obituaries_utils::redirect(_AM_OBITUARIES_SAVE_OK, $baseurl, 1);
+ } else {
+ obituaries_utils::redirect(_AM_OBITUARIES_SAVE_PB, $baseurl, 3);
+ }
+
+}
+xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/obituaries/trunk/obituaries/admin/menu.php
===================================================================
--- XoopsModules/obituaries/trunk/obituaries/admin/menu.php 2012-12-18 09:17:27 UTC (rev 10440)
+++ XoopsModules/obituaries/trunk/obituaries/admin/menu.php 2012-12-18 09:33:49 UTC (rev 10441)
@@ -1,34 +1,33 @@
-<?php
-/**
- * ****************************************************************************
- * Obituaries - MODULE FOR XOOPS
- * Based on birthday module made by Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * Created on 10 jully. 08 at 11:32:40
- * ****************************************************************************
- */
-
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
-$dirname = basename(dirname(dirname(__FILE__)));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
-$pathIcon32 = $module->getInfo('icons32');
-
-$adminmenu = array();
-$i = 1;
-$adminmenu[$i]["title"] = _MI_OBITUARIES_HOME;
-$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_OBITUARIES_OBITUARIES;
-$adminmenu[$i]["link"] = "admin/main.php";
-$adminmenu[$i]["icon"] = './images/obituary.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_OBITUARIES_MAINTAIN;
-$adminmenu[$i]["link"] = "admin/main.php?op=maintain";
-$adminmenu[$i]["icon"] = './images/maintenance.png';
-$i++;
-
-$adminmenu[$i]["title"] =_MI_OBITUARIES_ABOUT;
-$adminmenu[$i]["link"] = "admin/about.php";
+<?php
+/**
+ * ****************************************************************************
+ * Obituaries - MODULE FOR XOOPS
+ * Based on birthday module made by Herv\xE9 Thouzard
+ * Created on 10 jully. 08 at 11:32:40
+ * ****************************************************************************
+ */
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+
+$adminmenu = array();
+$i = 1;
+$adminmenu[$i]["title"] = _MI_OBITUARIES_HOME;
+$adminmenu[$i]["link"] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_OBITUARIES_OBITUARIES;
+$adminmenu[$i]["link"] = "admin/main.php";
+$adminmenu[$i]["icon"] = './images/obituary.png';
+//$i++;
+//$adminmenu[$i]["title"] = _MI_OBITUARIES_MAINTAIN;
+//$adminmenu[$i]["link"] = "admin/main.php?op=maintain";
+//$adminmenu[$i]["icon"] = './images/maintenance.png';
+$i++;
+$adminmenu[$i]["title"] =_MI_OBITUARIES_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
\ No newline at end of file
Deleted: XoopsModules/obituaries/trunk/obituaries/class/PEAR.php
===================================================================
--- XoopsModules/obituaries/trunk/obituaries/class/PEAR.php 2012-12-18 09:17:27 UTC (rev 10440)
+++ XoopsModules/obituaries/trunk/obituaries/class/PEAR.php 2012-12-18 09:33:49 UTC (rev 10441)
@@ -1,1066 +0,0 @@
-<?php
-/**
- * PEAR, the PHP Extension and Application Repository
- *
- * PEAR class and PEAR_Error class
- *
- * PHP versions 4 and 5
- *
- * @category pear
- * @package PEAR
- * @author Sterling Hughes <ste...@ph...>
- * @author Stig Bakken <ss...@ph...>
- * @author Tomas V.V.Cox <co...@id...>
- * @author Greg Beaver <ce...@ph...>
- * @copyright 1997-2010 The Authors
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version CVS: $Id: PEAR.php 313023 2011-07-06 19:17:11Z dufuz $
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 0.1
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN', 1);
-define('PEAR_ERROR_PRINT', 2);
-define('PEAR_ERROR_TRIGGER', 4);
-define('PEAR_ERROR_DIE', 8);
-define('PEAR_ERROR_CALLBACK', 16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
- version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
- define('OS_WINDOWS', true);
- define('OS_UNIX', false);
- define('PEAR_OS', 'Windows');
-} else {
- define('OS_WINDOWS', false);
- define('OS_UNIX', true);
- define('PEAR_OS', 'Unix'); // blatant assumption
-}
-
-$GLOBALS['_PEAR_default_error_mode'] = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options'] = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs'] = array();
-$GLOBALS['_PEAR_error_handler_stack'] = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes. Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix). Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters. Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded. If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category pear
- * @package PEAR
- * @author Stig Bakken <ss...@ph...>
- * @author Tomas V.V. Cox <co...@id...>
- * @author Greg Beaver <ce...@ph...>
- * @copyright 1997-2006 The PHP Group
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.4
- * @link http://pear.php.net/package/PEAR
- * @see PEAR_Error
- * @since Class available since PHP 4.0.2
- * @link http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-
-class PEAR
-{
- /**
- * Whether to enable internal debug messages.
- *
- * @var bool
- * @access private
- */
- var $_debug = false;
-
- /**
- * Default error mode for this object.
- *
- * @var int
- * @access private
- */
- var $_default_error_mode = null;
-
- /**
- * Default error options used for this object when error mode
- * is PEAR_ERROR_TRIGGER.
- *
- * @var int
- * @access private
- */
- var $_default_error_options = null;
-
- /**
- * Default error handler (callback) for this object, if error mode is
- * PEAR_ERROR_CALLBACK.
- *
- * @var string
- * @access private
- */
- var $_default_error_handler = '';
-
- /**
- * Which class to use for error objects.
- *
- * @var string
- * @access private
- */
- var $_error_class = 'PEAR_Error';
-
- /**
- * An array of expected errors.
- *
- * @var array
- * @access private
- */
- var $_expected_errors = array();
-
- /**
- * Constructor. Registers this object in
- * $_PEAR_destructor_object_list for destructor emulation if a
- * destructor object exists.
- *
- * @param string $error_class (optional) which class to use for
- * error objects, defaults to PEAR_Error.
- * @access public
- * @return void
- */
- function PEAR($error_class = null)
- {
- $classname = strtolower(get_class($this));
- if ($this->_debug) {
- print "PEAR constructor called, class=$classname\n";
- }
-
- if ($error_class !== null) {
- $this->_error_class = $error_class;
- }
-
- while ($classname && strcasecmp($classname, "pear")) {
- $destructor = "_$classname";
- if (method_exists($this, $destructor)) {
- global $_PEAR_destructor_object_list;
- $_PEAR_destructor_object_list[] = &$this;
- if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
- register_shutdown_function("_PEAR_call_destructors");
- $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
- }
- break;
- } else {
- $classname = get_parent_class($classname);
- }
- }
- }
-
- /**
- * Destructor (the emulated type of...). Does nothing right now,
- * but is included for forward compatibility, so subclass
- * destructors should always call it.
- *
- * See the note in the class desciption about output from
- * destructors.
- *
- * @access public
- * @return void
- */
- function _PEAR() {
- if ($this->_debug) {
- printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
- }
- }
-
- /**
- * If you have a class that's mostly/entirely static, and you need static
- * properties, you can use this method to simulate them. Eg. in your method(s)
- * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
- * You MUST use a reference, or they will not persist!
- *
- * @access public
- * @param string $class The calling classname, to prevent clashes
- * @param string $var The variable to retrieve.
- * @return mixed A reference to the variable. If not set it will be
- * auto initialised to NULL.
- */
- function &getStaticProperty($class, $var)
- {
- static $properties;
- if (!isset($properties[$class])) {
- $properties[$class] = array();
- }
-
- if (!array_key_exists($var, $properties[$class])) {
- $properties[$class][$var] = null;
- }
-
- return $properties[$class][$var];
- }
-
- /**
- * Use this function to register a shutdown method for static
- * classes.
- *
- * @access public
- * @param mixed $func The function name (or array of class/method) to call
- * @param mixed $args The arguments to pass to the function
- * @return void
- */
- function registerShutdownFunc($func, $args = array())
- {
- // if we are called statically, there is a potential
- // that no shutdown func is registered. Bug #6445
- if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
- register_shutdown_function("_PEAR_call_destructors");
- $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
- }
- $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
- }
-
- /**
- * Tell whether a value is a PEAR error.
- *
- * @param mixed $data the value to test
- * @param int $code if $data is an error object, return true
- * only if $code is a string and
- * $obj->getMessage() == $code or
- * $code is an integer and $obj->getCode() == $code
- * @access public
- * @return bool true if parameter is an error
- */
- function isError($data, $code = null)
- {
- if (!is_a($data, 'PEAR_Error')) {
- return false;
- }
-
- if (is_null($code)) {
- return true;
- } elseif (is_string($code)) {
- return $data->getMessage() == $code;
- }
-
- return $data->getCode() == $code;
- }
-
- /**
- * Sets how errors generated by this object should be handled.
- * Can be invoked both in objects and statically. If called
- * statically, setErrorHandling sets the default behaviour for all
- * PEAR objects. If called in an object, setErrorHandling sets
- * the default behaviour for that object.
- *
- * @param int $mode
- * One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
- * PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
- * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
- *
- * @param mixed $options
- * When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
- * of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
- *
- * When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
- * to be the callback function or method. A callback
- * function is a string with the name of the function, a
- * callback method is an array of two elements: the element
- * at index 0 is the object, and the element at index 1 is
- * the name of the method to call in the object.
- *
- * When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
- * a printf format string used when printing the error
- * message.
- *
- * @access public
- * @return void
- * @see PEAR_ERROR_RETURN
- * @see PEAR_ERROR_PRINT
- * @see PEAR_ERROR_TRIGGER
- * @see PEAR_ERROR_DIE
- * @see PEAR_ERROR_CALLBACK
- * @see PEAR_ERROR_EXCEPTION
- *
- * @since PHP 4.0.5
- */
- function setErrorHandling($mode = null, $options = null)
- {
- if (isset($this) && is_a($this, 'PEAR')) {
- $setmode = &$this->_default_error_mode;
- $setoptions = &$this->_default_error_options;
- } else {
- $setmode = &$GLOBALS['_PEAR_default_error_mode'];
- $setoptions = &$GLOBALS['_PEAR_default_error_options'];
- }
-
- switch ($mode) {
- case PEAR_ERROR_EXCEPTION:
- case PEAR_ERROR_RETURN:
- case PEAR_ERROR_PRINT:
- case PEAR_ERROR_TRIGGER:
- case PEAR_ERROR_DIE:
- case null:
- $setmode = $mode;
- $setoptions = $options;
- break;
-
- case PEAR_ERROR_CALLBACK:
- $setmode = $mode;
- // class/object method callback
- if (is_callable($options)) {
- $setoptions = $options;
- } else {
- trigger_error("invalid error callback", E_USER_WARNING);
- }
- break;
-
- default:
- trigger_error("invalid error mode", E_USER_WARNING);
- break;
- }
- }
-
- /**
- * This method is used to tell which errors you expect to get.
- * Expected errors are always returned with error mode
- * PEAR_ERROR_RETURN. Expected error codes are stored in a stack,
- * and this method pushes a new element onto it. The list of
- * expected errors are in effect until they are popped off the
- * stack with the popExpect() method.
- *
- * Note that this method can not be called statically
- *
- * @param mixed $code a single error code or an array of error codes to expect
- *
- * @return int the new depth of the "expected errors" stack
- * @access public
- */
- function expectError($code = '*')
- {
- if (is_array($code)) {
- array_push($this->_expected_errors, $code);
- } else {
- array_push($this->_expected_errors, array($code));
- }
- return count($this->_expected_errors);
- }
-
- /**
- * This method pops one element off the expected error codes
- * stack.
- *
- * @return array the list of error codes that were popped
- */
- function popExpect()
- {
- return array_pop($this->_expected_errors);
- }
-
- /**
- * This method checks unsets an error code if available
- *
- * @param mixed error code
- * @return bool true if the error code was unset, false otherwise
- * @access private
- * @since PHP 4.3.0
- */
- function _checkDelExpect($error_code)
- {
- $deleted = false;
- foreach ($this->_expected_errors as $key => $error_array) {
- if (in_array($error_code, $error_array)) {
- unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
- $deleted = true;
- }
-
- // clean up empty arrays
- if (0 == count($this->_expected_errors[$key])) {
- unset($this->_expected_errors[$key]);
- }
- }
-
- return $deleted;
- }
-
- /**
- * This method deletes all occurences of the specified element from
- * the expected error codes stack.
- *
- * @param mixed $error_code error code that should be deleted
- * @return mixed list of error codes that were deleted or error
- * @access public
- * @since PHP 4.3.0
- */
- function delExpect($error_code)
- {
- $deleted = false;
- if ((is_array($error_code) && (0 != count($error_code)))) {
- // $error_code is a non-empty array here; we walk through it trying
- // to unset all values
- foreach ($error_code as $key => $error) {
- $deleted = $this->_checkDelExpect($error) ? true : false;
- }
-
- return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
- } elseif (!empty($error_code)) {
- // $error_code comes alone, trying to unset it
- if ($this->_checkDelExpect($error_code)) {
- return true;
- }
-
- return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
- }
-
- // $error_code is empty
- return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
- }
-
- /**
- * This method is a wrapper that returns an instance of the
- * configured error class with this object's default error
- * handling applied. If the $mode and $options parameters are not
- * specified, the object's defaults are used.
- *
- * @param mixed $message a text error message or a PEAR error object
- *
- * @param int $code a numeric error code (it is up to your class
- * to define these if you want to use codes)
- *
- * @param int $mode One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
- * PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
- * PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
- *
- * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
- * specifies the PHP-internal error level (one of
- * E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
- * If $mode is PEAR_ERROR_CALLBACK, this
- * parameter specifies the callback function or
- * method. In other error modes this parameter
- * is ignored.
- *
- * @param string $userinfo If you need to pass along for example debug
- * information, this parameter is meant for that.
- *
- * @param string $error_class The returned error object will be
- * instantiated from this class, if specified.
- *
- * @param bool $skipmsg If true, raiseError will only pass error codes,
- * the error message parameter will be dropped.
- *
- * @access public
- * @return object a PEAR error object
- * @see PEAR::setErrorHandling
- * @since PHP 4.0.5
- */
- function &raiseError($message = null,
- $code = null,
- $mode = null,
- $options = null,
- $userinfo = null,
- $error_class = null,
- $skipmsg = false)
- {
- // The error is yet a PEAR error object
- if (is_object($message)) {
- $code = $message->getCode();
- $userinfo = $message->getUserInfo();
- $error_class = $message->getType();
- $message->error_message_prefix = '';
- $message = $message->getMessage();
- }
-
- if (
- isset($this) &&
- isset($this->_expected_errors) &&
- count($this->_expected_errors) > 0 &&
- count($exp = end($this->_expected_errors))
- ) {
- if ($exp[0] == "*" ||
- (is_int(reset($exp)) && in_array($code, $exp)) ||
- (is_string(reset($exp)) && in_array($message, $exp))
- ) {
- $mode = PEAR_ERROR_RETURN;
- }
- }
-
- // No mode given, try global ones
- if ($mode === null) {
- // Class error handler
- if (isset($this) && isset($this->_default_error_mode)) {
- $mode = $this->_default_error_mode;
- $options = $this->_default_error_options;
- // Global error handler
- } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
- $mode = $GLOBALS['_PEAR_default_error_mode'];
- $options = $GLOBALS['_PEAR_default_error_options'];
- }
- }
-
- if ($error_class !== null) {
- $ec = $error_class;
- } elseif (isset($this) && isset($this->_error_class)) {
- $ec = $this->_error_class;
- } else {
- $ec = 'PEAR_Error';
- }
-
- if (intval(PHP_VERSION) < 5) {
- // little non-eval hack to fix bug #12147
- include 'PEAR/FixPHP5PEARWarnings.php';
- return $a;
- }
-
- if ($skipmsg) {
- $a = new $ec($code, $mode, $options, $userinfo);
- } else {
- $a = new $ec($message, $code, $mode, $options, $userinfo);
- }
-
- return $a;
- }
-
- /**
- * Simpler form of raiseError with fewer options. In most cases
- * message, code and userinfo are enough.
- *
- * @param mixed $message a text error message or a PEAR error object
- *
- * @param int $code a numeric error code (it is up to your class
- * to define these if you want to use codes)
- *
- * @param string $userinfo If you need to pass along for example debug
- * information, this parameter is meant for that.
- *
- * @access public
- * @return object a PEAR error object
- * @see PEAR::raiseError
- */
- function &throwError($message = null, $code = null, $userinfo = null)
- {
- if (isset($this) && is_a($this, 'PEAR')) {
- $a = &$this->raiseError($message, $code, null, null, $userinfo);
- return $a;
- }
-
- $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
- return $a;
- }
-
- function staticPushErrorHandling($mode, $options = null)
- {
- $stack = &$GLOBALS['_PEAR_error_handler_stack'];
- $def_mode = &$GLOBALS['_PEAR_default_error_mode'];
- $def_options = &$GLOBALS['_PEAR_default_error_options'];
- $stack[] = array($def_mode, $def_options);
- switch ($mode) {
- case PEAR_ERROR_EXCEPTION:
- case PEAR_ERROR_RETURN:
- case PEAR_ERROR_PRINT:
- case PEAR_ERROR_TRIGGER:
- case PEAR_ERROR_DIE:
- case null:
- $def_mode = $mode;
- $def_options = $options;
- break;
-
- case PEAR_ERROR_CALLBACK:
- $def_mode = $mode;
- // class/object method callback
- if (is_callable($options)) {
- $def_options = $options;
- } else {
- trigger_error("invalid error callback", E_USER_WARNING);
- }
- break;
-
- default:
- trigger_error("invalid error mode", E_USER_WARNING);
- break;
- }
- $stack[] = array($mode, $options);
- return true;
- }
-
- function staticPopErrorHandling()
- {
- $stack = &$GLOBALS['_PEAR_error_handler_stack'];
- $setmode = &$GLOBALS['_PEAR_default_error_mode'];
- $setoptions = &$GLOBALS['_PEAR_default_error_options'];
- array_pop($stack);
- list($mode, $options) = $stack[sizeof($stack) - 1];
- array_pop($stack);
- switch ($mode) {
- case PEAR_ERROR_EXCEPTION:
- case PEAR_ERROR_RETURN:
- case PEAR_ERROR_PRINT:
- case PEAR_ERROR_TRIGGER:
- case PEAR_ERROR_DIE:
- case null:
- $setmode = $mode;
- $setoptions = $options;
- break;
-
- case PEAR_ERROR_CALLBACK:
- $setmode = $mode;
- // class/object method callback
- if (is_callable($options)) {
- $setoptions = $options;
- } else {
- trigger_error("invalid error callback", E_USER_WARNING);
- }
- break;
-
- default:
- trigger_error("invalid error mode", E_USER_WARNING);
- break;
- }
- return true;
- }
-
- /**
- * Push a new error handler on top of the error handler options stack. With this
- * you can easily override the actual error handler for some code and restore
- * it later with popErrorHandling.
- *
- * @param mixed $mode (same as setErrorHandling)
- * @param mixed $options (same as setErrorHandling)
- *
- * @return bool Always true
- *
- * @see PEAR::setErrorHandling
- */
- function pushErrorHandling($mode, $options = null)
- {
- $stack = &$GLOBALS['_PEAR_error_handler_stack'];
- if (isset($this) && is_a($this, 'PEAR')) {
- $def_mode = &$this->_default_error_mode;
- $def_options = &$this->_default_error_options;
- } else {
- $def_mode = &$GLOBALS['_PEAR_default_error_mode'];
- $def_options = &$GLOBALS['_PEAR_default_error_options'];
- }
- $stack[] = array($def_mode, $def_options);
-
- if (isset($this) && is_a($this, 'PEAR')) {
- $this->setErrorHandling($mode, $options);
- } else {
- PEAR::setErrorHandling($mode, $options);
- }
- $stack[] = array($mode, $options);
- return true;
- }
-
- /**
- * Pop the last error handler used
- *
- * @return bool Always true
- *
- * @see PEAR::pushErrorHandling
- */
- function popErrorHandling()
- {
- $stack = &$GLOBALS['_PEAR_error_handler_stack'];
- array_pop($stack);
- list($mode, $options) = $stack[sizeof($stack) - 1];
- array_pop($stack);
- if (isset($this) && is_a($this, 'PEAR')) {
- $this->setErrorHandling($mode, $options);
- } else {
- PEAR::setErrorHandling($mode, $options);
- }
- return true;
- }
-
- /**
- * OS independant PHP extension load. Remember to take care
- * on the correct extension name for case sensitive OSes.
- *
- * @param string $ext The extension name
- * @return bool Success or not on the dl() call
- */
- function loadExtension($ext)
- {
- if (extension_loaded($ext)) {
- return true;
- }
-
- // if either returns true dl() will produce a FATAL error, stop that
- if (
- function_exists('dl') === false ||
- ini_get('enable_dl') != 1 ||
- ini_get('safe_mode') == 1
- ) {
- return false;
- }
-
- if (OS_WINDOWS) {
- $suffix = '.dll';
- } elseif (PHP_OS == 'HP-UX') {
- $suffix = '.sl';
- } elseif (PHP_OS == 'AIX') {
- $suffix = '.a';
- } elseif (PHP_OS == 'OSX') {
- $suffix = '.bundle';
- } else {
- $suffix = '.so';
- }
-
- return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
- }
-}
-
-
-if (PEAR_ZE2) {
- include_once 'PEAR5.php';
-}
-if (!function_exists("_PEAR_call_destructors()")){
-function _PEAR_call_destructors()
-{
- global $_PEAR_destructor_object_list;
- if (is_array($_PEAR_destructor_object_list) &&
- sizeof($_PEAR_destructor_object_list))
- {
- reset($_PEAR_destructor_object_list);
- if (PEAR_ZE2) {
- $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
- } else {
- $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
- }
-
- if ($destructLifoExists) {
- $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
- }
-
- while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
- $classname = get_class($objref);
- while ($classname) {
- $destructor = "_$classname";
- if (method_exists($objref, $destructor)) {
- $objref->$destructor();
- break;
- } else {
- $classname = get_parent_class($classname);
- }
- }
- }
- // Empty the object list to ensure that destructors are
- // not called more than once.
- $_PEAR_destructor_object_list = array();
- }
-
- // Now call the shutdown functions
- if (
- isset($GLOBALS['_PEAR_shutdown_funcs']) &&
- is_array($GLOBALS['_PEAR_shutdown_funcs']) &&
- !empty($GLOBALS['_PEAR_shutdown_funcs'])
- ) {
- foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
- call_user_func_array($value[0], $value[1]);
- }
- }
-}
-}
-
-/**
- * Standard PEAR error class for PHP 4
- *
- * This class is supserseded by {@link PEAR_Exception} in PHP 5
- *
- * @category pear
- * @package PEAR
- * @author Stig Bakken <ss...@ph...>
- * @author Tomas V.V. Cox <co...@id...>
- * @author Gregory Beaver <ce...@ph...>
- * @copyright 1997-2006 The PHP Group
- * @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @version Release: 1.9.4
- * @link http://pear.php.net/manual/en/core.pear.pear-error.php
- * @see PEAR::raiseError(), PEAR::throwError()
- * @since Class available since PHP 4.0.2
- */
-class PEAR_Error
-{
- var $error_message_prefix = '';
- var $mode = PEAR_ERROR_RETURN;
- var $level = E_USER_NOTICE;
- var $code = -1;
- var $message = '';
- var $userinfo = '';
- var $backtrace = null;
-
- /**
- * PEAR_Error constructor
- *
- * @param string $message message
- *
- * @param int $code (optional) error code
- *
- * @param int $mode (optional) error mode, one of: PEAR_ERROR_RETURN,
- * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
- * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
- *
- * @param mixed $options (optional) error level, _OR_ in the case of
- * PEAR_ERROR_CALLBACK, the callback function or object/method
- * tuple.
- *
- * @param string $userinfo (optional) additional user/debug info
- *
- * @access public
- *
- */
- function PEAR_Error($message = 'unknown error', $code = null,
- $mode = null, $options = null, $userinfo = null)
- {
- if ($mode === null) {
- $mode = PEAR_ERROR_RETURN;
- }
- $this->message = $message;
- $this->code = $code;
- $this->mode = $mode;
- $this->userinfo = $userinfo;
-
- if (PEAR_ZE2) {
- $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
- } else {
- $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
- }
-
- if (!$skiptrace) {
- $this->backtrace = debug_backtrace();
- if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
- unset($this->backtrace[0]['object']);
- }
- }
-
- if ($mode & PEAR_ERROR_CALLBACK) {
- $this->level = E_USER_NOTICE;
- $this->callback = $options;
- } else {
- if ($options === null) {
- $options = E_USER_NOTICE;
- }
-
- $this->level = $options;
- $this->callback = null;
- }
-
- if ($this->mode & PEAR_ERROR_PRINT) {
- if (is_null($options) || is_int($options)) {
- $format = "%s";
- } else {
- $format = $options;
- }
-
- printf($format, $this->getMessage());
- }
-
- if ($this->mode & PEAR_ERROR_TRIGGER) {
- trigger_error($this->getMessage(), $this->level);
- }
-
- if ($this->mode & PEAR_ERROR_DIE) {
- $msg = $this->getMessage();
- if (is_null($options) || is_int($options)) {
- $format = "%s";
- if (substr($msg, -1) != "\n") {
- $msg .= "\n";
- }
- } else {
- $format = $options;
- }
- die(sprintf($format, $msg));
- }
-
- if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) {
- call_user_func($this->callback, $this);
- }
-
- if ($this->mode & PEAR_ERROR_EXCEPTION) {
- trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
- eval('$e = new Exception($this->message, $this->code);throw($e);');
- }
- }
-
- /**
- * Get the error mode from an error object.
- *
- * @return int error mode
- * @access public
- */
- function getMode()
- {
- return $this->mode;
- }
-
- /**
- * Get the callback function/method from an error object.
- *
- * @return mixed callback function or object/method array
- * @access public
- */
- function getCallback()
- {
- return $this->callback;
- }
-
- /**
- * Get the error message from an error object.
- *
- * @return string full error message
- * @access public
- */
- function getMessage()
- {
- return ($this->error_message_prefix . $this->message);
- }
-
- /**
- * Get error code from an error object
- *
- * @return int error code
- * @access public
- */
- function getCode()
- {
- return $this->code;
- }
-
- /**
- * Get the name of this error/exception.
- *
- * @return string error/exception name (type)
- * @access public
- */
- function getType()
- {
- return get_class($this);
- }
-
- /**
- * Get additional user-supplied information.
- *
- * @return string user-supplied information
- * @access public
- */
- function getUserInfo()
- {
- return $this->userinfo;
- }
-
- /**
- * Get additional debug information supplied by the application.
- *
- * @return string debug information
- * @access public
- */
- function getDebugInfo()
- {
- return $this->getUserInfo();
- }
-
- /**
- * Get the call backtrace from where the error was generated.
- * Supported with PHP 4.3.0 or newer.
- *
- * @param int $frame (optional) what frame to fetch
- * @return array Backtrace, or NULL if not available.
- * @access public
- */
- function getBacktrace($frame = null)
- {
- if (defined('PEAR_IGNORE_BACKTRACE')) {
- return null;
- }
- if ($frame === null) {
- return $this->backtrace;
- }
- return $this->backtrace[$frame];
- }
-
- function addUserInfo($info)
- {
- if (empty($this->userinfo)) {
- $this->userinfo = $info;
- } else {
- $this->userinfo .= " ** $info";
- }
- }
-
- function __toString()
- {
- return $this->getMessage();
- }
-
- /**
- * Make a string representation of this object.
- *
- * @return string a string with an object summary
- * @access public
- */
- function toString()
- {
- $modes = array();
- $levels = array(E_USER_NOTICE => 'notice',
- E_USER_WARNING => 'warning',
- E_USER_ERROR => 'error');
- if ($this->mode & PEAR_ERROR_CALLBACK) {
- if (is_array($this->callback)) {
- $callback = (is_object($this->callback[0]) ?
- strtolower(get_class($this->callback[0])) :
- $this->callback[0]) . '::' .
- $this->callback[1];
- } else {
- $callback = $this->callback;
- }
- return sprintf('[%s: message="%s" code=%d mode=callback '.
- 'callback=%s prefix="%s" info="%s"]',
- strtolower(get_class($this)), $this->message, $this->code,
- $callback, $this->error_message_prefix,
- $this->userinfo);
- }
- if ($this->mode & PEAR_ERROR_PRINT) {
- $modes[] = 'print';
- }
- if ($this->mode & PEAR_ERROR_TRIGGER) {
- $modes[] = 'trigger';
- }
- if ($this->mode & PEAR_ERROR_DIE) {
- $modes[] = 'die';
- }
- if ($this->mode & PEAR_ERROR_RETURN) {
- $modes[] = 'return';
- }
- return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
- 'prefix="%s" info="%s"]',
- strtolower(get_class($this)), $this->message, $this->code,
- implode("|", $modes), $levels[$this->level],
- $this->error_message_prefix,
- $this->userinfo);
- }
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
Deleted: XoopsModules/obituaries/trunk/obituaries/class/PEAR5.php
===================================================================
--- XoopsModules/obituaries/trunk/obituaries/class/PEAR5.php 2012-12-18 09:17:27 UTC (rev 10440)
+++ XoopsModules/obituaries/trunk/obituaries/class/PEAR5.php 2012-12-18 09:33:49 UTC (rev 10441)
@@ -1,33 +0,0 @@
-<?php
-/**
- * This is only meant for PHP 5 to get rid of certain strict warning
- * that doesn't get hidden since it's in the shutdown function
- */
-class PEAR5
-{
- /**
- * If you have a class that's mostly/entirely static, and you need static
- * properties, you can use this method to simulate them. Eg. in your method(s)
- * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
- * You MUST use a reference, or they will not persist!
- *
- * @access public
- * @param string $class The calling classname, to prevent clashes
- * @param string $var The variable to retrieve.
- * @return mixed A reference to the variable. If not set it will be
- * auto initialised to NULL.
- */
- static function &getStaticProperty($class, $var)
- {
- static $properties;
- if (!isset($properties[$class])) {
- $properties[$class] = array();
- }
-
- if (!array_key_exists($var, $properties[$class])) {
- $properties[$class][$var] = null;
- }
-
- return $properties[$class][$var];
- }
-}
\ No newline at end of file
Deleted: XoopsModules/obituaries/trunk/obituaries/class/PersistableObjectHandler.php
===================================================================
--- XoopsModules/obituaries/trunk/obituaries/class/PersistableObjectHandler.php 2012-12-18 09:17:27 UTC (rev 10440)
+++ XoopsModules/obituaries/trunk/obituaries/class/PersistableObjectHandler.php 2012-12-18 09:33:49 UTC (rev 10441)
@@ -1,763 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * Obituaries - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com)
- * Created on 20 oct. 07 at 14:38:20
- * Version : $Id:
- * ****************************************************************************
- */
-
-if (!defined('XOOPS_ROOT_PATH')) {
- die("XOOPS root path not defined");
-}
-
-class Obituaries_Object extends XoopsObject
-{
- function toArray($format = 's')
- {
- $ret = array();
- foreach ($this->vars as $k => $v) {
- $ret[$k] = $this->getVar($k, $format);
- }
- return $ret;
- }
-}
-
-
-
-
-/**
- * Persistable Object Handler class.
- * This class is responsible for providing data access mechanisms to the data source
- * of derived class objects. Original Author : Mithrandir
- */
-class Obituaries_XoopsPersistableObjectHandler extends XoopsObjectHandler {
-
- /**#@+
- * Information about the class, the handler is managing
- *
- * @var string
- */
- public $table;
- protected $keyName;
- protected $className;
- protected $identifierName;
- protected $cacheOptions = array();
- /**#@-*/
-
- /**
- * Constructor - called from child classes
- * @param object $db {@link XoopsDatabase} object
- * @param string $tablename Name of database table
- * @param string $classname Name of Class, this handler is managing
- * @param string $keyname Name of the property, holding the key
- * @param string $idenfierName Name of the property, holding the label
- * @param array $cacheOptions Optional, options for the cache
- *
- * @return void
- */
- function __construct(&$db, $tablename, $classname, $keyname, $idenfierName = '', $cacheOptions=null) {
- $this->XoopsObjectHandler($db);
- $this->table = $db->prefix($tablename);
- $this->keyName = $keyname;
- $this->className = $classname;
- if (trim($idenfierName) != '') {
- $this->identifierName = $idenfierName;
- }
- // To diable cache, add this line after the first one : 'caching' => false,
- if(is_null($cacheOptions)) {
- $this->setCachingOptions(array('cacheDir' => XOOPS_UPLOAD_PATH.'/obituaries/', 'lifeTime' => null, 'automaticSerialization' => true, 'fileNameProtection' => false));
- } else {
- $this->setCachingOptions($cacheOptions);
- }
- }
-
- function setCachingOptions($cacheOptions)
- {
- $this->cacheOptions = $cacheOptions;
- }
-
- /**
- * Generates a unique ID for a Sql Query
- *
- * @param string $query The SQL query for which we want a unidque ID
- * @param integer $start Which record to start at
- * @param integer $limit Max number of objects to fetch
- * @return string An MD5 of the query
- */
- protected function _getIdForCache($query, $start, $limi...
[truncated message content] |
|
From: <be...@us...> - 2012-12-18 09:17:29
|
Revision: 10440
http://sourceforge.net/p/xoops/svn/10440
Author: beckmi
Date: 2012-12-18 09:17:27 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 2.30 Final
Modified Paths:
--------------
XoopsModules/birthday/trunk/birthday/class/users_birthday.php
XoopsModules/birthday/trunk/birthday/docs/changelog.txt
XoopsModules/birthday/trunk/birthday/xoops_version.php
Modified: XoopsModules/birthday/trunk/birthday/class/users_birthday.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/class/users_birthday.php 2012-12-18 07:46:21 UTC (rev 10439)
+++ XoopsModules/birthday/trunk/birthday/class/users_birthday.php 2012-12-18 09:17:27 UTC (rev 10440)
@@ -299,10 +299,14 @@
$item->setVar('birthday_photo', '');
}
- $return = birthday_utils::uploadFile(0);
+ $uploadFolder=birthday_utils::getModuleOption('folder_path');
+
+ $return = birthday_utils::uploadFile(0,$uploadFolder );
+
+
if($return === true) {
- $newDestName = birthday_utils::createUploadName(birthday_utils::getModuleOption('folder_path'), basename($destname), true);
- $retval = birthday_utils::resizePicture(birthday_utils::getModuleOption('folder_path').DIRECTORY_SEPARATOR.$destname, birthday_utils::getModuleOption('folder_path').DIRECTORY_SEPARATOR.$newDestName, $images_width, $images_height);
+ $newDestName = birthday_utils::createUploadName($uploadFolder, basename($destname), true);
+ $retval = birthday_utils::resizePicture($uploadFolder.DIRECTORY_SEPARATOR.$destname, $uploadFolder.DIRECTORY_SEPARATOR.$newDestName, $images_width, $images_height);
if($retval == 1 || $retval == 3) {
$item->setVar('birthday_photo', $newDestName);
}
Modified: XoopsModules/birthday/trunk/birthday/docs/changelog.txt
===================================================================
--- XoopsModules/birthday/trunk/birthday/docs/changelog.txt 2012-12-18 07:46:21 UTC (rev 10439)
+++ XoopsModules/birthday/trunk/birthday/docs/changelog.txt 2012-12-18 09:17:27 UTC (rev 10440)
@@ -1,7 +1,5 @@
-Changelog
-
*******
-v.2.3 RC3 Changes made by Michael Beck (Mamba)
+v.2.3 Final Changes made by Michael Beck (Mamba)
*******
- Converted to standard XoopsPersistableObjectHandler
- Removed Cache Lite
Modified: XoopsModules/birthday/trunk/birthday/xoops_version.php
===================================================================
--- XoopsModules/birthday/trunk/birthday/xoops_version.php 2012-12-18 07:46:21 UTC (rev 10439)
+++ XoopsModules/birthday/trunk/birthday/xoops_version.php 2012-12-18 09:17:27 UTC (rev 10440)
@@ -22,10 +22,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/12/21';
+$modversion['release_date'] = '2012/12/17';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC3";
+$modversion["module_status"] = "Final";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.5";
$modversion['min_admin'] = '1.1';
|
|
From: <be...@us...> - 2012-12-18 07:46:24
|
Revision: 10439
http://sourceforge.net/p/xoops/svn/10439
Author: beckmi
Date: 2012-12-18 07:46:21 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 2.21 Final (updating to PCRE regex, and few cosmetics)
Modified Paths:
--------------
XoopsModules/mytabs/trunk/mytabs/admin/admin_footer.php
XoopsModules/mytabs/trunk/mytabs/class/tab.php
XoopsModules/mytabs/trunk/mytabs/docs/changelog.txt
XoopsModules/mytabs/trunk/mytabs/docs/credits.txt
XoopsModules/mytabs/trunk/mytabs/xoops_version.php
Modified: XoopsModules/mytabs/trunk/mytabs/admin/admin_footer.php
===================================================================
--- XoopsModules/mytabs/trunk/mytabs/admin/admin_footer.php 2012-12-18 07:30:07 UTC (rev 10438)
+++ XoopsModules/mytabs/trunk/mytabs/admin/admin_footer.php 2012-12-18 07:46:21 UTC (rev 10439)
@@ -21,7 +21,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
Modified: XoopsModules/mytabs/trunk/mytabs/class/tab.php
===================================================================
--- XoopsModules/mytabs/trunk/mytabs/class/tab.php 2012-12-18 07:30:07 UTC (rev 10438)
+++ XoopsModules/mytabs/trunk/mytabs/class/tab.php 2012-12-18 07:46:21 UTC (rev 10439)
@@ -1,140 +1,140 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Mytabs
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: tab.php 0 2009-11-14 18:47:04Z trabis $
- */
-
-
-class MytabsTab extends XoopsObject
-{
- /**
- * constructor
- */
- function __construct()
- {
- $this->initVar("tabid", XOBJ_DTYPE_INT);
- $this->initVar("tabpageid", XOBJ_DTYPE_INT);
- $this->initVar('tabtitle', XOBJ_DTYPE_TXTBOX, '');
- $this->initVar('tablink', XOBJ_DTYPE_TXTBOX, '');
- $this->initVar('tabrev', XOBJ_DTYPE_TXTBOX, '');
- $this->initVar("tabpriority", XOBJ_DTYPE_INT,0);
- $this->initVar('tabshowalways', XOBJ_DTYPE_TXTBOX, 'yes');
- $this->initVar('tabfromdate', XOBJ_DTYPE_INT);
- $this->initVar('tabtodate', XOBJ_DTYPE_INT);
- $this->initVar('tabnote', XOBJ_DTYPE_TXTAREA, '');
- $this->initVar('tabgroups', XOBJ_DTYPE_ARRAY, serialize(array(XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_USERS)));
- }
-
- /**
- * Return whether this block is visible now
- *
- * @return bool
- */
- function isVisible()
- {
- return ($this->getVar('tabshowalways') == "yes" || ($this->getVar('tabshowalways') == "time" && $this->getVar('tabfromdate') <= time() && $this->getVar('tabtodate') >= time()));
- }
-
- /**
- * Get the form for adding or editing tabs
- *
- * @return MytabsTabForm
- */
- function getForm()
- {
- include_once XOOPS_ROOT_PATH . '/modules/mytabs/class/form/tab.php';
- $form = new MytabsTabForm('Tab', 'tabform', 'tab.php');
- $form->createElements($this);
- return $form;
- }
-
- function getTabTitle()
- {
- $title = $this->getVar('tabtitle');
-
- // PM detection and conversion
- if (preg_match('/{pm_new}/i', $title)
- || preg_match('/{pm_readed}/i', $title)
- || preg_match('/{pm_total}/i', $title)
- ) {
- if (is_object($GLOBALS['xoopsUser'])) {
- $new_messages = 0;
- $old_messages = 0;
- $som = 0;
- $user_id = 0;
- $user_id = $GLOBALS['xoopsUser']->getVar('uid');
- $pm_handler =& xoops_gethandler('privmessage');
- $criteria_new = new CriteriaCompo(new Criteria('read_msg', 0));
- $criteria_new->add(new Criteria('to_userid', $GLOBALS['xoopsUser']->getVar('uid')));
- $new_messages = $pm_handler->getCount($criteria_new);
- $criteria_old = new CriteriaCompo(new Criteria('read_msg', 1));
- $criteria_old->add(new Criteria('to_userid', $GLOBALS['xoopsUser']->getVar('uid')));
- $old_messages = $pm_handler->getCount($criteria_old);
- $som = $old_messages + $new_messages;
- if ($new_messages > 0) {
- $title = preg_replace('/\{pm_new\}/', '(<span style="color: rgb(255, 0, 0); font-weight: bold;">'.$new_messages.'</span>)', $title);
- }
- if ($old_messages > 0) {
- $title = preg_replace('/\{pm_readed\}/', '(<span style="color: rgb(255, 0, 0); font-weight: bold;">'.$old_messages.'</span>)', $title);
- }
- if ($old_messages > 0) {
- $title = preg_replace('/\{pm_total\}/', '(<span style="color: rgb(255, 0, 0); font-weight: bold;">'.$som.'</span>)' , $title);
- }
- }
- $title = preg_replace('/\{pm_new\}/', '', $title);
- $title = preg_replace('/\{pm_readed\}/', '', $title);
- $title = preg_replace('/\{pm_total\}/', '', $title);
- }
- return trim($title);
- }
-
- function getTabLink()
- {
- $link = $this->getVar('tablink');
- if ($link == '') return $link;
-
- $user_id = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
- // Link type, taken from multimenu module
- if ((eregi("mailto:", $link)) ||
- (eregi("http://", $link)) ||
- (eregi("https://", $link)) ||
- (eregi("file://", $link)) ||
- (eregi("ftp://", $link))){
-
- $link = preg_replace('/\{user_id\}/', $user_id, $link);
- } else {
- $link = XOOPS_URL."/".$link;
- $link = preg_replace('/\{user_id\}/', $user_id, $link);
- }
-
- return $link;
- }
-
-}
-
-class MytabsTabHandler extends XoopsPersistableObjectHandler
-{
- /**
- * constructor
- */
- function __construct(&$db)
- {
- parent::__construct($db, "mytabs_tab", 'MytabsTab', "tabid", "tabtitle");
- }
-}
-
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package Mytabs
+ * @since 1.0
+ * @author trabis <lus...@gm...>
+ * @version $Id: tab.php 0 2009-11-14 18:47:04Z trabis $
+ */
+
+
+class MytabsTab extends XoopsObject
+{
+ /**
+ * constructor
+ */
+ function __construct()
+ {
+ $this->initVar("tabid", XOBJ_DTYPE_INT);
+ $this->initVar("tabpageid", XOBJ_DTYPE_INT);
+ $this->initVar('tabtitle', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('tablink', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('tabrev', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar("tabpriority", XOBJ_DTYPE_INT,0);
+ $this->initVar('tabshowalways', XOBJ_DTYPE_TXTBOX, 'yes');
+ $this->initVar('tabfromdate', XOBJ_DTYPE_INT);
+ $this->initVar('tabtodate', XOBJ_DTYPE_INT);
+ $this->initVar('tabnote', XOBJ_DTYPE_TXTAREA, '');
+ $this->initVar('tabgroups', XOBJ_DTYPE_ARRAY, serialize(array(XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_USERS)));
+ }
+
+ /**
+ * Return whether this block is visible now
+ *
+ * @return bool
+ */
+ function isVisible()
+ {
+ return ($this->getVar('tabshowalways') == "yes" || ($this->getVar('tabshowalways') == "time" && $this->getVar('tabfromdate') <= time() && $this->getVar('tabtodate') >= time()));
+ }
+
+ /**
+ * Get the form for adding or editing tabs
+ *
+ * @return MytabsTabForm
+ */
+ function getForm()
+ {
+ include_once XOOPS_ROOT_PATH . '/modules/mytabs/class/form/tab.php';
+ $form = new MytabsTabForm('Tab', 'tabform', 'tab.php');
+ $form->createElements($this);
+ return $form;
+ }
+
+ function getTabTitle()
+ {
+ $title = $this->getVar('tabtitle');
+
+ // PM detection and conversion
+ if (preg_match('/{pm_new}/i', $title)
+ || preg_match('/{pm_readed}/i', $title)
+ || preg_match('/{pm_total}/i', $title)
+ ) {
+ if (is_object($GLOBALS['xoopsUser'])) {
+ $new_messages = 0;
+ $old_messages = 0;
+ $som = 0;
+ $user_id = 0;
+ $user_id = $GLOBALS['xoopsUser']->getVar('uid');
+ $pm_handler =& xoops_gethandler('privmessage');
+ $criteria_new = new CriteriaCompo(new Criteria('read_msg', 0));
+ $criteria_new->add(new Criteria('to_userid', $GLOBALS['xoopsUser']->getVar('uid')));
+ $new_messages = $pm_handler->getCount($criteria_new);
+ $criteria_old = new CriteriaCompo(new Criteria('read_msg', 1));
+ $criteria_old->add(new Criteria('to_userid', $GLOBALS['xoopsUser']->getVar('uid')));
+ $old_messages = $pm_handler->getCount($criteria_old);
+ $som = $old_messages + $new_messages;
+ if ($new_messages > 0) {
+ $title = preg_replace('/\{pm_new\}/', '(<span style="color: rgb(255, 0, 0); font-weight: bold;">'.$new_messages.'</span>)', $title);
+ }
+ if ($old_messages > 0) {
+ $title = preg_replace('/\{pm_readed\}/', '(<span style="color: rgb(255, 0, 0); font-weight: bold;">'.$old_messages.'</span>)', $title);
+ }
+ if ($old_messages > 0) {
+ $title = preg_replace('/\{pm_total\}/', '(<span style="color: rgb(255, 0, 0); font-weight: bold;">'.$som.'</span>)' , $title);
+ }
+ }
+ $title = preg_replace('/\{pm_new\}/', '', $title);
+ $title = preg_replace('/\{pm_readed\}/', '', $title);
+ $title = preg_replace('/\{pm_total\}/', '', $title);
+ }
+ return trim($title);
+ }
+
+ function getTabLink()
+ {
+ $link = $this->getVar('tablink');
+ if ($link == '') return $link;
+
+ $user_id = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+ // Link type, taken from multimenu module
+ if ((preg_match("/mailto:/i", $link)) ||
+ (preg_match("#http://#i", $link)) ||
+ (preg_match("#https://#i", $link)) ||
+ (preg_match("#file://#i", $link)) ||
+ (preg_match("#ftp://#i", $link))){
+
+ $link = preg_replace('/\{user_id\}/', $user_id, $link);
+ } else {
+ $link = XOOPS_URL."/".$link;
+ $link = preg_replace('/\{user_id\}/', $user_id, $link);
+ }
+
+ return $link;
+ }
+
+}
+
+class MytabsTabHandler extends XoopsPersistableObjectHandler
+{
+ /**
+ * constructor
+ */
+ function __construct(&$db)
+ {
+ parent::__construct($db, "mytabs_tab", 'MytabsTab', "tabid", "tabtitle");
+ }
+}
+
?>
\ No newline at end of file
Modified: XoopsModules/mytabs/trunk/mytabs/docs/changelog.txt
===================================================================
--- XoopsModules/mytabs/trunk/mytabs/docs/changelog.txt 2012-12-18 07:30:07 UTC (rev 10438)
+++ XoopsModules/mytabs/trunk/mytabs/docs/changelog.txt 2012-12-18 07:46:21 UTC (rev 10439)
@@ -1,4 +1,4 @@
-<b><u>=> Version 2.21 RC (2011-12-04)</u></b>
+<b><u>=> Version 2.21 Final (2012-12-17)</u></b>
- Converting to XOOPS 2.5.0 GUI (mamba)
<b><u>=> Version 2.2 Final (2009-11-14)</u></b>
Modified: XoopsModules/mytabs/trunk/mytabs/docs/credits.txt
===================================================================
--- XoopsModules/mytabs/trunk/mytabs/docs/credits.txt 2012-12-18 07:30:07 UTC (rev 10438)
+++ XoopsModules/mytabs/trunk/mytabs/docs/credits.txt 2012-12-18 07:46:21 UTC (rev 10439)
@@ -1,6 +1,6 @@
Credits
===============
-Originally developed by Herv\xE9 Thouzard (hervet),
+Originally developed by Ricardo Costa (Trabis, www.xuups.org),
-Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba), with contributions by Gregory Mage (Mage)
\ No newline at end of file
+Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba)
\ No newline at end of file
Modified: XoopsModules/mytabs/trunk/mytabs/xoops_version.php
===================================================================
--- XoopsModules/mytabs/trunk/mytabs/xoops_version.php 2012-12-18 07:30:07 UTC (rev 10438)
+++ XoopsModules/mytabs/trunk/mytabs/xoops_version.php 2012-12-18 07:46:21 UTC (rev 10439)
@@ -1,114 +1,114 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package Mytabs
- * @since 1.0
- * @author trabis <lus...@gm...>
- * @version $Id: xoops_version.php 0 2009-11-14 18:47:04Z trabis $
- */
-
-defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
-
-$modversion['name'] = _MI_MYTABS_NAME;
-$modversion['description'] = _MI_MYTABS_DSC;
-$modversion['version'] = '2.21';
-$modversion['author'] = "Xuups";
-$modversion['credits'] = "Michael Wulff Nielsen <na...@kl...>(www.smartfactory.ca), Jan Keller Pedersen <jk...@cu...>(www.smartfactory.ca), Tab Content script v2.2- \xA9 Dynamic Drive DHTML code library (www.dynamicdrive.com), Menus from 13Styles (www.13styles.com)";
-$modversion['help'] = 'page=help';
-$modversion['license'] = "GPL see LICENSE";
-$modversion['official'] = 0;
-$modversion['image'] = "images/mytabs_slogo.png";
-$modversion['dirname'] = "mytabs";
-$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
-
-//about
-$modversion['release_date'] = '2011/11/25';
-$modversion["module_website_url"] = "http://www.xoops.org/";
-$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
-$modversion['min_php']='5.2';
-$modversion['min_xoops']="2.5";
-$modversion['min_admin']='1.1';
-$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
-
-//Database
-$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-$modversion['tables'][0] = "mytabs_page";
-$modversion['tables'][1] = "mytabs_tab";
-$modversion['tables'][2] = "mytabs_pageblock";
-
-$modversion['hasMain'] = 0;
-
-//Admin things
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-$modversion['system_menu'] = 1;
-
-$modversion['templates'][] = array('file' => "mytabs_admin_blocks.html",
- 'description' => "");
-$modversion['templates'][] = array('file' => "mytabs_admin_page.html",
- 'description' => "");
-$modversion['templates'][] = array('file' => "mytabs_block.html",
- 'description' => "");
-$modversion['templates'][] = array('file' => "mytabs_index.html",
- 'description' => "");
-$modversion['templates'][] = array('file' => "mytabs_about.html",
- 'description' => "");
-
-//Blocks
-$modversion['blocks'][1]['file'] = "mytabs_block.php";
-$modversion['blocks'][1]['name'] = _MI_MYATBS_BNAME1;
-$modversion['blocks'][1]['description'] = "Shows dynamic content tab";
-$modversion['blocks'][1]['show_func'] = "b_mytabs_block_show";
-$modversion['blocks'][1]['edit_func'] = "b_mytabs_block_edit";
-$modversion['blocks'][1]['options'] = "|0|400|mytabsdefault|true|2000||1|0|false";
-$modversion['blocks'][1]['template'] = 'mytabs_block_blocks.html';
-
-// About stuff
-$modversion['status_version'] = "Final";
-$modversion['developer_website_url'] = "http://www.xuups.com";
-$modversion['developer_website_name'] = "Xuups";
-$modversion['developer_email'] = "lus...@gm...";
-$modversion['status'] = "Final";
-$modversion['date'] = "14/11/2009";
-
-$modversion['people']['developers'][] = "Trabis, Mowaffak, Gopala, Bedu\xEDno";
-
-$modversion['people']['testers'][] = "xoopsbr.org Team, X-Trad.org Team, impresscms.org Team, xoops.org Team, YOU!";
-
-$modversion['people']['translaters'][] = "flymirco(italian)";
-$modversion['people']['translaters'][] = "voltan(persian)";
-$modversion['people']['translaters'][] = "Gibaphp(portuguesebr)";
-$modversion['people']['translaters'][] = "kris_fr(french)";
-$modversion['people']['translaters'][] = "wuddel(german)";
-$modversion['people']['translaters'][] = "almjd(arabic)";
-
-$modversion['people']['documenters'][] = "mamba - <a href='http://www.xoops.org/uploads/tutorials/MyTabsTutorial.pdf' target='_blank'>Quick Tutorial</a>(english version) ";
-$modversion['people']['documenters'][] = "Burning - <a href='http://internap.dl.sourceforge.net/sourceforge/xoops/xoops2_docu_module-mytabs2.pdf' target='_blank'>Full Tutorial</a> (english version)";
-//$modversion['people']['other'][] = "";
-
-$modversion['demo_site_url'] = "http://www.xuups.com";
-$modversion['demo_site_name'] = "Xuups.com";
-$modversion['support_site_url'] = "http://www.xuups.com/modules/newbb";
-$modversion['support_site_name'] = "Xuups Support Forums";
-$modversion['submit_bug'] = "http://www.xuups.com/modules/newbb";
-$modversion['submit_feature'] = "http://www.xuups.com/modules/newbb";
-
-$modversion['author_word'] = "I want to dedicated this module to Gopala, the owner of this idea and first lines of code.";
-//$modversion['warning'] = "";
-
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package Mytabs
+ * @since 1.0
+ * @author trabis <lus...@gm...>
+ * @version $Id: xoops_version.php 0 2009-11-14 18:47:04Z trabis $
+ */
+
+defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined");
+
+$modversion['name'] = _MI_MYTABS_NAME;
+$modversion['description'] = _MI_MYTABS_DSC;
+$modversion['version'] = '2.21';
+$modversion['author'] = "Trabis (www.xuups.com)";
+$modversion['credits'] = "Michael Wulff Nielsen <na...@kl...>(www.smartfactory.ca), Jan Keller Pedersen <jk...@cu...>(www.smartfactory.ca), Tab Content script v2.2- \xA9 Dynamic Drive DHTML code library (www.dynamicdrive.com), Menus from 13Styles (www.13styles.com)";
+$modversion['help'] = 'page=help';
+$modversion['license'] = "GPL see LICENSE";
+$modversion['official'] = 0;
+$modversion['image'] = "images/mytabs_slogo.png";
+$modversion['dirname'] = "mytabs";
+$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+
+//about
+$modversion['release_date'] = '2011/11/25';
+$modversion["module_website_url"] = "www.xoops.org/";
+$modversion["module_website_name"] = "XOOPS";
+$modversion["module_status"] = "Final";
+$modversion['min_php']='5.2';
+$modversion['min_xoops']="2.5.5";
+$modversion['min_admin']='1.1';
+$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+
+//Database
+$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
+$modversion['tables'][0] = "mytabs_page";
+$modversion['tables'][1] = "mytabs_tab";
+$modversion['tables'][2] = "mytabs_pageblock";
+
+$modversion['hasMain'] = 0;
+
+//Admin things
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/index.php";
+$modversion['adminmenu'] = "admin/menu.php";
+$modversion['system_menu'] = 1;
+
+$modversion['templates'][] = array('file' => "mytabs_admin_blocks.html",
+ 'description' => "");
+$modversion['templates'][] = array('file' => "mytabs_admin_page.html",
+ 'description' => "");
+$modversion['templates'][] = array('file' => "mytabs_block.html",
+ 'description' => "");
+$modversion['templates'][] = array('file' => "mytabs_index.html",
+ 'description' => "");
+$modversion['templates'][] = array('file' => "mytabs_about.html",
+ 'description' => "");
+
+//Blocks
+$modversion['blocks'][1]['file'] = "mytabs_block.php";
+$modversion['blocks'][1]['name'] = _MI_MYATBS_BNAME1;
+$modversion['blocks'][1]['description'] = "Shows dynamic content tab";
+$modversion['blocks'][1]['show_func'] = "b_mytabs_block_show";
+$modversion['blocks'][1]['edit_func'] = "b_mytabs_block_edit";
+$modversion['blocks'][1]['options'] = "|0|400|mytabsdefault|true|2000||1|0|false";
+$modversion['blocks'][1]['template'] = 'mytabs_block_blocks.html';
+
+// About stuff
+$modversion['status_version'] = "Final";
+$modversion['developer_website_url'] = "http://www.xuups.com";
+$modversion['developer_website_name'] = "Xuups";
+$modversion['developer_email'] = "lus...@gm...";
+$modversion['status'] = "Final";
+$modversion['date'] = "14/11/2009";
+
+$modversion['people']['developers'][] = "Trabis, Mowaffak, Gopala, Bedu\xEDno";
+
+$modversion['people']['testers'][] = "xoopsbr.org Team, X-Trad.org Team, impresscms.org Team, xoops.org Team, YOU!";
+
+$modversion['people']['translaters'][] = "flymirco(italian)";
+$modversion['people']['translaters'][] = "voltan(persian)";
+$modversion['people']['translaters'][] = "Gibaphp(portuguesebr)";
+$modversion['people']['translaters'][] = "kris_fr(french)";
+$modversion['people']['translaters'][] = "wuddel(german)";
+$modversion['people']['translaters'][] = "almjd(arabic)";
+
+$modversion['people']['documenters'][] = "mamba - <a href='http://www.xoops.org/uploads/tutorials/MyTabsTutorial.pdf' target='_blank'>Quick Tutorial</a>(english version) ";
+$modversion['people']['documenters'][] = "Burning - <a href='http://internap.dl.sourceforge.net/sourceforge/xoops/xoops2_docu_module-mytabs2.pdf' target='_blank'>Full Tutorial</a> (english version)";
+//$modversion['people']['other'][] = "";
+
+$modversion['demo_site_url'] = "http://www.xuups.com";
+$modversion['demo_site_name'] = "Xuups.com";
+$modversion['support_site_url'] = "http://www.xuups.com/modules/newbb";
+$modversion['support_site_name'] = "Xuups Support Forums";
+$modversion['submit_bug'] = "http://www.xuups.com/modules/newbb";
+$modversion['submit_feature'] = "http://www.xuups.com/modules/newbb";
+
+$modversion['author_word'] = "I want to dedicated this module to Gopala, the owner of this idea and first lines of code.";
+//$modversion['warning'] = "";
+
?>
\ No newline at end of file
|
|
From: <be...@us...> - 2012-12-18 07:30:10
|
Revision: 10438
http://sourceforge.net/p/xoops/svn/10438
Author: beckmi
Date: 2012-12-18 07:30:07 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 1.21 Final (updating to PCRE regex, and few cosmetics)
Modified Paths:
--------------
XoopsModules/mysearch/trunk/mysearch/admin/admin_footer.php
XoopsModules/mysearch/trunk/mysearch/admin/index.php
XoopsModules/mysearch/trunk/mysearch/class/searches.php
XoopsModules/mysearch/trunk/mysearch/language/english/admin.php
XoopsModules/mysearch/trunk/mysearch/language/english/main.php
XoopsModules/mysearch/trunk/mysearch/xoops_version.php
Modified: XoopsModules/mysearch/trunk/mysearch/admin/admin_footer.php
===================================================================
--- XoopsModules/mysearch/trunk/mysearch/admin/admin_footer.php 2012-12-18 07:16:04 UTC (rev 10437)
+++ XoopsModules/mysearch/trunk/mysearch/admin/admin_footer.php 2012-12-18 07:30:07 UTC (rev 10438)
@@ -18,7 +18,7 @@
**/
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
Modified: XoopsModules/mysearch/trunk/mysearch/admin/index.php
===================================================================
--- XoopsModules/mysearch/trunk/mysearch/admin/index.php 2012-12-18 07:16:04 UTC (rev 10437)
+++ XoopsModules/mysearch/trunk/mysearch/admin/index.php 2012-12-18 07:30:07 UTC (rev 10438)
@@ -1,53 +1,29 @@
<?php
-// $Id: index.php 8066 2011-11-06 05:09:33Z beckmi $
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// 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. //
-// //
-// You may not change or alter any portion of this comment or credits //
-// of supporting developers from this source code or any supporting //
-// source code which is considered copyrighted (c) material of the //
-// original comment or credit authors. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-// Author: Raul Recio (AKA UNFOR) //
-// Project: The XOOPS Project //
-// ------------------------------------------------------------------------- //
+/*
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package
+ * @since
+ * @author XOOPS Development Team
+ * @version $Id $
+ */
+
include_once 'admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
-//-----------------------
-// $xpPartnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname'));
-// $totalPartners = $xpPartnerHandler->getCount();
-// $totalNonActivePartners = $xpPartnerHandler->getCount(new Criteria('status', 0, '='));
-// $totalActivePartners = $totalPartners - $totalNonActivePartners;
-
-// $indexAdmin->addInfoBox(_MD_XPARTNERS_DASHBOARD);
-
-// $indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALACTIVE. "</infolabel>", $totalActivePartners, 'Green');
-// $indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALNONACTIVE. "</infolabel>", $totalNonActivePartners, 'Red');
-// $indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALPARTNERS. "</infolabel><infotext>", $totalPartners."</infotext>");
-//----------------------------
-
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
-include 'admin_footer.php';
-//xoops_cp_footer();
\ No newline at end of file
+include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/mysearch/trunk/mysearch/class/searches.php
===================================================================
--- XoopsModules/mysearch/trunk/mysearch/class/searches.php 2012-12-18 07:16:04 UTC (rev 10437)
+++ XoopsModules/mysearch/trunk/mysearch/class/searches.php 2012-12-18 07:30:07 UTC (rev 10438)
@@ -121,7 +121,7 @@
$proxy_ip = $_SERVER['HTTP_COMING_FROM'];
}
- if (!empty($proxy_ip) && $is_ip = ereg('^([0-9]{1,3}\.){3,3}[0-9]{1,3}', $proxy_ip, $regs) && count($regs) > 0) {
+ if (!empty($proxy_ip) && $is_ip = preg_match('/^([0-9]{1,3}\.){3,3}[0-9]{1,3}/', $proxy_ip, $regs) && count($regs) > 0) {
$the_IP = $regs[0];
} else {
$the_IP = $_SERVER['REMOTE_ADDR'];
Modified: XoopsModules/mysearch/trunk/mysearch/language/english/admin.php
===================================================================
--- XoopsModules/mysearch/trunk/mysearch/language/english/admin.php 2012-12-18 07:16:04 UTC (rev 10437)
+++ XoopsModules/mysearch/trunk/mysearch/language/english/admin.php 2012-12-18 07:30:07 UTC (rev 10438)
@@ -78,7 +78,4 @@
define("_AM_MYSEARCH_MODDEVDET","Details");
define("_AM_MYSEARCH_RELEASEDATE","Release date");
define("_AM_MYSEARCH_STATUS","Satus");
-define("_AM_MYSEARCH_OFCSUPORTSITE","Suport site");
-
-
-?>
+define("_AM_MYSEARCH_OFCSUPORTSITE","Suport site");
\ No newline at end of file
Modified: XoopsModules/mysearch/trunk/mysearch/language/english/main.php
===================================================================
--- XoopsModules/mysearch/trunk/mysearch/language/english/main.php 2012-12-18 07:16:04 UTC (rev 10437)
+++ XoopsModules/mysearch/trunk/mysearch/language/english/main.php 2012-12-18 07:30:07 UTC (rev 10438)
@@ -46,5 +46,4 @@
define('_MA_MYSEARCH_KEYTOOSHORT','Keywords must be at least <b>%s</b> characters long');
define('_MA_MYSEARCH_KEYIGNORE','Keywords shorter than <b>%s</b> characters will be ignored');
define('_MA_MYSEARCH_SEARCHRULE','Seach Rule');
-define('_MA_MYSEARCH_IGNOREDWORDS','The following words are shorter than allowed minmum length (%u chars) and were not included in your search:');
-?>
+define('_MA_MYSEARCH_IGNOREDWORDS','The following words are shorter than allowed minmum length (%u chars) and were not included in your search:');
\ No newline at end of file
Modified: XoopsModules/mysearch/trunk/mysearch/xoops_version.php
===================================================================
--- XoopsModules/mysearch/trunk/mysearch/xoops_version.php 2012-12-18 07:16:04 UTC (rev 10437)
+++ XoopsModules/mysearch/trunk/mysearch/xoops_version.php 2012-12-18 07:30:07 UTC (rev 10438)
@@ -28,7 +28,7 @@
}
$modversion['name'] = _MI_MYSEARCH_NAME;
-$modversion['version'] = 1.20;
+$modversion['version'] = 1.21;
$modversion['description'] = _MI_MYSEARCH_DESC;
$modversion['credits'] = "Christian, Marco, Lankford, Smart2, Trabis";
$modversion['author'] = 'Hervet, Trabis & Others';
@@ -43,7 +43,7 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["release_date"] = "2012/05/22";
$modversion["module_status"] = "Final";
|
|
From: <be...@us...> - 2012-12-18 07:16:06
|
Revision: 10437
http://sourceforge.net/p/xoops/svn/10437
Author: beckmi
Date: 2012-12-18 07:16:04 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 1.41 Final
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php
Modified: XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2012-12-18 06:56:26 UTC (rev 10436)
+++ XoopsModules/mymenus/trunk/mymenus/docs/changelog.txt 2012-12-18 07:16:04 UTC (rev 10437)
@@ -1,6 +1,10 @@
+<b><u>Version 1.41 (2012-12-17)</u></b>
+
+- small adjustments (mamba)
+
<b><u>Version 1.4 (2011-12-05)</u></b>
-- converted to XOOPS 2.5.x GUI
+- converted to XOOPS 2.5.x GUI (mamba)
<b><u>Version 1.3 (2011-04-02)</u></b>
Modified: XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php 2012-12-18 06:56:26 UTC (rev 10436)
+++ XoopsModules/mymenus/trunk/mymenus/language/english/modinfo.php 2012-12-18 07:16:04 UTC (rev 10437)
@@ -13,7 +13,7 @@
// Admin menu
define('_MI_MYMENUS_MENUSMANAGER',"Menus manager");
-define('_MI_MYMENUS_MENUMANAGER',"Menu manager");
+define('_MI_MYMENUS_MENUMANAGER',"Links manager");
define('_MI_MYMENUS_ABOUT',"About");
//Configs
|
|
From: <be...@us...> - 2012-12-18 06:56:28
|
Revision: 10436
http://sourceforge.net/p/xoops/svn/10436
Author: beckmi
Date: 2012-12-18 06:56:26 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 1.41 Final
Modified Paths:
--------------
XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
XoopsModules/mymenus/trunk/mymenus/xoops_version.php
Modified: XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2012-12-18 06:34:10 UTC (rev 10435)
+++ XoopsModules/mymenus/trunk/mymenus/admin/admin_footer.php 2012-12-18 06:56:26 UTC (rev 10436)
@@ -20,7 +20,7 @@
echo "<div class='adminfooter'>\n"
." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
." </div>\n"
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
."</div>";
Modified: XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php 2012-12-18 06:34:10 UTC (rev 10435)
+++ XoopsModules/mymenus/trunk/mymenus/plugins/mymenus/mymenus.php 2012-12-18 06:56:26 UTC (rev 10436)
@@ -60,7 +60,7 @@
$linkArray = $registry->getEntry('link_array');
$linkArray['link'] = self::_doDecoration($linkArray['link']);
//if (!eregi('mailto:', $linkArray['link']) && !eregi('://', $linkArray['link'])) {
- if (!preg_match('/mailto:/i', $linkArray['link']) && !preg_match('/:\/\//i', $linkArray['link'])) {
+ if (!preg_match('/mailto:/i', $linkArray['link']) && !preg_match('#://#i', $linkArray['link'])) {
$linkArray['link'] = XOOPS_URL . '/' . $linkArray['link']; //Do not do this in other decorators
}
$registry->setEntry('link_array', $linkArray);
Modified: XoopsModules/mymenus/trunk/mymenus/xoops_version.php
===================================================================
--- XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2012-12-18 06:34:10 UTC (rev 10435)
+++ XoopsModules/mymenus/trunk/mymenus/xoops_version.php 2012-12-18 06:56:26 UTC (rev 10436)
@@ -20,42 +20,41 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-$modversion['name'] = _MI_MYMENUS_MD_NAME;
-$modversion['version'] = 1.4;
-$modversion['description'] = _MI_MYMENUS_MD_DESC;
-$modversion['credits'] = "Xuups";
-$modversion['author'] = "Trabis (www.xuups.com)";
-$modversion['help'] = 'page=help';
- $modversion['license'] = 'GNU GPL 2.0';
- $modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['official'] = 0;
-$modversion['image'] = "images/mymenus.png";
-$modversion['dirname'] = "mymenus";
-
+$modversion['name'] = _MI_MYMENUS_MD_NAME;
+$modversion['version'] = 1.41;
+$modversion['description'] = _MI_MYMENUS_MD_DESC;
+$modversion['credits'] = "Xuups";
+$modversion['author'] = "Trabis (www.xuups.com)";
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+$modversion['official'] = 0;
+$modversion['image'] = "images/mymenus.png";
+$modversion['dirname'] = "mymenus";
$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
- //about
- $modversion['release_date'] = '2012/05/22';
- $modversion["module_website_url"] = "http://www.xoops.org/";
- $modversion["module_website_name"] = "XOOPS";
- $modversion["module_status"] = "Final";
- $modversion["author_website_url"] = "http://www.xuups.com/";
- $modversion["author_website_name"] = "Xuups";
- $modversion['min_php']='5.2';
- $modversion['min_xoops']="2.5";
- $modversion['min_admin']='1.1';
- $modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+//about
+$modversion['release_date'] = '2012/12/17';
+$modversion["module_website_url"] = "www.xoops.org";
+$modversion["module_website_name"] = "XOOPS";
+$modversion["module_status"] = "Final";
+$modversion["author_website_url"] = "http://www.xuups.com/";
+$modversion["author_website_name"] = "Xuups";
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = "2.5.5";
+$modversion['min_admin'] = '1.1';
+$modversion['min_db'] = array('mysql' => '5.0.7', 'mysqli' => '5.0.7');
// Menu
$modversion['hasMain'] = 0;
// Admin things
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-$modversion['system_menu'] =1;
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/index.php";
+$modversion['adminmenu'] = "admin/menu.php";
+$modversion['system_menu'] = 1;
// Search
$modversion['hasSearch'] = 0;
@@ -65,7 +64,7 @@
// Sql
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
-$i = 0;
+$i = 0;
$i++;
$modversion['tables'][$i] = "mymenus_menu";
$i++;
@@ -74,24 +73,23 @@
// Config
$i = 0;
$i++;
-$modversion['config'][$i]['name'] = 'assign_method';
-$modversion['config'][$i]['title'] = '_MI_MENUS_CONF_ASSIGN_METHOD';
+$modversion['config'][$i]['name'] = 'assign_method';
+$modversion['config'][$i]['title'] = '_MI_MENUS_CONF_ASSIGN_METHOD';
$modversion['config'][$i]['description'] = '_MI_MENUS_CONF_ASSIGN_METHOD_DSC';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'xotheme';
-$modversion['config'][$i]['options'] = array(
- _MI_MENUS_CONF_ASSIGN_METHOD_XOOPSTPL => 'xoopstpl',
- _MI_MENUS_CONF_ASSIGN_METHOD_XOTHEME => 'xotheme'
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = 'xotheme';
+$modversion['config'][$i]['options'] = array(
+ _MI_MENUS_CONF_ASSIGN_METHOD_XOOPSTPL => 'xoopstpl', _MI_MENUS_CONF_ASSIGN_METHOD_XOTHEME => 'xotheme'
);
// Blocks
$i = 0;
$i++;
-$modversion['blocks'][$i]['file'] = "mymenus_block.php";
-$modversion['blocks'][$i]['name'] = _MI_MYMENUS_BLK;
+$modversion['blocks'][$i]['file'] = "mymenus_block.php";
+$modversion['blocks'][$i]['name'] = _MI_MYMENUS_BLK;
$modversion['blocks'][$i]['description'] = _MI_MYMENUS_BLK_DSC;
-$modversion['blocks'][$i]['show_func'] = "mymenus_block_show";
-$modversion['blocks'][$i]['edit_func'] = "mymenus_block_edit";
-$modversion['blocks'][$i]['options'] = "0|default|0|block|0";
-$modversion['blocks'][$i]['template'] = "mymenus_block.html";
+$modversion['blocks'][$i]['show_func'] = "mymenus_block_show";
+$modversion['blocks'][$i]['edit_func'] = "mymenus_block_edit";
+$modversion['blocks'][$i]['options'] = "0|default|0|block|0";
+$modversion['blocks'][$i]['template'] = "mymenus_block.html";
|
|
From: <be...@us...> - 2012-12-18 06:34:13
|
Revision: 10435
http://sourceforge.net/p/xoops/svn/10435
Author: beckmi
Date: 2012-12-18 06:34:10 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Updating to 1.01 Final
Modified Paths:
--------------
XoopsModules/mycomments/trunk/mycomments/docs/changelog.txt
XoopsModules/mycomments/trunk/mycomments/language/english/help/help.html
XoopsModules/mycomments/trunk/mycomments/language/english/modinfo.php
XoopsModules/mycomments/trunk/mycomments/plugins/news.php
XoopsModules/mycomments/trunk/mycomments/plugins/publisher.php
XoopsModules/mycomments/trunk/mycomments/xoops_version.php
Modified: XoopsModules/mycomments/trunk/mycomments/docs/changelog.txt
===================================================================
--- XoopsModules/mycomments/trunk/mycomments/docs/changelog.txt 2012-12-18 00:41:00 UTC (rev 10434)
+++ XoopsModules/mycomments/trunk/mycomments/docs/changelog.txt 2012-12-18 06:34:10 UTC (rev 10435)
@@ -1,5 +1,5 @@
---------------------------------------
-1.01 Beta 1 2012-07-23
+1.01 Final 2012-12-17
---------------------------------------
- Converted to XOOPS 2.5.5 Admin GUI (Mamba)
Modified: XoopsModules/mycomments/trunk/mycomments/language/english/help/help.html
===================================================================
--- XoopsModules/mycomments/trunk/mycomments/language/english/help/help.html 2012-12-18 00:41:00 UTC (rev 10434)
+++ XoopsModules/mycomments/trunk/mycomments/language/english/help/help.html 2012-12-18 06:34:10 UTC (rev 10435)
@@ -8,7 +8,7 @@
<h4 class="odd">Description</h4>
- <p class="even">With this Xoops module, your users can keep a track of they received and sent comments.<br /> <br />
+ <p class="even">With this Xoops module, your users can keep a track of their received and sent comments.<br /> <br />
The module can :<br /> <br />
. display received comments by user<br /> <br />
. display sent comments by user<br /> <br />
@@ -33,7 +33,7 @@
<h4 class="odd">Developing plugins</h4>
- <p class="even">Plugins are based on the "What's new" module plugins. With little effort you can adpat them to work with my comments.
+ <p class="even">Plugins are based on the "What's new" module plugins. With little effort you can adapt them to work with mycomments.
If you are a module developer you can include your plugins under yourmodule/include/mycomments.plugin.php<br /> <br />
The plugin should also work for modules that use XOOPS_TRUST_PATH.<br /> <br />
Modified: XoopsModules/mycomments/trunk/mycomments/language/english/modinfo.php
===================================================================
--- XoopsModules/mycomments/trunk/mycomments/language/english/modinfo.php 2012-12-18 00:41:00 UTC (rev 10434)
+++ XoopsModules/mycomments/trunk/mycomments/language/english/modinfo.php 2012-12-18 06:34:10 UTC (rev 10435)
@@ -5,7 +5,7 @@
//general
define("_MI_MYCOM_NAME","My comments"); // Module name will appear in Advanced Search options
-define("_MI_MYCOM_DSC","This module allows users to browse recieved and sent comments. It also provides a search funtion.");
+define("_MI_MYCOM_DSC","This module allows users to browse received and sent comments. It also provides a search function.");
//blocks
define("_MI_MYCOM_BNAME1","Last comments");
define("_MI_MYCOM_BNAME2","Last comments per item");
Modified: XoopsModules/mycomments/trunk/mycomments/plugins/news.php
===================================================================
--- XoopsModules/mycomments/trunk/mycomments/plugins/news.php 2012-12-18 00:41:00 UTC (rev 10434)
+++ XoopsModules/mycomments/trunk/mycomments/plugins/news.php 2012-12-18 06:34:10 UTC (rev 10435)
@@ -8,7 +8,7 @@
global $xoopsDB;
$ret = array();
- $sql = "SELECT storyid FROM ".$xoopsDB->prefix("stories")." WHERE published>0 AND published<=".time()." AND uid=".$uid;
+ $sql = "SELECT storyid FROM ".$xoopsDB->prefix("mod_news_stories")." WHERE published>0 AND published<=".time()." AND uid=".$uid;
$result = $xoopsDB->query($sql, $limit, $offset);
if ( $result ) {
while ($row = $xoopsDB->fetchArray($result)){
@@ -25,7 +25,7 @@
$URL_MOD = XOOPS_URL."/modules/news";
$sql = "SELECT s.storyid, s.title, s.published, s.hometext, s.nohtml, s.nosmiley, s.created, s.uid, s.counter, s.comments, t.topic_id, t.topic_title
- FROM ".$xoopsDB->prefix("stories")." s, ".$xoopsDB->prefix("topics")." t
+ FROM ".$xoopsDB->prefix("mod_news_stories")." s, ".$xoopsDB->prefix("mod_news_topics")." t
WHERE s.topicid=t.topic_id
AND s.storyid IN (".implode(',',$items).")
AND s.published>0
Modified: XoopsModules/mycomments/trunk/mycomments/plugins/publisher.php
===================================================================
--- XoopsModules/mycomments/trunk/mycomments/plugins/publisher.php 2012-12-18 00:41:00 UTC (rev 10434)
+++ XoopsModules/mycomments/trunk/mycomments/plugins/publisher.php 2012-12-18 06:34:10 UTC (rev 10435)
@@ -8,11 +8,11 @@
global $xoopsDB;
$ret = array();
- $sql = "SELECT storyid FROM ".$xoopsDB->prefix("publisher_stories")." WHERE published>0 AND published<=".time()." AND uid=".$uid;
+ $sql = "SELECT itemid FROM ".$xoopsDB->prefix("publisher_items")." WHERE datesub>0 AND datesub<=".time()." AND uid=".$uid;
$result = $xoopsDB->query($sql, $limit, $offset);
if ( $result ) {
while ($row = $xoopsDB->fetchArray($result)){
- $ret[] = $row['storyid'];
+ $ret[] = $row['itemid'];
}
}
return $ret;
@@ -24,26 +24,26 @@
$ret = array();
$URL_MOD = XOOPS_URL."/modules/publisher";
- $sql = "SELECT s.storyid, s.title, s.published, s.bodytext, s.uid, s.counter, s.comments, t.topic_id, t.topic_title
- FROM ".$xoopsDB->prefix("publisher_stories")." s, ".$xoopsDB->prefix("publisher_topics")." t
- WHERE s.topicid=t.topic_id
- AND s.storyid IN (".implode(',',$items).")
- AND s.published>0 AND s.published<=".time()."
- ORDER BY s.published DESC";
+ $sql = "SELECT s.itemid, s.title, s.datesub, s.body, s.uid, s.counter, s.comments, t.categoryid, t.name
+ FROM ".$xoopsDB->prefix("publisher_items")." s, ".$xoopsDB->prefix("publisher_categories")." t
+ WHERE s.categoryid=t.categoryid
+ AND s.itemid IN (".implode(',',$items).")
+ AND s.datesub>0 AND s.datesub<=".time()."
+ ORDER BY s.datesub DESC";
$result = $xoopsDB->query($sql, $limit, $offset);
$i = 0;
while($row = $xoopsDB->fetchArray($result)){
- $storyid = $row['storyid'];
- $ret[$i]['link'] = $URL_MOD."/article.php?storyid=".$storyid;
- $ret[$i]['pda'] = $URL_MOD."/print.php?storyid=".$storyid;
- $ret[$i]['cat_link'] = $URL_MOD."/index.php?storytopic=".$row['topic_id'];
+ $itemid = $row['itemid'];
+ $ret[$i]['link'] = $URL_MOD."/article.php?itemid=".$itemid;
+ $ret[$i]['pda'] = $URL_MOD."/print.php?itemid=".$itemid;
+ $ret[$i]['cat_link'] = $URL_MOD."/index.php?storytopic=".$row['categoryid'];
$ret[$i]['title'] = $row['title'];
- $ret[$i]['time'] = $row['published'];
+ $ret[$i]['time'] = $row['datesub'];
// uid
$ret[$i]['uid'] = $row['uid'];
// category
- $ret[$i]['cat_name'] = $row['topic_title'];
+ $ret[$i]['cat_name'] = $row['name'];
// counter
$ret[$i]['hits'] = $row['counter'];
// comments
@@ -53,7 +53,7 @@
$html = 1;
$smiley = 1;
$xcodes = 1;
- $ret[$i]['description'] = $myts->displayTarea($row['bodytext'], $html, $smiley, $xcodes);
+ $ret[$i]['description'] = $myts->displayTarea($row['body'], $html, $smiley, $xcodes);
$i++;
}
@@ -66,7 +66,7 @@
{
global $xoopsDB;
- $sql = "SELECT storyid, title, created FROM ".$xoopsDB->prefix("stories")." WHERE published>0 AND published<=".time()." ORDER BY storyid";
+ $sql = "SELECT itemid, title, created FROM ".$xoopsDB->prefix("stories")." WHERE datesub>0 AND datesub<=".time()." ORDER BY itemid";
$result = $xoopsDB->query($sql,$limit,$offset);
$i = 0;
@@ -74,9 +74,9 @@
while($row = $xoopsDB->fetchArray($result))
{
- $id = $row['storyid'];
+ $id = $row['itemid'];
$ret[$i]['id'] = $id;
- $ret[$i]['link'] = XOOPS_URL."/modules/news/article.php?storyid=".$id."";
+ $ret[$i]['link'] = XOOPS_URL."/modules/news/article.php?itemid=".$id."";
$ret[$i]['title'] = $row['title'];
$ret[$i]['time'] = $row['created'];
$i++;
Modified: XoopsModules/mycomments/trunk/mycomments/xoops_version.php
===================================================================
--- XoopsModules/mycomments/trunk/mycomments/xoops_version.php 2012-12-18 00:41:00 UTC (rev 10434)
+++ XoopsModules/mycomments/trunk/mycomments/xoops_version.php 2012-12-18 06:34:10 UTC (rev 10435)
@@ -18,10 +18,10 @@
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/07/30';
+$modversion['release_date'] = '2012/12/17';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "Final";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.5";
$modversion['min_admin'] = '1.1';
|
|
From: <tr...@us...> - 2012-12-18 00:41:04
|
Revision: 10434
http://sourceforge.net/p/xoops/svn/10434
Author: trabis
Date: 2012-12-18 00:41:00 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Fixing some search functions
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/class/plugin/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/include/search.inc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/search.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/class/plugin/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/class/plugin/search.php 2012-12-17 22:06:02 UTC (rev 10433)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/class/plugin/search.php 2012-12-18 00:41:00 UTC (rev 10434)
@@ -22,7 +22,8 @@
{
public function search($queries, $andor, $limit, $start, $uid)
{
- $queries = implode(' ', $queries);
+ $queries = implode(' ', (array) $queries);
+
$files = XoopsLists::getFileListAsArray(dirname(dirname(dirname(__FILE__))));
$res = array();
$i = 0;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/include/search.inc.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/include/search.inc.php 2012-12-17 22:06:02 UTC (rev 10433)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/include/search.inc.php 2012-12-18 00:41:00 UTC (rev 10434)
@@ -30,6 +30,7 @@
function news_search($queryarray, $andor, $limit, $offset, $userid){
global $xoopsDB, $xoopsUser;
+ $xoops = Xoops::getInstance();
include_once XOOPS_ROOT_PATH.'/modules/news/include/functions.php';
$restricted=news_getmoduleoption('restrictindex');
$highlight = false;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php 2012-12-17 22:06:02 UTC (rev 10433)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php 2012-12-18 00:41:00 UTC (rev 10434)
@@ -188,10 +188,10 @@
$xoops->tpl()->assign('categories', $categories);
// Dynamic user profiles end
-if ($xoops->getModuleConfig('profile_search')) {
- $criteria = new CriteriaCompo(new Criteria('hassearch', 1));
- $criteria->add(new Criteria('isactive', 1));
- $modules = $xoops->getHandlerModule()->getObjectsArray($criteria, true);
+if ($xoops->isActiveModule('search') && $xoops->getModuleConfig('profile_search') && $xoops->getModuleConfig('enable_search', 'search')) {
+ $available_plugins = Xoops_Plugin::getAvailablePlugins('search');
+ $criteria = new Criteria('dirname', "('" . implode("','", array_keys($available_plugins)) . "')", 'IN');
+ $modules = $module_handler->getObjectsArray($criteria, true);
$mids = array_keys($modules);
$myts = MyTextSanitizer::getInstance();
@@ -201,7 +201,9 @@
if (in_array($mid, $allowed_mids)) {
/* @var XoopsModule $module */
$module = $modules[$mid];
- $results = $module->search('', '', 5, 0, $thisUser->getVar('uid'));
+ $plugin = Xoops_Plugin::getPlugin($module->getVar('dirname'), 'search');
+ /* @var $plugin SearchPluginInterface */
+ $results = $plugin->search('', '', 5, 0, $thisUser->getVar('uid'));
$count = count($results);
if (is_array($results) && $count > 0) {
for ($i = 0; $i < $count; $i++) {
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/index.html 2012-12-18 00:41:00 UTC (rev 10434)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/search.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/search.php 2012-12-18 00:41:00 UTC (rev 10434)
@@ -0,0 +1,97 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Publisher class
+ *
+ * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package Class
+ * @subpackage Utils
+ * @since 1.0
+ * @author trabis <lus...@gm...>
+ * @version $Id$
+ */
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+class PublisherSearchPlugin extends Xoops_Plugin_Abstract implements SearchPluginInterface
+{
+ public function search($queryarray, $andor, $limit, $offset, $userid)
+ {
+ $categories = array();
+ $sortby = 0;
+ $searchin = "";
+ $extra = "";
+ return self::searchAdvanced($queryarray, $andor, $limit, $offset, $userid, $categories, $sortby, $searchin, $extra);
+ }
+
+ public function searchAdvanced($queryarray, $andor, $limit, $offset, $userid, $categories = array(), $sortby = 0, $searchin = "", $extra = "")
+ {
+ $publisher = Publisher::getInstance();
+ $ret = array();
+ if ($queryarray == '' || count($queryarray) == 0) {
+ $hightlight_key = '';
+ } else {
+ $keywords = implode('+', $queryarray);
+ $hightlight_key = "&keywords=" . $keywords;
+ }
+ $itemsObjs = $publisher->getItemHandler()
+ ->getItemsFromSearch($queryarray, $andor, $limit, $offset, $userid, $categories, $sortby, $searchin, $extra);
+ $withCategoryPath = $publisher->getConfig('search_cat_path');
+
+ $usersIds = array();
+ /* @var $obj PublisherItem */
+ foreach ($itemsObjs as $obj) {
+ $item['image'] = "images/item_icon.gif";
+ $item['link'] = $obj->getItemUrl();
+ $item['link'] .= (!empty($hightlight_key) && (strpos($item['link'], '.php?') === false)) ? "?" . ltrim($hightlight_key, '&') : $hightlight_key;
+ if ($withCategoryPath) {
+ $item['title'] = $obj->getCategoryPath(false) . " > " . $obj->title();
+ } else {
+ $item['title'] = $obj->title();
+ }
+ $item['time'] = $obj->getVar('datesub'); //must go has unix timestamp
+ $item['uid'] = $obj->getVar('uid');
+ //"Fulltext search/highlight
+ $text = $obj->body();
+ $sanitized_text = "";
+ $text_i = strtolower($text);
+ $queryarray = is_array($queryarray) ? $queryarray : array($queryarray);
+
+ //@todo look into xoopslocal
+ if ($hightlight_key != '') {
+ foreach ($queryarray as $query) {
+ $pos = strpos($text_i, strtolower($query)); //xoops_local("strpos", $text_i, strtolower($query));
+ $start = max(($pos - 100), 0);
+ $length = strlen($query) + 200; //xoops_local("strlen", $query) + 200;
+ $context = $obj->highlight(XoopsLocal::substr($text, $start, $length, " [...]"), $query);
+ $sanitized_text .= "<p>[...] " . $context . "</p>";
+ }
+ }
+
+ //End of highlight
+ $item['text'] = $sanitized_text;
+ $item['author'] = $obj->getVar('author_alias');
+ $item['datesub'] = $obj->datesub($publisher->getConfig('format_date'));
+ $usersIds[$obj->getVar('uid')] = $obj->getVar('uid');
+ $ret[] = $item;
+ unset($item, $sanitized_text);
+ }
+ $usersNames = XoopsUserUtility::getUnameFromIds($usersIds, $publisher->getConfig('format_realname'), true);
+ foreach ($ret as $key => $item) {
+ if ($item["author"] == '') {
+ $ret[$key]["author"] = @$usersNames[$item["uid"]];
+ }
+ }
+ unset($usersNames, $usersIds);
+ return $ret;
+ }
+}
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/plugin/search.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Rev URL
Added: svn:eol-style
+ native
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php 2012-12-17 22:06:02 UTC (rev 10433)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php 2012-12-18 00:41:00 UTC (rev 10434)
@@ -202,77 +202,6 @@
$modversion['blocks'][$i]['options'] = "0|datesub|5|65";
$modversion['blocks'][$i]['template'] = "publisher_category_items_sel.html";
-// Templates
-$i = 0;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_header.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_HEADER_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_footer.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_FOOTER_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_singleitem.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_SINGLEITEM_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_categories_table.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_CATEGORIES_TABLE_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_display_list.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_DISPLAY_LIST_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_display_summary.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_DISPLAY_SUMMARY_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_display_full.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_DISPLAY_FULL_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_display_wfsection.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_DISPLAY_WFSECTION_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_item.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_ITEM_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_submit.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_SUBMIT_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_singleitem_block.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_SINGLEITEM_BLOCK_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_print.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_PRINT_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_rss.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_RSS_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_addfile.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_ADDFILE_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_search.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_SEARCH_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_author_items.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_AUTHOR_ITEMS_DSC;
-
-$i++;
-$modversion['templates'][$i]['file'] = 'publisher_archive.html';
-$modversion['templates'][$i]['description'] = _MI_PUBLISHER_ARCHIVE__DSC;
-
// Config categories
$i = 0;
$modversion['configcat']['seo']['name'] = _MI_PUBLISHER_CONFCAT_SEO;
|
|
From: <tr...@us...> - 2012-12-17 22:06:05
|
Revision: 10433
http://sourceforge.net/p/xoops/svn/10433
Author: trabis
Date: 2012-12-17 22:06:02 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Removing db:
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/backendt.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_archives.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_bigstory.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_moderate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_randomnews.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_top.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topics.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topicsnav.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_cloud.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_top.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_article.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_by_topic.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_items_spot.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_addfile.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_full.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_list.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_summary.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_wfsection.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_footer.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_item.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/backendt.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/backendt.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/backendt.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -68,7 +68,7 @@
$tpl = new XoopsTpl();
$tpl->caching=2;
$tpl->xoops_setCacheTime(3600); // Change this to the value you want
-if (!$tpl->is_cached('db:news_rss.html', $topicid)) {
+if (!$tpl->is_cached('module:news|news_rss.html', $topicid)) {
$xt = new NewsTopic($topicid);
$sarray = $story->getAllPublished($newsnumber, 0, $restricted, $topicid);
if (is_array($sarray) && count($sarray)>0) {
@@ -106,5 +106,5 @@
}
}
}
-$tpl->display('db:news_rss.html', $topicid);
+$tpl->display('module:news|news_rss.html', $topicid);
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_archives.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_archives.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_archives.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -50,7 +50,7 @@
} else {
include_once XOOPS_ROOT_PATH.'/modules/news/language/english/main.php';
}
-
+
$months_arr = array(1 => _CAL_JANUARY, 2 => _CAL_FEBRUARY, 3 => _CAL_MARCH, 4 => _CAL_APRIL, 5 => _CAL_MAY, 6 => _CAL_JUNE, 7 => _CAL_JULY, 8 => _CAL_AUGUST, 9 => _CAL_SEPTEMBER, 10 => _CAL_OCTOBER, 11 => _CAL_NOVEMBER, 12 => _CAL_DECEMBER);
$block = array();
$sort_order = $options[0] == 0 ? 'ASC' : 'DESC';
@@ -167,7 +167,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_archives.html');
+ $tpl->display('block:news|news_block_archives.html');
}
?>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_bigstory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_bigstory.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_bigstory.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -49,7 +49,7 @@
$htmltitle=' title="'.$block['infotips'].'"';
} else {
$htmltitle=' title="'.$story->title('Show').'"';
- }
+ }
$block['htmltitle']=$htmltitle;
$block['message'] = _MB_NEWS_TMRSI;
$block['story_title'] = $story->title('Show');
@@ -76,7 +76,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_bigstory.html');
+ $tpl->display('block:news|news_block_bigstory.html');
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_moderate.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_moderate.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_moderate.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -85,6 +85,6 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_moderate.html');
+ $tpl->display('block:news|news_block_moderate.html');
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_randomnews.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_randomnews.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_randomnews.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -70,7 +70,7 @@
$news['topic_color']= '#'.$myts->displayTarea($story->topic_color);
$news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture();
$news['pictureinfo'] = $story->pictureinfo();
-
+
if ($options[3] > 0) {
$html = $story->nohtml() == 1 ? 0 : 1;
$news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext, $html), $options[3]+3);
@@ -144,7 +144,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_moderate.html');
+ $tpl->display('block:news|news_block_moderate.html');
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_top.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_top.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_top.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -355,7 +355,7 @@
$news['topic_color'] = '#'.$myts->displayTarea($story->topic_color);
$news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture();
$news['pictureinfo'] = $story->pictureinfo();
-
+
if($displayname!=3) {
$news['author'] = sprintf("%s %s",_POSTEDBY,$story->uname());
} else {
@@ -473,7 +473,7 @@
$news['topic_color'] = '#'.$myts->displayTarea($story->topic_color);
$news['picture'] = XOOPS_URL.'/uploads/news/image/'.$story->picture();
$news['pictureinfo'] = $story->pictureinfo();
-
+
if($displayname!=3) {
$news['author']= sprintf("%s %s",_POSTEDBY,$story->uname());
} else {
@@ -481,7 +481,7 @@
}
if ($options[3] > 0) {
$html = $story->nohtml() == 1 ? 0 : 1;
- $news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext(), $html), $options[3]+3);
+ $news['teaser'] = news_truncate_tagsafe($myts->displayTarea($story->hometext(), $html), $options[3]+3);
$news['infotips'] = '';
} else {
$news['teaser'] = '';
@@ -694,7 +694,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_top.html');
+ $tpl->display('block:news|news_block_top.html');
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topics.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topics.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topics.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -54,7 +54,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_topics.html');
+ $tpl->display('block:news|news_block_topics.html');
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topicsnav.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topicsnav.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/blocks/news_topicsnav.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -94,7 +94,7 @@
$tpl = new XoopsTpl();
$tpl->assign('block', $block);
- $tpl->display('db:news_block_topicnav.html');
+ $tpl->display('block:news|news_block_topicnav.html');
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_cloud.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_cloud.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_cloud.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1 +1 @@
-<{include file="db:tag_block_cloud.html"}>
\ No newline at end of file
+<{include file="block:tag|tag_block_cloud.html"}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_top.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_top.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/blocks/news_tag_block_top.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1 +1 @@
-<{include file="db:tag_block_top.html"}>
+<{include file="block:tag|tag_block_top.html"}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_article.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_article.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_article.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1,7 +1,7 @@
<div class="news-article">
-
- <div class="marg2 pad2"><{include file="db:news_item.html" story=$story}>
+ <div class="marg2 pad2"><{include file="module:news|news_item.html" story=$story}>
+
<{if $xoops_isadmin}>
<a href="<{$xoops_url}>/modules/news/submit.php?op=edit&storyid=<{$story.id}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>"></a>
<a href="<{$xoops_url}>/modules/news/admin/index.php?op=delete&storyid=<{$story.id}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>"></a>
@@ -14,8 +14,8 @@
<{/if}>
</div>
-
+
<{if $attached_files_count>0}>
<div class="itemInfo"><{$lang_attached_files}>
<{foreach item=onefile from=$attached_files}>
@@ -23,21 +23,21 @@
<{/foreach}>
</div>
<{/if}>
-
+
<{if $pagenav}><div class="pagenav"><{$smarty.const._NW_PAGE}> <{$pagenav}></div><{/if}>
-
+
<{if $tags}>
- <div class="marg10 tagbar"><{include file="db:tag_bar.html"}></div>
+ <div class="marg10 tagbar"><{include file="block:tag|tag_bar.html"}></div>
<{/if}>
-
+
<div class="pad5 marg5">
<{if $nav_links}>
<{if $previous_story_id != -1}><a href='<{$xoops_url}>/modules/news/article.php?storyid=<{$previous_story_id}>' title="<{$previous_story_title}>"><{$lang_previous_story}></a> - <{/if}>
<{if $next_story_id!= -1}><a href='<{$xoops_url}>/modules/news/article.php?storyid=<{$next_story_id}>' title="<{$next_story_title}>"><{$lang_next_story}></a><{/if}>
- <{/if}>
+ <{/if}>
</div>
-
+
<{if $showsummary == true && $summary_count>0}>
<div class="marg10">
<table width='50%' cellspacing='0' cellpadding='1'>
@@ -52,7 +52,7 @@
</table>
</div>
<{/if}>
-
+
<{if $bookmarkme == true}>
<div class="item-bookmarkme">
<div class="head item-bookmarkme-title"><{$smarty.const._NW_BOOKMARK_ME}></div>
@@ -96,21 +96,21 @@
<div id="fb-root"></div><script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script><fb:comments href="<{$xoops_url}>/modules/news/article.php?storyid=<{$story.id}>" num_posts="5" width="500"></fb:comments>
<{/if}>
-
+
<div class="pad2 marg2">
<{$commentsnav}>
<{$lang_notice}>
</div>
-
+
<div class="pad2 marg2">
<{if $comment_mode == "flat"}>
- <{include file="db:system_comments_flat.html"}>
+ <{include file="module:system|system_comments_flat.html"}>
<{elseif $comment_mode == "thread"}>
- <{include file="db:system_comments_thread.html"}>
+ <{include file="module:system|system_comments_thread.html"}>
<{elseif $comment_mode == "nest"}>
- <{include file="db:system_comments_nest.html"}>
+ <{include file="module:system|system_comments_nest.html"}>
<{/if}>
</div>
- <{include file='db:system_notification_select.html'}>
+ <{include file='module:system|system_notification_select.html'}>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_by_topic.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_by_topic.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_by_topic.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -9,7 +9,7 @@
<{counter start=0 print=false assign=storynum}>
<{foreach item=story from=$topic.stories}>
<{if $storynum == 0}>
- <{include file="db:news_item.html" story=$story}><br />
+ <{include file="module:news|news_item.html" story=$story}><br />
<{else}>
<{if $storynum == 1}>
<ul>
@@ -29,4 +29,4 @@
</tr>
</table>
</div>
-<{include file='db:system_notification_select.html'}>
\ No newline at end of file
+<{include file='module:system|system_notification_select.html'}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_index.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/templates/news_index.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -2,7 +2,7 @@
<{if $topic_rssfeed_link != ""}>
<div align='right'><{$topic_rssfeed_link}></div>
<{/if}>
-
+
<{if $displaynav == true}>
<div style="text-align: center;">
<form name="form1" action="<{$xoops_url}>/modules/news/index.php" method="get">
@@ -10,20 +10,20 @@
<hr />
</div>
<{/if}>
-
+
<{if $topic_description != ''}>
<div style="text-align: center;"><{$topic_description}></div>
<{/if}>
-
+
<div style="margin: 10px;"><{$pagenav}></div>
<table width='100%' border='0'>
<tr>
<{section name=i loop=$columns}>
- <td width="<{$columnwidth}>%"><{foreach item=story from=$columns[i]}><{include file="db:news_item.html" story=$story}><{/foreach}></td>
+ <td width="<{$columnwidth}>%"><{foreach item=story from=$columns[i]}><{include file="module:news|news_item.html" story=$story}><{/foreach}></td>
<{/section}>
</tr>
</table>
-
+
<div class="pagenav"><{$pagenav}></div>
- <{include file='db:system_notification_select.html'}>
+ <{include file='module:system|system_notification_select.html'}>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/item.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/item.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/item.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -465,7 +465,7 @@
$sform = $publisher->getForm($itemObj, 'item');
$sform->setTitle(_AM_PUBLISHER_ITEMS);
$sform->assign($formTpl);
- $formTpl->display('db:publisher_submit.html');
+ $formTpl->display('module:publisher|publisher_submit.html');
PublisherUtils::closeCollapsableBar('edititemtable', 'edititemicon');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_items_spot.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_items_spot.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_items_spot.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -6,7 +6,7 @@
<{if $block.display_type=='block'}>
-<{foreach item=item from=$block.items}> <{include file="db:publisher_singleitem_block.html" item=$item}> <{/foreach}>
+<{foreach item=item from=$block.items}> <{include file="module:publisher|publisher_singleitem_block.html" item=$item}> <{/foreach}>
<{else}> <{foreach item=item from=$block.items name=spotlight}> <{if $item.summary != ''}>
<div class="itemText" style="padding-left: 5px; padding-top: 5px;">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_addfile.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_addfile.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_addfile.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1,4 +1,4 @@
-<{include file="db:publisher_header.html" item=$item}>
+<{include file="module:publisher|publisher_header.html" item=$item}>
<div class="publisher_infotitle"><{$lang_intro_title}></div>
<div class="publisher_infotext"><{$lang_intro_text}></div>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_full.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_full.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_full.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1,4 +1,4 @@
-<{include file='db:publisher_header.html'}>
+<{include file='module:publisher|publisher_header.html'}>
<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE), let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}>
@@ -9,7 +9,7 @@
<div id='toptable'>
<span class="publisher_collaps_info""><{$lang_category_summary}></span> <!-- Content under the collapsable bar //--> <{/if}>
- <{include file='db:publisher_categories_table.html'}>
+ <{include file='module:publisher|publisher_categories_table.html'}>
<{if $collapsable_heading == 1}>
</div> <{/if}>
@@ -21,10 +21,10 @@
<span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span> <{/if}>
<div align="right"><{$navbar}></div>
- <!-- Start item loop --> <{foreach item=item from=$items}> <{include file="db:publisher_singleitem.html" item=$item}> <{/foreach}> <!-- End item loop -->
+ <!-- Start item loop --> <{foreach item=item from=$items}> <{include file="module:publisher|publisher_singleitem.html" item=$item}> <{/foreach}> <!-- End item loop -->
<div align="right"><{$navbar}></div>
<{if $collapsable_heading == 1}>
</div> <{/if}><!-- end of if $items --> <{/if}>
-<{include file='db:publisher_footer.html'}>
\ No newline at end of file
+<{include file='module:publisher|publisher_footer.html'}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_list.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_list.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_list.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1,4 +1,4 @@
-<{include file='db:publisher_header.html'}>
+<{include file='module:publisher|publisher_header.html'}>
<!-- Display type is bullet list -->
<div class="publisher_infotitle"><{$lang_category_summary}></div>
@@ -7,7 +7,7 @@
<strong><{$smarty.const._MD_PUBLISHER_LAST_SMARTITEM}> : <{$category.last_title_link}>
</div> <{/if}><br/>
-<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE, let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}> <{include file='db:publisher_categories_table.html'}>
+<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE, let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}> <{include file='module:publisher|publisher_categories_table.html'}>
<br/><!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--><{/if}>
<{if $items}> <{if $collapsable_heading == 1}>
@@ -69,4 +69,4 @@
<{if !$subcats && !$items}>
<div class="publisher_infotext"><{$smarty.const._MD_PUBLISHER_EMPTY}></div><{/if}>
-<{include file='db:publisher_footer.html'}>
\ No newline at end of file
+<{include file='module:publisher|publisher_footer.html'}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_summary.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_summary.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_summary.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1,4 +1,4 @@
-<{include file='db:publisher_header.html'}>
+<{include file='module:publisher|publisher_header.html'}>
<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE), let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}>
@@ -9,7 +9,7 @@
<div id='toptable'>
<span class="publisher_collaps_info""><{$lang_category_summary}></span> <!-- Content under the collapsable bar //--> <{/if}>
- <{include file='db:publisher_categories_table.html'}>
+ <{include file='module:publisher|publisher_categories_table.html'}>
<{if $collapsable_heading == 1}>
</div> <{/if}>
@@ -57,4 +57,4 @@
<{if $collapsable_heading == 1}>
</div> <{/if}><!-- end of if $items --> <{/if}>
-<{include file='db:publisher_footer.html'}>
\ No newline at end of file
+<{include file='module:publisher|publisher_footer.html'}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_wfsection.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_wfsection.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_display_wfsection.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1,4 +1,4 @@
-<{include file='db:publisher_header.html'}>
+<{include file='module:publisher|publisher_header.html'}>
<!--<{if $collapsable_heading == 1}>
<div class="publisher_collaps_title"><a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/images/links/close12.gif' alt='' /></a> <{$lang_category_summary}></div>
@@ -96,4 +96,4 @@
<{/if}> <!-- end of if $items --> <{/if}>
</div>
-<{include file='db:publisher_footer.html'}>
+<{include file='module:publisher|publisher_footer.html'}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_footer.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_footer.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_footer.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -7,7 +7,7 @@
<td colspan="3" align="left">
<div style="text-align: center; padding: 3px; margin:3px;"> <{$commentsnav}> <{$lang_notice}></div>
<div style="margin:3px; padding: 3px;">
- <!-- start comments loop --> <{if $comment_mode == "flat"}> <{include file="db:system_comments_flat.html"}> <{elseif $comment_mode == "thread"}> <{include file="db:system_comments_thread.html"}> <{elseif $comment_mode == "nest"}> <{include file="db:system_comments_nest.html"}> <{/if}> <!-- end comments loop -->
+ <!-- start comments loop --> <{if $comment_mode == "flat"}> <{include file="module:system|system_comments_flat.html"}> <{elseif $comment_mode == "thread"}> <{include file="module:system|system_comments_thread.html"}> <{elseif $comment_mode == "nest"}> <{include file="module:system|system_comments_nest.html"}> <{/if}> <!-- end comments loop -->
</div>
</td>
</tr>
@@ -16,4 +16,4 @@
<{if $rssfeed_link != ""}>
<div id="publisher_rpublisher_feed"><{$rssfeed_link}></div><{/if}>
-<{include file='db:system_notification_select.html'}>
+<{include file='module:system|system_notification_select.html'}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_item.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_item.html 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_item.html 2012-12-17 22:06:02 UTC (rev 10433)
@@ -1,4 +1,4 @@
-<{include file='db:publisher_header.html'}>
+<{include file='module:publisher|publisher_header.html'}>
<div class="item">
<h2><{$item.title}></h2>
@@ -67,7 +67,7 @@
<{/if}> <{if $pagenav}>
<div class="publisher_pagenav_bottom"><{$smarty.const._MD_PUBLISHER_PAGE}>: <{$pagenav}></div>
<{/if}> <{if $tagbar}>
- <p><{include file="db:tag_bar.html"}></p>
+ <p><{include file="module:tag|tag_bar.html"}></p>
<{/if}>
</div>
<{if $itemfooter}>
@@ -172,7 +172,7 @@
</tr>
<{/foreach}> <!-- End item loop -->
</table><{/if}><{if $rating_enabled}>
-<small><{$item.ratingbar}></small><{/if}><{include file='db:publisher_footer.html'}>
+<small><{$item.ratingbar}></small><{/if}><{include file='module:publisher|publisher_footer.html'}>
<script type="text/javascript">
<!--//<![CDATA[
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php 2012-12-17 21:48:45 UTC (rev 10432)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php 2012-12-17 22:06:02 UTC (rev 10433)
@@ -257,7 +257,7 @@
$block = b_xlanguage_select_show($options);
$xoops->theme()->addStylesheet('modules/xlanguage/css/block.css');
$xoops->tpl()->assign('block', $block);
- $xlanguage_switch_code = "<div id='xo-language' class='" . $options[0] . "'>" . $xoops->tpl()->fetch('db:xlanguage_block.html') . "</div>";
+ $xlanguage_switch_code = "<div id='xo-language' class='" . $options[0] . "'>" . $xoops->tpl()->fetch('block:xlanguage|xlanguage_block.html') . "</div>";
$xoops->tpl()->assign('xlanguage_switch_code', $xlanguage_switch_code);
return true;
}
\ No newline at end of file
|
|
From: <tr...@us...> - 2012-12-17 21:48:49
|
Revision: 10432
http://sourceforge.net/p/xoops/svn/10432
Author: trabis
Date: 2012-12-17 21:48:45 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Removing hasSearch and fixing some bugs
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/news/include/install_function.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/form/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/publisher.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/qrcode/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php 2012-12-17 21:27:34 UTC (rev 10431)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php 2012-12-17 21:48:45 UTC (rev 10432)
@@ -227,11 +227,7 @@
global $xoopsConfig; //for legacy
$xoops = xoops::getInstance();
$dirname = basename($dirname);
- if (file_exists($file = $xoops->path('modules/' . $dirname . '/language/' . $xoops->getConfig('language') . '/modinfo.php'))) {
- include_once $file;
- } else if (file_exists($file = $xoops->path('modules/' . $dirname . '/language/english/modinfo.php'))) {
- include_once $file;
- }
+ $xoops->loadLanguage('modinfo', $dirname);
if (!file_exists($file = $xoops->path('modules/' . $dirname . '/xoops_version.php'))) {
if (false != $verbose) {
@@ -239,6 +235,7 @@
}
|
|
From: <tr...@us...> - 2012-12-17 21:27:37
|
Revision: 10431
http://sourceforge.net/p/xoops/svn/10431
Author: trabis
Date: 2012-12-17 21:27:34 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Updating Xoops getConfig methods to allow same flexibility for modules
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/preload.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/system_configs.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/xoopsconfig.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/preload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/preload.php 2012-12-17 18:32:50 UTC (rev 10430)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/preload.php 2012-12-17 21:27:34 UTC (rev 10431)
@@ -48,6 +48,11 @@
private $_events = array();
/**
+ * @var bool in case of cache miss, try get to get active modules again
+ */
+ private $_checkAgain = false;
+
+ /**
* Constructor
*/
private function __construct()
@@ -79,9 +84,11 @@
*/
private function _setPreloads()
{
+ $this->_checkAgain = false;
$modules_list = Xoops_Cache::read('system_modules_active');
if (!$modules_list) {
$modules_list = array ('system');
+ $this->_checkAgain = true;
}
$i = 0;
foreach ($modules_list as $module) {
@@ -133,6 +140,9 @@
*/
public function triggerEvent($event_name, $args = array())
{
+ if ($this->_checkAgain) {
+ $this->__construct();
+ }
$event_name = strtolower(str_replace('.', '', $event_name));
if (isset($this->_events[$event_name])) {
foreach ($this->_events[$event_name] as $event) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2012-12-17 18:32:50 UTC (rev 10430)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2012-12-17 21:27:34 UTC (rev 10431)
@@ -105,11 +105,11 @@
/**
* Merge file and db configs.
*/
-if (file_exists($file = $xoops->path('var/configs/xoopsconfig.php'))) {
+if (file_exists($file = $xoops->path('var/configs/system_configs.php'))) {
$xoops->addConfigs(include $file);
unset($file);
} else {
- trigger_error('File Path Error: ' . 'var/configs/xoopsconfig.php' . ' does not exist.');
+ trigger_error('File Path Error: ' . 'var/configs/system_configs.php' . ' does not exist.');
}
$xoopsPreload->triggerEvent('core.include.common.configs.success');
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/system_configs.php (from rev 10430, XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/xoopsconfig.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/system_configs.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/system_configs.php 2012-12-17 21:27:34 UTC (rev 10431)
@@ -0,0 +1,36 @@
+<?php
+
+return array(
+ /**#@+
+ * Extended HTML editor for {@link XoopsFormDhtmlTextArea}
+ *
+ * <p>If an extended HTML editor is set, the renderer will be replaced by the specified editor, usually a visual or WYSIWYG editor.</p>
+ *
+ * <ul>Developer and user guide:
+ * <li><ul>For run-time settings per call
+ * <li>To use an editor pre-configured by {@link XoopsEditor}, e.g. 'fckeditor': <code>$options['editor'] = 'fckeditor';</code></li>
+ * <li>To use a custom editor, e.g. 'MyEditor' class located in "/modules/myeditor/myeditor.php": <code>$options['editor'] = array('MyEditor', XOOPS_ROOT_PATH . "/modules/myeditor/myeditor.php");</code></li>
+ * </ul></li>
+ * <li><ul>For pre-configured settings, which will force to use a editor if no specific editor is set for call
+ * <li><ul>Set up custom configs: in XOOPS_VAR_PATH . '/configs/xoopsconfig.php' set a editor as default, e.g.
+ * <li>a pre-configured editor 'fckeditor': <code>return array('editor' => 'fckeditor');</code></li>
+ * <li>a custom editor 'MyEditor' class located in "/modules/myeditor/myeditor.php": <code>return array('editor' => array('MyEditor', XOOPS_ROOT_PATH . "/modules/myeditor/myeditor.php");</code></li>
+ * </ul></li>
+ * <li>To disable the default editor, in XOOPS_VAR_PATH . '/configs/xoopsconfig.php': <code>return array();</code></li>
+ * <li>To disable the default editor for a specific call: <code>$options['editor'] = 'dhtmltextarea';</code></li>
+ * </ul></li>
+ * </ul>
+ */
+ //"editor" => "fckeditor",
+ //"editor" => "dhtmlext",
+ /**#@-*/
+
+ /** XOOPS admin security warnings
+ *
+ * <ul>Display admin security warnings:
+ * <li> 0 - Disabled</li>
+ * <li> 1 - Enabled</li>
+ * </ul>
+ */
+ "admin_warnings_enable" => 1,
+ );
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/xoopsconfig.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/xoopsconfig.php 2012-12-17 18:32:50 UTC (rev 10430)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_data/configs/xoopsconfig.php 2012-12-17 21:27:34 UTC (rev 10431)
@@ -1,53 +0,0 @@
-<?php
-
-return array(
- /**#@+
- * Extended HTML editor for {@link XoopsFormDhtmlTextArea}
- *
- * <p>If an extended HTML editor is set, the renderer will be replaced by the specified editor, usually a visual or WYSIWYG editor.</p>
- *
- * <ul>Developer and user guide:
- * <li><ul>For run-time settings per call
- * <li>To use an editor pre-configured by {@link XoopsEditor}, e.g. 'fckeditor': <code>$options['editor'] = 'fckeditor';</code></li>
- * <li>To use a custom editor, e.g. 'MyEditor' class located in "/modules/myeditor/myeditor.php": <code>$options['editor'] = array('MyEditor', XOOPS_ROOT_PATH . "/modules/myeditor/myeditor.php");</code></li>
- * </ul></li>
- * <li><ul>For pre-configured settings, which will force to use a editor if no specific editor is set for call
- * <li><ul>Set up custom configs: in XOOPS_VAR_PATH . '/configs/xoopsconfig.php' set a editor as default, e.g.
- * <li>a pre-configured editor 'fckeditor': <code>return array('editor' => 'fckeditor');</code></li>
- * <li>a custom editor 'MyEditor' class located in "/modules/myeditor/myeditor.php": <code>return array('editor' => array('MyEditor', XOOPS_ROOT_PATH . "/modules/myeditor/myeditor.php");</code></li>
- * </ul></li>
- * <li>To disable the default editor, in XOOPS_VAR_PATH . '/configs/xoopsconfig.php': <code>return array();</code></li>
- * <li>To disable the default editor for a specific call: <code>$options['editor'] = 'dhtmltextarea';</code></li>
- * </ul></li>
- * </ul>
- */
- //"editor" => "fckeditor",
- //"editor" => "dhtmlext",
- /**#@-*/
-
-
- /**#@+
- * Debug level for XOOPS
- *
- * Note: temporary solution only. Will be re-designed in XOOPS 3.0
- *
- * <ul>Displaying debug information to different level(s) of users:
- * <li> 0 - To all users</li>
- * <li> 1 - To members</li>
- * <li> 2 - To admins only</li>
- * </ul>
- */
- "debugLevel" => 2,
- /**#@-*/
-
- /** XOOPS admin security warnings
- *
- * <ul>Display admin security warnings:
- * <li> 0 - Disabled</li>
- * <li> 1 - Enabled</li>
- * </ul>
- */
- "admin_warnings_enable" => 1,
- );
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php 2012-12-17 18:32:50 UTC (rev 10430)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php 2012-12-17 21:27:34 UTC (rev 10431)
@@ -106,11 +106,6 @@
/**
* @var array
*/
- private $_systemConfigs = array();
-
- /**
- * @var array
- */
private $_moduleConfigs = array();
/**
@@ -1515,14 +1510,7 @@
*/
public function getConfig($key)
{
- if (isset($this->_systemConfigs[$key])) {
- return $this->_systemConfigs[$key];
- }
- $this->getConfigs();
- if (!isset($this->_systemConfigs[$key])) {
- $this->_systemConfigs[$key] = '';
- }
- return $this->_systemConfigs[$key];
+ return $this->getModuleConfig($key, 'system');
}
/**
@@ -1530,39 +1518,39 @@
*/
public function getConfigs()
{
- static $configsFetched = false;
- if (!$configsFetched) {
- if (!$configs = Xoops_Cache::read('configs_system')) {
- $configs = $this->getHandlerConfig()->getConfigsByModule(1);
- Xoops_Cache::write('configs_system', $configs);
- }
- $this->_systemConfigs = array_merge($this->_systemConfigs, $configs);
- $this->config =& $this->_systemConfigs; //for compatibilty
- $configsFetched = true;
- }
- return $this->_systemConfigs;
+ return $this->getModuleConfigs('system');
}
/**
- * @param $configs
+ * @param $configs array
+ * @param $dirname string
*
* @return void
*/
- public function addConfigs($configs)
+ public function addConfigs($configs, $dirname = 'system')
{
- $this->_systemConfigs = array_merge($this->_systemConfigs, (array)$configs);
+ $dirname = trim(strtolower($dirname));
+ if (empty($dirname)) {
+ $dirname = $this->isModule() ? $this->module->getVar('dirname') : 'system';
+ }
+ $this->_moduleConfigs[$dirname] = array_merge($this->_moduleConfigs[$dirname], (array)$configs);
}
/**
* @param string $key
* @param mixed $value
+ * @param string $dirname
*
* @return void
*/
- public function setConfig($key, $value = null)
+ public function setConfig($key, $value = null, $dirname = 'system')
{
if (!is_null($value)) {
- $this->_systemConfigs[$key] = $value;
+ $dirname = trim(strtolower($dirname));
+ if (empty($dirname)) {
+ $dirname = $this->isModule() ? $this->module->getVar('dirname') : 'system';
+ }
+ $this->_moduleConfigs[$dirname][$key] = $value;
}
}
@@ -1570,17 +1558,22 @@
* @param string $key
* @param array $values
* @param bool $appendWithKey
+ * @param string $dirname
*
* @return void
*/
- public function appendConfig($key, array $values, $appendWithKey = false)
+ public function appendConfig($key, array $values, $appendWithKey = false, $dirname = 'system')
{
+ $dirname = trim(strtolower($dirname));
+ if (empty($dirname)) {
+ $dirname = $this->isModule() ? $this->module->getVar('dirname') : 'system';
+ }
if ($appendWithKey) {
foreach ($values as $key2 => $value) {
- $this->_systemConfigs[$key][$key2] = $value;
+ $this->_moduleConfigs[$dirname][$key][$key2] = $value;
}
} else {
- $this->_systemConfigs[$key][] = $values;
+ $this->_moduleConfigs[$dirname][$key][] = $values;
}
}
@@ -1592,21 +1585,21 @@
*/
public function getModuleConfig($key, $dirname = '')
{
- $dirname = trim($dirname);
+ $dirname = trim(strtolower($dirname));
if (empty($dirname)) {
$dirname = $this->isModule() ? $this->module->getVar('dirname') : 'system';
}
- if (!isset($this->_moduleConfigs[$dirname])) {
- if (!$configs = Xoops_Cache::read("configs_{$dirname}")) {
- $configs = $this->getModuleConfigs($dirname);
- Xoops_Cache::write("configs_{$dirname}", $configs);
- }
- $this->_moduleConfigs[$dirname] = $configs;
- }
+
if (isset($this->_moduleConfigs[$dirname][$key])) {
return $this->_moduleConfigs[$dirname][$key];
}
- return '';
+
+ $this->getModuleConfigs($dirname);
+
+ if (!isset($this->_moduleConfigs[$dirname][$key])) {
+ $this->_moduleConfigs[$dirname][$key] = '';
+ }
+ return $this->_moduleConfigs[$dirname][$key];
}
/**
@@ -1625,13 +1618,24 @@
}
$this->_moduleConfigs[$dirname] = array();
- $module = $this->getHandlerModule()->getByDirname($dirname);
- if (is_object($module)) {
- $this->_moduleConfigs[$dirname] = $this->getHandlerConfig()->getConfigsByModule($module->getVar('mid'));
+ if (!$configs = Xoops_Cache::read("{$dirname}_configs")) {
+ $module = $this->getHandlerModule()->getByDirname($dirname);
+ if (is_object($module)) {
+ $configs = $this->getHandlerConfig()->getConfigsByModule($module->getVar('mid'));
+ Xoops_Cache::write("{$dirname}_configs", $configs);
+ $this->_moduleConfigs[$dirname] = $configs;
+ }
+ } else {
+ $this->_moduleConfigs[$dirname] = $configs;
}
+
if ($this->isModule()) {
+ //for legacy
$this->moduleConfig =& $this->_moduleConfigs[$this->module->getVar('dirname')];
}
+ if ($dirname == 'system') {
+ $this->config =& $this->_moduleConfigs['system'];
+ }
return $this->_moduleConfigs[$dirname];
}
|
|
From: <du...@us...> - 2012-12-17 18:32:53
|
Revision: 10430
http://sourceforge.net/p/xoops/svn/10430
Author: dugris
Date: 2012-12-17 18:32:50 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Add search block to module search
Remove search block from module system
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/index.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/search_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/block_search.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/index.html
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/index.html 2012-12-17 18:32:50 UTC (rev 10430)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/search_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/search_blocks.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/search_blocks.php 2012-12-17 18:32:50 UTC (rev 10430)
@@ -0,0 +1,40 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Blocks functions
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author Laurent JEN (aka DuGris)
+ * @package system
+ * @version $Id$
+ */
+
+function b_search_show()
+{
+ $search = Search::getInstance();
+ $search->loadLanguage('main', 'search');
+
+ $form = new XoopsSimpleForm('', 'search', $search->url('index.php'), 'get', false, 'inline');
+
+ // create form elements
+ $form->addElement(new XoopsFormText('', 'query', 2, 100, '', _MD_SEARCH_KEYWORDS), true);
+ $form->addElement(new XoopsFormHidden('action', 'results'));
+ $form->addElement(new XoopsFormHiddenToken('id'));
+
+ $button = new XoopsFormButton('', 'submit', _MD_SEARCH, 'submit');
+ $button->setClass('btn btn-primary');
+ $form->addElement($button);
+
+ $block['form'] = $form->render();
+ return $block;
+}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/blocks/search_blocks.php
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Revision URL
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/language/english/modinfo.php 2012-12-17 16:14:34 UTC (rev 10429)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/language/english/modinfo.php 2012-12-17 18:32:50 UTC (rev 10430)
@@ -26,3 +26,4 @@
define("_MI_SEARCH_MINSEARCH", "Minimum keyword length");
define("_MI_SEARCH_MINSEARCHDSC", "Enter the minimum keyword length that users are required to enter to perform search");
+define("_MI_SEARCH_BNAME1","Search");
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks
___________________________________________________________________
Added: tsvn:autoprops
+ *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/block_search.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/block_search.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/block_search.html 2012-12-17 18:32:50 UTC (rev 10430)
@@ -0,0 +1 @@
+<{$block.form}>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/templates/blocks/index.html 2012-12-17 18:32:50 UTC (rev 10430)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/xoops_version.php 2012-12-17 16:14:34 UTC (rev 10429)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/search/xoops_version.php 2012-12-17 18:32:50 UTC (rev 10430)
@@ -70,6 +70,11 @@
Blocks
*/
$modversion['blocks'] = array();
+$modversion['blocks'][1]['file'] = 'search_blocks.php';
+$modversion['blocks'][1]['name'] = _MI_SEARCH_BNAME1;
+$modversion['blocks'][1]['description'] = 'Shows search form block';
+$modversion['blocks'][1]['show_func'] = 'b_search_show';
+$modversion['blocks'][1]['template'] = 'block_search.html';
// Preferences
$i = 0;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-12-17 16:14:34 UTC (rev 10429)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-12-17 18:32:50 UTC (rev 10430)
@@ -161,14 +161,6 @@
return $xoops->tpl()->fetch('admin:system|system_modules_menu.html');
}
-function b_system_search_show()
-{
- $block = array();
- $block['lang_search'] = _MB_SYSTEM_SEARCH;
- $block['lang_advsearch'] = _MB_SYSTEM_ADVS;
- return $block;
-}
-
function b_system_user_show()
{
$xoops = Xoops::getInstance();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php 2012-12-17 16:14:34 UTC (rev 10429)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php 2012-12-17 18:32:50 UTC (rev 10430)
@@ -15,7 +15,6 @@
// Names of blocks for this module (Not all module has blocks)
define("_MI_SYSTEM_BNAME2","User Menu");
define("_MI_SYSTEM_BNAME3","Login");
-define("_MI_SYSTEM_BNAME4","Search");
define("_MI_SYSTEM_BNAME5","Waiting Contents");
define("_MI_SYSTEM_BNAME6","Main Menu");
define("_MI_SYSTEM_BNAME7","Site Info");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-17 16:14:34 UTC (rev 10429)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-17 18:32:50 UTC (rev 10430)
@@ -114,12 +114,6 @@
$modversion['blocks'][2]['show_func'] = 'b_system_login_show';
$modversion['blocks'][2]['template'] = 'system_block_login.html';
-$modversion['blocks'][3]['file'] = 'system_blocks.php';
-$modversion['blocks'][3]['name'] = _MI_SYSTEM_BNAME4;
-$modversion['blocks'][3]['description'] = 'Shows search form block';
-$modversion['blocks'][3]['show_func'] = 'b_system_search_show';
-$modversion['blocks'][3]['template'] = 'system_block_search.html';
-
$modversion['blocks'][4]['file'] = 'system_blocks.php';
$modversion['blocks'][4]['name'] = _MI_SYSTEM_BNAME5;
$modversion['blocks'][4]['description'] = 'Shows contents waiting for approval';
|
|
From: <du...@us...> - 2012-12-17 16:14:37
|
Revision: 10429
http://sourceforge.net/p/xoops/svn/10429
Author: dugris
Date: 2012-12-17 16:14:34 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Fix rev: 10403 (installation of system module for config moved in modules/system/xoops_version.php)
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_theme.php
Property Changed:
----------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php 2012-12-17 10:03:16 UTC (rev 10428)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php 2012-12-17 16:14:34 UTC (rev 10429)
@@ -1,161 +1,120 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-/**
- * Installer data generation file
- * See the enclosed file license.txt for licensing information.
- * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
- *
- * @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
- * @package installer
- * @since 2.3.0
- * @author Haruki Setoyama <ha...@pl...>
- * @author Kazumi Ono <web...@my...>
- * @author Skalpa Keo <sk...@xo...>
- * @author Taiwen Jiang <ph...@us...>
- * @author DuGris (aka L. JEN) <du...@fr...>
- * @version $Id$
- */
-// include_once './class/dbmanager.php';
-// RMV
-// TODO: Shouldn't we insert specific field names?? That way we can use
-// the defaults specified in the database...!!!! (and don't have problem
-// of missing fields in install file, when add new fields to database)
-function make_groups($dbm)
-{
- $gruops['XOOPS_GROUP_ADMIN'] = $dbm->insert('groups', " VALUES (1, '" . addslashes(_INSTALL_WEBMASTER) . "', '" . addslashes(_INSTALL_WEBMASTERD) . "', 'Admin')");
- $gruops['XOOPS_GROUP_USERS'] = $dbm->insert('groups', " VALUES (2, '" . addslashes(_INSTALL_REGUSERS) . "', '" . addslashes(_INSTALL_REGUSERSD) . "', 'User')");
- $gruops['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (3, '" . addslashes(_INSTALL_ANONUSERS) . "', '" . addslashes(_INSTALL_ANONUSERSD) . "', 'Anonymous')");
- if (!$gruops['XOOPS_GROUP_ADMIN'] || !$gruops['XOOPS_GROUP_USERS'] || !$gruops['XOOPS_GROUP_ANONYMOUS']) {
- return false;
- }
- return $gruops;
-}
-
-function make_data(XoopsDatabaseManager $dbm, $adminname, $adminpass, $adminmail, $language, $gruops)
-{
- $root = dirname(dirname(dirname(__FILE__)));
- // $xoopsDB =& Database::getInstance();
- // $dbm = new db_manager;
- $tables = array();
- // data for table 'groups_users_link'
- $dbm->insert('groups_users_link', " VALUES (0, " . $gruops['XOOPS_GROUP_ADMIN'] . ", 1)");
- $dbm->insert('groups_users_link', " VALUES (0, " . $gruops['XOOPS_GROUP_USERS'] . ", 1)");
- // data for table 'group_permission'
- $dbm->insert("group_permission", " VALUES (0," . $gruops['XOOPS_GROUP_ADMIN'] . ",1,1,'module_admin')");
- $dbm->insert("group_permission", " VALUES (0," . $gruops['XOOPS_GROUP_ADMIN'] . ",1,1, 'module_read')");
- $dbm->insert("group_permission", " VALUES (0," . $gruops['XOOPS_GROUP_USERS'] . ",1,1,'module_read')");
- $dbm->insert("group_permission", " VALUES (0," . $gruops['XOOPS_GROUP_ANONYMOUS'] . ",1,1,'module_read')");
-
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",1,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",2,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",3,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",4,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",5,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",6,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",7,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",8,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",9,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",10,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",11,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",12,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",13,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",14,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",15,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",16,1,'system_admin')");
- $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",17,1,'system_admin')");
- // default theme
- $time = time();
- $dbm->insert('tplset', " VALUES (1, 'default', 'XOOPS Default Template Set', '', " . $time . ")");
- // system modules
- if (file_exists($file = $root . '/modules/system/language/' . $language . '/modinfo.php')) {
- include $file;
- } else {
- include $root . '/modules/system/language/english/modinfo.php';
- $language = 'english';
- }
-
- $modversion = array();
- include_once $root . '/modules/system/xoops_version.php';
- $time = time();
- // RMV-NOTIFY (updated for extra column in table)
- $dbm->insert("modules", " VALUES (1, '" . _MI_SYSTEM_NAME . "', " . ($modversion['version'] * 100) . ", " . $time . ", 0, 1, 'system', 0, 1, 0, 0, 0, 0)");
-
- foreach ($modversion['templates'] as $tplfile) {
- // Main templates
- if (file_exists($file = $root . '/modules/system/templates/' . $tplfile['file'])) {
- if ($fp = fopen($file, 'r')) {
- $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ", " . $time . ", 'module')");
- // $newtplid = $xoopsDB->getInsertId();
- $tplsource = fread($fp, filesize($root . '/modules/system/templates/' . $tplfile['file']));
- fclose($fp);
- $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
- }
- }
- // Admin templates
- if (file_exists($file = $root . '/modules/system/admin/templates/' . $tplfile['file'])) {
- if ($fp = fopen($file, 'r')) {
- $newtplid = $dbm->insert('tplfile', " VALUES (0, 1, 'system', 'default', '" . addslashes($tplfile['file']) . "', '" . addslashes($tplfile['description']) . "', " . $time . ", " . $time . ", 'admin')");
- // $newtplid = $xoopsDB->getInsertId();
- $tplsource = fread($fp, filesize($root . '/modules/system/templates/admin/' . $tplfile['file']));
- fclose($fp);
- $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
- }
- }
- }
-
- foreach ($modversion['blocks'] as $func_num => $newblock) {
- if (file_exists($file = $root . '/modules/system/templates/blocks/' . $newblock['template'])) {
- if ($fp = fopen($file, 'r')) {
- if (in_array($newblock['template'], array(
- 'system_block_user.html', 'system_block_login.html', 'system_block_mainmenu.html'
- ))
- ) {
- $visible = 1;
- } else {
- $visible = 0;
- }
- $options = !isset($newblock['options']) ? '' : trim($newblock['options']);
- $edit_func = !isset($newblock['edit_func']) ? '' : trim($newblock['edit_func']);
- $newbid = $dbm->insert('newblocks', " VALUES (0, 1, " . $func_num . ", '" . addslashes($options) . "', '" . addslashes($newblock['name']) . "', '" . addslashes($newblock['name']) . "', '', 0, 0, " . $visible . ", 'S', 'H', 1, 'system', '" . addslashes($newblock['file']) . "', '" . addslashes($newblock['show_func']) . "', '" . addslashes($edit_func) . "', '" . addslashes($newblock['template']) . "', 0, " . $time . ")");
- // $newbid = $xoopsDB->getInsertId();
- $newtplid = $dbm->insert('tplfile', " VALUES (0, " . $newbid . ", 'system', 'default', '" . addslashes($newblock['template']) . "', '" . addslashes($newblock['description']) . "', " . $time . ", " . $time . ", 'block')");
- // $newtplid = $xoopsDB->getInsertId();
- $tplsource = fread($fp, filesize($root . '/modules/system/templates/blocks/' . $newblock['template']));
- fclose($fp);
- $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES (" . $newtplid . ", '" . addslashes($tplsource) . "')");
- $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_ADMIN'] . ", " . $newbid . ", 1, 'block_read')");
- // $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", ".$newbid.", 'xoops_blockadmiin')");
- $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_USERS'] . ", " . $newbid . ", 1, 'block_read')");
- $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_ANONYMOUS'] . ", " . $newbid . ", 1, 'block_read')");
- }
- }
- }
-
- // data for table 'users'
- $temp = md5($adminpass);
- $regdate = time();
- // $dbadminname= addslashes($adminname);
- // RMV-NOTIFY (updated for extra columns in user table)
- $dbm->insert('users', " VALUES (1,'','" . addslashes($adminname) . "','" . addslashes($adminmail) . "','" . XOOPS_URL . "/','avatars/blank.gif','" . $regdate . "','','','',1,'','','','','" . $temp . "',0,0,7,5,'default','0.0'," . time() . ",'flat',0,1,0,'','','',0)");
- // data for table 'block_module_link'
- $sql = 'SELECT bid, side FROM ' . $dbm->prefix('newblocks');
- $result = $dbm->query($sql);
-
- while ($myrow = $dbm->fetchArray($result)) {
- if ($myrow['side'] == 0) {
- $dbm->insert("block_module_link", " VALUES (" . $myrow['bid'] . ", 0)");
- } else {
- $dbm->insert("block_module_link", " VALUES (" . $myrow['bid'] . ", -1)");
- }
- }
- return $gruops;
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+/**
+ * Installer data generation file
+ * See the enclosed file license.txt for licensing information.
+ * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
+ *
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @package installer
+ * @since 2.3.0
+ * @author Haruki Setoyama <ha...@pl...>
+ * @author Kazumi Ono <web...@my...>
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @author DuGris (aka L. JEN) <du...@fr...>
+ * @version $Id$
+ */
+// include_once './class/dbmanager.php';
+// RMV
+// TODO: Shouldn't we insert specific field names?? That way we can use
+// the defaults specified in the database...!!!! (and don't have problem
+// of missing fields in install file, when add new fields to database)
+function make_groups($dbm)
+{
+ $gruops['XOOPS_GROUP_ADMIN'] = $dbm->insert('groups', " VALUES (1, '" . addslashes(_INSTALL_WEBMASTER) . "', '" . addslashes(_INSTALL_WEBMASTERD) . "', 'Admin')");
+ $gruops['XOOPS_GROUP_USERS'] = $dbm->insert('groups', " VALUES (2, '" . addslashes(_INSTALL_REGUSERS) . "', '" . addslashes(_INSTALL_REGUSERSD) . "', 'User')");
+ $gruops['XOOPS_GROUP_ANONYMOUS'] = $dbm->insert('groups', " VALUES (3, '" . addslashes(_INSTALL_ANONUSERS) . "', '" . addslashes(_INSTALL_ANONUSERSD) . "', 'Anonymous')");
+ if (!$gruops['XOOPS_GROUP_ADMIN'] || !$gruops['XOOPS_GROUP_USERS'] || !$gruops['XOOPS_GROUP_ANONYMOUS']) {
+ return false;
+ }
+ return $gruops;
+}
+
+function make_data(XoopsDatabaseManager $dbm, $adminname, $adminpass, $adminmail, $language, $gruops)
+{
+ $root = dirname(dirname(dirname(__FILE__)));
+ // $xoopsDB =& Database::getInstance();
+ // $dbm = new db_manager;
+ $tables = array();
+ // data for table 'groups_users_link'
+ $dbm->insert('groups_users_link', " VALUES (0, " . $gruops['XOOPS_GROUP_ADMIN'] . ", 1)");
+ $dbm->insert('groups_users_link', " VALUES (0, " . $gruops['XOOPS_GROUP_USERS'] . ", 1)");
+ // data for table 'group_permission'
+ $dbm->insert("group_permission", " VALUES (0," . $gruops['XOOPS_GROUP_ADMIN'] . ",1,1,'module_admin')");
+ $dbm->insert("group_permission", " VALUES (0," . $gruops['XOOPS_GROUP_ADMIN'] . ",1,1, 'module_read')");
+ $dbm->insert("group_permission", " VALUES (0," . $gruops['XOOPS_GROUP_USERS'] . ",1,1,'module_read')");
+ $dbm->insert("group_permission", " VALUES (0," . $gruops['XOOPS_GROUP_ANONYMOUS'] . ",1,1,'module_read')");
+
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",1,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",2,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",3,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",4,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",5,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",6,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",7,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",8,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",9,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",10,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",11,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",12,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",13,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",14,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",15,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",16,1,'system_admin')");
+ $dbm->insert("group_permission", " VALUES(0," . $gruops['XOOPS_GROUP_ADMIN'] . ",17,1,'system_admin')");
+ // default theme
+ $time = time();
+ $dbm->insert('tplset', " VALUES (1, 'default', 'XOOPS Default Template Set', '', " . $time . ")");
+ // system modules
+ if (file_exists($file = $root . '/modules/system/language/' . $language . '/modinfo.php')) {
+ include $file;
+ } else {
+ include $root . '/modules/system/language/english/modinfo.php';
+ $language = 'english';
+ }
+
+ // Install system module
+ include_once $root . "/modules/system/class/module.php";
+ include_once $root . "/modules/system/class/system.php";
+
+ $system_module = new SystemModule();
+ $system = System::getInstance();
+ $system->loadLanguage('modulesadmin','system');
+ $system_module->install('system');
+
+ // Make system block visible
+ include_once $root . "/kernel/block.php";
+ $block_handler = new XoopsBlockHandler();
+ $blocks = $block_handler->getByModule(1);
+ foreach ( $blocks as $k => $block) {
+ if (in_array( $block->getVar('template'),
+ array('system_block_user.html', 'system_block_login.html', 'system_block_mainmenu.html'))) {
+
+ $block->setVar('visible', 1);
+ $block_handler->insert($block);
+
+ $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_ADMIN'] . ", " . $block->id() . ", 1, 'block_read')");
+ $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_USERS'] . ", " . $block->id() . ", 1, 'block_read')");
+ $dbm->insert("group_permission", " VALUES (0, " . $gruops['XOOPS_GROUP_ANONYMOUS'] . ", " . $block->id() . ", 1, 'block_read')");
+ }
+ }
+
+ // data for table 'users'
+ $temp = md5($adminpass);
+ $regdate = time();
+ // $dbadminname= addslashes($adminname);
+ // RMV-NOTIFY (updated for extra columns in user table)
+ $dbm->insert('users', " VALUES (1,'','" . addslashes($adminname) . "','" . addslashes($adminmail) . "','" . XOOPS_URL . "/','avatars/blank.gif','" . $regdate . "','','','',1,'','','','','" . $temp . "',0,0,7,5,'default','0.0'," . time() . ",'flat',0,1,0,'','','',0)");
+
+ return $gruops;
}
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/makedata.php
___________________________________________________________________
Deleted: svn:eol-style
- native
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php 2012-12-17 10:03:16 UTC (rev 10428)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_configsite.php 2012-12-17 16:14:34 UTC (rev 10429)
@@ -48,7 +48,7 @@
$config_handler = $xoops->getHandlerConfig();
$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('conf_modid', 0));
+$criteria->add(new Criteria('conf_modid', 1));
$criteria2 = new CriteriaCompo();
foreach ($wizard->configs['conf_names'] as $conf_name) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_theme.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_theme.php 2012-12-17 10:03:16 UTC (rev 10428)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_theme.php 2012-12-17 16:14:34 UTC (rev 10429)
@@ -52,7 +52,7 @@
$xoops->loadLanguage('admin/preferences', 'system', $wizard->language);
$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('conf_modid', 0));
+$criteria->add(new Criteria('conf_modid', 1));
$criteria->add(new Criteria('conf_name', 'theme_set'));
$tempvar = $config_handler->getConfigs($criteria);
|
|
From: <be...@us...> - 2012-12-17 10:03:19
|
Revision: 10428
http://sourceforge.net/p/xoops/svn/10428
Author: beckmi
Date: 2012-12-17 10:03:16 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Updating to 1.01 Final
Modified Paths:
--------------
XoopsModules/mastop_go2/trunk/mastop_go2/docs/changelog.txt
XoopsModules/mastop_go2/trunk/mastop_go2/xoops_version.php
Removed Paths:
-------------
XoopsModules/mastop_go2/trunk/mastop_go2/leiame.txt
XoopsModules/mastop_go2/trunk/mastop_go2/readme.txt
Modified: XoopsModules/mastop_go2/trunk/mastop_go2/docs/changelog.txt
===================================================================
--- XoopsModules/mastop_go2/trunk/mastop_go2/docs/changelog.txt 2012-12-17 08:44:58 UTC (rev 10427)
+++ XoopsModules/mastop_go2/trunk/mastop_go2/docs/changelog.txt 2012-12-17 10:03:16 UTC (rev 10428)
@@ -1,4 +1,4 @@
-1.01 (Mamba) 2011/12/12
+1.01 (Mamba) 2012/12/17
=================================
- updated to XOOPS 2.5.x GUI
- replaced action text with icons
Deleted: XoopsModules/mastop_go2/trunk/mastop_go2/leiame.txt
===================================================================
--- XoopsModules/mastop_go2/trunk/mastop_go2/leiame.txt 2012-12-17 08:44:58 UTC (rev 10427)
+++ XoopsModules/mastop_go2/trunk/mastop_go2/leiame.txt 2012-12-17 10:03:16 UTC (rev 10428)
@@ -1,28 +0,0 @@
-### =============================================================
-### Mastop InfoDigital - Paixão por Internet
-### =============================================================
-### Informações para uso do Mastop Go2
-### =============================================================
-### Developer: Fernando Santos (topet05), fer...@ma...
-### Copyright: Mastop InfoDigital © 2003-2007
-### -------------------------------------------------------------
-### www.mastop.com.br
-### =============================================================
-### $Id: leiame.txt,v 1.1.1.1 2007/04/30 23:18:58 topet05 Exp $
-### =============================================================
-
-Obrigado por usar o Mastop Go2!
-
-Este módulo foi desenvolvido para rodar na atual versão estável do Xoops: 2.0.16
-Funciona em PHP 4 e PHP 5
-
-Instruções:
-- Instale como um módulo normal
-- Configure as permissões do módulo para que visitantes possam acessar (só assim você poderá usar o gerador de códigos e poderá colocar seus destaques em qualquer lugar através do código gerado).
-- Vá até a administração e cadastre as seções e os destaques.
-- Vá até a administração de blocos do Mastop Go2 e ative / configure / clone blocos da forma que você desejar.
-- Caso queira usar os destaques cadastrados em outro site (ou se quiser permitir que seus visitantes divulguem seus destaques), vá até a Home do módulo e use o Gerador de Códigos.
-
-Dúvidas / Críticas / Sugestões e Bugs: go...@ma...
-
-Mais informações: http://www.mastop.com.br/produtos/go2/
Deleted: XoopsModules/mastop_go2/trunk/mastop_go2/readme.txt
===================================================================
--- XoopsModules/mastop_go2/trunk/mastop_go2/readme.txt 2012-12-17 08:44:58 UTC (rev 10427)
+++ XoopsModules/mastop_go2/trunk/mastop_go2/readme.txt 2012-12-17 10:03:16 UTC (rev 10428)
@@ -1,28 +0,0 @@
-### =============================================================
-### Mastop InfoDigital - Paixão por Internet
-### =============================================================
-### Information About Mastop Go2
-### =============================================================
-### Developer: Fernando Santos (topet05), fer...@ma...
-### Copyright: Mastop InfoDigital © 2003-2007
-### -------------------------------------------------------------
-### www.mastop.com.br
-### =============================================================
-### $Id: readme.txt,v 1.2 2007/05/01 21:45:11 topet05 Exp $
-### =============================================================
-
-Thank your for using the Mastop Go2!
-
-This module was developed to work with current stable version of Xoops: 2.0.16
-Works in PHP 4 and PHP 5
-
-Instructions:
-- Install it like a normal module
-- Set the access permissions to anonymous users (only doing that you can use the code generator to put yours Spotlights everywhere).
-- Go to administration and submit sections and spotlights.
-- Go to Mastop Go2 Blocks Administration and active / configure / clone blocks as you want.
-- If you want to use the Spotlights in other site (or if you want allow your guests to promote yours spotlights), go to Code Generator at the Home of your Mastop Go2.
-
-Questions / Critical / Suggestions and Bugs: go...@ma...
-
-More Information: http://www.mastop.com.br/produtos/go2/
Modified: XoopsModules/mastop_go2/trunk/mastop_go2/xoops_version.php
===================================================================
--- XoopsModules/mastop_go2/trunk/mastop_go2/xoops_version.php 2012-12-17 08:44:58 UTC (rev 10427)
+++ XoopsModules/mastop_go2/trunk/mastop_go2/xoops_version.php 2012-12-17 10:03:16 UTC (rev 10428)
@@ -30,12 +30,12 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/12/12';
+$modversion['release_date'] = '2012/12/17';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
+$modversion["module_status"] = "Final";
$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5";
+$modversion['min_xoops'] = "2.5.5";
$modversion['min_admin'] = '1.1';
$modversion['min_db'] = array('mysql' => '5.0.7', 'mysqli' => '5.0.7');
|
|
From: <be...@us...> - 2012-12-17 08:45:01
|
Revision: 10427
http://sourceforge.net/p/xoops/svn/10427
Author: beckmi
Date: 2012-12-17 08:44:58 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Updating version number
Modified Paths:
--------------
XoopsModules/marquee/trunk/marquee/xoops_version.php
Modified: XoopsModules/marquee/trunk/marquee/xoops_version.php
===================================================================
--- XoopsModules/marquee/trunk/marquee/xoops_version.php 2012-12-17 07:53:32 UTC (rev 10426)
+++ XoopsModules/marquee/trunk/marquee/xoops_version.php 2012-12-17 08:44:58 UTC (rev 10427)
@@ -26,7 +26,7 @@
$moduleDirName = basename( dirname( __FILE__ ) ) ;
$modversion['name'] = _MI_MARQUEE_NAME;
-$modversion['version'] = '2.50';
+$modversion['version'] = '2.49';
$modversion['description'] = _MI_MARQUEE_DESC;
$modversion['credits'] = "Carnuke, defkon1, the Newbb team, Mage, Mamba";
$modversion['author'] = 'Hervé Thouzard';
@@ -42,11 +42,11 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/11/25';
+$modversion['release_date'] = '2012/12/17';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC 1";
-$modversion["author_website_url"] = "http://www.herve-thouzard.com/";
+$modversion["module_status"] = "Final";
+$modversion["author_website_url"] = "http://xoops.org/";
$modversion["author_website_name"] = "Hervé Thouzard";
$modversion['min_php']='5.2';
$modversion['min_xoops']="2.5.5";
|
|
From: <be...@us...> - 2012-12-17 07:53:35
|
Revision: 10426
http://sourceforge.net/p/xoops/svn/10426
Author: beckmi
Date: 2012-12-17 07:53:32 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Updating to 0.9 Final
Modified Paths:
--------------
XoopsModules/googlemaps/trunk/googlemaps/docs/changelog.txt
XoopsModules/googlemaps/trunk/googlemaps/xoops_version.php
Modified: XoopsModules/googlemaps/trunk/googlemaps/docs/changelog.txt
===================================================================
--- XoopsModules/googlemaps/trunk/googlemaps/docs/changelog.txt 2012-12-17 06:27:50 UTC (rev 10425)
+++ XoopsModules/googlemaps/trunk/googlemaps/docs/changelog.txt 2012-12-17 07:53:32 UTC (rev 10426)
@@ -1,14 +1,16 @@
Changelog (English)
--------------------------
-Version 0.9 Beta (Mamba) 2012/03/17
+Version 0.9 Final (Mamba) 2012/12/17
=================================
- converted to XOOPS 2.5.x Admin GUI (mamba)
Version 0.83 (Marco) - 03/03/07
+=================================
- security fix (thx Martin ZPC)
Version 0.82 (Marco) - 17/02/07
+=================================
- many security fixes, that work permitted me to improve my knowledge in that area (thx herv�)
- Notice: Undefined variable: pentry : suppression message bug
- add indexes on tables (read readme file for upgrade instructions)
@@ -17,10 +19,12 @@
Version 0.81 (Marco) - 26/12/06
+=================================
- add some definitions for xoopsinfo module in the xoops_version.php file
- add chineses (thx twinwoods) and german translations (thx wuddel)
Version 0.8 (Marco) - 06/09/06
+=================================
- add 2 templates for index.php page : user centric map/ location centric map. An option in module preferences has been added, so that this module can benefit from smarty cache feature as well.The other pages of this module will have their own template later. Special thanks to kris for icons hunting ;-)
- add parameter in module preferences to manage how many last point to display in "Last Points" area
- add keyboard zoom featurec CTRL + "fl�ches" or CRTL + "+" ou "-"
@@ -33,35 +37,43 @@
- fix zoom bug on new/modify markers (no more blank zoom field in forms on click) - thx Djiman
Version 0.7g (Marco) - 21/08/06
+=================================
- fix end tag for div and fix for directions
Version 0.7f (Marco) - 20/08/06
+=================================
- end fixes for css2 compliancy, fixed some errors on IE browser too
- add max width per infowindow
- add wrap feature in infowindow for too large contents
- modify call to GoogleMap API
Version 0.7e (Marco) - 09/08/06
+=================================
- add mouseover/clickout effect
- replacement of some residual '< b>\' tag by '\< b />\'
- code rewriting to better use ", ' and limit bugs on some plateforms
- residual fixes for mysql 5
Version 0.7d (Marco) - 08/08/06
+=================================
- add a check whether user has set his real name or not. if not, uname (login) will be used
- delete all unecessary < table>, make output rendering css compliant, move some parts so that it displays well on more websites
Version 0.7c (Marco) - 08/08/06
+=================================
- remove blank ('') insert from map_id in admin.php, which was an autoincrement field (it caused an mysql "error Error Code: 0013 ERROR: Could not query the database. Error: Out of range value adjusted for column 'map_id' at row 1" on category creation), reported by khuhner
- remove some sprintf call in admin.php
Version 0.7b (Marco) - 07/08/06
+=================================
- replace XOOPS_ROOT_PATH by XOOPS_URL in maps.js
Version 0.7a (Marco) - 06/08/06
+=================================
- quick fix just after release (typo in maps.js)
Version 0.7 (Marco) - 06/08/06
+=================================
- add tabulation feature
- add direction feature. You can search your direction from current marker position
- add some icones to personalize tabs, add names to tabs (Profile/Directions)
@@ -74,6 +86,7 @@
Version 0.6 (Marco) - 05/08/06
+=================================
- replace '< ?' by '< ?php' tags (still left some in maps.js, i keep that one for later)
- add some css style into markers to better display informations within markers (still need to create a module .css file,i keep that one for later)
To use it, just add to your theme .css such a style (names infobox)
@@ -84,6 +97,7 @@
Version 0.5 (Marco)
+=================================
- Added ability for users to add/modify their point by themselves (managepoint.php file). user's should be connected to perform that action
- Added some language defines
- Added "one point only per users" control
@@ -93,12 +107,14 @@
Version 0.4 (Phatbloke)
+=================================
-Added code to handle V2 of the google API making europe maps available
-Added ability to choose a map type to display as default
-Fixed Shifted sidebar to the side of the map to help if categories get too big
Version 0.3 (Phatbloke)
+=================================
-Added dynamic menu system for categories
-Added first category as default display
-Added ordering for points
@@ -108,8 +124,10 @@
Version 0.2 (Phatbloke)
+=================================
-Fixed issue with IE
Version 0.1 (Phatbloke)
+=================================
-First release
\ No newline at end of file
Modified: XoopsModules/googlemaps/trunk/googlemaps/xoops_version.php
===================================================================
--- XoopsModules/googlemaps/trunk/googlemaps/xoops_version.php 2012-12-17 06:27:50 UTC (rev 10425)
+++ XoopsModules/googlemaps/trunk/googlemaps/xoops_version.php 2012-12-17 07:53:32 UTC (rev 10426)
@@ -26,11 +26,11 @@
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["release_date"] = "2012/03/27";
-$modversion["module_status"] = "RC";
+$modversion["module_status"] = "Final";
$modversion["author_website_url"] = "http://www.xoops.org/";
$modversion["author_website_name"] = "XOOPS";
$modversion['min_php']='5.2';
-$modversion['min_xoops']='2.5';
+$modversion['min_xoops']='2.5.5';
$modversion['min_admin']='1.1';
$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
|
|
From: <be...@us...> - 2012-12-17 06:27:52
|
Revision: 10425
http://sourceforge.net/p/xoops/svn/10425
Author: beckmi
Date: 2012-12-17 06:27:50 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Updating to 3.3 Final
Modified Paths:
--------------
XoopsModules/backup/trunk/backup/xoops_version.php
Modified: XoopsModules/backup/trunk/backup/xoops_version.php
===================================================================
--- XoopsModules/backup/trunk/backup/xoops_version.php 2012-12-17 05:27:27 UTC (rev 10424)
+++ XoopsModules/backup/trunk/backup/xoops_version.php 2012-12-17 06:27:50 UTC (rev 10425)
@@ -19,15 +19,15 @@
$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
//about
-$modversion['status_version'] = 'RC';
-$modversion['release_date'] = '2012/05/10';
+$modversion['status_version'] = 'Final';
+$modversion['release_date'] = '2012/12/16';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
+$modversion["module_status"] = "Final";
$modversion["author_website_url"] = "http://www.metalslug.altervista.org/";
$modversion["author_website_name"] = "Metalaslug";
$modversion['min_php']=5.2;
-$modversion['min_xoops']="2.5.0";
+$modversion['min_xoops']="2.5.5";
$modversion['min_admin']= "1.1";
$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
$modversion['system_menu'] = 1;
|
|
From: <be...@us...> - 2012-12-17 05:27:30
|
Revision: 10424
http://sourceforge.net/p/xoops/svn/10424
Author: beckmi
Date: 2012-12-17 05:27:27 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Updating to 0.22 Final
Modified Paths:
--------------
XoopsModules/avaman/trunk/avaman/xoops_version.php
Modified: XoopsModules/avaman/trunk/avaman/xoops_version.php
===================================================================
--- XoopsModules/avaman/trunk/avaman/xoops_version.php 2012-12-17 05:15:03 UTC (rev 10423)
+++ XoopsModules/avaman/trunk/avaman/xoops_version.php 2012-12-17 05:27:27 UTC (rev 10424)
@@ -46,7 +46,7 @@
$modversion["author_website_url"] = "http://www.peak.ne.jp";
$modversion["author_website_name"] = "GIJOE";
$modversion['min_php']='5.2';
-$modversion['min_xoops']="2.5.0";
+$modversion['min_xoops']="2.5.5";
$modversion['min_db'] = array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
$modversion['min_admin'] = '1.1';
|
|
From: <be...@us...> - 2012-12-17 05:15:06
|
Revision: 10423
http://sourceforge.net/p/xoops/svn/10423
Author: beckmi
Date: 2012-12-17 05:15:03 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Updating to 3.21 Final
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2012-12-17 04:58:36 UTC (rev 10422)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2012-12-17 05:15:03 UTC (rev 10423)
@@ -1,3 +1,7 @@
+<b><u>=> Version 3.21 Final (2012-12-16)</u></b>
+
+- Final Release (mamba)
+
<b><u>=> Version 3.21 Beta 1 (2012-07-30)</u></b>
- Converted to XOOPS 2.5.5 Admin GUI (mamba)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt 2012-12-17 04:58:36 UTC (rev 10422)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt 2012-12-17 05:15:03 UTC (rev 10423)
@@ -10,13 +10,9 @@
x renamed
---------------------------------------
-2.33 Beta 1 2012-07-23
+3.21 Beta 1 2012-07-30
---------------------------------------
-__admin.php__
-+ _AM_OLEDRION_ADD_ATTRIBUTE
-+ _AM_OLEDRION_EDIT_ATTRIBUTE
-
-
-New file to translate :
- /xoops/modules/admin/gateways/paypal/language/mylanguage/main.php
\ No newline at end of file
+__modinfo.php__
++ _MI_WFD_DB_IMPORT
++ _MI_WFD_HELP
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt 2012-12-17 04:58:36 UTC (rev 10422)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt 2012-12-17 05:15:03 UTC (rev 10423)
@@ -9,7 +9,7 @@
What is WF-Downloads ?
======================
-WF-Downloads is an advanced Downloads module for your XOOPS 2.x site. With this powerfull module, you can easily set a downloads section on your site and offer unlimited amount of files to your users. The module supports subcategories, has a fully integrated permissions system as well as a complete notifications system.
+WF-Downloads is an advanced Downloads module for your XOOPS 2.x site. With this powerful module, you can easily set a downloads section on your site and offer unlimited amount of files to your users. The module supports subcategories, has a fully integrated permissions system as well as a complete notifications system.
How to install or Update WF-Downloads
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2012-12-17 04:58:36 UTC (rev 10422)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2012-12-17 05:15:03 UTC (rev 10423)
@@ -13,7 +13,7 @@
$modversion['name'] = _MI_WFD_NAME;
$modversion['version'] = 3.21;
$modversion['releasedate'] = "2008-05-10";
-$modversion['status'] = "RC2";
+$modversion['status'] = "Final";
$modversion['description'] = _MI_WFD_DESC;
$modversion['author'] = "The SmartFactory";
$modversion['credits'] = "This module was originally based on Mydownloads, and refactored by Catzwolf and the WF-Projects team. Then it became a project of The SmartFactory who continued the excellent work started by the WF-Projects team.";
@@ -29,10 +29,10 @@
$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/07/30';
+$modversion['release_date'] = '2012/12/16';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "Final";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.5";
$modversion['min_admin'] = '1.1';
|
8 messages has been excluded from this view by a project administrator.
