Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9374] XoopsModules/xpdf/trunk/modules/xpdf
|
From: <txm...@us...> - 2012-04-22 19:11:14
|
Revision: 9374
http://xoops.svn.sourceforge.net/xoops/?rev=9374&view=rev
Author: txmodxoops
Date: 2012-04-22 19:11:05 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
Updated trunk
Modified Paths:
--------------
XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_header.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/broken.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/categories.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/filesname.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/index.php
XoopsModules/xpdf/trunk/modules/xpdf/admin/modified.php
XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_broken.php
XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_cat.php
XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php
XoopsModules/xpdf/trunk/modules/xpdf/css/style.css
XoopsModules/xpdf/trunk/modules/xpdf/header.php
XoopsModules/xpdf/trunk/modules/xpdf/include/configs.php
XoopsModules/xpdf/trunk/modules/xpdf/include/functions.php
XoopsModules/xpdf/trunk/modules/xpdf/index.php
XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php
XoopsModules/xpdf/trunk/modules/xpdf/language/english/main.php
XoopsModules/xpdf/trunk/modules/xpdf/language/english/modinfo.php
XoopsModules/xpdf/trunk/modules/xpdf/language/italian/admin.php
XoopsModules/xpdf/trunk/modules/xpdf/language/italian/main.php
XoopsModules/xpdf/trunk/modules/xpdf/language/italian/modinfo.php
XoopsModules/xpdf/trunk/modules/xpdf/list.tag.php
XoopsModules/xpdf/trunk/modules/xpdf/makepdf.php
XoopsModules/xpdf/trunk/modules/xpdf/rss.php
XoopsModules/xpdf/trunk/modules/xpdf/singledoc.php
XoopsModules/xpdf/trunk/modules/xpdf/sql/mysql.sql
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_footer.html
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_header.html
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_index.html
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_rss.html
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_singledoc.html
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html
XoopsModules/xpdf/trunk/modules/xpdf/view.tag.php
XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php
XoopsModules/xpdf/trunk/modules/xpdf/xoops_version.php
Added Paths:
-----------
XoopsModules/xpdf/trunk/modules/xpdf/js/
XoopsModules/xpdf/trunk/modules/xpdf/js/index.html
XoopsModules/xpdf/trunk/modules/xpdf/js/js.init.js
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_header.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_header.php 2012-04-22 19:07:20 UTC (rev 9373)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/admin_header.php 2012-04-22 19:11:05 UTC (rev 9374)
@@ -24,7 +24,7 @@
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+include_once '../include/configs.php';
include_once '../include/functions.php';
$pathDir = $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin');
@@ -44,8 +44,8 @@
$catHandler=& xoops_getModuleHandler('xpdf_cat', $dirname);
$docsHandler=& xoops_getModuleHandler('xpdf_doc', $dirname);
-//$brokHandler=& xoops_getModuleHandler('xpdf_broken', $dirname);
-//$modHandler=& xoops_getModuleHandler('xpdf_mod', $dirname);
+$brokHandler=& xoops_getModuleHandler('xpdf_broken', $dirname);
+$modHandler=& xoops_getModuleHandler('xpdf_mod', $dirname);
$purHandler=& xoops_getModuleHandler('xpdf_purchase', $dirname);
$vlimHandler=& xoops_getModuleHandler('xpdf_viewlimit', $dirname);
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/broken.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/broken.php 2012-04-22 19:07:20 UTC (rev 9373)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/broken.php 2012-04-22 19:11:05 UTC (rev 9374)
@@ -29,7 +29,7 @@
//Options
switch ($op)
{
- // Vue liste
+ // View list
case "list":
//Affichage de la partie haute de l'administration de Xoops
echo $brokenAdmin->addNavigation('broken.php');
@@ -49,25 +49,22 @@
$start = 0;
}
$criteria->setSort('reportid');
- $criteria->setOrder('ASC');
- //pour faire une jointure de table
- //$docsbroken_Handler->table_link = $docHandler->db->prefix("xpdf_doc"); // Nom de la table en jointure
- //$docsbroken_Handler->field_link = "doc_id"; // champ de la table en jointure
- //$docsbroken_Handler->field_object = "doc_id"; // champ de la table courante
- $docsbroken_arr = $docsHandler->getByLink($criteria);
- $numrows = $docsHandler->getCount($criteria);
+ $criteria->setOrder('ASC');
+ $docsbroken_arr = $brokHandler->getAll($criteria);
+ $numrows = $brokHandler->getCount($criteria);
if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
- //Affichage du tableau des téléchargements brisés
+ //Table view of broken files
if ($numrows > 0) {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr>';
- echo '<th align="center" width="10%">'._AM_XPDF_FORMFILE.'</th>';
- echo '<th align="center">' . _AM_XPDF_FORMTITLE . '</th>';
+ echo '<th align="center" width="10%">'._AM_XPDF_BROKEN_FILE.'</th>';
+ echo '<th align="center">' . _AM_XPDF_BROKEN_TITLE . '</th>';
echo '<th align="center" width="20%">' . _AM_XPDF_BROKEN_SENDER . '</th>';
echo '<th align="center" width="15%">'._AM_XPDF_FORMACTION.'</th>';
echo '</tr>';
@@ -82,25 +79,33 @@
$docs_poster_ip = $docsbroken_arr[$i]->getVar('ip');
echo '<tr class="'.$class.'">';
echo '<td align="center">';
- echo '<a href="../visit.php?cid=' . $docs_cid . '&lid=' . $doc_id . '" target="_blank"><img src="../images/icon/download.png" alt="Download ' . $docs_title . '" title="Download ' . $docs_title . '"></a>';
+ echo '<a href="../visit.php?cid=' . $docs_cid . '&lid=' . $doc_id . '" target="_blank"><img src="../images/icon/download.png" alt="Document ' . $docs_title . '" title="Document ' . $docs_title . '"></a>';
echo '</td>';
echo '<td align="center">' . $docs_title . '</td>';
echo '<td align="center"><b>' . $docs_poster . '</b> (' . $docs_poster_ip . ')</td>';
echo '<td align="center" width="15%">';
echo '<a href="documents.php?op=view_docs&doc_id=' . $doc_id . '"><img src="../images/icon/view_mini.png" alt="' . _AM_XPDF_FORMDISPLAY . '" title="' . _AM_XPDF_FORMDISPLAY . '"></a> ';
echo '<a href="documents.php?op=edit_docs&doc_id=' . $doc_id . '"><img src="../images/icon/edit.png" alt="' . _AM_XPDF_FORMEDIT . '" title="' . _AM_XPDF_FORMEDIT . '"></a> ';
- echo '<a href="broken.php?op=del_brokendocs&broken_id=' . $docs_reportid . '"><img src="../images/icon/ignore_mini.png" alt="' . _AM_XPDF_FORMIGNORE . '" title="' . _AM_XPDF_FORMIGNORE . '"></a>';
+ echo '<a href="broken.php?op=del_brokendoc&broken_id=' . $docs_reportid . '"><img src="../images/icon/ignore_mini.png" alt="' . _AM_XPDF_FORMIGNORE . '" title="' . _AM_XPDF_FORMIGNORE . '"></a>';
echo '</td>';
}
echo '</table><br />';
echo '<br /><div align=right>' . $pagenav . '</div><br />';
}else{
- echo '<div class="errorMsg center">' . _AM_XPDF_ERROR_NOBROKENDOCUMENTS . '</div><br />';
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr>';
+ echo '<th align="center" width="10%">'._AM_XPDF_BROKEN_FILE.'</th>';
+ echo '<th align="center">' . _AM_XPDF_BROKEN_TITLE . '</th>';
+ echo '<th align="center" width="20%">' . _AM_XPDF_BROKEN_SENDER . '</th>';
+ echo '<th align="center" width="15%">'._AM_XPDF_FORMACTION.'</th>';
+ echo '</tr>';
+ echo '<tr><td class="errorMsg center" colspan="4">' . _AM_XPDF_ERROR_NOBROKENDOCUMENTS . '</td></tr>';
+ echo '</table><br />';
}
break;
// permet de suprimmer le rapport de téléchargment brisé
- case "del_brokendocs":
+ case "del_brokendoc":
$obj =& $docsbroken_Handler->get($_REQUEST['broken_id']);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -114,7 +119,7 @@
$brokenAdmin->addItemButton(_MI_XPDF_ADMENU4, 'broken.php', 'list');
echo $brokenAdmin->renderButton();
- xoops_confirm(array('ok' => 1, 'broken_id' => $_REQUEST['broken_id'], 'op' => 'del_brokendocs'), $_SERVER['REQUEST_URI'], _AM_XPDF_BROKEN_SURDEL . '<br>');
+ xoops_confirm(array('ok' => 1, 'broken_id' => $_REQUEST['broken_id'], 'op' => 'del_brokendoc'), $_SERVER['REQUEST_URI'], _AM_XPDF_BROKEN_SURDEL . '<br />');
}
break;
}
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/categories.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/categories.php 2012-04-22 19:07:20 UTC (rev 9373)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/categories.php 2012-04-22 19:11:05 UTC (rev 9374)
@@ -26,75 +26,93 @@
xoops_cp_header();
global $pathImageIcon;
// CleanVars
-$op = xpdf_CleanVars($_REQUEST, 'op', 'list_cat', 'string');
+$op = xpdf_CleanVars($_REQUEST, 'op', 'list', 'string');
$catAdmin = new ModuleAdmin();
switch ($op)
{
- case "list_cat":
+ case "list":
default:
- echo $catAdmin->addNavigation('categories.php');
- $catAdmin->addItemButton(_AM_XPDF_NEWCAT, 'categories.php?op=new_cat', 'add');
- echo $catAdmin->renderButton();
- $criteria = new CriteriaCompo();
- $criteria->setSort("cat_id");
- $criteria->setOrder("ASC");
- $numrows = $catHandler->getCount();
- $cat_arr = $catHandler->getall($criteria);
-
- //Table View
- if ($numrows>0)
- {
- echo "<table width='100%' cellspacing='1' class='outer'>
- <tr>
- <th class='center'>"._ID."</th>
- <th class='center'>"._TITLE."</th>
- <th class='center'>"._IMAGE."</th>
- <th class='center'>"._DESCRIPTION."</th>
- <th class='center'>"._WEIGHT."</th>
- <th class='center'>"._FORMACTION."</th>
- </tr>";
-
- $class = "odd";
-
- foreach (array_keys($cat_arr) as $i)
- {
- echo "<tr class='".$class."'>";
- $class = ($class == "even") ? "odd" : "even";
-
- $cat =& $catHandler->get($cat_arr[$i]->getVar("cat_pid"));
- $cat_cat = $cat->getVar("cat_pid");
- $cat_img = $cat_arr[$i]->getVar("cat_image");
- $cat_img_name = substr($cat_img, 0, strpos($cat_img, '.'));
- echo "<td class='center'>".$cat_arr[$i]->getVar("cat_id")."</td>";
- echo "<td class='center'>".$cat_arr[$i]->getVar("cat_title")."</td>";
- echo "<td class='center'><img src='".XOOPS_UPLOAD_URL."/xpdf/images/cat/".$cat_img."' height='30px' title='".$cat_img_name."' alt='".$cat_img_name."'></td>";
- echo "<td class='center'>".$cat_arr[$i]->getVar("cat_description")."</td>";
- echo "<td class='center'>".$cat_arr[$i]->getVar("cat_weight")."</td>";
-
- echo "<td align='center' width='10%'>
- <a href='categories.php?op=edit_cat&cat_id=".$cat_arr[$i]->getVar("cat_id")."'><img src=".$pathImageIcon."/edit.png alt='"._EDIT."' title='"._EDIT."'></a>
- <a href='categories.php?op=delete_cat&cat_id=".$cat_arr[$i]->getVar("cat_id")."'><img src=".$pathImageIcon."/delete.png alt='"._DELETE."' title='"._DELETE."'></a>
- </td>";
- echo "</tr>";
- }
- echo "</table><br><br>";
- } else {
- echo "<table width='100%' cellspacing='1' class='outer'>
- <tr>
- <th class='center'>"._ID."</th>
- <th class='center'>"._TITLE."</th>
- <th class='center'>"._IMAGE."</th>
- <th class='center'>"._DESCRIPTION."</th>
- <th class='center'>"._WEIGHT."</th>
- <th class='center'>"._FORMACTION."</th>
- </tr>";
- echo "</table><br><br>";
- }
+ echo $catAdmin->addNavigation('categories.php');
+ $catAdmin->addItemButton(_AM_XPDF_NEWCAT, 'categories.php?op=new_cat', 'add');
+ echo $catAdmin->renderButton();
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("cat_id");
+ $criteria->setOrder("ASC");
+ $numrows = $catHandler->getCount($criteria);
+ if (isset($_REQUEST['limit'])) {
+ $criteria->setLimit($_REQUEST['limit']);
+ $limit = $_REQUEST['limit'];
+ } else {
+ $criteria->setLimit($GLOBALS['xoopsModuleConfig']['adminperpage']);
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ }
+ if (isset($_REQUEST['start'])) {
+ $criteria->setStart($_REQUEST['start']);
+ $start = $_REQUEST['start'];
+ } else {
+ $criteria->setStart(0);
+ $start = 0;
+ }
+ $cat_arr = $catHandler->getall($criteria);
+ if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+ $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit);
+ $pagenav = $pagenav->renderNav(4);
+ } else {
+ $pagenav = '';
+ }
+ $cat_arr = $catHandler->getall($criteria);
+ //Table View
+ if ($numrows>0)
+ {
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th class='center'>"._ID."</th>
+ <th class='center'>"._TITLE."</th>
+ <th class='center'>"._IMAGE."</th>
+ <th class='center'>"._DESCRIPTION."</th>
+ <th class='center'>"._WEIGHT."</th>
+ <th class='center'>"._FORMACTION."</th>
+ </tr>";
+ $class = "odd";
+ foreach (array_keys($cat_arr) as $i)
+ {
+ echo "<tr class='".$class."'>";
+ $class = ($class == "even") ? "odd" : "even";
+ $cat =& $catHandler->get($cat_arr[$i]->getVar("cat_pid"));
+ $cat_cat = $cat->getVar("cat_pid");
+ $cat_img = $cat_arr[$i]->getVar("cat_image");
+ $cat_img_name = substr($cat_img, 0, strpos($cat_img, '.'));
+ echo "<td class='center'>".$cat_arr[$i]->getVar("cat_id")."</td>";
+ echo "<td class='center'>".$cat_arr[$i]->getVar("cat_title")."</td>";
+ echo "<td class='center'><img src='".XOOPS_UPLOAD_URL."/xpdf/images/cat/".$cat_img."' height='30px' title='".$cat_img_name."' alt='".$cat_img_name."'></td>";
+ echo "<td class='center'>".$cat_arr[$i]->getVar("cat_description")."</td>";
+ echo "<td class='center'>".$cat_arr[$i]->getVar("cat_weight")."</td>";
+
+ echo "<td align='center' width='10%'>
+ <a href='categories.php?op=edit_cat&cat_id=".$cat_arr[$i]->getVar("cat_id")."'><img src=".$pathImageIcon."/edit.png alt='"._EDIT."' title='"._EDIT."'></a>
+ <a href='categories.php?op=delete_cat&cat_id=".$cat_arr[$i]->getVar("cat_id")."'><img src=".$pathImageIcon."/delete.png alt='"._DELETE."' title='"._DELETE."'></a>
+ </td>";
+ echo "</tr>";
+ }
+ echo "</table><br><br>";
+ } else {
+ echo "<table width='100%' cellspacing='1' class='outer'>
+ <tr>
+ <th class='center'>"._ID."</th>
+ <th class='center'>"._TITLE."</th>
+ <th class='center'>"._IMAGE."</th>
+ <th class='center'>"._DESCRIPTION."</th>
+ <th class='center'>"._WEIGHT."</th>
+ <th class='center'>"._FORMACTION."</th>
+ </tr>";
+ echo "</table><br><br>";
+ }
break;
case "new_cat":
echo $catAdmin->addNavigation("categories.php");
- $catAdmin->addItemButton(_AM_XPDF_CATLIST, 'categories.php?op=list_cat', 'list');
+ $catAdmin->addItemButton(_AM_XPDF_CATLIST, 'categories.php?op=list', 'list');
echo $catAdmin->renderButton();
$obj =& $catHandler->create();
@@ -111,16 +129,14 @@
} else {
$obj =& $catHandler->create();
}
-
- //Form cat_pid
- $obj->setVar("cat_pid", $_REQUEST["cat_pid"]);
- //Form cat_title
- $obj->setVar("cat_title", $_REQUEST["cat_title"]);
- //Form cat_image
+ global $xoopsModuleConfig;
+ //Form setCat
+ $catArray1 = array("cat_pid" => $_REQUEST["cat_pid"], "cat_title" => $_REQUEST["cat_title"]);
+ $obj->setVars($catArray1);
+ //Form cat_image $GLOBALS["xoopsModuleConfig"]["maxsize"]
include_once XOOPS_ROOT_PATH."/class/uploader.php";
$uploaddir = XOOPS_UPLOAD_PATH."/xpdf/images/cat/";
- $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS["xoopsModuleConfig"]["mimetypes"],
- $GLOBALS["xoopsModuleConfig"]["size"], null, null);
+ $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS["xoopsModuleConfig"]["mimetypes"], 104857600, null, null);
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setPrefix("cat_image_") ;
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
@@ -133,23 +149,12 @@
} else {
$obj->setVar("cat_image", $_REQUEST["cat_image"]);
}
- //Form cat_description
- $obj->setVar("cat_description", $_REQUEST["cat_description"]);
- //Form cat_weight
- $obj->setVar("cat_weight", $_REQUEST["cat_weight"]);
- //Form cat_dohtml
- $obj->setVar("cat_dohtml", $_REQUEST["cat_dohtml"]);
- //Form cat_dosmiley
- $obj->setVar("cat_dosmiley", $_REQUEST["cat_dosmiley"]);
- //Form cat_doxcodes
- $obj->setVar("cat_doxcodes", $_REQUEST["cat_doxcodes"]);
- //Form cat_doimages
- $obj->setVar("cat_doimages", $_REQUEST["cat_doimages"]);
- //Form cat_dobreak
- $obj->setVar("cat_dobreak", $_REQUEST["cat_dobreak"]);
-
+ //Form setCat
+ $catArray2 = array("cat_description" => $_REQUEST["cat_description"], "cat_weight" => $_REQUEST["cat_weight"], "cat_dohtml" => $_REQUEST["cat_dohtml"], "cat_dosmiley" => $_REQUEST["cat_dosmiley"], "cat_doxcodes" => $_REQUEST["cat_doxcodes"], "cat_doimages" => $_REQUEST["cat_doimages"], "cat_dobreak" => $_REQUEST["cat_dobreak"]);
+ $obj->setVars($catArray2);
+
if ($catHandler->insert($obj)) {
- redirect_header("categories.php?op=list_cat", 2, _AM_XPDF_FORMOK);
+ redirect_header("categories.php?op=list", 2, _AM_XPDF_FORMOK);
}
echo $obj->getHtmlErrors();
@@ -160,7 +165,7 @@
case "edit_cat":
echo $catAdmin->addNavigation("categories.php");
$catAdmin->addItemButton(_AM_XPDF_NEWCAT, 'categories.php?op=new_cat', 'add');
- $catAdmin->addItemButton(_AM_XPDF_CATLIST, 'categories.php?op=list_cat', 'list');
+ $catAdmin->addItemButton(_AM_XPDF_CATLIST, 'categories.php?op=list', 'list');
echo $catAdmin->renderButton();
$obj = $catHandler->get($_REQUEST["cat_id"]);
$form = $obj->getForm();
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php 2012-04-22 19:07:20 UTC (rev 9373)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php 2012-04-22 19:11:05 UTC (rev 9374)
@@ -25,21 +25,25 @@
include "admin_header.php";
xoops_cp_header();
global $pathImageIcon;
-$op = xpdf_CleanVars($_REQUEST, 'op', 'list_doc', 'string');
-$status_menu = xpdf_CleanVars($_REQUEST, 'doc_status', 1, 'int');
+$op = xpdf_CleanVars($_REQUEST, 'op', 'list', 'string');
$docAdmin = new ModuleAdmin();
switch ($op)
{
- case "list_doc":
+ case "list":
default:
echo $docAdmin->addNavigation('documents.php');
- if ($status_menu == 1){
- $docAdmin->addItemButton(_AM_XPDF_NEWDOC, 'documents.php?op=new_doc', 'add');
- }else{
- $docAdmin->addItemButton(_AM_XPDF_DOCLIST, 'documents.php?op=list_doc', 'list');
- $docAdmin->addItemButton(_AM_XPDF_NEWDOC, 'documents.php?op=new_doc', 'add');
- }
+ $docAdmin->addItemButton(_AM_XPDF_NEWDOC, 'documents.php?op=new_doc', 'add');
echo $docAdmin->renderButton();
+
+ // Number of documents per page
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ $cat_arr = $catHandler->getall();
+ $numrowscat = count( $cat_arr );
+ // Redirect if there aren't categories
+ if ( $numrowscat == 0 ) {
+ redirect_header('categories.php?op=new_cat', 2, _AM_XPDF_REDIRECT_NOCAT );
+ }
+
$criteria = new CriteriaCompo();
$criteria->setSort("doc_id ASC, doc_title");
$criteria->setOrder("ASC");
@@ -85,10 +89,10 @@
{
echo "<table cellspacing='1' class='outer width100'>
<tr>
- <th class='center'>"._ID."</th>
- <th class='center'>"._CATEGORY."</th>
+ <th class='center'>"._ID."</th>
<th class='center'>"._TITLE."</th>
- <th class='center'>"._SUBJECT."</th>
+ <th class='center'>"._CATEGORY."</th>
+ <th class='center'>"._SUBJECT."</th>
<th class='center'>"._SUBMITTER."</th>
<th class='center'>"._CREATED."</th>
<th class='center'>"._PUBLISHED."</th>
@@ -103,38 +107,43 @@
{
echo "<tr class='".$class."'>";
$class = ($class == "even") ? "odd" : "even";
-
- echo "<td class='center'>".$doc_arr[$i]->getVar("doc_id")."</td>";
- $cat =& $catHandler->get($doc_arr[$i]->getVar("doc_cid"));
- $doc_cat = $cat->getVar("cat_id");
- echo "<td class='center'>".$doc_cat."</td>";
+ $doc_id = $doc_arr[$i]->getVar("doc_id");
+ echo "<td class='center'>".$doc_id."</td>";
+ include_once(XOOPS_ROOT_PATH."/class/tree.php");
+ $mytree = new XoopsObjectTree($cat_arr, 'cat_id', 'cat_pid');
+ $category = xpdf_PathTree($mytree, $doc_arr[$i]->getVar('doc_cid'), $cat_arr, 'cat_title', $prefix = ' <img src="../images/icons/arrow.gif"> ' );
+ /* $key = $doc_arr[$i]->getVar('doc_cid');
+ if (array_key_exists($key, $cat_arr)){
+ $category = $cat_arr[$key]->getVar('cat_title');
+ } */
echo "<td class='center'>".$doc_arr[$i]->getVar("doc_title")."</td>";
- echo "<td class='center'>".$doc_arr[$i]->getVar("doc_subject")."</td>";
+ echo "<td class='center'>".$category."</td>";
+ echo "<td class='center'>".$doc_arr[$i]->getVar("doc_subject")."</td>";
echo "<td class='center'>".XoopsUser::getUnameFromId($doc_arr[$i]->getVar("doc_submitter"),"S")."</td>";
echo "<td class='center'>".formatTimeStamp($doc_arr[$i]->getVar("doc_created"),"S")."</td>";
echo "<td class='center'>".formatTimeStamp($doc_arr[$i]->getVar("doc_published"),"S")."</td>";
if ( $doc_arr[$i]->getVar("doc_status") == 1 ) {
- echo "<td class='center'><a href='./documents.php?op=delete_pdf_documento&doc_id='".$doc_arr[$i]->getVar("doc_id")."&doc_status=0' title='"._AM_XPDF_DELETEPDF."'><img src=".$pathImageIcon."/green_ball.png border='0' alt='"._AM_XPDF_DELETEPDF."' /></a></td>";
+ echo "<td class='center'><a href='./documents.php?op=delete_pdf_file&doc_id='".$doc_id."&doc_status=0' title='"._AM_XPDF_DELETEPDF."'><img src=".$pathImageIcon."/green_ball.png border='0' alt='"._AM_XPDF_DELETEPDF."' /></a></td>";
} else {
- echo "<td class='center'><a href='./documents.php?op=create_pdf_documento&doc_id='".$doc_arr[$i]->getVar("doc_id")."&doc_status=1' title='"._AM_XPDF_CREATEPDF."'><img src=".$pathImageIcon."/red_ball.png border='0' alt='"._AM_XPDF_CREATEPDF."' /></a></td>";
+ echo "<td class='center'><a href='./documents.php?op=create_pdf_file&doc_id='".$doc_id."&doc_status=1' title='"._AM_XPDF_CREATEPDF."'><img src=".$pathImageIcon."/red_ball.png border='0' alt='"._AM_XPDF_CREATEPDF."' /></a></td>";
}
if ( $doc_arr[$i]->getVar("doc_waiting") == 1 ) {
- echo "<td class='center'><a href='./documents.php?op=approve_doc&doc_id='".$doc_arr[$i]->getVar("doc_id")."&doc_waiting=0' title='"._AM_XPDF_CREATEPDF."'><img src=".$pathImageIcon."/orange_ball.png border='0' alt='' /></a></td>";
+ echo "<td class='center'><a href='./documents.php?op=approve_doc&doc_id='".$doc_id."&doc_waiting=0' title='"._AM_XPDF_CREATEPDF."'><img src=".$pathImageIcon."/orange_ball.png border='0' alt='' /></a></td>";
} else {
echo "<td class='center'><img src=".$pathImageIcon."/grey_ball.png border='0' alt='' /></td>";
}
echo "<td class='center'>".$doc_arr[$i]->getVar("doc_weight")."</td>";
if ( $doc_arr[$i]->getVar("doc_online") == 1 ) {
- echo "<td class='center'><a href='./documents.php?op=update_online_doc&doc_id=".$doc_arr[$i]->getVar("doc_id")."&doc_online=0'><img src=".$pathImageIcon."/on.png border='0' alt='"._ONLINE."' title='"._ONLINE."'></a></td>";
+ echo "<td class='center'><a href='./documents.php?op=update_online&doc_id=".$doc_id."&doc_online=0'><img src=".$pathImageIcon."/on.png border='0' alt='"._ONLINE."' title='"._ONLINE."'></a></td>";
} else {
- echo "<td class='center'><a href='./documents.php?op=update_online_doc&doc_id=".$doc_arr[$i]->getVar("doc_id")."&doc_online=1'><img src=".$pathImageIcon."/off.png border='0' alt='"._OFFLINE."' title='"._OFFLINE."'></a></td>";
+ echo "<td class='center'><a href='./documents.php?op=update_online&doc_id=".$doc_id."&doc_online=1'><img src=".$pathImageIcon."/off.png border='0' alt='"._OFFLINE."' title='"._OFFLINE."'></a></td>";
}
- echo "<td class='center width10'>
- <a href='documents.php?op=edit_doc&doc_id=".$doc_arr[$i]->getVar("doc_id")."'><img src=".$pathImageIcon."/edit.png alt='"._EDIT."' title='"._EDIT."'></a>
- <a href='documents.php?op=delete_doc&doc_id=".$doc_arr[$i]->getVar("doc_id")."'><img src=".$pathImageIcon."/delete.png alt='"._DELETE."' title='"._DELETE."'></a>
+ echo "<td class='center width8'>
+ <a href='documents.php?op=edit_doc&doc_id=".$doc_id."'><img src=".$pathImageIcon."/edit.png alt='"._EDIT."' title='"._EDIT."'></a>
+ <a href='documents.php?op=delete_doc&doc_id=".$doc_id."'><img src=".$pathImageIcon."/delete.png alt='"._DELETE."' title='"._DELETE."'></a>
</td>";
echo "</tr>";
}
@@ -154,18 +163,20 @@
<th class='center'>"._WEIGHT."</th>
<th class='center'>"._ONLINE."</th>
<th class='center'>"._FORMACTION."</th>
- </tr>";
- echo "</table><br><br>";
+ </tr>
+ <tr><td class='errorMsg center' colspan='12'>" . _AM_XPDF_ERROR_NODOCUMENTS . "</td></tr>";
+ echo "</table><br />";
}
break;
case "new_doc":
echo $docAdmin->addNavigation("documents.php");
- $docAdmin->addItemButton(_AM_XPDF_DOCLIST, 'documents.php?op=list_doc', 'list');
+ $docAdmin->addItemButton(_AM_XPDF_DOCLIST, 'documents.php?op=list', 'list');
+ $docAdmin->addItemButton(_AM_XPDF_FILESLIST, 'filesname.php?op=list', 'list');
echo $docAdmin->renderButton();
$obj =& $docsHandler->create();
- $form = $obj->getForm();
+ $form = $obj->getForm($given, false);
$form->display();
break;
@@ -178,24 +189,18 @@
$obj =& $docsHandler->get($doc_id);
} else {
$obj =& $docsHandler->create();
- }
- //Form doc_cid
- $obj->setVar("doc_cid", $_REQUEST["doc_cid"]);
- //Form doc_documentoname
- $obj->setVar("doc_filename", strtolower($_REQUEST["doc_filename"]));
- //Form doc_title
- $obj->setVar("doc_title", $_REQUEST["doc_title"]);
- //Form doc_description
- $obj->setVar("doc_slogan", $_REQUEST["doc_slogan"]);
- //Form doc_description
- $obj->setVar("doc_description", $_REQUEST["doc_description"]);
+ }
+
+ $docArray1 = array("doc_cid" => $_POST["doc_cid"], "doc_filename" => strtolower($_POST["doc_filename"]), "doc_title" => $_POST["doc_title"], "doc_slogan" => $_POST["doc_slogan"], "doc_description" => $_POST["doc_description"]);
+ //Form docs_vars
+ $obj->setVars($docArray1);
//Form doc_image
include_once XOOPS_ROOT_PATH."/class/uploader.php";
$uploaddir = XOOPS_UPLOAD_PATH."/xpdf/images/doc/";
$uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
- if ($uploader->fetchMedia($_POST['xoops_upload_documento'][0])) {
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$uploader->setPrefix("doc_image_");
- $uploader->fetchMedia($_POST['xoops_upload_documento'][0]);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
redirect_header("javascript:history.go(-1)",3, $errors);
@@ -203,71 +208,37 @@
$obj->setVar("doc_image", $uploader->getSavedFileName());
}
} else {
- $obj->setVar("doc_image", $_REQUEST["doc_image"]);
- }
- //Form doc_subject
- $obj->setVar("doc_subject", $_REQUEST["doc_subject"]);
- //Form doc_fontname
- $obj->setVar("doc_fontname", $_REQUEST["doc_fontname"]);
- //Form doc_fontsize
- $obj->setVar("doc_fontsize", $_REQUEST["doc_fontsize"]);
- //Form doc_description
- $obj->setVar("doc_keywords", $_REQUEST["doc_keywords"]);
- //Form doc_submitter
- $obj->setVar("doc_submitter", $_REQUEST["doc_submitter"]);
- //Form doc_created
- $obj->setVar("doc_created", xpdf_convertDate($_REQUEST["doc_created"]));
- //Form doc_created
- $obj->setVar("doc_published", xpdf_convertDate($_REQUEST["doc_published"]));
- //Form doc_paypal
- $obj->setVar("doc_view", $_REQUEST["doc_view"]);
- //Form doc_weight
- $obj->setVar("doc_comments", $_REQUEST["doc_comments"]);
- //Form doc_weight
- $obj->setVar("doc_weight", $_REQUEST["doc_weight"]);
- //Form doc_status
- $verif_doc_status = ($_REQUEST["doc_status"] == 1) ? "1" : "0";
- $obj->setVar("doc_status", $verif_doc_status);
- //Form doc_waiting
- $verif_doc_waiting = ($_REQUEST["doc_waiting"] == 1) ? "1" : "0";
- $obj->setVar("doc_waiting", $verif_doc_waiting);
- //Form doc_online
- $verif_doc_online = ($_REQUEST["doc_online"] == 1) ? "1" : "0";
- $obj->setVar("doc_online", $verif_doc_online);
- //Form doc_online
- $verif_doc_dohtml = ($_REQUEST["doc_dohtml"] == 1) ? "1" : "0";
- $obj->setVar("doc_dohtml", $verif_doc_dohtml);
- //Form doc_online
- $verif_doc_dosmiley = ($_REQUEST["doc_dosmiley"] == 1) ? "1" : "0";
- $obj->setVar("doc_dosmiley", $verif_doc_dosmiley);
- //Form doc_online
- $verif_doc_doxcodes = ($_REQUEST["doc_doxcodes"] == 1) ? "1" : "0";
- $obj->setVar("doc_doxcodes", $verif_doc_doxcodes);
- //Form doc_online
- $verif_doc_doimages = ($_REQUEST["doc_doimages"] == 1) ? "1" : "0";
- $obj->setVar("doc_doimages", $verif_doc_doimages);
- //Form doc_online
- $verif_doc_dobreak = ($_REQUEST["doc_dobreak"] == 1) ? "1" : "0";
- $obj->setVar("doc_dobreak", $verif_doc_dobreak);
- //Form doc_paypal
- $obj->setVar("doc_paypal", $_REQUEST["doc_paypal"]);
- //Form doc_price
- $obj->setVar("doc_price", $_REQUEST["doc_price"]);
- //Form doc_currency
- $obj->setVar("doc_currency", $_REQUEST["doc_currency"]);
- //Form doc_catalogue_number
- $obj->setVar("doc_catalogue_number", $_REQUEST["doc_catalogue_number"]);
+ $obj->setVar("doc_image", $_POST["doc_image"]);
+ }
+ $check_doc_status = ($_REQUEST["doc_status"] == 1) ? "1" : "0";
+ $check_doc_waiting = ($_REQUEST["doc_waiting"] == 1) ? "1" : "0";
+ $check_doc_online = ($_REQUEST["doc_online"] == 1) ? "1" : "0";
+ $check_doc_dohtml = ($_REQUEST["doc_dohtml"] == 1) ? "1" : "0";
+ $check_doc_dosmiley = ($_REQUEST["doc_dosmiley"] == 1) ? "1" : "0";
+ $check_doc_doxcodes = ($_REQUEST["doc_doxcodes"] == 1) ? "1" : "0";
+ $check_doc_doimages = ($_REQUEST["doc_doimages"] == 1) ? "1" : "0";
+ $check_doc_dobreak = ($_REQUEST["doc_dobreak"] == 1) ? "1" : "0";
+
+ $docArray2 = array("doc_subject" => $_POST["doc_subject"], "doc_fontname" => strtolower($_POST["doc_fontname"]), "doc_fontsize" => $_POST["doc_fontsize"], "doc_keywords" => $_POST["doc_keywords"], "doc_submitter" => $_POST["doc_submitter"], "doc_created" => xpdf_convertDate($_POST["doc_created"]), "doc_published" => xpdf_convertDate($_POST["doc_published"]), "doc_view" => $_POST["doc_view"], "doc_comments" => $_POST["doc_comments"], "doc_weight" => $_POST["doc_weight"], "doc_status" => $check_doc_status, "doc_waiting" => $check_doc_waiting, "doc_online" => $check_doc_online, "doc_dohtml" => $check_doc_dohtml, "doc_dosmiley" => $check_doc_dosmiley, "doc_doxcodes" => $check_doc_doxcodes, "doc_doimages" => $check_doc_doimages, "doc_dobreak" => $check_doc_dobreak, "doc_paypal" => $_POST["doc_paypal"], "doc_price" => $_POST["doc_price"], "doc_currency" => $_POST["doc_currency"], "doc_catalogue_number" => $_POST["doc_catalogue_number"]);
+ //Form docs_vars
+ $obj->setVars($docArray2);
+
+ // Temporary registration tags
+ if (($GLOBALS['xoopsModuleConfig']['usetag'] == 1) and (is_dir('../../tag'))){
+ $given['TAG'] = $_POST['tag'];
+ }
+
if ($docsHandler->insert($obj)) {
- redirect_header("documents.php?op=list_doc", 2, _AM_XPDF_FORMOK);
+ redirect_header("documents.php?op=list", 2, _AM_XPDF_FORMOK);
}
echo $obj->getHtmlErrors();
- $form =& $obj->getForm();
+ $form =& $obj->getForm($given, true);
$form->display();
break;
- case "create_pdf_doc":
+ case "create_pdf_file":
if (isset($_REQUEST["doc_id"])) {
$obj =& $docHandler->get($_REQUEST["doc_id"]);
}
@@ -278,9 +249,9 @@
echo $obj->getHtmlErrors();
//include_once XOOPS_URL.'/Frameworks/tcpdf/tcpdf.php';
require_once XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php';
- $documentoname = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/'._LANGCODE.'.php';
- if(documento_exists($documentoname)) {
- require_once $documentoname;
+ $filename = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/'._LANGCODE.'.php';
+ if(file_exists($filename)) {
+ require_once $filename;
} else {
require_once XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/en.php';
}
@@ -358,37 +329,41 @@
$pdf->AddPage();
$pdf->writeHTMLCell($w=0, $h=0, $x='', $y='', $content, $border=0, $ln=1, $fill=0, $reseth=true, $align='', $autopadding=true);
// Pdf Filename
- $pdf_documento = XOOPS_UPLOAD_PATH."/xpdf/doc/".strtolower($pdf_data['filename']).".pdf";
+ $pdf_filename = XOOPS_UPLOAD_PATH."/xpdf/files/".strtolower($pdf_data['filename']).".pdf";
// Output
- $pdf->Output($pdf_documento, 'F');
+ $pdf->Output($pdf_filename, 'F');
break;
-
- case "delete_pdf_doc":
+ // Delete pdf file
+ case "delete_pdf_file":
if (isset($_REQUEST["doc_id"])) {
- $obj =& $docHandler->get($_REQUEST["doc_id"]);
+ $obj =& $docsHandler->get($_REQUEST["doc_id"]);
}
$obj->setVar("doc_status", $_REQUEST["doc_status"]);
- $documentoname = XOOPS_UPLOAD_PATH."/xpdf/doc/".strtolower($obj->getVar("doc_documentoname")).".pdf";
- if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('documents.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- if(is_documento($documentoname)){
- chmod($documentoname, 0777);
- unlink($documentoname);
- }
- }
+ $filename = XOOPS_UPLOAD_PATH."/xpdf/files/".strtolower($obj->getVar("doc_filename")).".pdf";
+ if(is_dir($filename)){
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('documents.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ chmod($filename, 0777);
+ unlink($filename);
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'doc_id' => $_REQUEST['doc_id'], 'op' => 'delete_pdf'), $_SERVER['REQUEST_URI'], sprintf(_AM_XPDF_FORMSUREDEL, $obj->getVar('doc_filename')));
+ }
} else {
- xoops_confirm(array('ok' => 1, 'doc_id' => $_REQUEST['doc_id'], 'op' => 'delete_pdf_doc'), $_SERVER['REQUEST_URI'], sprintf(_AM_XPDF_FORMSUREDEL, $obj->getVar('doc_filename')));
+ redirect_header('documents.php', 3, _AM_XPDF_THISFILENOTEXIST);
}
break;
case "edit_doc":
echo $docAdmin->addNavigation("documents.php");
$docAdmin->addItemButton(_AM_XPDF_NEWDOC, 'documents.php?op=new_doc', 'add');
- $docAdmin->addItemButton(_AM_XPDF_DOCLIST, 'documents.php?op=list_doc', 'list');
+ $docAdmin->addItemButton(_AM_XPDF_DOCLIST, 'documents.php?op=list', 'list');
+ $docAdmin->addItemButton(_AM_XPDF_FILESLIST, 'filesname.php?op=list', 'list');
echo $docAdmin->renderButton();
- $obj = $docsHandler->get($_REQUEST["doc_id"]);
- $form = $obj->getForm();
+ $doc_id = xpdf_CleanVars($_REQUEST, 'doc_id', 0, 'int');
+ $obj = $docsHandler->get($doc_id);
+ $form = $obj->getForm($given, false);
$form->display();
break;
@@ -418,7 +393,8 @@
xoops_confirm(array("ok" => 1, "doc_id" => $_REQUEST["doc_id"], "op" => "delete_doc"), $_SERVER["REQUEST_URI"], sprintf(_AM_XPDF_FORMSUREDEL, $obj->getVar("doc_title")));
}
break;
- case "update_online_doc":
+
+ case "update_online":
if (isset($_REQUEST["doc_id"])) {
$obj =& $docsHandler->get($_REQUEST["doc_id"]);
}
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/filesname.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/filesname.php 2012-04-22 19:07:20 UTC (rev 9373)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/filesname.php 2012-04-22 19:11:05 UTC (rev 9374)
@@ -31,9 +31,19 @@
{
// Vue liste
case "list":
- //Affichage de la partie haute de l'administration de Xoops
- echo $filesnameAdmin->addNavigation('filesname.php');
+ //Display the upper of the administration of filesname table
+ echo $filesnameAdmin->addNavigation('filesname.php');
+ $filesnameAdmin->addItemButton(_AM_XPDF_NEWCAT, 'categories.php?op=new_cat', 'add');
+ $filesnameAdmin->addItemButton(_AM_XPDF_CATLIST, 'categories.php?op=list', 'list');
+ $filesnameAdmin->addItemButton(_AM_XPDF_NEWDOC, 'documents.php?op=new_doc', 'add');
+ $filesnameAdmin->addItemButton(_AM_XPDF_DOCLIST, 'documents.php?op=list', 'list');
+ echo $filesnameAdmin->renderButton();
+ $doc_id = xpdf_CleanVars($_REQUEST, 'doc_id', 0, 'int');
$criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('doc_id', $doc_id));
+ $criteria->setSort('doc_id');
+ $criteria->setOrder('ASC');
+ $numrows = $docsHandler->getCount($criteria);
if (isset($_REQUEST['limit'])) {
$criteria->setLimit($_REQUEST['limit']);
$limit = $_REQUEST['limit'];
@@ -47,12 +57,10 @@
} else {
$criteria->setStart(0);
$start = 0;
- }
- $criteria->setSort('doc_id');
- $criteria->setOrder('ASC');
- $docsfilesname_arr = $docsHandler->getByLink($criteria);
- $numrows = $docsHandler->getCount($criteria);
+ }
+ $docs_arr = $docsHandler->getAll($criteria);
if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
$pagenav = $pagenav->renderNav(4);
} else {
@@ -62,52 +70,64 @@
if ($numrows > 0) {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr>';
- echo '<th align="center" width="10%">' . _AM_XPDF_FILESNAME_ID . '</th>';
+ echo '<th align="center" width="10%">' . _EDIT . '</th>';
echo '<th align="center">'._AM_XPDF_FILESNAME_TITLE.'</th>';
echo '<th align="center" width="20%">' . _AM_XPDF_FILESNAME_STATUS . '</th>';
echo '<th align="center" width="15%">'._AM_XPDF_FORMACTION.'</th>';
echo '</tr>';
$class = 'odd';
- foreach (array_keys($docsfilesname_arr) as $i) {
+ foreach (array_keys($docs_arr) as $i) {
$class = ($class == 'even') ? 'odd' : 'even';
- $doc_id = $docsfilesname_arr[$i]->getVar('lid');
- $docs_title = $docsfilesname_arr[$i]->getVar('title');
- $docs_cid = $docsfilesname_arr[$i]->getVar('cid');
+ $doc_id = $docs_arr[$i]->getVar('doc_id');
+ $doc_cid = $docs_arr[$i]->getVar('doc_cid');
+ $doc_title = $docs_arr[$i]->getVar('doc_title');
+ $doc_status = $docs_arr[$i]->getVar('doc_status');
echo '<tr class="'.$class.'">';
echo '<td align="center">';
- echo '<a href="../visit.php?cid=' . $docs_cid . '&lid=' . $doc_id . '" target="_blank"><img src="../images/icon/download.png" alt="Download ' . $docs_title . '" title="Download ' . $docs_title . '"></a>';
+ echo '<a href="../documents.php?op=edit_doc&doc_id=' . $doc_cid . '"><img src="'.$pathImageIcon.'/edit.png" alt="' . _EDIT . '" title="' . _EDIT . '" /></a>';
echo '</td>';
- echo '<td align="center">' . $docs_title . '</td>';
+ echo '<td align="center">' . $doc_title . '</td>';
+ echo '<td align="center">' . $doc_status . '</td>';
echo '<td align="center" width="15%">';
- echo '<a href="documents.php?op=view_docs&doc_id=' . $doc_id . '"><img src="../images/icon/view_mini.png" alt="' . _AM_XPDF_FORMDISPLAY . '" title="' . _AM_XPDF_FORMDISPLAY . '"></a> ';
- echo '<a href="documents.php?op=edit_docs&doc_id=' . $doc_id . '"><img src="../images/icon/edit.png" alt="' . _AM_XPDF_FORMEDIT . '" title="' . _AM_XPDF_FORMEDIT . '"></a> ';
- echo '<a href="filesname.php?op=del_filesname&doc_id=' . $docs_reportid . '"><img src="../images/icon/ignore_mini.png" alt="' . _AM_XPDF_FORMIGNORE . '" title="' . _AM_XPDF_FORMIGNORE . '"></a>';
+ echo '<a href="documents.php?op=view_docs&doc_id=' . $doc_id . '"><img src="../images/16/display.png" alt="' . _AM_XPDF_FORMDISPLAY . '" title="' . _AM_XPDF_FORMDISPLAY . '"></a> ';
+ echo '<a href="'. XPDF_MODULE_URL .'/makepdf.php?cid='.$doc_cid.'&did=' . $doc_id . '"><img src="'.$pathImageIcon.'/pdf.png" alt="Document ' . $doc_title . '" title="Document ' . $doc_title . '" /></a> ';
+ echo '<a href="filesname.php?op=del_filename&doc_id=' . $doc_id . '"><img src="'.$pathImageIcon.'/delete.png" alt="' . _AM_XPDF_FORMIGNORE . '" title="' . _AM_XPDF_FORMIGNORE . '"></a>';
echo '</td>';
}
echo '</table><br />';
echo '<br /><div align=right>' . $pagenav . '</div><br />';
}else{
- echo '<div class="errorMsg center">' . _AM_XPDF_ERROR_NOFILENAME . '</div><br />';
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr>';
+ echo '<th align="center" width="10%">' . _EDIT . '</th>';
+ echo '<th align="center">'._AM_XPDF_FILESNAME_TITLE.'</th>';
+ echo '<th align="center" width="20%">' . _AM_XPDF_FILESNAME_STATUS . '</th>';
+ echo '<th align="center" width="15%">'._AM_XPDF_FORMACTION.'</th>';
+ echo '</tr>';
+ echo '<tr><td class="errorMsg center" colspan="4">' . _AM_XPDF_ERROR_NOFILENAME . '</td></tr>';
+ echo '</table><br />';
}
+
break;
- // permet de suprimmer le rapport de téléchargment brisé
+ // To delete a specific file
case "del_filename":
- $obj =& $docsfilesname_Handler->get($_REQUEST['doc_id']);
- if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('documents.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if ($docsfilesname_Handler->delete($obj)) {
- redirect_header('filesname.php', 1, _AM_XPDF_REDIRECT_DELOK);
- }
- echo $objvotedata->getHtmlErrors();
- } else {
+ $obj =& $docsHandler->get($_REQUEST['doc_id']);
+ $obj->setVar("doc_status", $_REQUEST["doc_status"]);
+ $filename = XOOPS_UPLOAD_PATH."/xpdf/files/".strtolower($obj->getVar("doc_filename")).".pdf";
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('filesname.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ if(is_file($filename)){
+ chmod($filename, 0777);
+ unlink($filename);
+ }
+ }
+ } else {
$filesnameAdmin->addItemButton(_MI_XPDF_ADMENU4, 'filesname.php', 'list');
- echo $filesnameAdmin->renderButton();
-
- xoops_confirm(array('ok' => 1, 'doc_id' => $_REQUEST['doc_id'], 'op' => 'del_filename'), $_SERVER['REQUEST_URI'], _AM_XPDF_BROKEN_SURDEL . '<br />');
+ echo $filesnameAdmin->renderButton();
+ xoops_confirm(array('ok' => 1, 'doc_id' => $_REQUEST['doc_id'], 'op' => 'del_filename'), $_SERVER['REQUEST_URI'], _AM_XPDF_BROKEN_SURDEL . $obj->getVar('doc_filename'));
}
break;
}
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/index.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/index.php 2012-04-22 19:07:20 UTC (rev 9373)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/index.php 2012-04-22 19:11:05 UTC (rev 9374)
@@ -27,26 +27,61 @@
$indexAdmin = new ModuleAdmin();
//count "total cat"
- $count_cat = $catHandler->getCount();
- //count "total doc"
- $count_doc = $docsHandler->getCount();
- //count "online"
$criteria = new CriteriaCompo();
+ $count_cat = $catHandler->getCount($criteria);
+ unset($criteria);
+ //count "total doc"
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("doc_waiting", 0, '='));
+ $criteria->add(new Criteria("doc_status", 0, '!='));
+ $count_doc = $docsHandler->getCount($criteria);
+ unset($criteria);
+ //count "status"
+ $criteria = new CriteriaCompo();
$criteria->add(new Criteria("doc_status", 1));
$doc_status = $docsHandler->getCount($criteria);
+ unset($criteria);
//count "waiting"
+ $criteria = new CriteriaCompo();
$criteria->add(new Criteria("doc_waiting", 1));
$doc_waiting = $docsHandler->getCount($criteria);
- //count "online"
+ unset($criteria);
+ //count "online"
+ $criteria = new CriteriaCompo();
$criteria->add(new Criteria("doc_online", 1));
$doc_online = $docsHandler->getCount($criteria);
+ unset($criteria);
+ // count "total broken"
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("doc_waiting", 0, '='));
+ $criteria->add(new Criteria("doc_status", 0, '!='));
+ $count_broken = $brokHandler->getCount($criteria);
+ unset($criteria);
+ // count "total modified"
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("doc_waiting", 0, '='));
+ $criteria->add(new Criteria("doc_status", 0, '!='));
+ $count_modified = $modHandler->getCount($criteria);
+ unset($criteria);
+ // Colors
+ $r = '#FF0000'; $g = '#00AA00';
+ $count_cat_color = ($count_cat == 0) ? $r : $g;
+ $count_doc_color = ($count_doc == 0) ? $r : $g;
+ $doc_status_color = ($doc_status == 0) ? $r : $g;
+ $doc_waiting_color = ($doc_waiting == 0) ? $g : $r;
+ $doc_online_color = ($doc_online == 0) ? $r : $g;
+ $count_broken_color = ($count_broken == 0) ? $g : $r;
+ $count_modified_color = ($count_modified == 0) ? $g : $r;
+
// InfoBox stats
$indexAdmin->addInfoBox(_AM_XPDF_STATISTICS);
- $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_CAT, $count_cat);
- $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC, $count_doc);
- $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_STATUS, $doc_status);
- $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_WAITING, $doc_waiting);
- $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_ONLINE, $doc_online);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS, _AM_XPDF_THEREARE_CAT, $count_cat, $count_cat_color);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC, $count_doc, $count_doc_color);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_STATUS, $doc_status, $doc_status_color);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_WAITING, $doc_waiting, $doc_waiting_color);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_ONLINE, $doc_online, $doc_online_color);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_BROKEN, $count_broken, $count_broken_color);
+ $indexAdmin->addInfoBoxLine(_AM_XPDF_STATISTICS,_AM_XPDF_THEREARE_DOC_MODIFIED, $count_modified, $count_modified_color);
// Render Index
echo $indexAdmin->addNavigation("index.php");
echo $indexAdmin->renderIndex();
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/modified.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/modified.php 2012-04-22 19:07:20 UTC (rev 9373)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/modified.php 2012-04-22 19:11:05 UTC (rev 9374)
@@ -34,6 +34,9 @@
case "list":
echo $modifiedAdmin->addNavigation('modified.php');
$criteria = new CriteriaCompo();
+ $criteria->setSort('requestid');
+ $criteria->setOrder('ASC');
+ $numrows = $docsHandler->getCount($criteria);
if (isset($_REQUEST['limit'])) {
$criteria->setLimit($_REQUEST['limit']);
$limit = $_REQUEST['limit'];
@@ -47,23 +50,22 @@
} else {
$criteria->setStart(0);
$start = 0;
- }
- $criteria->setSort('requestid');
- $criteria->setOrder('ASC');
- $docsmod_arr = $docsHandler->getall($criteria);
- $numrows = $docsHandler->getCount($criteria);
+ }
+ $docsmod_arr = $docsHandler->getall($criteria);
if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit);
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
- //Affichage du tableau des téléchargements modifiés
+ //Display of the table with loading modified
if ($numrows > 0) {
echo '<table width="100%" cellspacing="1" class="outer">';
echo '<tr>';
- echo '<th align="center">' . _AM_XPDF_FORMTITLE . '</th>';
- echo '<th align="center" width="20%">' . _AM_XPDF_BROKEN_SENDER . '</th>';
+ echo '<th align="center" width="15%">' . _AM_XPDF_MODIFIED_ID . '</th>';
+ echo '<th align="center" width="20%">' . _AM_XPDF_MODIFIED_TITLE . '</th>';
+ echo '<th align="center" width="20%">' . _AM_XPDF_MODIFIED_SENDER . '</th>';
echo '<th align="center" width="15%">'._AM_XPDF_FORMACTION.'</th>';
echo '</tr>';
$class = 'odd';
@@ -72,7 +74,7 @@
$docs_lid = $docsmod_arr[$i]->getVar('lid');
$docs_requestid = $docsmod_arr[$i]->getVar('requestid');
$docs =& $docsHandler->get($docsmod_arr[$i]->getVar('lid'));
- // pour savoir si le fichier est nouveau
+ // If the document is new
$docs_url = $docs->getVar('url');
$moddocs_url = $docsmod_arr[$i]->getVar('url');
$new_document = ($docs_url == $moddocs_url ? false : true);
@@ -80,56 +82,55 @@
echo '<td align="center">' . $docs->getVar('title') . '</td>';
echo '<td align="center"><b>' . XoopsUser::getUnameFromId($docsmod_arr[$i]->getVar('modifysubmitter')) . '</b></td>';
echo '<td align="center" width="15%">';
- echo '<a href="modified.php?op=view_docs&docs_lid=' . $docs_lid . '&mod_id=' . $docs_requestid . '"><img src="../images/icon/view_mini.png" alt="' . _AM_XPDF_FORMDISPLAY . '" title="' . _AM_XPDF_FORMDISPLAY . '"></a> ';
- echo '<a href="modified.php?op=del_moddocs&mod_id=' . $docs_requestid . '&new_document=' . $new_document . '"><img src="../images/icon/ignore_mini.png" alt="' . _AM_XPDF_FORMIGNORE . '" title="' . _AM_XPDF_FORMIGNORE . '"></a>';
+ echo '<a href="modified.php?op=view_docs&docs_lid=' . $docs_lid . '&mod_id=' . $docs_requestid . '"><img src="../images/icons/view_mini.png" alt="' . _AM_XPDF_FORMDISPLAY . '" title="' . _AM_XPDF_FORMDISPLAY . '"></a> ';
+ echo '<a href="modified.php?op=del_moddocs&mod_id=' . $docs_requestid . '&new_document=' . $new_document . '"><img src="../images/icons/ignore_mini.png" alt="' . _AM_XPDF_FORMIGNORE . '" title="' . _AM_XPDF_FORMIGNORE . '"></a>';
echo '</td>';
}
echo '</table><br />';
echo '<br /><div align=right>' . $pagenav . '</div><br />';
- }else{
- echo '<div class="errorMsg center">' . _AM_XPDF_ERROR_NOBMODDOCUMENTS . '</div><br />';
+ } else {
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr>';
+ echo '<th align="center" width="15%">' . _AM_XPDF_MODIFIED_ID . '</th>';
+ echo '<th align="center" width="20%">' . _AM_XPDF_MODIFIED_TITLE . '</th>';
+ echo '<th align="center" width="20%">' . _AM_XPDF_MODIFIED_SENDER . '</th>';
+ echo '<th align="center" width="15%">'._AM_XPDF_FORMACTION.'</th>';
+ echo '</tr>';
+ echo '<tr><td class="errorMsg center" colspan="4">' . _AM_XPDF_ERROR_NOBMODDOCUMENTS . '</td></tr>';
+ echo '</table><br />';
}
break;
- // Affiche la comparaison de fichier
+ // Displays the document comparison
case "view_docs":
echo $modifiedAdmin->addNavigation('modified.php');
$modifiedAdmin->addItemButton(_MI_XPDF_ADMENU5, 'modified.php', 'list');
echo $modifiedAdmin->renderButton();
- //information du téléchargement
+ //information of loading
$view_docs = $docsHandler->get($_REQUEST['doc_id']);
//information du téléchargement modifié
$view_moddocs = $docsmod_Handler->get($_REQUEST['mod_id']);
// original
- $docs_title = $view_docs->getVar('title');
- $docs_url = $view_docs->getVar('url');
- //catégorie
- $view_categorie = $docscat_Handler->get($view_docs->getVar('cid'));
- $docs_categorie = $view_categorie->getVar('cat_title');
- $docs_homepage = $view_docs->getVar('homepage');
- $docs_version = $view_docs->getVar('version');
- $docs_size = $view_docs->getVar('size');
- $docs_platform = $view_docs->getVar('platform');
- $docs_description = $view_docs->getVar('description');
- $docs_logourl = $view_docs->getVar('logourl');
- // modifié
- $moddocs_title = $view_moddocs->getVar('title');
- $moddocs_url = $view_moddocs->getVar('url');
- //catégorie
- $view_categorie = $docscat_Handler->get($view_moddocs->getVar('cid'));
- $moddocs_categorie = $view_categorie->getVar('cat_title');
- $moddocs_homepage = $view_moddocs->getVar('homepage');
- $moddocs_version = $view_moddocs->getVar('version');
- $moddocs_size = $view_moddocs->getVar('size');
- $moddocs_platform = $view_moddocs->getVar('platform');
- $moddocs_description = $view_moddocs->getVar('description');
- $moddocs_logourl = $view_moddocs->getVar('logourl');
+ $docs_title = $view_docs->getVar('doc_title');
+ $docs_url = $view_docs->getVar('doc_image');
+ //category
+ $view_categorie = $catHandler->get($view_docs->getVar('doc_cid'));
+ $docs_categorie = $view_categorie->getVar('cat_title');
+ $docs_description = $view_docs->getVar('doc_description');
+ // modified
+ $moddocs_title = $view_moddocs->getVar('doc_title');
+ $moddocs_url = $view_moddocs->getVar('doc_image');
+ //category
+ $view_categorie = $catHandler->get($view_moddocs->getVar('mod_cid'));
+ $moddocs_categorie = $view_categorie->getVar('cat_title');
+ $moddocs_description = $view_moddocs->getVar('mod_description');
+ $moddocs_logourl = $view_moddocs->getVar('mod_image');
echo "<style type=\"text/css\">\n";
echo ".style_dif {color: #FF0000; font-weight: bold;}\n";
echo ".style_ide {color: #009966; font-weight: bold;}\n";
echo "</style>\n";
- //originale
+ // original
echo '<table width="100%" border="0" cellspacing="1" class="outer"><tr class="odd"><td>';
echo '<table border="1" cellpadding="5" cellspacing="0" align="center"><tr><td>';
echo '<h4>' . _AM_XPDF_MODIFIED_ORIGINAL . '</h4>';
@@ -145,46 +146,7 @@
$criteria->setOrder('ASC');
$criteria->add(new Criteria('status', 1));
$docs_field = $docsfield_Handler->getall($criteria);
- foreach (array_keys($docs_field) as $i) {
- if ($docs_field[$i]->getVar('status_def') == 1){
- if ($docs_field[$i]->getVar('fid') == 1){
- //page d'accueil
- echo '<tr><td valign="top" width="40%"><small><span class="' . ($docs_homepage == $moddocs_homepage ? 'style_ide' : 'style_dif') . '">' . _AM_XPDF_FORMHOMEPAGE . '</span>: <a href="' . $docs_homepage . '">' . $docs_homepage . '</a></small></td></tr>';
- }
- if ($docs_field[$i]->getVar('fid') == 2){
- //version
- echo '<tr><td valign="top" width="40%"><small><span class="' . ($docs_version == $moddocs_version ? 'style_ide' : 'style_dif') . '">' . _AM_XPDF_FORMVERSION . '</span>: ' . $docs_version . '</small></td></tr>';
- }
- if ($docs_field[$i]->getVar('fid') == 3){
- //taille du fichier
- echo '<tr><td valign="top" width="40%"><small><span class="' . ($docs_size == $moddocs_size ? 'style_ide' : 'style_dif') . '">' . _AM_XPDF_FORMSIZE . '</span>: ' . $docs_size . '</small></td></tr>';
- }
- if ($docs_field[$i]->getVar('fid') == 4){
- //plateforme
- echo '<tr><td valign="top" width="40%"><small><span class="' . ($docs_platform == $moddocs_platform ? 'style_ide' : 'style_dif') . '">' . _AM_XPDF_FORMPLATFORM . '</span>: ' . $docs_platform . '</small></td></tr>';
- }
- }else{
- //original
- $contenu = '';
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('lid', $_REQUEST['docs_lid']));
- $criteria->add(new Criteria('fid', $docs_field[$i]->getVar('fid')));
- $docsfielddata = $docsfielddata_Handler->getall($criteria);
- foreach (array_keys($docsfielddata) as $j) {
- $contenu = $docsfielddata[$j]->getVar('data');
- }
- //proposé
- $mod_contenu = '';
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('lid', $_REQUEST['mod_id']));
- $criteria->add(new Criteria('fid', $docs_field[$i]->getVar('fid')));
- $docsfieldmoddata = $docsfieldmoddata_Handler->getall($criteria);
- foreach (array_keys($docsfieldmoddata) as $j) {
- $mod_contenu = $docsfieldmoddata[$j]->getVar('moddata');
- }
- echo '<tr><td valign="top" width="40%"><small><span class="' . ($contenu == $mod_contenu ? 'style_ide' : 'style_dif') . '">' . $docs_field[$i]->getVar('title') . '</span>: ' . $contenu . '</small></td></tr>';
- }
- }
+
...
[truncated message content] |
