Thread: [xoops-svn] SF.net SVN: xoops:[9373] XoopsModules/xpdf/releases/1.01b/modules/xpdf

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9373
          http://xoops.svn.sourceforge.net/xoops/?rev=9373&view=rev
Author:   txmodxoops
Date:     2012-04-22 19:07:20 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
Updated

Modified Paths:
--------------
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/admin/documents.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/admin/index.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/class/xpdf_cat.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/class/xpdf_doc.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/include/functions.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/js/js.init.js
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/language/italian/admin.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/language/italian/modinfo.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/list.tag.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/singledoc.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/sql/mysql.sql
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/templates/xpdf_singledoc.html
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/templates/xpdf_viewcat.html
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/view.tag.php
    XoopsModules/xpdf/releases/1.01b/modules/xpdf/xoops_version.php

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/admin/documents.php
===================================================================

--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/admin/documents.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/admin/documents.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -163,8 +163,9 @@
 					<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;
 
@@ -237,7 +238,7 @@
 		$form->display();
 	break;
 	
-	case "create_pdf_doc":
+	case "create_pdf_file":
 	    if (isset($_REQUEST["doc_id"])) {
 			$obj =& $docHandler->get($_REQUEST["doc_id"]);
 		} 

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/admin/index.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/admin/index.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/admin/index.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -27,35 +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);
-	
-	$r = '#FF0000';
-	$g = '#00AA00';
+	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, $count_cat_color); 
+	$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/releases/1.01b/modules/xpdf/class/xpdf_cat.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/class/xpdf_cat.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/class/xpdf_cat.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -62,7 +62,9 @@
 		$form = new XoopsThemeForm($title, "form", $action, "post", true);
 		$form->setExtra('enctype="multipart/form-data"');	
 		// Title
-		$form->addElement(new XoopsFormText(_TITLE, "cat_title", 50, 255, $this->getVar("cat_title")), true);
+		$cat_title = $this->getVar("cat_title");
+		$form->addElement(new XoopsFormText(_TITLE, "cat_title", 50, 255, $cat_title), true);
+		
 		// Subcategories
 		include_once(XOOPS_ROOT_PATH."/class/tree.php");			
 		$catHandler =& xoops_getModuleHandler("xpdf_cat", "xpdf");

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/class/xpdf_doc.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/class/xpdf_doc.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/class/xpdf_doc.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -116,7 +116,7 @@
             redirect_header('index.php', 2,  _NOPERM);
         }
 		$mytree = new XoopsObjectTree($cat_arr, "cat_id", "cat_pid");
-		$form->addElement(new XoopsFormLabel(_CATEGORY, $mytree->makeSelBox("cat_pid", "cat_title","--", $this->getVar("cat_pid"),false)));
+		$form->addElement(new XoopsFormLabel(_CATEGORY, $mytree->makeSelBox("doc_cid", "cat_title","--", $this->getVar("doc_cid"),false)));
 		
 		// Subject
 		$form->addElement(new XoopsFormText(_SUBJECT, "doc_subject", 50, 100, $this->getVar("doc_subject")), true);
@@ -272,7 +272,7 @@
             $form->addElement(new XoopsFormHidden('documents_modified', true));
         }
 		if($this->getVar("doc_status") != 0) {
-		   $form->addElement(new XoopsFormHidden("op", "create_pdf_doc"));
+		    $form->addElement(new XoopsFormHidden("op", "create_pdf_file"));
 		}
 		$form->addElement(new XoopsFormHidden("op", "save_doc"));
 		$form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit"));

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/include/functions.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/include/functions.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/include/functions.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -106,7 +106,7 @@
 * returns an image "new" or "update"
 **/
 
-function xpdf_Thumbnail($time, $status) 
+function xpdf_NewOrUpdate($time, $status) 
 {    
     $count = 7;  $new = '';
     $startdate = (time()-(86400 * $count));
@@ -145,20 +145,20 @@
 * returns an image "popular"
 **/
 
-function xpdf_Popular($hits) 
+function xpdf_Popular( $hits ) 
 {    
     $pop = '';
     if ($hits >= $GLOBALS['xoopsModuleConfig']['popular']) {
         $language = $GLOBALS['xoopsConfig']['language'];
-        if ( !is_dir( XOOPS_ROOT_PATH . "/modules/xpdf/language/" . $language . "/" ) ){
+        if ( !is_dir( XPDF_PATH . "/language/" . $language . "/" ) ){
             $language = 'english';
         }
-        $img_path = XOOPS_ROOT_PATH . "/modules/xpdf/language/" . $language . "/";
-        $img_url = XOOPS_URL . "/modules/xpdf/language/" . $language . "/";
+        $img_path = XPDF_PATH . "/language/" . $language . "/";
+        $img_url = XPDF_URL . "/language/" . $language . "/";
         if ( is_readable( $img_path . 'popular.png') ){
             $pop = '&nbsp;<img src="' . $img_url . 'popular.png" alt="' . _MA_XPDF_INDEX_POPULAR . '" title="' . _MA_XPDF_INDEX_POPULAR . '"/>';
         }else{
-            $pop = '&nbsp;<img src ="' . XOOPS_URL . '/modules/xpdf/language/english/popular.png" alt="' . _MA_XPDF_INDEX_POPULAR . '" title="' . _MA_XPDF_INDEX_POPULAR . '"/>';
+            $pop = '&nbsp;<img src ="' . XPDF_URL . '/language/english/popular.png" alt="' . _MA_XPDF_INDEX_POPULAR . '" title="' . _MA_XPDF_INDEX_POPULAR . '"/>';
         }
     }
     return $pop;
@@ -188,6 +188,18 @@
 	}
 }
 
+function xpdf_paypalDonations($paypal, $title, $user, $currency, $image, $altimg)
+{
+    $ret = "<form name='_xclick' action='https://www.paypal.com/cgi-bin/webscr' method='post'>
+			<input type='hidden' name='cmd' value='_xclick'>
+			<input type='hidden' name='business' value='".$paypal."'>
+			<input type='hidden' name='item_name' value='" . $title . " (" . $user . ")'>
+			<input type='hidden' name='currency_code' value='" . $currency . "'>
+			<input type='image' src='" . $image . "' border='0' name='submit' alt='" .$altimg ."'>
+			</form>";
+	return $ret;
+}
+
 /**
  * Convert StringToTime Date
  *

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/js/js.init.js
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/js/js.init.js	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/js/js.init.js	2012-04-22 19:07:20 UTC (rev 9373)
@@ -11,5 +11,5 @@
    $( "button, input:button, input:submit, input:file, input:reset" ).css("color","inherit").button();
    $( ".check" ).css("color","#fff").button();
    $( ".radio" ).css("color","#fff").buttonset();
-   $( ".toolbar" ).css("color","#000").buttonset();       
+   $( ".toolbar" ).css("color","#000").buttonset();
 });
\ No newline at end of file

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/language/italian/admin.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/language/italian/admin.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/language/italian/admin.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -30,7 +30,7 @@
 define('_AM_XPDF_THEREARE_DOC_STATUS',"Ci sono <span class='bold'>%s</span> Documenti attivi");
 define('_AM_XPDF_THEREARE_DOC_WAITING',"Ci sono <span class='bold'>%s</span> Documenti in attesa");
 define('_AM_XPDF_THEREARE_DOC_ONLINE',"Ci sono <span class='bold'>%s</span> Documenti online");
-define('_AM_XPDF_THEREARE_DOC_MODIFIED',"Ci sono <span class='bold'>%s</span> richieste di Documenti da modificare");
+define('_AM_XPDF_THEREARE_DOC_MODIFIED',"Ci sono <span class='bold'>%s</span> Documenti da modificare");
 //Buttons
 define('_AM_XPDF_NEWCAT',"Aggiungi Categoria");
 define('_AM_XPDF_CATLIST',"Lista Categorie");

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/language/italian/modinfo.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/language/italian/modinfo.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/language/italian/modinfo.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -24,7 +24,7 @@
  */
 // Admin
 define('_MI_XPDF_NAME', "Documenti Pdf");
-define('_MI_XPDF_DESC', "Questo modulo creare un documento pdf dall'inserimento di dati direttamente dall'amministrazione.");
+define('_MI_XPDF_DESC', "Questo modulo crea documenti pdf<br />inserendo i dati direttamente dall'amministrazione.");
 //Menu
 define('_MI_XPDF_ADMENU1', "Dashboard");
 define('_MI_XPDF_ADMENU2', "Categorie");

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/list.tag.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/list.tag.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/list.tag.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -22,6 +22,6 @@
  * Version : 1.01 Sun 2012/02/05 1:04:25 : Timgno Exp $
  * ****************************************************************************
  */
-include dirname(dirname(dirname(__FILE__))) . '/mainfile.php';
-header( "HTTP/1.1 301 Moved Permanently" );  header('Location: '.XOOPS_URL.str_replace('document','tag',$_SERVER['PHP_SELF']));
+include 'header.php';
+include XOOPS_ROOT_PATH . '/modules/tag/list.tag.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/singledoc.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/singledoc.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/singledoc.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -25,14 +25,15 @@
 include_once "header.php";
 $xoopsOption['template_main'] = 'xpdf_singledoc.html';	
 include_once XOOPS_ROOT_PATH."/header.php";
-$xoTheme->addStylesheet( XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/css/styles.css', null );
+$xoTheme->addStylesheet($style);
+$xoTheme->addScript($js);
 
 $doc_id = xpdf_CleanVars($_REQUEST, 'doc_id', 0, 'int');
 $docHandler =& xoops_getModuleHandler("xpdf_doc", "xpdf");
 // Viewing information
 $view_doc = $docHandler->get($doc_id);
 
-// Redirection if the docoment does't exist or is not enabled
+// Redirection if the document does't exist or is not enabled
 if (count($view_doc) == 0 || $view_doc->getVar('doc_status') == 0){
     redirect_header('index.php', 3, _MD_XPDF_SINGLEDOC_NOTEXISTENT);
     exit();
@@ -45,7 +46,7 @@
     exit();
 }
 
-//tableau des cat\xE9gories
+// Table of categories
 $criteria = new CriteriaCompo();
 $criteria->setSort('cat_weight ASC, cat_title');
 $criteria->setOrder('ASC');
@@ -75,13 +76,13 @@
 }	
 
 // Output information
-if ($view_doc->getVar('logourl') == 'blank.gif') {
-    $logourl = '';
+if ($view_doc->getVar('dic_image') == 'blank.gif') {
+    $dic_image = '';
 }else{
-    $logourl = $view_doc->getVar('logourl');
-    $logourl = $uploadurl_shots . $logourl;
+    $dic_image = $view_doc->getVar('dic_image');
+    $dic_image = $uploadurl_shots . $dic_image;
 }
-// D\xE9fini si la personne est un admin
+// 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&amp;doc_id=' . $_REQUEST['doc_id'] . '" title="' . _MD_XPDF_EDITTHISPDF . '"><img src="' .$pathImageIcon. '/edit.png" border="0" alt="' . _MD_XPDF_EDITTHISPDF . '" /></a>';
 } else {
@@ -89,11 +90,11 @@
 }
 
 $description = $view_doc->getVar('doc_description');
-$xoopsTpl->assign('description' , str_replace('[pagebreak]','',$description));
+$xoopsTpl->assign('description' , str_replace('[pagebreak]', '', $description));
 $xoopsTpl->assign('did' , $doc_id);
 $xoopsTpl->assign('cid' , $view_doc->getVar('doc_cid'));
-// Vignettes for "new" and "updated"
-$new = xpdf_Thumbnail($view_doc->getVar('doc_published'), $view_doc->getVar('doc_status'));
+// Images for "new" and "updated"
+$new = xpdf_NewOrUpdate($view_doc->getVar('doc_published'), $view_doc->getVar('doc_status'));
 $pop = xpdf_Popular($view_doc->getVar('doc_view'));
 $xoopsTpl->assign('title' , $view_doc->getVar('doc_title'));
 $xoopsTpl->assign('new' , $new);
@@ -103,18 +104,17 @@
 $xoopsTpl->assign('author' , XoopsUser::getUnameFromId($view_doc->getVar('doc_submitter')));
 $xoopsTpl->assign('views', sprintf(_MD_XPDF_SINGLEDOC_NBVIEWS,$view_doc->getVar('doc_view')));
 $xoopsTpl->assign('nb_comments', sprintf(_MD_XPDF_SINGLEDOC_COMMENTS,$view_doc->getVar('doc_comments')));
-$xoopsTpl->assign('shwo_bookmark' , $GLOBALS['xoopsModuleConfig']['shwo_bookmark']);
+$xoopsTpl->assign('show_bookmarks' , $GLOBALS['xoopsModuleConfig']['show_bookmarks']);
 $xoopsTpl->assign('show_social' , $GLOBALS['xoopsModuleConfig']['show_social']);
 
-//paypal
+// Paypal
 if( $view_doc->getVar('doc_paypal') != '' && $GLOBALS['xoopsModuleConfig']['use_paypal'] == true) {
-    $paypal = '<form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-    <input type="hidden" name="cmd" value="_xclick">
-    <input type="hidden" name="business" value="'.$view_doc->getVar('paypal').'">
-    <input type="hidden" name="item_name" value="' . sprintf(_MD_XPDF_SINGLEDOC_PAYPAL, $view_doc->getVar('doc_title')) . ' (' . XoopsUser::getUnameFromId(!empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0) . ')">
-    <input type="hidden" name="currency_code" value="' . $GLOBALS['xoopsModuleConfig']['currency_paypal'] . '">
-    <input type="image" src="' . $GLOBALS['xoopsModuleConfig']['image_paypal'] . '" border="0" name="submit" alt="'._MD_XPDF_SINGLEDOC_PAYPAL_ALTIMG.'">
-    </form>';
+    $paypal = xpdf_paypalDonations($view_doc->getVar('paypal'), 
+	                               sprintf(_MD_XPDF_SINGLEDOC_PAYPAL, $view_doc->getVar('doc_title')), 
+								   XoopsUser::getUnameFromId(!empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0), 
+								   $GLOBALS['xoopsModuleConfig']['currency_paypal'], 
+								   $GLOBALS['xoopsModuleConfig']['image_paypal'], 
+								   _MD_XPDF_SINGLEDOC_PAYPAL_ALTIMG);
 } else {
     $paypal = false;
 }
@@ -139,7 +139,7 @@
     }
 }
 
-// pour utiliser tellafriend.
+// To use tellafriend.
 if (($GLOBALS['xoopsModuleConfig']['usetellafriend'] == 1) and (is_dir('../tellafriend'))) {
     $string = sprintf(_MD_XPDF_SINGLEDOC_INTDOCFOUND,$xoopsConfig['sitename'].':  '.XPDF_URL.'/singledoc.php?doc_id=' . $_REQUEST['doc_id']);
     $subject = sprintf(_MD_XPDF_SINGLEDOC_INTDOCFOUND,$xoopsConfig['sitename']);
@@ -171,10 +171,10 @@
 $pagetitle .= xpdf_PathTreeUrl($mytree, $view_doc->getVar('doc_cid'), $doccat_arr, 'cat_title', $prefix = ' - ', false, 'DESC', true);
 $xoopsTpl->assign('xoops_pagetitle', $pagetitle);
 //description
-if (strpos($description,'[pagebreak]')==false){
-    $description_short = substr($description,0,400);
+if (strpos($description, '[pagebreak]') == false){
+    $description_short = substr($description, 0, 400);
 }else{
-    $description_short = substr($description,0,strpos($description,'[pagebreak]'));
+    $description_short = substr($description, 0, strpos($description,'[pagebreak]'));
 }
 $xoTheme->addMeta( 'meta', 'description', strip_tags($description_short));
 //keywords
@@ -182,10 +182,9 @@
 $xoTheme->addMeta( 'meta', 'keywords', $keywords);*/
 include XOOPS_ROOT_PATH.'/include/comment_view.php';
 
-if($GLOBALS['xoopsModuleConfig']['act_socialnetworks']== 1){  
-$social = $GLOBALS['xoopsModuleConfig']['socialnetworks'];   
+if($GLOBALS['xoopsModuleConfig']['show_social'] == 1) {  
+$social = $GLOBALS['xoopsModuleConfig']['code_social'];   
 $xoopsTpl->assign('social', $social); }
 
 include_once XOOPS_ROOT_PATH."/footer.php";	
-
 ?>
\ No newline at end of file

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/sql/mysql.sql
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/sql/mysql.sql	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/sql/mysql.sql	2012-04-22 19:07:20 UTC (rev 9373)
@@ -58,7 +58,7 @@
 `doc_comments` int (11) unsigned NOT NULL default '0',
 `doc_weight` int (11) NOT NULL default '0',
 `doc_status` tinyint (1) NOT NULL default '0',
-`doc_waiting` tinyint (1) NOT NULL default '0',
+`doc_waiting` tinyint (2) NOT NULL default '0',
 `doc_online` tinyint (1) NOT NULL default '0',
 `doc_dohtml` tinyint(8) NOT NULL default '0',
 `doc_dosmiley` tinyint(8) NOT NULL default '0',

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/templates/xpdf_singledoc.html
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/templates/xpdf_singledoc.html	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/templates/xpdf_singledoc.html	2012-04-22 19:07:20 UTC (rev 9373)
@@ -33,6 +33,11 @@
    <!-- Tag bar-->
 	   <div class="documents-tag"><{include file="db:tag_bar.html"}></div>
         <{/if}> 
+<{if $show_bookmarks}>
+   <div style="text-align: center; padding: 3px; margin:3px;">
+	  <{$show_bookmarks}>
+   </div>
+<{/if}>
 <{if $show_social}>
    <div style="text-align: center; padding: 3px; margin:3px;">
 	  <{$code_social}>

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/templates/xpdf_viewcat.html
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/templates/xpdf_viewcat.html	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/templates/xpdf_viewcat.html	2012-04-22 19:07:20 UTC (rev 9373)
@@ -6,8 +6,7 @@
 	<{if $cat_description != ""}>
 	<!-- Category description -->
 	<div class="marg5 pad5"><{$cat_description}></div>
-	<{/if}>
-
+	<{/if}> 
    <!-- Start Show categories information -->
    <div class="xpdf-categories">
 	<table>

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/view.tag.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/view.tag.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/view.tag.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -22,6 +22,6 @@
  * Version : 1.01 Sun 2012/02/05 1:04:25 : Timgno Exp $
  * ****************************************************************************
  */
-include dirname(dirname(dirname(__FILE__))) . '/mainfile.php';
-header( "HTTP/1.1 301 Moved Permanently" );  header('Location: '.XOOPS_URL.str_replace('document','tag',$_SERVER['PHP_SELF']));
+include 'header.php';
+include_once XOOPS_ROOT_PATH . '/modules/tag/view.tag.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/xpdf/releases/1.01b/modules/xpdf/xoops_version.php
===================================================================
--- XoopsModules/xpdf/releases/1.01b/modules/xpdf/xoops_version.php	2012-04-22 18:58:29 UTC (rev 9372)
+++ XoopsModules/xpdf/releases/1.01b/modules/xpdf/xoops_version.php	2012-04-22 19:07:20 UTC (rev 9373)
@@ -189,7 +189,7 @@
 $modversion['config'][$i]['description'] = "_MI_XPDF_KEYWORDS_DESC";
 $modversion['config'][$i]['formtype'] = "textbox";
 $modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = "";
+$modversion['config'][$i]['default'] = "xpdf, documents, pdf, categories";
 $i++;
 //Uploads:maxsize
 $modversion['config'][$i]['name'] = "maxsize";
@@ -399,6 +399,13 @@
 $modversion['config'][$i]['aluetype'] = "int";
 $modversion['config'][$i]['default'] = 0;
 $i++;
+$modversion['config'][$i]['name'] = "show_bookmarks";
+$modversion['config'][$i]['title'] = "_MI_XPDF_SHOWBOOKMARKS";
+$modversion['config'][$i]['description'] = "_MI_XPDF_SHOWBOOKMARKS_DESC";
+$modversion['config'][$i]['formtype'] = "yesno";
+$modversion['config'][$i]['aluetype'] = "int";
+$modversion['config'][$i]['default'] = 0;
+$i++;
 $modversion['config'][$i]['name'] = "code_social";
 $modversion['config'][$i]['title'] = "_MI_XPDF_CODESOCIAL";
 $modversion['config'][$i]['description'] = "_MI_XPDF_CODESOCIAL_DESC";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [xoops-svn] SF.net SVN: xoops:[9373] XoopsModules/xpdf/releases/1.01b/modules/xpdf

The world's leading content management systems (CMS) written in PHP

xoops-svn