Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9423] XoopsModules/xpdf/trunk/modules/xpdf
|
From: <txm...@us...> - 2012-05-01 23:12:25
|
Revision: 9423
http://xoops.svn.sourceforge.net/xoops/?rev=9423&view=rev
Author: txmodxoops
Date: 2012-05-01 23:12:18 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Fixed bug editors
Fixed bug globals variables
Modified Paths:
--------------
XoopsModules/xpdf/trunk/modules/xpdf/admin/about.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_footer.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_header.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/categories.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/index.php
XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php
XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php
XoopsModules/xpdf/trunk/modules/xpdf/rss.php
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html
XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/about.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/about.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/about.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -30,5 +30,5 @@
xoops_cp_header();
$aboutAdmin = new ModuleAdmin();
echo $aboutAdmin->addNavigation("about.php");
-echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
+echo $aboutAdmin->renderabout('25J998Y3QEDZW', false);
include "admin_footer.php";
\ No newline at end of file
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_footer.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_footer.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_footer.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -29,7 +29,7 @@
global $pathImageAdmin;
echo "<div align='center'><a href='http://www.xoops.org' target='_blank'>
<img src='".$pathImageAdmin."/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a></div>";
-echo "<div class='center small italic pad5'>
- <strong>" . $xoopsModule->getVar('name') . "</strong> "._AM_XPDF_MAINTAINEDBY."
- <a href='http://www.txmodxoops.org/modules/newbb' title='Visit TXMod Xoops Community' class='tooltip' rel='external'>TXMod Xoops Community</a></div>";
+echo "<div class='center pad5'>
+ <span class='bold'>" . $xoopsModule->getVar('name') . "</span><span class='small italic'> "._AM_XPDF_MAINTAINEDBY."
+ <a href='http://www.txmodxoops.org/modules/newbb' title='Visit TXMod Xoops Community' class='tooltip' rel='external'>TXMod Xoops Community</a></span></div>";
xoops_cp_footer();
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_header.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_header.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_header.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -27,7 +27,7 @@
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
include_once XOOPS_ROOT_PATH . '/class/tree.php';
include_once '../include/config.php';
include_once '../include/functions.php';
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/categories.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/categories.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/categories.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -25,10 +25,9 @@
* Version : 1.01 Mon 2012/04/30 15:11:55 : timgno Exp $
* ****************************************************************************
*/
-
include "admin_header.php";
xoops_cp_header();
-global $pathImageIcon, $xoopsModuleConfig;
+global $pathImageIcon;
// We recovered the value of the argument op in the URL$
$op = xpdf_CleanVars($_REQUEST, 'op', 'list', 'string');
@@ -42,8 +41,8 @@
echo $catAdmin->renderButton();
$limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
$criteria = new CriteriaCompo();
- $criteria->setSort("cat_weight ASC, cat_title");
- $criteria->setOrder("ASC");
+ $criteria->setSort("cat_weight DESC, cat_title");
+ $criteria->setOrder("DESC");
$numrows = $catHandler->getCount();
$start = xpdf_CleanVars ( $_REQUEST, 'start', 0, 'int' );
$criteria->setStart($start);
@@ -110,7 +109,7 @@
$obj =& $catHandler->create();
$form = $obj->getForm();
- $form->display();
+ echo $form->display();
break;
case "save_cat":
@@ -129,8 +128,8 @@
$obj->setVar("cat_title", $_REQUEST["cat_title"]);
//Form cat_image
include_once XOOPS_ROOT_PATH."/class/uploader.php";
- $uploaddir = XPDF_UPLOAD_CAT_PATH."/";
- $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'], 104857600, null, null);
+ $uploader = new XoopsMediaUploader(XPDF_UPLOAD_CAT_PATH."/", $GLOBALS['xoopsModuleConfig']['mimetypes'],
+ $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setPrefix("cat_image_") ;
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
@@ -154,7 +153,7 @@
echo $obj->getHtmlErrors();
$form =& $obj->getForm();
- $form->display();
+ echo $form->display();
break;
case "edit_cat":
@@ -164,7 +163,7 @@
echo $catAdmin->renderButton();
$obj = $catHandler->get($_REQUEST["cat_id"]);
$form = $obj->getForm();
- $form->display();
+ echo $form->display();
break;
case "delete_cat":
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -143,7 +143,7 @@
$obj =& $docHandler->create();
$form = $obj->getForm();
- $form->display();
+ echo $form->display();
break;
case "save_doc":
@@ -168,9 +168,8 @@
$obj->setVar("doc_pdftext", $_REQUEST["doc_pdftext"]);
//Form doc_image
include_once XOOPS_ROOT_PATH."/class/uploader.php";
- $uploaddir = XOOPS_UPLOAD_PATH."/xpdf/images/";
- $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']['mimetypes'],
- $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
+ $uploader = new XoopsMediaUploader(XPDF_UPLOAD_DOC_PATH."/", $GLOBALS['xoopsModuleConfig']['mimetypes'],
+ $GLOBALS['xoopsModuleConfig']['maxsize'], null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setPrefix("doc_image_") ;
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
@@ -225,7 +224,7 @@
echo $obj->getHtmlErrors();
$form =& $obj->getForm();
- $form->display();
+ echo $form->display();
break;
case "edit_doc":
@@ -235,7 +234,7 @@
echo $docAdmin->renderButton();
$obj = $docHandler->get($_REQUEST["doc_id"]);
$form = $obj->getForm();
- $form->display();
+ echo $form->display();
break;
case "delete_doc":
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/index.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/index.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/index.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -39,11 +39,10 @@
unset($criteria);
$r = '#FF0000'; // Red
$g = '#00AA00'; // Green
- $indexAdmin->addInfoBox(_AM_XPDF_CAT);
- $indexAdmin->addInfoBoxLine(_AM_XPDF_CAT,_AM_XPDF_THEREARE_CAT, $count_cat, ($count_cat == 0) ? $r : $g);
- $indexAdmin->addInfoBox(_AM_XPDF_DOC);
- $indexAdmin->addInfoBoxLine(_AM_XPDF_DOC,_AM_XPDF_THEREARE_DOC, $count_doc, ($count_doc == 0) ? $r : $g);
- $indexAdmin->addInfoBoxLine(_AM_XPDF_DOC,_AM_XPDF_THEREARE_DOC_ONLINE, $doc_online, ($count_doc == 0) ? $r : $g);
+ $indexAdmin->addInfoBox(_AM_XPDF_STATISTICS);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_CAT, $count_cat, ($count_cat == 0) ? $r : $g);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC, $count_doc, ($count_doc == 0) ? $r : $g);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_ONLINE, $doc_online, ($count_doc == 0) ? $r : $g);
echo $indexAdmin->addNavigation("index.php");
echo $indexAdmin->renderIndex();
include "admin_footer.php";
Modified: XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -66,9 +66,7 @@
}
function getForm($action = false)
- {
- global $xoopsDB, $xoopsModuleConfig;
-
+ {
if ($action === false) {
$action = $_SERVER["REQUEST_URI"];
}
@@ -228,11 +226,11 @@
$pdf_data['doimages'] = $pdfdoc->getVar('doc_doimages');
$pdf_data['dobreak'] = $pdfdoc->getVar('doc_dobreak');
- define ('PDF_CREATOR', $pdf_data['creator']);
- define ('PDF_AUTHOR', $pdf_data['author']);
- define ('PDF_HEADER_TITLE', $pdf_data['title']);
- define ('PDF_HEADER_STRING', $pdf_data['subject']);
- define ('PDF_HEADER_LOGO', 'logo.gif');
+ define ('XPDF_CREATOR', $pdf_data['creator']);
+ define ('XPDF_AUTHOR', $pdf_data['author']);
+ define ('XPDF_HEADER_TITLE', $pdf_data['title']);
+ define ('XPDF_HEADER_STRING', $pdf_data['subject']);
+ define ('XPDF_HEADER_LOGO', 'logo.gif');
define ('K_PATH_IMAGES', XOOPS_ROOT_PATH.'/images/');
$myts =& MyTextSanitizer::getInstance();
@@ -258,7 +256,7 @@
$pdf->SetKeywords($doc_keywords);
// set default header data
- $pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE, PDF_HEADER_STRING);
+ $pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, XPDF_HEADER_TITLE, XPDF_HEADER_STRING);
//set margins
$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP + 10, PDF_MARGIN_RIGHT);
Modified: XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -27,18 +27,16 @@
*/
//Index
-define("_AM_XPDF_CAT","Categories Statistics");
+define("_AM_XPDF_STATISTICS","Statistics xPdf");
define("_AM_XPDF_THEREARE_CAT","There are <span class='bold'>%s</span> Categories in the Database");
-define("_AM_XPDF_DOC","Documents Statistics");
define("_AM_XPDF_THEREARE_DOC","There are <span class='bold'>%s</span> Documents in the Database");
define("_AM_XPDF_THEREARE_DOC_ONLINE","There are <span class='bold'>%s</span> Documents online");
//Buttons
-define("_AM_XPDF_NEWCAT","Add New Categories");
+define("_AM_XPDF_NEWCAT","Add New Category");
define("_AM_XPDF_CATLIST","List Categories");
//Buttons
-define("_AM_XPDF_NEWDOC","Add New Documents");
+define("_AM_XPDF_NEWDOC","Add New Document");
define("_AM_XPDF_DOCLIST","List Documents");
-
//General
define("_AM_XPDF_FORMOK","Registered successfull");
define("_AM_XPDF_FORMDELOK","Deleted successfull");
@@ -50,9 +48,9 @@
define("_AM_XPDF_OFF","Offline");
define("_AM_XPDF_ON","Online");
-define("_AM_XPDF_CAT_ADD","Add a Categories");
-define("_AM_XPDF_CAT_EDIT","Edit a Categories");
-define("_AM_XPDF_CAT_DELETE","Delete a Categories");
+define("_AM_XPDF_CAT_ADD","Add a Category");
+define("_AM_XPDF_CAT_EDIT","Edit Category");
+define("_AM_XPDF_CAT_DELETE","Delete Category");
define("_AM_XPDF_CAT_ID","Id");
define("_AM_XPDF_CAT_PID","Main Category");
define("_AM_XPDF_CAT_TITLE","Category Title");
@@ -60,10 +58,9 @@
define("_AM_XPDF_CAT_DESCRIPTION","Description");
define("_AM_XPDF_CAT_WEIGHT","Weight");
-
-define("_AM_XPDF_DOC_ADD","Add a Documents");
-define("_AM_XPDF_DOC_EDIT","Edit a Documents");
-define("_AM_XPDF_DOC_DELETE","Delete a Documents");
+define("_AM_XPDF_DOC_ADD","Add a Document");
+define("_AM_XPDF_DOC_EDIT","Edit Document");
+define("_AM_XPDF_DOC_DELETE","Delete Document");
define("_AM_XPDF_DOC_ID","Id");
define("_AM_XPDF_DOC_CID","Category");
define("_AM_XPDF_DOC_FILENAME","Filename");
@@ -72,8 +69,8 @@
define("_AM_XPDF_DOC_PDFTEXT","Pdf Content");
define("_AM_XPDF_DOC_IMAGE","Image");
define("_AM_XPDF_DOC_SUBJECT","Subject");
-define("_AM_XPDF_DOC_FONTNAME","Fontname");
-define("_AM_XPDF_DOC_FONTSIZE","Fontsize");
+define("_AM_XPDF_DOC_FONTNAME","Name: ");
+define("_AM_XPDF_DOC_FONTSIZE","Size: ");
define("_AM_XPDF_DOC_KEYWORDS","Keywords");
define("_AM_XPDF_DOC_SUBMITTER","Submitter");
define("_AM_XPDF_DOC_CREATED","Created");
@@ -113,6 +110,6 @@
define('_AM_XPDF_VIEWFORM_DESC',"Permission to view a document");
//Error NoFrameworks
-define("_AM_XPDF_NOFRAMEWORKS","Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+define("_AM_XPDF_NOFRAMEWORKS","Error: You don't use the Frameworks 'Admin Module'. Please install this Frameworks");
define("_AM_XPDF_MAINTAINEDBY", "is maintained by the");
?>
\ No newline at end of file
Modified: XoopsModules/xpdf/trunk/modules/xpdf/rss.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/rss.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/rss.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -23,10 +23,10 @@
* ****************************************************************************
*/
include_once dirname(__FILE__) . '/header.php';
-$cid = isset($_GET['doc_cid']) ? intval($_GET['doc_cid']) : 0;
+$did = xpdf_CleanVars($_REQUEST, 'doc_id', 0, 'int');
+$cid = xpdf_CleanVars($_REQUEST, 'doc_cid', 0, 'int');
include_once XOOPS_ROOT_PATH.'/class/template.php';
-$items_count = $GLOBALS['xoopsModuleConfig']['rssperpage'];
-
+$catHandler =& xoops_getModuleHandler('xpdf_cat', XPDF_DIRNAME);
if (function_exists('mb_http_output')) {
mb_http_output('pass');
}
@@ -42,7 +42,7 @@
$criteria->add(new Criteria('doc_cid', '(' . implode(',', $cats) . ')','IN'));
if ($cid != 0){
$criteria->add(new Criteria('doc_cid', $cid));
- $cat = $docscat_Handler->get($cid);
+ $cat = $catHandler->get($cid);
$title = $GLOBALS['xoopsConfig']['sitename'] . ' - ' . $GLOBALS['xoopsModule']->getVar('name') . ' - ' . $cat->getVar('cat_title');
}else{
$title = $GLOBALS['xoopsConfig']['sitename'] . ' - ' . $GLOBALS['xoopsModule']->getVar('name');
@@ -88,11 +88,13 @@
if (strpos($slogan,'[pagebreak]') == false){
$slogan_short = $slogan;
}else{
- $slogan_short = substr($slogan,0,strpos($slogan,'[pagebreak]'));
+ $slogan_short = substr($slogan, 0, strpos($slogan,'[pagebreak]'));
}
+ $doc_id = $docs_arr[$i]->getVar('doc_id');
+ $doc_cid = $docs_arr[$i]->getVar('doc_cid');
$tpl->append('items', array('title' => htmlspecialchars($docs_arr[$i]->getVar('doc_title'), ENT_QUOTES),
- 'link' => XOOPS_URL . '/modules/xpdf/singledoc.php?cid=' . $docs_arr[$i]->getVar('doc_cid') . '&did=' . $docs_arr[$i]->getVar('doc_id'),
- 'guid' => XOOPS_URL . '/modules/xpdf/singledoc.php?cid=' . $docs_arr[$i]->getVar('doc_cid') . '&did=' . $docs_arr[$i]->getVar('doc_id'),
+ 'link' => XOOPS_URL . '/modules/xpdf/viewdoc.php?doc_cid=' . $doc_cid . '&doc_id=' . $doc_id,
+ 'guid' => XOOPS_URL . '/modules/xpdf/viewdoc.php?doc_cid=' . $doc_cid . '&doc_id=' . $doc_id,
'pubdate' => formatTimestamp($docs_arr[$i]->getVar('doc_published'), 'rss'),
'description' => htmlspecialchars($slogan_short, ENT_QUOTES)));
}
Modified: XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html 2012-05-01 23:12:18 UTC (rev 9423)
@@ -44,7 +44,7 @@
<!-- RSS logo -->
<div class="xpdf-rss right">
- <a title="<{$smarty.const._MA_XPDF_RSS}>" href="<{$xpdf_url}>/rss.php?cid=<{$cid}>"><img src="<{$xpdf_url}>/images/rss.gif" alt="<{$smarty.const._MA_XPDF_RSS}>" /></a>
+ <a title="<{$smarty.const._MA_XPDF_RSS}>" href="<{$xpdf_url}>/rss.php?cid=<{$cid}>" rel="external"><img src="<{$xpdf_url}>/images/rss.gif" alt="<{$smarty.const._MA_XPDF_RSS}>" /></a>
</div>
<div class="xpdf-thereare"><{$lang_thereare}></div>
<{if $file != ""}>
Modified: XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php 2012-05-01 18:10:53 UTC (rev 9422)
+++ XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php 2012-05-01 23:12:18 UTC (rev 9423)
@@ -172,12 +172,12 @@
}
$datetime = formatTimestamp($doc_arr[$i]->getVar('doc_published'),'s');
$submitter = XoopsUser::getUnameFromId($doc_arr[$i]->getVar('doc_submitter'));
- $description = $doc_arr[$i]->getVar('doc_slogan');
+ $slogan = $doc_arr[$i]->getVar('doc_slogan');
//to view only the short description
- if (strpos($description,'[pagebreak]')==false){
- $slogan = $description;
+ if (strpos($slogan,'[pagebreak]')==false){
+ $slogan_short = $slogan;
}else{
- $slogan = substr($description,0,strpos($description,'[pagebreak]'));
+ $slogan_short = substr($slogan,0,strpos($slogan,'[pagebreak]'));
}
// pour les vignettes "new" et "mis \xE0 jour"
$new = xpdf_NewOrUpdate($doc_arr[$i]->getVar('doc_published'), $doc_arr[$i]->getVar('doc_status'));
@@ -185,7 +185,7 @@
// Set if the user is an admin.
if (is_object($xoopsUser) && $xoopsUser->isAdmin($xoopsModule->mid())) {
- $adminlink = '<a href="' . XPDF_URL . '/admin/documents.php?op=edit_doc&did=' . $doc_arr[$i]->getVar('doc_id') . '" title="' . _EDIT . '"><img src="images/editicon.png" border="0" alt="' . _EDIT . '" /></a>';
+ $adminlink = '<a href="' . XPDF_URL . '/admin/documents.php?op=edit_doc&doc_id=' . $doc_arr[$i]->getVar('doc_id') . '" title="' . _EDIT . '"><img src="images/editicon.png" border="0" alt="' . _EDIT . '" /></a>';
} else {
$adminlink = '';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
