Menu
▾
▴
xoops-cvs2 — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(361) |
Oct
(65) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(798) |
Feb
(694) |
Mar
(586) |
Apr
(145) |
May
(24) |
Jun
(24) |
Jul
(56) |
Aug
(11) |
Sep
(138) |
Oct
(107) |
Nov
(58) |
Dec
(39) |
| 2004 |
Jan
(157) |
Feb
(24) |
Mar
(13) |
Apr
(14) |
May
(73) |
Jun
(106) |
Jul
(217) |
Aug
(91) |
Sep
(116) |
Oct
(357) |
Nov
(27) |
Dec
(272) |
| 2005 |
Jan
(97) |
Feb
(40) |
Mar
(167) |
Apr
(365) |
May
(344) |
Jun
(357) |
Jul
(407) |
Aug
(529) |
Sep
(204) |
Oct
(52) |
Nov
(80) |
Dec
(1) |
| 2006 |
Jan
(2) |
Feb
(1) |
Mar
(11) |
Apr
(112) |
May
(121) |
Jun
(86) |
Jul
(51) |
Aug
(48) |
Sep
(107) |
Oct
(20) |
Nov
(50) |
Dec
(11) |
| 2007 |
Jan
(7) |
Feb
(11) |
Mar
(8) |
Apr
(11) |
May
(2) |
Jun
(25) |
Jul
(67) |
Aug
(134) |
Sep
(54) |
Oct
(69) |
Nov
(10) |
Dec
(74) |
| 2008 |
Jan
(73) |
Feb
(81) |
Mar
(64) |
Apr
(98) |
May
(157) |
Jun
(68) |
Jul
(80) |
Aug
(108) |
Sep
(176) |
Oct
(107) |
Nov
(265) |
Dec
(60) |
| 2009 |
Jan
(149) |
Feb
(140) |
Mar
(195) |
Apr
(141) |
May
(53) |
Jun
(45) |
Jul
(98) |
Aug
(153) |
Sep
(160) |
Oct
(138) |
Nov
(139) |
Dec
(104) |
| 2010 |
Jan
(188) |
Feb
(259) |
Mar
(133) |
Apr
(104) |
May
(42) |
Jun
(121) |
Jul
(38) |
Aug
(223) |
Sep
(259) |
Oct
(255) |
Nov
(106) |
Dec
(157) |
| 2011 |
Jan
(202) |
Feb
(110) |
Mar
(261) |
Apr
(272) |
May
(218) |
Jun
(108) |
Jul
(141) |
Aug
(205) |
Sep
(326) |
Oct
(279) |
Nov
(368) |
Dec
(238) |
| 2012 |
Jan
(239) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(6) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(3) |
Mar
(9) |
Apr
(10) |
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(25) |
2
(3) |
3
(7) |
4
(16) |
5
(19) |
|
6
(7) |
7
(3) |
8
(3) |
9
(4) |
10
(1) |
11
(5) |
12
(10) |
|
13
(5) |
14
(28) |
15
(27) |
16
(3) |
17
(9) |
18
(6) |
19
(1) |
|
20
(4) |
21
(20) |
22
(12) |
23
(4) |
24
(5) |
25
|
26
(1) |
|
27
(14) |
28
(2) |
29
|
30
(14) |
31
(3) |
|
|
|
From: <vo...@us...> - 2011-03-31 06:27:29
|
Revision: 6505
http://xoops.svn.sourceforge.net/xoops/?rev=6505&view=rev
Author: voltan1
Date: 2011-03-31 06:27:23 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
fix img in print page
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html 2011-03-31 05:49:02 UTC (rev 6504)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html 2011-03-31 06:27:23 UTC (rev 6505)
@@ -7,9 +7,9 @@
<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>"/>
<meta name="keywords" content="<{$meta_keywords}>" />
<meta name="description" content="<{$meta_description}>" />
- <meta name="author" content="<{$meta_author}>" />
+ <meta name="author" content="Unknown" />
<meta name="copyright" content="<{$meta_copyright}>"/>
- <meta name="generator" content="XOOPS" />
+ <meta name="generator" content="Bluefish 2.0.3" />
<link rel="shortcut icon" type="image/ico" href="<{$xoops_url}>/favicon.ico"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css"/>
@@ -26,7 +26,7 @@
<div class="item spacer">
<{if $print_title}><div class="itemTitle spacer"><{$content.title}></div><{/if}>
<div class="itemBody spacer <{$print_columns}>">
- <{if $print_img && $content.imgurl}>
+ <{if $print_img && $content.img}>
<span class="itemImg">
<img width="<{$imgwidth}>" class="<{$imgfloat}> content_img" src="<{$content.imgurl}>" alt="<{$content.title}>"/>
</span>
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-31 05:49:02 UTC (rev 6504)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-31 06:27:23 UTC (rev 6505)
@@ -85,7 +85,8 @@
$page['alias'] = $obj->getVar('content_alias');
$page['short'] = $obj->getVar('content_short');
$page['text'] = $obj->getVar('content_text');
-$page['imgurl'] = XOOPS_URL . xoops_getModuleOption('img_dir', $forMods->getVar('dirname')) . $obj->getVar('content_img', 's');
+$page['img'] = $obj->getVar('content_img');
+$page['imgurl'] = XOOPS_URL . xoops_getModuleOption('img_dir', $forMods->getVar('dirname')) . $obj->getVar('content_img');
$page['author'] = XoopsUser::getUnameFromId($obj->getVar('content_uid'));
$page['date'] = formatTimestamp($obj->getVar('content_create'), _MEDIUMDATESTRING);
$page['link'] = fmcontent_Url($forMods->getVar('dirname'), $page);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-31 05:49:08
|
Revision: 6504
http://xoops.svn.sourceforge.net/xoops/?rev=6504&view=rev
Author: voltan1
Date: 2011-03-31 05:49:02 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
fix error in template
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html 2011-03-31 05:25:36 UTC (rev 6503)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html 2011-03-31 05:49:02 UTC (rev 6504)
@@ -55,14 +55,14 @@
<div class="pad5 marg5 ui-state-default ui-corner-all">
<span class="itemPermaLink right">
<{if $info.author}>
- <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
+ <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
<{/if}>
<{if $info.date}>
<{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
<{/if}>
<{if $info.hits}>
( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )
+ <{/if}>
<{if $info.coms}>
<{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}>
<{/if}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-31 05:25:42
|
Revision: 6503
http://xoops.svn.sourceforge.net/xoops/?rev=6503&view=rev
Author: voltan1
Date: 2011-03-31 05:25:36 +0000 (Thu, 31 Mar 2011)
Log Message:
-----------
- list style set none
- change <html> tag
Modified Paths:
--------------
XoopsEngine/usr/themes/html5/themes/960-html5/admin.html
XoopsEngine/usr/themes/html5/themes/960-html5/css/style.css
XoopsEngine/usr/themes/html5/themes/960-html5/layout.html
XoopsEngine/usr/themes/html5/themes/960-html5/simple.html
Modified: XoopsEngine/usr/themes/html5/themes/960-html5/admin.html
===================================================================
--- XoopsEngine/usr/themes/html5/themes/960-html5/admin.html 2011-03-30 22:25:24 UTC (rev 6502)
+++ XoopsEngine/usr/themes/html5/themes/960-html5/admin.html 2011-03-31 05:25:36 UTC (rev 6503)
@@ -1,5 +1,5 @@
<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<html lang="<{$xoops_langcode}>">
<head>
<{$headMeta}>
<{$headTitle}>
Modified: XoopsEngine/usr/themes/html5/themes/960-html5/css/style.css
===================================================================
--- XoopsEngine/usr/themes/html5/themes/960-html5/css/style.css 2011-03-30 22:25:24 UTC (rev 6502)
+++ XoopsEngine/usr/themes/html5/themes/960-html5/css/style.css 2011-03-31 05:25:36 UTC (rev 6503)
@@ -250,4 +250,8 @@
text-align: right;
margin: 2px 0 2px 6px;
clear: right;
+}
+
+li , li a {
+ list-style: none;
}
\ No newline at end of file
Modified: XoopsEngine/usr/themes/html5/themes/960-html5/layout.html
===================================================================
--- XoopsEngine/usr/themes/html5/themes/960-html5/layout.html 2011-03-30 22:25:24 UTC (rev 6502)
+++ XoopsEngine/usr/themes/html5/themes/960-html5/layout.html 2011-03-31 05:25:36 UTC (rev 6503)
@@ -2,7 +2,7 @@
<{translation data=main}>
<!-- DocType -->
<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<html lang="<{$xoops_langcode}>">
<head>
<{$headMeta}>
<{$headTitle}>
Modified: XoopsEngine/usr/themes/html5/themes/960-html5/simple.html
===================================================================
--- XoopsEngine/usr/themes/html5/themes/960-html5/simple.html 2011-03-30 22:25:24 UTC (rev 6502)
+++ XoopsEngine/usr/themes/html5/themes/960-html5/simple.html 2011-03-31 05:25:36 UTC (rev 6503)
@@ -1,5 +1,5 @@
<{$doctype}>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<html lang="<{$xoops_langcode}>">
<head>
<{$headMeta}>
<{$headTitle}>
@@ -15,7 +15,7 @@
<body>
<!-- Start content module page -->
- <{if !empty($xoops_contents)}><div id="content"><{$xoops_contents}></div><{/if}>
+ <{if !empty($xoops_contents)}><section id="content"><{$xoops_contents}></section><{/if}>
<!-- End content module -->
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2011-03-30 22:25:33
|
Revision: 6502
http://xoops.svn.sourceforge.net/xoops/?rev=6502&view=rev
Author: luciorota
Date: 2011-03-30 22:25:24 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
+ajax file manager zip/unzip support (beta, try it!)
Modified Paths:
--------------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_create_file.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaxfilemanager.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/en.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/changelog.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/description.html
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/xoops_version.php
Added Paths:
-----------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/pclzip.lib.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/_header.jpg
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/_loadingAnimation.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/_player.gif
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/_shadow.gif
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_create_file.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_create_file.php 2011-03-30 13:53:10 UTC (rev 6501)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_create_file.php 2011-03-30 22:25:24 UTC (rev 6502)
@@ -38,8 +38,11 @@
$manager = new manager(addTrailingSlash($_POST['currentFilePath']) . $_POST['new_file'] . '.' . $_POST['ext'], false);
$pathInfo = $manager->getFolderInfo(addTrailingSlash($_POST['currentFilePath']) . $_POST['new_file'] . '.' . $_POST['ext']);
$filePath = addTrailingSlash($_POST['currentFilePath']) . $_POST['new_file'] . '.' . $_POST['ext'];
- $fileType = $manager->getFileType($filePath, (is_dir($filePath) ? true : false));
+ $fileType = $manager->getFileType($filePath, false);
$fileType['name'] = $_POST['new_file'] . '.' . $_POST['ext']; // IN PROGRESS
+ $fileType['is_writable'] = true;
+ $fileType['is_readable'] = true;
+ $fileType['type'] = 'file';
foreach($fileType as $k=>$v) {
switch ($k) {
case "ctime";
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php 2011-03-30 13:53:10 UTC (rev 6501)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php 2011-03-30 22:25:24 UTC (rev 6502)
@@ -1,62 +1,72 @@
<?php
-// IN PROGRESS
-// IN PROGRESS
-// IN PROGRESS
/**
- * unzip selected file
- * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
- * @link www.phpletter.com
- * @since 22/April/2007
+ * unzip selected files
+ * @author Lucio Rota (lucio [dot] rota [at] gmail [dot] com)
+ * @since 30/March/2011
*
*/
+
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
$error = "";
-if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_ZIP) {
+if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_unzip) {
$error = SYS_DISABLED;
-} elseif(!empty($_GET['zip'])) {
- //zip the selected file from context menu
- if(!file_exists($_GET['zip'])) {
- $error = ERR_FILE_NOT_AVAILABLE;
- } elseif(!isUnderRoot($_GET['zip'])) {
- $error = ERR_FOLDER_PATH_NOT_ALLOWED;
+} elseif(count($_GET['unzip']) == 0) {
+ $error = ERR_NAME_EMPTY;
+} elseif(!file_exists($_GET['unzip'])) {
+ $error = ERR_FILE_NOT_AVAILABLE;
+} elseif(!isUnderRoot($_GET['unzip'])) {
+ $error = ERR_FOLDER_PATH_NOT_ALLOWED;
+} elseif(!is_file($_GET['unzip'])) {
+ $error = ERR_FILE_NOT_AVAILABLE;
+}
+
+if($error == "") {
+ $archiveFilePath = backslashToSlash($_GET['unzip']);
+ $relativeTo = backslashToSlash(getParentPath(getRealPath($_GET['unzip'])));
+ $unzipTo = $relativeTo; // TEMPORARY SOLUTION
+ $checkOverwrite = true; // if true is not possible to overwrite files, MORE SECURE SOLUTION
+
+ require_once('inc/pclzip.lib.php'); // PclZip library http://www.phpconcept.net/pclzip
+ $archive = new PclZip($archiveFilePath);
+
+ // get file list
+ $filesList = $archive->listContent();
+
+ if (!$filesList) {
+ // if there are errors in archive
+ $error = $archive->errorInfo(true);
+ } elseif (count($filesList) == 0) {
+ // if archive is empty
+ $error = ERR_ZIP_FILE_EMPTY;
} else {
- include_once(CLASS_FILE);
- $file = new file();
- if(is_dir($_GET['zip'])
- && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, getBaseName($_GET['zip']))
- && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, getBaseName($_GET['zip'])))
- {
- $file->delete(addTrailingSlash(backslashToSlash($_GET['zip'])));
- } elseif(is_file($_GET['zip'])
- && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, getBaseName($_GET['zip']))
- && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, getBaseName($_GET['zip']))
- )
- {
- $file->zip(($_GET['zip']));
+ // if archive is ok
+
+ if ($checkOverwrite) {
+ // check if archived files exists
+ foreach ($filesList as $key=>$file) {
+ $unzipFilePath = backslashToSlash((addTrailingSlash($unzipTo)) . $file['filename']);
+ if (file_exists($unzipFilePath)) {
+ $error = ERR_UNZIP_NOT_POSSIBLE_OVERWRITE;
+ break; // break foreach
}
- }
-} else {
- if(!isset($_POST['selectedDoc']) || !is_array($_POST['selectedDoc']) || sizeof($_POST['selectedDoc']) < 1) {
- $error = ERR_NOT_FILE_SELECTED;
- } else {
- include_once(CLASS_FILE);
- $file = new file();
- foreach($_POST['selectedDoc'] as $doc) {
- if(file_exists($doc) && isUnderRoot($doc)) {
- if(is_dir($doc)
- && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $doc)
- && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $doc))
- {
- $file->delete(addTrailingSlash(backslashToSlash($doc)));
- } elseif(is_file($doc)
- && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $doc)
- && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $doc))
- {
- $file->zip($doc);
- }
}
}
+
+ if($error == "") {
+ $returned = $archive->extract(PCLZIP_OPT_PATH, backslashToSlash(addTrailingSlash($unzipTo)));
+ if (!$returned) {
+ $error = $archive->errorInfo(true);
+ } else {
+ // NOP
+ }
+ }
}
}
-echo "{error:'" . $error . "'}";
+
+// TO IMPROVE: REFRESH FILES LIST
+
+echo "{";
+echo "error:'" . $error . "'";
+//echo $info;
+echo "}";
?>
\ No newline at end of file
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php 2011-03-30 13:53:10 UTC (rev 6501)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php 2011-03-30 22:25:24 UTC (rev 6502)
@@ -1,62 +1,113 @@
<?php
-// IN PROGRESS
-// IN PROGRESS
-// IN PROGRESS
/**
* zip selected files
* @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
* @link www.phpletter.com
- * @since 22/April/2007
+ * @author Lucio Rota (lucio [dot] rota [at] gmail [dot] com)
+ * @since 28/March/2011
*
*/
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
$error = "";
+error_log(print_r($_POST,true));
if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_ZIP) {
$error = SYS_DISABLED;
-} elseif(!empty($_GET['zip'])) {
- //zip the selected file from context menu
- if(!file_exists($_GET['zip'])) {
- $error = ERR_FILE_NOT_AVAILABLE;
- } elseif(!isUnderRoot($_GET['zip'])) {
- $error = ERR_FOLDER_PATH_NOT_ALLOWED;
+} elseif(count($_POST['zip_name']) == 0) {
+ $error = ERR_NAME_EMPTY;
+} elseif(!preg_match("/^[a-zA-Z0-9 _\-.]+$/", $_POST['zip_name'])) {
+ $error = ERR_NAME_FORMAT;
+} elseif(file_exists(addTrailingSlash(getParentPath($_POST['zip_path'])) . DIRECTORY_SEPARATOR . $_POST['zip_name'] . '.zip')) {
+ $error = ERR_ZIP_EXIST;
+} elseif(!isset($_POST['zip_path']) || empty($_POST['zip_path'])) {
+ $error = ERR_NOT_FILE_SELECTED;
+}
+
+if($error == "") {
+ $filesToZip = array();
+ if (isset($_POST['zip_selected'])) {
+ $filesToZip = $_POST['zip_selected'];
} else {
- include_once(CLASS_FILE);
- $file = new file();
- if(is_dir($_GET['zip'])
- && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, getBaseName($_GET['zip']))
- && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, getBaseName($_GET['zip'])))
- {
- $file->delete(addTrailingSlash(backslashToSlash($_GET['zip'])));
- } elseif(is_file($_GET['zip'])
- && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, getBaseName($_GET['zip']))
- && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, getBaseName($_GET['zip']))
- )
- {
- $file->zip(($_GET['zip']));
+ $filesToZip[] = $_POST['zip_path'];
+ }
+ // convert paths from relative to absolute
+ foreach ($filesToZip as $key => $value) {
+ $filesToZip[$key] = backslashToSlash(getRealPath($value));
+ }
+ $relativeTo = backslashToSlash(getParentPath(getRealPath($_POST['zip_path'])));
+ $zipFilePath = backslashToSlash((addTrailingSlash(getParentPath($_POST['zip_path'])) . DIRECTORY_SEPARATOR . $_POST['zip_name'] . '.zip'));
+
+ // get all files and sub files
+ function dir_tree($dir) {
+ $path = '';
+ $stack[] = $dir;
+ while ($stack) {
+ $thisdir = array_pop($stack);
+ if ($dircont = scandir($thisdir)) {
+ $i=0;
+ while (isset($dircont[$i])) {
+ if ($dircont[$i] !== '.' && $dircont[$i] !== '..') {
+ $current_file = "{$thisdir}/{$dircont[$i]}";
+ if (is_file($current_file)) {
+ $path[] = "{$thisdir}/{$dircont[$i]}";
+ } elseif (is_dir($current_file)) {
+ $path[] = "{$thisdir}/{$dircont[$i]}";
+ $stack[] = $current_file;
+ }
+ }
+ $i++;
}
- }
-} else {
- if(!isset($_POST['selectedDoc']) || !is_array($_POST['selectedDoc']) || sizeof($_POST['selectedDoc']) < 1) {
- $error = ERR_NOT_FILE_SELECTED;
- } else {
- include_once(CLASS_FILE);
- $file = new file();
- foreach($_POST['selectedDoc'] as $doc) {
- if(file_exists($doc) && isUnderRoot($doc)) {
- if(is_dir($doc)
- && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $doc)
- && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $doc))
- {
- $file->delete(addTrailingSlash(backslashToSlash($doc)));
- } elseif(is_file($doc)
- && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $doc)
- && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $doc))
- {
- $file->zip($doc);
- }
}
}
+ return $path;
}
+ $allFilesToZip = array();
+ foreach ($filesToZip as $key => $value) {
+ if (is_dir()) {
+ $allFilesToZip = array_add($allFilesToZip, dir_tree($value));
+ } else {
+ $allFilesToZip[] = $value;
+ }
+ }
+
+ require_once('inc/pclzip.lib.php'); // PclZip library http://www.phpconcept.net/pclzip
+ $archive = new PclZip($zipFilePath);
+ foreach ($allFilesToZip as $key => $value) {
+ if(!$archive->add($value, PCLZIP_OPT_REMOVE_PATH, $relativeTo)) {
+ $error = ERR_ZIP_ADD_FILE;
+ break;
+ }
+ }
+
+ // get/return new file info
+ include_once(CLASS_FILE);
+ $objFile = new file($zipFilePath);
+ $fileType = $objFile->getFileInfo();
+ include_once(CLASS_MANAGER);
+ $manager = new manager($zipFilePath, false);
+ $pathInfo = $manager->getFolderInfo($zipFilePath);
+ $fileType = array_merge($fileType, $manager->getFileType($zipFilePath, false));
+
+ $info = '';
+ foreach($fileType as $k=>$v) {
+ switch ($k) {
+ case "ctime":
+ case "mtime":
+ case "atime":
+ $v = date(DATE_TIME_FORMAT, $v);
+ break;
+ case 'name':
+ $info .= sprintf(", %s:'%s'", 'short_name', shortenFileName($v));
+ break;
+ //case 'cssClass':
+ //$v = 'folderEmpty';
+ //break;
+ }
+ $info .= sprintf(", %s:'%s'", $k, $v);
+ }
}
-echo "{error:'" . $error . "'}";
+
+echo "{";
+echo "error:'" . $error . "'";
+echo $info;
+echo "}";
?>
\ No newline at end of file
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php 2011-03-30 13:53:10 UTC (rev 6501)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php 2011-03-30 22:25:24 UTC (rev 6502)
@@ -90,6 +90,7 @@
var permits = {'del':<?php echo (CONFIG_OPTIONS_DELETE?1:0); ?>, 'cut':<?php echo (CONFIG_OPTIONS_CUT?'1':'0'); ?>, 'copy':<?php echo (CONFIG_OPTIONS_COPY?1:0); ?>, 'newfolder':<?php echo (CONFIG_OPTIONS_NEWFOLDER?1:0); ?>, 'rename':<?php echo (CONFIG_OPTIONS_RENAME?1:0); ?>, 'upload':<?php echo (CONFIG_OPTIONS_UPLOAD?1:0); ?>, 'edit':<?php echo (CONFIG_OPTIONS_EDITABLE?1:0); ?>, 'view_only':<?php echo (CONFIG_SYS_VIEW_ONLY?1:0); ?>};
var currentFolder = {};
var warningDelete = '<?php echo WARNING_DELETE; ?>';
+ var warningUnzip = '<?php echo WARNING_UNZIP; ?>';
var newFile = {'num':1, 'label':'<?php echo FILE_LABEL_SELECT; ?>', 'upload':'<?php echo FILE_LBL_UPLOAD; ?>'};
var counts = {'new_file':1};
var thickbox = {
@@ -232,7 +233,7 @@
echo '<li ><a href="#" id="actionZip" ><span>' .LBL_BTN_ZIP . '</span></a><li>';
}
if(CONFIG_OPTIONS_UNZIP && class_exists('ZipArchive')) {
- echo '<li ><a href="#" id="actionUnzip" ><span>' .LBL_BTN_UNZIP . '</span></a><li>';
+ //echo '<li ><a href="#" id="actionUnzip" ><span>' .LBL_BTN_UNZIP . '</span></a><li>';
}
?>
<!--<li><a href="#" id="actionClose" ><?php echo IMG_BTN_CLOSE; ?></a></li>-->
@@ -241,7 +242,11 @@
<li ><a href="#" id="actionZip"><span>Zip</span></a><li>
<li ><a href="#" id="actionUnzip"><span>Unzip</span></a><li>-->
</ul>
-<form action="" method="POST" name="formAction" id="formAction"><input type="hidden" name="currentFolderPath" id="currentFolderPathVal" value="" /><select name="selectedDoc[]" id="selectedDoc" style="display:none;" multiple="multiple"></select><input type="hidden" name="action_value" value="" id="action_value" /></form>
+<form action="" method="POST" name="formAction" id="formAction">
+ <input type="hidden" name="currentFolderPath" id="currentFolderPathVal" value="" />
+ <select name="selectedDoc[]" id="selectedDoc" style="display:none;" multiple="multiple"></select>
+ <input type="hidden" name="action_value" value="" id="action_value" />
+</form>
</div><!--</div id="header">-->
@@ -530,7 +535,7 @@
.
<select id="ext" name="ext">
<?php
- foreach(getValidFileExts() as $v) {
+ foreach(getValidTextEditorExts() as $v) {
echo "<option value='" . $v . "' " . (strtolower($v) == strtolower(getFileExt($path))?'selected':'') . ">" . $v . "</option>";
}
?>
@@ -641,7 +646,7 @@
<table cellpadding="0" cellspacing="0" border="0">
<tr>
<td width="99%"> </td>
- <td nowrap width="1%"><a href="#" class="buttonLink" ><span><?php echo RENAME_LBL_RENAME; ?></span></a> </td>
+ <td nowrap width="1%"><a href="#" class="buttonLink" ><span><?php echo RENAME_LBL_RENAME; ?></span></a></td>
</tr>
</table>
</td>
@@ -655,6 +660,50 @@
+<div id="winZip" style="display:none">
+ <div class="jqmContainer">
+ <div class="jqmHeader">
+ <a href="#" ><?php echo LBL_ACTION_CLOSE; ?></a>
+ </div>
+ <div class="jqmBody">
+ <form id="formZip" name="formZip" method="POST" action="">
+ <input type="hidden" name="zip_path" id="zipPath" />
+ <input type="hidden" name="zip_num" id="zipNum" value="" />
+ <select name="zip_selected[]" id="zipSelected" style="display:none;" multiple="multiple"></select>
+
+ <table class="tableForm" cellpadding="0" cellspacing="0">
+ <thead>
+ <tr>
+ <th colspan="2"><?php echo ZIP_FORM_TITLE; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th nowrap><label><?php echo ZIP_NEW_NAME; ?></label></th>
+ <td ><input type="name" id="zipName" style="font-size:12px" class="input" name="zip_name" style="width:250px" /></td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <th> </th>
+ <td nowrap>
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td width="99%"> </td>
+ <td nowrap width="1%"><a href="#" class="buttonLink" ><span><?php echo LBL_BTN_ZIP; ?></span></a></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </form>
+ </div>
+ </div>
+</div>
+
+
+
<div id="winInfo" style="display:none">
<div class="jqmContainer">
<div class="jqmHeader">
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt 2011-03-30 13:53:10 UTC (rev 6501)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt 2011-03-30 22:25:24 UTC (rev 6502)
@@ -1,12 +1,12 @@
-26/March/2011 V1.0 Final
+31/March/2011 V1.0 Final
for Xoops by luciorota <luc...@gm...>
+ Xoops Editors support
+ Xoops Preferences system support (Upload valid extensions, Max upload size, Default items per page, Navigation mode, Text editor)
+ added filetypes (.kml = GoogleMaps Kml, ...)
-+ added create new file
++ added create new file (create empty editable files)
+ fixed bug pasting files/folders
-+ added zip/unzip support (in progress)
++ added zip/unzip support (beta)
@@ -23,6 +23,8 @@
theme/xoops
theme/xoops/...
ajax_create_file.php (in progress)
+ ajax_file_unzip.php (in progress)
+ ajax_file_zip.php (in progress)
xoops_ajax_image_editor.php (in progress)
xoops_ajax_text_editor.php
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php 2011-03-30 13:53:10 UTC (rev 6501)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php 2011-03-30 22:25:24 UTC (rev 6502)
@@ -74,9 +74,9 @@
define('CONFIG_OPTIONS_NEWFOLDER', $permNewfolder);
$permNewfile = $permNewfolder;
define('CONFIG_OPTIONS_NEWFILE', $permNewfile);
- $permZip = false; // IN PROGRESS
+ $permZip = true; // IN PROGRESS
define('CONFIG_OPTIONS_ZIP', $permZip);
- $permUnzip = false; // IN PROGRESS
+ $permUnzip = true; // IN PROGRESS
define('CONFIG_OPTIONS_UNZIP', $permUnzip);
$permRename = ($gpermHandler->checkRight('ajaxfilemanager_extra', 64, $groups, $ajaxfilemanagerModule->mid())) ? true : false ;
define('CONFIG_OPTIONS_RENAME', $permRename);
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php 2011-03-30 13:53:10 UTC (rev 6501)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php 2011-03-30 22:25:24 UTC (rev 6502)
@@ -1,9 +1,8 @@
<pre>Array
(
- [currentFilePath] => ../../../uploads/ajaxfilemanager/uploaded/
- [new_file] => qqq
- [ext] => gif
+ [currentFolderPath] => ../../../themes/
+ [new_folder] => TEMP
)
</pre>
-28/Mar/2011 10:08:37
\ No newline at end of file
+30/Mar/2011 15:04:21
\ No newline at end of file
Added: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/pclzip.lib.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/pclzip.lib.php (rev 0)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/pclzip.lib.php 2011-03-30 22:25:24 UTC (rev 6502)
@@ -0,0 +1,5694 @@
+<?php
+// --------------------------------------------------------------------------------
+// PhpConcept Library - Zip Module 2.8.2
+// --------------------------------------------------------------------------------
+// License GNU/LGPL - Vincent Blavet - August 2009
+// http://www.phpconcept.net
+// --------------------------------------------------------------------------------
+//
+// Presentation :
+// PclZip is a PHP library that manage ZIP archives.
+// So far tests show that archives generated by PclZip are readable by
+// WinZip application and other tools.
+//
+// Description :
+// See readme.txt and http://www.phpconcept.net
+//
+// Warning :
+// This library and the associated files are non commercial, non professional
+// work.
+// It should not have unexpected results. However if any damage is caused by
+// this software the author can not be responsible.
+// The use of this software is at the risk of the user.
+//
+// --------------------------------------------------------------------------------
+// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
+// --------------------------------------------------------------------------------
+
+ // ----- Constants
+ if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
+ define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+ }
+
+ // ----- File list separator
+ // In version 1.x of PclZip, the separator for file list is a space
+ // (which is not a very smart choice, specifically for windows paths !).
+ // A better separator should be a comma (,). This constant gives you the
+ // abilty to change that.
+ // However notice that changing this value, may have impact on existing
+ // scripts, using space separated filenames.
+ // Recommanded values for compatibility with older versions :
+ //define( 'PCLZIP_SEPARATOR', ' ' );
+ // Recommanded values for smart separation of filenames.
+ if (!defined('PCLZIP_SEPARATOR')) {
+ define( 'PCLZIP_SEPARATOR', ',' );
+ }
+
+ // ----- Error configuration
+ // 0 : PclZip Class integrated error handling
+ // 1 : PclError external library error handling. By enabling this
+ // you must ensure that you have included PclError library.
+ // [2,...] : reserved for futur use
+ if (!defined('PCLZIP_ERROR_EXTERNAL')) {
+ define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+ }
+
+ // ----- Optional static temporary directory
+ // By default temporary files are generated in the script current
+ // path.
+ // If defined :
+ // - MUST BE terminated by a '/'.
+ // - MUST be a valid, already created directory
+ // Samples :
+ // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
+ // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
+ if (!defined('PCLZIP_TEMPORARY_DIR')) {
+ define( 'PCLZIP_TEMPORARY_DIR', '' );
+ }
+
+ // ----- Optional threshold ratio for use of temporary files
+ // Pclzip sense the size of the file to add/extract and decide to
+ // use or not temporary file. The algorythm is looking for
+ // memory_limit of PHP and apply a ratio.
+ // threshold = memory_limit * ratio.
+ // Recommended values are under 0.5. Default 0.47.
+ // Samples :
+ // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
+ if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+ define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+ }
+
+// --------------------------------------------------------------------------------
+// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
+// --------------------------------------------------------------------------------
+
+ // ----- Global variables
+ $g_pclzip_version = "2.8.2";
+
+ // ----- Error codes
+ // -1 : Unable to open file in binary write mode
+ // -2 : Unable to open file in binary read mode
+ // -3 : Invalid parameters
+ // -4 : File does not exist
+ // -5 : Filename is too long (max. 255)
+ // -6 : Not a valid zip file
+ // -7 : Invalid extracted file size
+ // -8 : Unable to create directory
+ // -9 : Invalid archive extension
+ // -10 : Invalid archive format
+ // -11 : Unable to delete file (unlink)
+ // -12 : Unable to rename file (rename)
+ // -13 : Invalid header checksum
+ // -14 : Invalid archive size
+ define( 'PCLZIP_ERR_USER_ABORTED', 2 );
+ define( 'PCLZIP_ERR_NO_ERROR', 0 );
+ define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
+ define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
+ define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
+ define( 'PCLZIP_ERR_MISSING_FILE', -4 );
+ define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
+ define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
+ define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
+ define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
+ define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
+ define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
+ define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
+ define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
+ define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
+ define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
+ define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
+ define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
+ define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
+ define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
+ define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
+ define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
+ define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+
+ // ----- Options values
+ define( 'PCLZIP_OPT_PATH', 77001 );
+ define( 'PCLZIP_OPT_ADD_PATH', 77002 );
+ define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
+ define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
+ define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
+ define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
+ define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
+ define( 'PCLZIP_OPT_BY_NAME', 77008 );
+ define( 'PCLZIP_OPT_BY_INDEX', 77009 );
+ define( 'PCLZIP_OPT_BY_EREG', 77010 );
+ define( 'PCLZIP_OPT_BY_PREG', 77011 );
+ define( 'PCLZIP_OPT_COMMENT', 77012 );
+ define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
+ define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
+ define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
+ define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
+ define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
+ // Having big trouble with crypt. Need to multiply 2 long int
+ // which is not correctly supported by PHP ...
+ //define( 'PCLZIP_OPT_CRYPT', 77018 );
+ define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
+ define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
+ define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
+ define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
+ define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
+ define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
+ define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+
+ // ----- File description attributes
+ define( 'PCLZIP_ATT_FILE_NAME', 79001 );
+ define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
+ define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
+ define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
+ define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
+ define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+
+ // ----- Call backs values
+ define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
+ define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
+ define( 'PCLZIP_CB_PRE_ADD', 78003 );
+ define( 'PCLZIP_CB_POST_ADD', 78004 );
+ /* For futur use
+ define( 'PCLZIP_CB_PRE_LIST', 78005 );
+ define( 'PCLZIP_CB_POST_LIST', 78006 );
+ define( 'PCLZIP_CB_PRE_DELETE', 78007 );
+ define( 'PCLZIP_CB_POST_DELETE', 78008 );
+ */
+
+ // --------------------------------------------------------------------------------
+ // Class : PclZip
+ // Description :
+ // PclZip is the class that represent a Zip archive.
+ // The public methods allow the manipulation of the archive.
+ // Attributes :
+ // Attributes must not be accessed directly.
+ // Methods :
+ // PclZip() : Object creator
+ // create() : Creates the Zip archive
+ // listContent() : List the content of the Zip archive
+ // extract() : Extract the content of the archive
+ // properties() : List the properties of the archive
+ // --------------------------------------------------------------------------------
+ class PclZip
+ {
+ // ----- Filename of the zip file
+ var $zipname = '';
+
+ // ----- File descriptor of the zip file
+ var $zip_fd = 0;
+
+ // ----- Internal error handling
+ var $error_code = 1;
+ var $error_string = '';
+
+ // ----- Current status of the magic_quotes_runtime
+ // This value store the php configuration for magic_quotes
+ // The class can then disable the magic_quotes and reset it after
+ var $magic_quotes_status;
+
+ // --------------------------------------------------------------------------------
+ // Function : PclZip()
+ // Description :
+ // Creates a PclZip object and set the name of the associated Zip archive
+ // filename.
+ // Note that no real action is taken, if the archive does not exist it is not
+ // created. Use create() for that.
+ // --------------------------------------------------------------------------------
+ function PclZip($p_zipname)
+ {
+
+ // ----- Tests the zlib
+ if (!function_exists('gzopen'))
+ {
+ die('Abort '.basename(__FILE__).' : Missing zlib extensions');
+ }
+
+ // ----- Set the attributes
+ $this->zipname = $p_zipname;
+ $this->zip_fd = 0;
+ $this->magic_quotes_status = -1;
+
+ // ----- Return
+ return;
+ }
+ // --------------------------------------------------------------------------------
+
+ // --------------------------------------------------------------------------------
+ // Function :
+ // create($p_filelist, $p_add_dir="", $p_remove_dir="")
+ // create($p_filelist, $p_option, $p_option_value, ...)
+ // Description :
+ // This method supports two different synopsis. The first one is historical.
+ // This method creates a Zip Archive. The Zip file is created in the
+ // filesystem. The files and directories indicated in $p_filelist
+ // are added in the archive. See the parameters description for the
+ // supported format of $p_filelist.
+ // When a directory is in the list, the directory and its content is added
+ // in the archive.
+ // In this synopsis, the function takes an optional variable list of
+ // options. See bellow the supported options.
+ // Parameters :
+ // $p_filelist : An array containing file or directory names, or
+ // a string containing one filename or one directory name, or
+ // a string containing a list of filenames and/or directory
+ // names separated by spaces.
+ // $p_add_dir : A path to add before the real path of the archived file,
+ // in order to have it memorized in the archive.
+ // $p_remove_dir : A path to remove from the real path of the file to archive,
+ // in order to have a shorter path memorized in the archive.
+ // When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+ // is removed first, before $p_add_dir is added.
+ // Options :
+ // PCLZIP_OPT_ADD_PATH :
+ // PCLZIP_OPT_REMOVE_PATH :
+ // PCLZIP_OPT_REMOVE_ALL_PATH :
+ // PCLZIP_OPT_COMMENT :
+ // PCLZIP_CB_PRE_ADD :
+ // PCLZIP_CB_POST_ADD :
+ // Return Values :
+ // 0 on failure,
+ // The list of the added files, with a status of the add action.
+ // (see PclZip::listContent() for list entry format)
+ // --------------------------------------------------------------------------------
+ function create($p_filelist)
+ {
+ $v_result=1;
+
+ // ----- Reset the error handler
+ $this->privErrorReset();
+
+ // ----- Set default values
+ $v_options = array();
+ $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+ // ----- Look for variable options arguments
+ $v_size = func_num_args();
+
+ // ----- Look for arguments
+ if ($v_size > 1) {
+ // ----- Get the arguments
+ $v_arg_list = func_get_args();
+
+ // ----- Remove from the options list the first argument
+ array_shift($v_arg_list);
+ $v_size--;
+
+ // ----- Look for first arg
+ if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+ // ----- Parse the options
+ $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+ array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+ PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+ PCLZIP_OPT_ADD_PATH => 'optional',
+ PCLZIP_CB_PRE_ADD => 'optional',
+ PCLZIP_CB_POST_ADD => 'optional',
+ PCLZIP_OPT_NO_COMPRESSION => 'optional',
+ PCLZIP_OPT_COMMENT => 'optional',
+ PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+ PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+ PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+ //, PCLZIP_OPT_CRYPT => 'optional'
+ ));
+ if ($v_result != 1) {
+ return 0;
+ }
+ }
+
+ // ----- Look for 2 args
+ // Here we need to support the first historic synopsis of the
+ // method.
+ else {
+
+ // ----- Get the first argument
+ $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+ // ----- Look for the optional second argument
+ if ($v_size == 2) {
+ $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+ }
+ else if ($v_size > 2) {
+ PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+ "Invalid number / type of arguments");
+ return 0;
+ }
+ }
+ }
+
+ // ----- Look for default option values
+ $this->privOptionDefaultThreshold($v_options);
+
+ // ----- Init
+ $v_string_list = array();
+ $v_att_list = array();
+ $v_filedescr_list = array();
+ $p_result_list = array();
+
+ // ----- Look if the $p_filelist is really an array
+ if (is_array($p_filelist)) {
+
+ // ----- Look if the first element is also an array
+ // This will mean that this is a file description entry
+ if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+ $v_att_list = $p_filelist;
+ }
+
+ // ----- The list is a list of string names
+ else {
+ $v_string_list = $p_filelist;
+ }
+ }
+
+ // ----- Look if the $p_filelist is a string
+ else if (is_string($p_filelist)) {
+ // ----- Create a list from the string
+ $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+ }
+
+ // ----- Invalid variable type for $p_filelist
+ else {
+ PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+ return 0;
+ }
+
+ // ----- Reformat the string list
+ if (sizeof($v_string_list) != 0) {
+ foreach ($v_string_list as $v_string) {
+ if ($v_string != '') {
+ $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+ }
+ else {
+ }
+ }
+ }
+
+ // ----- For each file in the list check the attributes
+ $v_supported_attributes
+ = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+ ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+ ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+ ,PCLZIP_ATT_FILE_MTIME => 'optional'
+ ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+ ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+ );
+ foreach ($v_att_list as $v_entry) {
+ $v_result = $this->privFileDescrParseAtt($v_entry,
+ $v_filedescr_list[],
+ $v_options,
+ $v_supported_attributes);
+ if ($v_result != 1) {
+ return 0;
+ }
+ }
+
+ // ----- Expand the filelist (expand directories)
+ $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+ if ($v_result != 1) {
+ return 0;
+ }
+
+ // ----- Call the create fct
+ $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+ if ($v_result != 1) {
+ return 0;
+ }
+
+ // ----- Return
+ return $p_result_list;
+ }
+ // --------------------------------------------------------------------------------
+
+ // --------------------------------------------------------------------------------
+ // Function :
+ // add($p_filelist, $p_add_dir="", $p_remove_dir="")
+ // add($p_filelist, $p_option, $p_option_value, ...)
+ // Description :
+ // This method supports two synopsis. The first one is historical.
+ // This methods add the list of files in an existing archive.
+ // If a file with the same name already exists, it is added at the end of the
+ // archive, the first one is still present.
+ // If the archive does not exist, it is created.
+ // Parameters :
+ // $p_filelist : An array containing file or directory names, or
+ // a string containing one filename or one directory name, or
+ // a string containing a list of filenames and/or directory
+ // names separated by spaces.
+ // $p_add_dir : A path to add before the real path of the archived file,
+ // in order to have it memorized in the archive.
+ // $p_remove_dir : A path to remove from the real path of the file to archive,
+ // in order to have a shorter path memorized in the archive.
+ // When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+ // is removed first, before $p_add_dir is added.
+ // Options :
+ // PCLZIP_OPT_ADD_PATH :
+ // PCLZIP_OPT_REMOVE_PATH :
+ // PCLZIP_OPT_REMOVE_ALL_PATH :
+ // PCLZIP_OPT_COMMENT :
+ // PCLZIP_OPT_ADD_COMMENT :
+ // PCLZIP_OPT_PREPEND_COMMENT :
+ // PCLZIP_CB_PRE_ADD :
+ // PCLZIP_CB_POST_ADD :
+ // Return Values :
+ // 0 on failure,
+ // The list of the added files, with a status of the add action.
+ // (see PclZip::listContent() for list entry format)
+ // --------------------------------------------------------------------------------
+ function add($p_filelist)
+ {
+ $v_result=1;
+
+ // ----- Reset the error handler
+ $this->privErrorReset();
+
+ // ----- Set default values
+ $v_options = array();
+ $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+ // ----- Look for variable options arguments
+ $v_size = func_num_args();
+
+ // ----- Look for arguments
+ if ($v_size > 1) {
+ // ----- Get the arguments
+ $v_arg_list = func_get_args();
+
+ // ----- Remove form the options list the first argument
+ array_shift($v_arg_list);
+ $v_size--;
+
+ // ----- Look for first arg
+ if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+ // ----- Parse the options
+ $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+ array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+ PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+ PCLZIP_OPT_ADD_PATH => 'optional',
+ PCLZIP_CB_PRE_ADD => 'optional',
+ PCLZIP_CB_POST_ADD => 'optional',
+ PCLZIP_OPT_NO_COMPRESSION => 'optional',
+ PCLZIP_OPT_COMMENT => 'optional',
+ PCLZIP_OPT_ADD_COMMENT => 'optional',
+ PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+ PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+ PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+ PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+ //, PCLZIP_OPT_CRYPT => 'optional'
+ ));
+ if ($v_result != 1) {
+ return 0;
+ }
+ }
+
+ // ----- Look for 2 args
+ // Here we need to support the first historic synopsis of the
+ // method.
+ else {
+
+ // ----- Get the first argument
+ $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+ // ----- Look for the optional second argument
+ if ($v_size == 2) {
+ $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+ }
+ else if ($v_size > 2) {
+ // ----- Error log
+ PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+ // ----- Return
+ return 0;
+ }
+ }
+ }
+
+ // ----- Look for default option values
+ $this->privOptionDefaultThreshold($v_options);
+
+ // ----- Init
+ $v_string_list = array();
+ $v_att_list = array();
+ $v_filedescr_list = array();
+ $p_result_list = array();
+
+ // ----- Look if the $p_filelist is really an array
+ if (is_array($p_filelist)) {
+
+ // ----- Look if the first element is also an array
+ // This will mean that this is a file description entry
+ if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+ $v_att_list = $p_filelist;
+ }
+
+ // ----- The list is a list of string names
+ else {
+ $v_string_list = $p_filelist;
+ }
+ }
+
+ // ----- Look if the $p_filelist is a string
+ else if (is_string($p_filelist)) {
+ // ----- Create a list from the string
+ $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+ }
+
+ // ----- Invalid variable type for $p_filelist
+ else {
+ PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+ return 0;
+ }
+
+ // ----- Reformat the string list
+ if (sizeof($v_string_list) != 0) {
+ foreach ($v_string_list as $v_string) {
+ $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+ }
+ }
+
+ // ----- For each file in the list check the attributes
+ $v_supported_attributes
+ = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+ ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+ ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+ ,PCLZIP_ATT_FILE_MTIME => 'optional'
+ ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+ ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+ );
+ foreach ($v_att_list as $v_entry) {
+ $v_result = $this->privFileDescrParseAtt($v_entry,
+ $v_filedescr_list[],
+ $v_options,
+ $v_supported_attributes);
+ if ($v_result != 1) {
+ return 0;
+ }
+ }
+
+ // ----- Expand the filelist (expand directories)
+ $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+ if ($v_result != 1) {
+ return 0;
+ }
+
+ // ----- Call the create fct
+ $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+ if ($v_result != 1) {
+ return 0;
+ }
+
+ // ----- Return
+ return $p_result_list;
+ }
+ // --------------------------------------------------------------------------------
+
+ // --------------------------------------------------------------------------------
+ // Function : listContent()
+ // Description :
+ // This public method, gives the list of the files and directories, with their
+ // properties.
+ // The properties of each entries in the list are (used also in other functions) :
+ // filename : Name of the file. For a create or add action it is the filename
+ // given by the user. For an extract function it is the filename
+ // of the extracted file.
+ // stored_filename : Name of the file / directory stored in the archive.
+ // size : Size of the stored file.
+ // compressed_size : Size of the file's data compressed in the archive
+ // (without the headers overhead)
+ // mtime : Last known modification date of the file (UNIX timestamp)
+ // comment : Comment associated with the file
+ // folder : true | false
+ // index : index of the file in the archive
+ // status : status of the action (depending of the action) :
+ // Values are :
+ // ok : OK !
+ // filtered : the file / dir is not extracted (filtered by user)
+ // already_a_directory : the file can not be extracted because a
+ // directory with the same name already exists
+ // write_protected : the file can not be extracted because a file
+ // with the same name already exists and is
+ // write protected
+ // newer_exist : the file was not extracted because a newer file exists
+ // path_creation_fail : the file is not extracted because the folder
+ // does not exist and can not be created
+ // write_error : the file was not extracted because there was a
+ // error while writing the file
+ // read_error : the file was not extracted because there was a error
+ // while reading the file
+ // invalid_header : the file was not extracted because of an archive
+ // format error (bad file header)
+ // Note that each time a method can continue operating when there
+ // is an action error on a file, the error is only logged in the file status.
+ // Return Values :
+ // 0 on an unrecoverable failure,
+ // The list of the files in the archive.
+ // --------------------------------------------------------------------------------
+ function listContent()
+ {
+ $v_result=1;
+
+ // ----- Reset the error handler
+ $this->privErrorReset();
+
+ // ----- Check archive
+ if (!$this->privCheckFormat()) {
+ return(0);
+ }
+
+ // ----- Call the extracting fct
+ $p_list = array();
+ if (($v_result = $this->privList($p_list)) != 1)
+ {
+ unset($p_list);
+ return(0);
+ }
+
+ // ----- Return
+ return $p_list;
+ }
+ // --------------------------------------------------------------------------------
+
+ // --------------------------------------------------------------------------------
+ // Function :
+ // extract($p_path="./", $p_remove_path="")
+ // extract([$p_option, $p_option_value, ...])
+ // Description :
+ // This method supports two synopsis. The first one is historical.
+ // This method extract all the files / directories from the archive to the
+ // folder indicated in $p_path.
+ // If you want to ignore the 'root' part of path of the memorized files
+ // you can indicate this in the optional $p_remove_path parameter.
+ // By default, if a newer file with the same name already exists, the
+ // file is not extracted.
+ //
+ // If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+ // are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+ // at the end of the path value of PCLZIP_OPT_PATH.
+ // Parameters :
+ // $p_path : Path where the files and directories are to be extracted
+ // $p_remove_path : First part ('root' part) of the memorized path
+ // (if any similar) to remove while extracting.
+ // Options :
+ // PCLZIP_OPT_PATH :
+ // PCLZIP_OPT_ADD_PATH :
+ // PCLZIP_OPT_REMOVE_PATH :
+ // PCLZIP_OPT_REMOVE_ALL_PATH :
+ // PCLZIP_CB_PRE_EXTRACT :
+ // PCLZIP_CB_POST_EXTRACT :
+ // Return Values :
+ // 0 or a negative value on failure,
+ // The list of the extracted files, with a status of the action.
+ // (see PclZip::listContent() for list entry format)
+ // --------------------------------------------------------------------------------
+ function extract()
+ {
+ $v_result=1;
+
+ // ----- Reset the error handler
+ $this->privErrorReset();
+
+ // ----- Check archive
+ if (!$this->privCheckFormat()) {
+ return(0);
+ }
+
+ // ----- Set default values
+ $v_options = array();
+// $v_path = "./";
+ $v_path = '';
+ $v_remove_path = "";
+ $v_remove_all_path = false;
+
+ // ----- Look for variable options arguments
+ $v_size = func_num_args();
+
+ // ----- Default values for option
+ $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+ // ----- Look for arguments
+ if ($v_size > 0) {
+ // ----- Get the arguments
+ $v_arg_list = func_get_args();
+
+ // ----- Look for first arg
+ if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+ // ----- Parse the options
+ $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+ array (PCLZIP_OPT_PATH => 'optional',
+ PCLZIP_OPT_REMOVE_PATH => 'optional',
+ PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+ PCLZIP_OPT_ADD_PATH => 'optional',
+ PCLZIP_CB_PRE_EXTRACT => 'optional',
+ PCLZIP_CB_POST_EXTRACT => 'optional',
+ PCLZIP_OPT_SET_CHMOD => 'optional',
+ PCLZIP_OPT_BY_NAME => 'optional',
+ PCLZIP_OPT_BY_EREG => 'optional',
+ PCLZIP_OPT_BY_PREG => 'optional',
+ PCLZIP_OPT_BY_INDEX => 'optional',
+ PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+ PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+ PCLZIP_OPT_REPLACE_NEWER => 'optional'
+ ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+ ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+ PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+ PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+ PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+ ));
+ if ($v_result != 1) {
+ return 0;
+ }
+
+ // ----- Set the arguments
+ if (isset($v_options[PCLZIP_OPT_PATH])) {
+ $v_path = $v_options[PCLZIP_OPT_PATH];
+ }
+ if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+ $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+ }
+ if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+ $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+ }
+ if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+ // ----- Check for '/' in last path char
+ if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+ $v_path .= '/';
+ }
+ $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+ }
+ }
+
+ // ----- Look for 2 args
+ // Here we need to support the first historic synopsis of the
+ // method.
+ else {
+
+ // ----- Get the first argument
+ $v_path = $v_arg_list[0];
+
+ // ----- Look for the optional second argument
+ if ($v_size == 2) {
+ $v_remove_path = $v_arg_list[1];
+ }
+ else if ($v_size > 2) {
+ // ----- Error log
+ PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+ // ----- Return
+ return 0;
+ }
+ }
+ }
+
+ // ----- Look for default option values
+ $this->privOptionDefaultThreshold($v_options);
+
+ // ----- Trace
+
+ // ----- Call the extracting fct
+ $p_list = array();
+ $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
+ $v_remove_all_path, $v_options);
+ if ($v_result < 1) {
+ unset($p_list);
+ return(0);
+ }
+
+ // ----- Return
+ return $p_list;
+ }
+ // --------------------------------------------------------------------------------
+
+
+ // --------------------------------------------------------------------------------
+ // Function :
+ // extractByIndex($p_index, $p_path="./", $p_remove_path="")
+ // extractByIndex($p_index, [$p_option, $p_option_value, ...])
+ // Description :
+ // This method supports two synopsis. The first one is historical.
+ // This method is doing a partial extract of the archive.
+ // The extracted files or folders are identified by their index in the
+ // archive (from 0 to n).
+ // Note that if the index identify a folder, only the folder entry is
+ // extracted, not all the files included in the archive.
+ // Parameters :
+ // $p_index : A single index (integer) or a string of indexes of files to
+ // extract. The form of the string is "0,4-6,8-12" with only numbers
+ // and '-' for range or ',' to separate ranges. No spaces or ';'
+ // are allowed.
+ // $p_path : Path where the files and directories are to be extracted
+ // $p_remove_path : First part ('root' part) of the memorized path
+ // (if any similar) to remove while extracting.
+ // Options :
+ // PCLZIP_OPT_PATH :
+ // PCLZIP_OPT_ADD_PATH :
+ // PCLZIP_OPT_REMOVE_PATH :
+ // PCLZIP_OPT_REMOVE_ALL_PATH :
+ // PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+ // not as files.
+ // The resulting content is in a new field 'content' in the file
+ // structure.
+ // This option must be used alone (any other options are ignored).
+ // PCLZIP_CB_PRE_EXTRACT :
+ // PCLZIP_CB_POST_EXTRACT :
+ // Return Values :
+ // 0 on failure,
+ // The list of the extracted files, with a status of the action.
+ // (see PclZip::listContent() for list entry format)
+ // --------------------------------------------------------------------------------
+ //function extractByIndex($p_index, options...)
+ function extractByIndex($p_index)
+ {
+ $v_result=1;
+
+ // ----- Reset the error handler
+ $this->privErrorReset();
+
+ // ----- Check archive
+ if (!$this->privCheckFormat()) {
+ return(0);
+ }
+
+ // ----- Set default values
+ $v_options = array();
+// $v_path = "./";
+ $v_path = '';
+ $v_remove_path = "";
+ $v_remove_all_path = false;
+
+ // ----- Look for variable options arguments
+ $v_size = func_num_args();
+
+ // ----- Default values for option
+ $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+ // ----- Look for arguments
+ if ($v_size > 1) {
+ // ----- Get the arguments
+ $v_arg_list = func_get_args();
+
+ // ----- Remove form the options list the first argument
+ array_shift($v_arg_list);
+ $v_size--;
+
+ // ----- Look for first arg
+ if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+ // ----- Parse the options
+ $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+ array (PCLZIP_OPT_PATH => 'optional',
+ PCLZIP_OPT_REMOVE_PATH => 'optional',
+ PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+ PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+ PCLZIP_OPT_ADD_PATH => 'optional',
+ PCLZIP_CB_PRE_EXTRACT => 'optional',
+ PCLZIP_CB_POST_EXTRACT => 'optional',
+ PCLZIP_OPT_SET_CHMOD => 'optional',
+ PCLZIP_OPT_REPLACE_NEWER => 'optional'
+ ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+ ,PCLZ...
[truncated message content] |
|
From: <vo...@us...> - 2011-03-30 13:53:16
|
Revision: 6501
http://xoops.svn.sourceforge.net/xoops/?rev=6501&view=rev
Author: voltan1
Date: 2011-03-30 13:53:10 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Update changlog
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/docs/changelog.txt
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/docs/changelog.txt
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/docs/changelog.txt 2011-03-30 13:48:59 UTC (rev 6500)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/docs/changelog.txt 2011-03-30 13:53:10 UTC (rev 6501)
@@ -6,8 +6,11 @@
- Fix pdf and print file URL (formuss)
- Edited backend.php for use this module RSS (Voltan)
- Improve Queries (Voltan)
-- Add function for update user posts after add or delete or change status (Voltan)
+- Add function for update user posts after add or delete or change status (Voltan)
- Submit page in user side (Voltan)
+- Improve templates(Voltan)
+- Add some config options for print page (Voltan)
+- Set check permissions in pdf and print pages (Voltan)
1.01
=================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-30 13:49:05
|
Revision: 6500
http://xoops.svn.sourceforge.net/xoops/?rev=6500&view=rev
Author: voltan1
Date: 2011-03-30 13:48:59 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Add check permissions for make pdf and print
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/pdf.php
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/pdf.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/pdf.php 2011-03-30 10:36:20 UTC (rev 6499)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/pdf.php 2011-03-30 13:48:59 UTC (rev 6500)
@@ -28,6 +28,7 @@
require_once XOOPS_TRUST_PATH . '/modules/fmcontent/fpdf/fpdf.inc.php';
// Initialize content handler
$content_handler = xoops_getmodulehandler('page', 'fmcontent');
+$topic_handler = xoops_getmodulehandler('topic', 'fmcontent');
$obj = $content_handler->get($content_id);
// Get user right
$group = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
@@ -36,8 +37,47 @@
redirect_header('index.php', 2, _NOPERM);
exit();
}
+
// Construct page array
-$page = array();
+$page = array();
+//$page = $obj->toArray();
+$content_topic = $obj->getVar('content_topic');
+
+if (isset($content_topic) && $content_topic > 0) {
+
+ $view_topic = $topic_handler->get($content_topic);
+
+ if (!isset($view_topic)) {
+ redirect_header('index.php', 3, _FMCONTENT_TOPIC_ERROR);
+ exit();
+ }
+
+ if ($view_topic->getVar('topic_modid') != $forMods->getVar('mid')) {
+ redirect_header('index.php', 3, _FMCONTENT_TOPIC_ERROR);
+ exit();
+ }
+
+ if ($view_topic->getVar('topic_online') == '0') {
+ redirect_header('index.php', 3, _FMCONTENT_TOPIC_ERROR);
+ exit();
+ }
+
+ // Check the access permission
+ $perm_handler = fmcontentPermHandler::getHandler();
+ if (!$perm_handler->isAllowed($xoopsUser, 'fmcontent_access', $view_topic->getVar('topic_id'), $forMods)) {
+ redirect_header("index.php", 3, _NOPERM);
+ exit;
+ }
+
+ if(xoops_getModuleOption('disp_option', $forMods->getVar('dirname')) && $view_topic->getVar('topic_showpdf') == '0') {
+ redirect_header("index.php", 3, _NOPERM);
+ exit;
+ } elseif(xoops_getModuleOption('disp_pdflink', $forMods->getVar('dirname')) == '0') {
+ redirect_header("index.php", 3, _NOPERM);
+ exit;
+ }
+}
+
$page['title'] = $obj->getVar('content_title');
$page['alias'] = $obj->getVar('content_alias');
$page['text'] = $obj->getVar('content_text', 's');
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-30 10:36:20 UTC (rev 6499)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-30 13:48:59 UTC (rev 6500)
@@ -70,7 +70,15 @@
if (!$perm_handler->isAllowed($xoopsUser, 'fmcontent_access', $view_topic->getVar('topic_id'), $forMods)) {
redirect_header("index.php", 3, _NOPERM);
exit;
- }
+ }
+
+ if(xoops_getModuleOption('disp_option', $forMods->getVar('dirname')) && $view_topic->getVar('topic_showprint') == '0') {
+ redirect_header("index.php", 3, _NOPERM);
+ exit;
+ } elseif(xoops_getModuleOption('disp_printlink', $forMods->getVar('dirname')) == '0') {
+ redirect_header("index.php", 3, _NOPERM);
+ exit;
+ }
}
$page['title'] = $obj->getVar('content_title');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2011-03-30 10:36:27
|
Revision: 6499
http://xoops.svn.sourceforge.net/xoops/?rev=6499&view=rev
Author: beckmi
Date: 2011-03-30 10:36:20 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Updating module logo
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/images/logo.png
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/images/logo.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-30 09:48:50
|
Revision: 6498
http://xoops.svn.sourceforge.net/xoops/?rev=6498&view=rev
Author: voltan1
Date: 2011-03-30 09:48:44 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
fix templates
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_header.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_level.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_topic.html
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_header.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_header.html 2011-03-30 09:34:42 UTC (rev 6497)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_header.html 2011-03-30 09:48:44 UTC (rev 6498)
@@ -1,8 +1,6 @@
<{if $fmcontent_tips}>
<div class="tips ui-corner-all">
- <img class="floatleft tooltip" src="<{xoAdminIcons tips.png}>" alt="<{$smarty.const._AM_SYSTEM_TIPS}>"
- title="<{$smarty.const._AM_SYSTEM_TIPS}>"/>
-
+ <img class="floatleft tooltip" src="<{xoAdminIcons tips.png}>" alt="<{$smarty.const._AM_SYSTEM_TIPS}>" title="<{$smarty.const._AM_SYSTEM_TIPS}>"/>
<div class="floatleft"><{$fmcontent_tips}></div>
<div class="clear"> </div>
</div>
@@ -11,21 +9,9 @@
<div class="moduleicons">
<div class="floatright">
<div class="xo-buttons">
- <a class="ui-corner-all tooltip" href="content.php?op=new_content"
- title="<{$smarty.const._FMCONTENT_ADD_CONTENT}>">
- <img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._FMCONTENT_ADD_CONTENT}>"/>
- <{$smarty.const._FMCONTENT_ADD_CONTENT}>
- </a>
- <a class="ui-corner-all tooltip" href="topic.php?op=new_topic"
- title="<{$smarty.const._FMCONTENT_ADD_TOPIC}>">
- <img src="<{xoAdminIcons attach.png}>" alt="<{$smarty.const._FMCONTENT_ADD_TOPIC}>"/>
- <{$smarty.const._FMCONTENT_ADD_TOPIC}>
- </a>
- <a class="ui-corner-all tooltip" href="content.php?op=new_link"
- title="<{$smarty.const._FMCONTENT_ADD_MENU}>">
- <img src="<{xoAdminIcons colorize.png}>" alt="<{$smarty.const._FMCONTENT_ADD_MENU}>"/>
- <{$smarty.const._FMCONTENT_ADD_MENU}>
- </a>
+ <a class="ui-corner-all tooltip" href="content.php?op=new_content" title="<{$smarty.const._FMCONTENT_ADD_CONTENT}>"><img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._FMCONTENT_ADD_CONTENT}>"/><{$smarty.const._FMCONTENT_ADD_CONTENT}></a>
+ <a class="ui-corner-all tooltip" href="topic.php?op=new_topic" title="<{$smarty.const._FMCONTENT_ADD_TOPIC}>"><img src="<{xoAdminIcons attach.png}>" alt="<{$smarty.const._FMCONTENT_ADD_TOPIC}>"/><{$smarty.const._FMCONTENT_ADD_TOPIC}></a>
+ <a class="ui-corner-all tooltip" href="content.php?op=new_link" title="<{$smarty.const._FMCONTENT_ADD_MENU}>"><img src="<{xoAdminIcons colorize.png}>" alt="<{$smarty.const._FMCONTENT_ADD_MENU}>"/><{$smarty.const._FMCONTENT_ADD_MENU}></a>
</div>
</div>
</div>
\ No newline at end of file
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_level.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_level.html 2011-03-30 09:34:42 UTC (rev 6497)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_level.html 2011-03-30 09:48:44 UTC (rev 6498)
@@ -12,63 +12,35 @@
<{/if}>
</td>
<td class="txtcenter width10 bold">
- <img src="../images/icons/<{$data.content_type}>.png" alt=""/><{$data.content_type}>
+ <img src="../images/icons/<{$data.content_type}>.png" alt=""/><{$data.content_type}>
</td>
- <td class="txtcenter width10"><a href="<{$xoops_url}>/userinfo.php?uid=<{$data.content_uid}>">
- <img class="tooltip" src="../images/icons/user.png" alt="<{$data.owner}>" title="<{$data.owner}>"/> <{$data.owner}></a>
+ <td class="txtcenter width10">
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$data.content_uid}>"><img class="tooltip" src="../images/icons/user.png" alt="<{$data.owner}>" title="<{$data.owner}>"/> <{$data.owner}></a>
</td>
<td class="txtcenter width5">
- <img class="cursorpointer" id="status<{$data.content_id}>"
-
- src="<{if $data.content_status}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>" alt=""/>
+ <img class="cursorpointer" id="status<{$data.content_id}>" src="<{if $data.content_status}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>" alt=""/>
</td>
<td class="txtcenter width5">
<{if $data.content_type == 'content'}>
- <img class="cursorpointer xo-defaultimg" id="default<{$data.content_id}>"
-
- src="<{if $data.content_default}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>" alt=""/>
+ <img class="cursorpointer xo-defaultimg" id="default<{$data.content_id}>" src="<{if $data.content_default}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>" alt=""/>
<{/if}>
</td>
<td class="txtcenter width5">
- <img class="cursorpointer" id="display<{$data.content_id}>"
-
- src="<{if $data.content_display}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>" alt=""/>
+ <img class="cursorpointer" id="display<{$data.content_id}>" src="<{if $data.content_display}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>" alt=""/>
</td>
<td class="txtcenter xo-actions width15">
- <img class="tooltip"
- src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" />
+ <img class="tooltip" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" />
<{if $data.content_type == 'content'}>
- <a href="<{$data.url}>">
- <img class="tooltip" src="../images/icons/display.png" alt="<{$smarty.const._PREVIEW}>"
- title="<{$smarty.const._PREVIEW}>"/>
- </a>
+ <a href="<{$data.url}>"><img class="tooltip" src="../images/icons/display.png" alt="<{$smarty.const._PREVIEW}>" title="<{$smarty.const._PREVIEW}>"/></a>
<{if $data.content_topic != 0}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$data.content_topic}>">
- <img class="tooltip" src="../images/icons/section.png" alt="<{$smarty.const._FMCONTENT_CONTENT_TOPIC}>"
- title="<{$smarty.const._FMCONTENT_CONTENT_TOPIC}>"/>
- </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$data.content_topic}>"><img class="tooltip" src="../images/icons/section.png" alt="<{$smarty.const._FMCONTENT_CONTENT_TOPIC}>" title="<{$smarty.const._FMCONTENT_CONTENT_TOPIC}>"/></a>
<{/if}>
- <a href="content.php?op=edit_content&content_id=<{$data.content_id}>">
- <img class="tooltip" src="../images/icons/edit.png" alt="<{$smarty.const._EDIT}>"
- title="<{$smarty.const._EDIT}>"/>
- </a>
- <a href="content.php?op=delete&content_id=<{$data.content_id}>">
- <img class="tooltip" src="../images/icons/delete.png" alt="<{$smarty.const._DELETE}>"
- title="<{$smarty.const._DELETE}>"/>
- </a>
+ <a href="content.php?op=edit_content&content_id=<{$data.content_id}>"><img class="tooltip" src="../images/icons/edit.png" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>"/></a>
+ <a href="content.php?op=delete&content_id=<{$data.content_id}>"><img class="tooltip" src="../images/icons/delete.png" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>"/></a>
<{else}>
- <a href="<{$data.content_link}>">
- <img class="tooltip" src="../images/icons/display.png" alt="<{$smarty.const._PREVIEW}>"
- title="<{$smarty.const._PREVIEW}>"/>
- </a>
- <a href="content.php?op=edit_link&content_id=<{$data.content_id}>">
- <img class="tooltip" src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>"
- title="<{$smarty.const._EDIT}>"/>
- </a>
- <a href="content.php?op=delete&content_id=<{$data.content_id}>">
- <img class="tooltip" src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>"
- title="<{$smarty.const._DELETE}>"/>
- </a>
+ <a href="<{$data.content_link}>"><img class="tooltip" src="../images/icons/display.png" alt="<{$smarty.const._PREVIEW}>" title="<{$smarty.const._PREVIEW}>"/></a>
+ <a href="content.php?op=edit_link&content_id=<{$data.content_id}>"><img class="tooltip" src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>"/></a>
+ <a href="content.php?op=delete&content_id=<{$data.content_id}>"><img class="tooltip" src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>"/></a>
<{/if}>
</td>
</tr>
\ No newline at end of file
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_topic.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_topic.html 2011-03-30 09:34:42 UTC (rev 6497)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/admin/fmcontent_topic.html 2011-03-30 09:48:44 UTC (rev 6498)
@@ -41,31 +41,16 @@
<td class="txtcenter width5 bold"><{$topic.topic_perpage}></td>
<td class="txtcenter width5 bold"><{$topic.topic_columns}></td>
<td class="txtcenter width5 bold">
- <img class="cursorpointer" id="topic_asmenu<{$topic.topic_id}>"
-
- src="<{if $topic.topic_asmenu}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>"
- class="tooltip" alt=""/>
+ <img class="cursorpointer" id="topic_asmenu<{$topic.topic_id}>" src="<{if $topic.topic_asmenu}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>" class="tooltip" alt=""/>
</td>
<td class="txtcenter width5 bold">
- <img class="cursorpointer" id="topic_online<{$topic.topic_id}>"
-
- src="<{if $topic.topic_online}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>"
- class="tooltip" alt=""/>
+ <img class="cursorpointer" id="topic_online<{$topic.topic_id}>" src="<{if $topic.topic_online}>../images/icons/ok.png<{else}>../images/icons/cancel.png<{/if}>" class="tooltip" alt=""/>
</td>
<td class="txtcenter width10 xo-actions">
- <img class="tooltip"
- src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" />
- <a href="../index.php?topic=<{$topic.topic_id}>">
- <img class="tooltip" src="../images/icons/display.png" alt="<{$smarty.const._PREVIEW}>"
- title="<{$smarty.const._PREVIEW}>"/>
- </a>
- <a href="topic.php?op=edit_topic&topic_id=<{$topic.topic_id}>">
- <img class="tooltip" src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>"/>
- </a>
- <a href="topic.php?op=delete_topic&topic_id=<{$topic.topic_id}>">
- <img class="tooltip" src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>"
- title="<{$smarty.const._DELETE}>"/>
- </a>
+ <img class="tooltip" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" />
+ <a href="../index.php?topic=<{$topic.topic_id}>"><img class="tooltip" src="../images/icons/display.png" alt="<{$smarty.const._PREVIEW}>" title="<{$smarty.const._PREVIEW}>"/></a>
+ <a href="topic.php?op=edit_topic&topic_id=<{$topic.topic_id}>"><img class="tooltip" src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>"/></a>
+ <a href="topic.php?op=delete_topic&topic_id=<{$topic.topic_id}>"><img class="tooltip" src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>"/></a>
</td>
</tr>
<{/foreach}>
@@ -74,10 +59,9 @@
<{foreach item=topic from=$topics}>
<div id="dialog<{$topic.topic_id}>" title="<{$topic.topic_title}>" style='display:none;'>
- <div class="marg5 pad5 ui-state-default ui-corner-all"><{$smarty.const._FMCONTENT_TOPIC_NAME}> : <span class="bold"> <{if $topic.contentcount == 0}><{$topic.topic_title}><{else}><a href="content.php?topic=<{$topic.topic_id}>"><{$topic.topic_title}></a><{/if}>
- <span class="red">(<{$topic.contentcount}>)</span>
- <span class="green">(<{$topic.menutcount}>)</span>
- </span></div>
+ <div class="marg5 pad5 ui-state-default ui-corner-all">
+ <{$smarty.const._FMCONTENT_TOPIC_NAME}> : <span class="bold"> <{if $topic.contentcount == 0}><{$topic.topic_title}><{else}><a href="content.php?topic=<{$topic.topic_id}>"><{$topic.topic_title}></a><{/if}></span>
+ </div>
<div class="marg5 pad5 ui-state-highlight ui-corner-all">
<div class="pad5"><{$smarty.const._FMCONTENT_TOPIC_DESC}> : <span class="bold"><{$topic.topic_desc}></span></div>
<div class="pad5"><{$smarty.const._FMCONTENT_TOPIC_SHOWTYPE}> :<span class="bold">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-30 09:34:49
|
Revision: 6497
http://xoops.svn.sourceforge.net/xoops/?rev=6497&view=rev
Author: voltan1
Date: 2011-03-30 09:34:42 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
fix templates
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-30 09:04:52 UTC (rev 6496)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-30 09:34:42 UTC (rev 6497)
@@ -33,49 +33,30 @@
<{if $content.content_titleview}>
<!-- Display page content -->
<div class="itemHead">
- <div class="itemTitle"><h2><{if $link.topicshow}><a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>">x<{$link.topic}></a> :
- <{/if}><{$content.content_title}></h2>
+ <div class="itemTitle"><h2><{if $link.topicshow}><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>">x<{$link.topic}></a> :<{/if}><{$content.content_title}></h2></div>
</div>
- </div>
<{/if}>
- <div class="itemInfo">
- <{if $content.author}>
- <span class="itemPoster">
- <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.author}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )
- </span>
- <{/if}>
- <{if $link.date}>
- <span class="itemPostDate">
- <time pubdate="<{$content.content_create}>"><{$smarty.const._FMCONTENT_DATE}></time><{$content.content_create}> <{if $content.content_update != $content.content_create}><time
- pubdate="<{$content.content_update}>"><{$smarty.const._FMCONTENT_UPDATE}>
- </time><{$content.content_update}> <{/if}>
- </span>
- <{/if}>
- <{if $link.hits}>
- <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
- <{/if}>
- <{if $link.coms}>
- <span class="itemPermaLink">
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
- </span>
+ <div class="itemInfo">
+ <{if $content.author}>
+ <span class="itemPoster"><{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.author}></a> - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )</span>
<{/if}>
- </div>
+ <{if $link.date}>
+ <span class="itemPostDate"><time pubdate="<{$content.content_create}>"><{$smarty.const._FMCONTENT_DATE}></time><{$content.content_create}> <{if $content.content_update != $content.content_create}><time pubdate="<{$content.content_update}>"><{$smarty.const._FMCONTENT_UPDATE}></time><{$content.content_update}> <{/if}></span>
+ <{/if}>
+ <{if $link.hits}>
+ <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
+ <{/if}>
+ <{if $link.coms}>
+ <span class="itemPermaLink"><{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}></span>
+ <{/if}>
+ </div>
</header>
<article class="itemBody">
-
<div class="itemShort"><{$content.content_short}></div>
-
<{if $advertisement}>
<div class="itemAde"><{$advertisement}></div>
<{/if}>
-
<div class="itemText editable <{$multiple_columns}>" id="content_<{$content.content_id}>">
<{if $content.content_img}>
<aside class="sideimg">
@@ -96,57 +77,33 @@
<{$content.content_text}>
<div class="endline"></div>
</div>
-
</article>
<footer class="itemFoot">
<address>
<a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a>
</address>
- <span class="right">
- <{if $link.prev}>
- <a href="<{$link.prev}>" title="<{$smarty.const._FMCONTENT_PREV}> : <{$link.prev_title}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/prev.png"
- alt="<{$smarty.const._FMCONTENT_PREV}>"/>
- </a>
- <{/if}>
- <{if $link.next}>
- <a href="<{$link.next}>" title="<{$smarty.const._FMCONTENT_NEXT}> : <{$link.next_title}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/next.png"
- alt="<{$smarty.const._FMCONTENT_NEXT}>"/>
- </a>
- <{/if}>
- <{if $link.print}>
- <a href="<{$link.print}>" title="<{$smarty.const._FMCONTENT_PRINT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/printer.png"
- alt="<{$smarty.const._FMCONTENT_PRINT}>"/>
- </a>
- <{/if}>
- <{if $link.pdf}>
- <a href="<{$link.pdf}>" title="<{$smarty.const._FMCONTENT_PDF}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/pdf.png"
- alt="<{$smarty.const._FMCONTENT_PDF}>"/>
- </a>
- <{/if}>
- <{if $link.mail}>
- <a href="<{$link.mail}>" title="<{$smarty.const._FMCONTENT_MAIL}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/mail.png"
- alt="<{$smarty.const._FMCONTENT_MAIL}>"/>
- </a>
- <{/if}>
- <{if $xoops_isadmin}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
- <{/if}>
- </span>
+ <span class="itemIcons">
+ <{if $link.prev}>
+ <a href="<{$link.prev}>" title="<{$smarty.const._FMCONTENT_PREV}> : <{$link.prev_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/prev.png" alt="<{$smarty.const._FMCONTENT_PREV}>"/></a>
+ <{/if}>
+ <{if $link.next}>
+ <a href="<{$link.next}>" title="<{$smarty.const._FMCONTENT_NEXT}> : <{$link.next_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/next.png" alt="<{$smarty.const._FMCONTENT_NEXT}>"/></a>
+ <{/if}>
+ <{if $link.print}>
+ <a href="<{$link.print}>" title="<{$smarty.const._FMCONTENT_PRINT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/printer.png" alt="<{$smarty.const._FMCONTENT_PRINT}>"/></a>
+ <{/if}>
+ <{if $link.pdf}>
+ <a href="<{$link.pdf}>" title="<{$smarty.const._FMCONTENT_PDF}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/pdf.png" alt="<{$smarty.const._FMCONTENT_PDF}>"/></a>
+ <{/if}>
+ <{if $link.mail}>
+ <a href="<{$link.mail}>" title="<{$smarty.const._FMCONTENT_MAIL}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/mail.png" alt="<{$smarty.const._FMCONTENT_MAIL}>"/></a>
+ <{/if}>
+ <{if $xoops_isadmin}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
+ <{/if}>
+ </span>
</footer>
</section>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html 2011-03-30 09:04:52 UTC (rev 6496)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html 2011-03-30 09:34:42 UTC (rev 6497)
@@ -21,10 +21,7 @@
<{/if}>
<hgroup>
<h3><a href="<{$default.url}>"><{$default.content_title}></a></h3>
- <h4>
- <time pubdate="<{$default.content_create}>"><{$smarty.const._FMCONTENT_DATE}></time>
- <{$default.content_create}>
- </h4>
+ <h4><time pubdate="<{$default.content_create}>"><{$smarty.const._FMCONTENT_DATE}></time><{$default.content_create}></h4>
</hgroup>
<div class="itemText"><{$default.content_short}></div>
<div><a href="<{$default.url}>"><{$smarty.const._FMCONTENT_MORE}></a></div>
@@ -42,27 +39,18 @@
<header>
<div class="itemHead">
- <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> :
- <a href="<{$content.url}>"><{$content.content_title}></a></h2></div>
+ <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a></h2></div>
</div>
<div class="itemInfo">
<{if $info.author}>
- <span class="itemPoster">
- <{$smarty.const._FMCONTENT_AUTHOR}><a
- href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )
- </span>
+ <span class="itemPoster"><{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )</span>
<{/if}>
<{if $info.date}>
- <span class="itemPostDate">
- <time pubdate="<{$content.content_create}>"><{$smarty.const._FMCONTENT_DATE}></time><{$content.content_create}> <{if $content.content_update != $content.content_create}><time
- pubdate="<{$content.content_update}>"><{$smarty.const._FMCONTENT_UPDATE}>
- </time><{$content.content_update}> <{/if}>
- </span>
- <{/if}>
- <{if $info.hits}>
- <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
- <{/if}>
+ <span class="itemPostDate"><time pubdate="<{$content.content_create}>"><{$smarty.const._FMCONTENT_DATE}></time><{$content.content_create}> <{if $content.content_update != $content.content_create}><time pubdate="<{$content.content_update}>"><{$smarty.const._FMCONTENT_UPDATE}></time><{$content.content_update}> <{/if}></span>
+ <{/if}>
+ <{if $info.hits}>
+ <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
+ <{/if}>
</div>
</header>
@@ -90,26 +78,12 @@
<footer class="itemFoot">
<{if $xoops_isadmin}>
<span class="itemAdminLink">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
</span>
<{/if}>
<{if $info.coms}>
- <span class="itemPermaLink">
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
- </span>
+ <span class="itemPermaLink"><{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}></span>
<{/if}>
</footer>
@@ -158,23 +132,14 @@
<header>
<div class="itemHead">
- <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
- href="<{$content.url}>"><{$content.content_title}></a></h2></div>
+ <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a></h2></div>
</div>
<div class="itemInfo">
<{if $info.author}>
- <span class="itemPoster">
- <{$smarty.const._FMCONTENT_AUTHOR}><a
- href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )
- </span>
+ <span class="itemPoster"><{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )</span>
<{/if}>
<{if $info.date}>
- <span class="itemPostDate">
- <time pubdate="<{$content.content_create}>"><{$smarty.const._FMCONTENT_DATE}></time><{$content.content_create}> <{if $content.content_update != $content.content_create}><time
- pubdate="<{$content.content_update}>"><{$smarty.const._FMCONTENT_UPDATE}>
- </time><{$content.content_update}> <{/if}>
- </span>
+ <span class="itemPostDate"><time pubdate="<{$content.content_create}>"><{$smarty.const._FMCONTENT_DATE}></time><{$content.content_create}> <{if $content.content_update != $content.content_create}><time pubdate="<{$content.content_update}>"><{$smarty.const._FMCONTENT_UPDATE}></time><{$content.content_update}> <{/if}></span>
<{/if}>
<{if $info.hits}>
<span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
@@ -185,26 +150,12 @@
<footer class="itemFoot">
<{if $xoops_isadmin}>
<span class="itemAdminLink">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
</span>
<{/if}>
<{if $info.coms}>
- <span class="itemPermaLink">
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
- </span>
+ <span class="itemPermaLink"><{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}></span>
<{/if}>
</footer>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-30 09:04:52 UTC (rev 6496)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-30 09:34:42 UTC (rev 6497)
@@ -28,39 +28,25 @@
<{else}>
<div class="item">
+ <{if $content.content_titleview}>
+ <!-- Display page content -->
<div class="itemHead">
- <{if $content.content_titleview}>
- <!-- Display page content -->
- <div class="itemTitle"><h2><{if $link.topicshow}><a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>"><{$link.topic}></a> :
- <{/if}><{$content.content_title}></h2>
- </div>
- <{/if}>
+ <div class="itemTitle"><h2><{if $link.topicshow}><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>">x<{$link.topic}></a> :<{/if}><{$content.content_title}></h2></div>
</div>
+ <{/if}>
<div class="itemInfo">
- <{if $content.author}>
- <span class="itemPoster">
- <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.author}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )
- </span>
- <{/if}>
- <{if $link.date}>
- <span class="itemPostDate">
- <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
- </span>
- <{/if}>
- <{if $link.hits}>
- <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
- <{/if}>
- <{if $link.coms}>
- <span class="itemPermaLink">
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
- </span>
- <{/if}>
+ <{if $content.author}>
+ <span class="itemPoster"><{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.author}></a> - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )</span>
+ <{/if}>
+ <{if $link.date}>
+ <span class="itemPostDate"><{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}><{/if}></span>
+ <{/if}>
+ <{if $link.hits}>
+ <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
+ <{/if}>
+ <{if $link.coms}>
+ <span class="itemPermaLink"><{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}></span>
+ <{/if}>
</div>
<div class="itemBody">
@@ -84,54 +70,30 @@
<div class="endline"></div>
</div>
</div>
+
<div class="itemFoot">
- <span class="itemAuthor"><a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a></span>
- <span class="itemIcons">
- <{if $link.prev}>
- <a href="<{$link.prev}>" title="<{$smarty.const._FMCONTENT_PREV}> : <{$link.prev_title}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/prev.png"
- alt="<{$smarty.const._FMCONTENT_PREV}>"/>
- </a>
- <{/if}>
- <{if $link.next}>
- <a href="<{$link.next}>" title="<{$smarty.const._FMCONTENT_NEXT}> : <{$link.next_title}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/next.png"
- alt="<{$smarty.const._FMCONTENT_NEXT}>"/>
- </a>
- <{/if}>
- <{if $link.print}>
- <a href="<{$link.print}>"
- title="<{$smarty.const._FMCONTENT_PRINT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/printer.png"
- alt="<{$smarty.const._FMCONTENT_PRINT}>"/>
- </a>
- <{/if}>
- <{if $link.pdf}>
- <a href="<{$link.pdf}>"
- title="<{$smarty.const._FMCONTENT_PDF}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/pdf.png"
- alt="<{$smarty.const._FMCONTENT_PDF}>"/>
- </a>
- <{/if}>
- <{if $link.mail}>
- <a href="<{$link.mail}>" title="<{$smarty.const._FMCONTENT_MAIL}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/mail.png"
- alt="<{$smarty.const._FMCONTENT_MAIL}>"/>
- </a>
- <{/if}>
- <{if $xoops_isadmin}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
- <{/if}>
- </span>
+ <span class="itemAuthor"><a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a></span>
+ <span class="itemIcons">
+ <{if $link.prev}>
+ <a href="<{$link.prev}>" title="<{$smarty.const._FMCONTENT_PREV}> : <{$link.prev_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/prev.png" alt="<{$smarty.const._FMCONTENT_PREV}>"/></a>
+ <{/if}>
+ <{if $link.next}>
+ <a href="<{$link.next}>" title="<{$smarty.const._FMCONTENT_NEXT}> : <{$link.next_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/next.png" alt="<{$smarty.const._FMCONTENT_NEXT}>"/></a>
+ <{/if}>
+ <{if $link.print}>
+ <a href="<{$link.print}>" title="<{$smarty.const._FMCONTENT_PRINT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/printer.png" alt="<{$smarty.const._FMCONTENT_PRINT}>"/></a>
+ <{/if}>
+ <{if $link.pdf}>
+ <a href="<{$link.pdf}>" title="<{$smarty.const._FMCONTENT_PDF}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/pdf.png" alt="<{$smarty.const._FMCONTENT_PDF}>"/></a>
+ <{/if}>
+ <{if $link.mail}>
+ <a href="<{$link.mail}>" title="<{$smarty.const._FMCONTENT_MAIL}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/mail.png" alt="<{$smarty.const._FMCONTENT_MAIL}>"/></a>
+ <{/if}>
+ <{if $xoops_isadmin}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
+ <{/if}>
+ </span>
</div>
</div>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html 2011-03-30 09:04:52 UTC (rev 6496)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html 2011-03-30 09:34:42 UTC (rev 6497)
@@ -32,8 +32,7 @@
<{foreach item=content from=$contents}>
<div class="item">
<div class="itemHead">
- <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
- href="<{$content.url}>"><{$content.content_title}></a></h2></div>
+ <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a></h2></div>
</div>
<div class="itemInfo">
<{if $info.author}>
@@ -70,26 +69,12 @@
<div class="itemFoot">
<{if $xoops_isadmin}>
<span class="itemAdminLink">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
</span>
<{/if}>
<{if $info.coms}>
- <span class="itemPermaLink">
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
- </span>
+ <span class="itemPermaLink"><{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}></span>
<{/if}>
</div>
</div>
@@ -131,21 +116,14 @@
<div class="itemText"><{$content.content_short}></div>
</div>
<div class="itemHead">
- <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
- href="<{$content.url}>"><{$content.content_title}></a></h2></div>
+ <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a></h2></div>
</div>
<div class="itemInfo">
<{if $info.author}>
- <span class="itemPoster">
- <{$smarty.const._FMCONTENT_AUTHOR}><a
- href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
- </span>
+ <span class="itemPoster"><{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )</span>
<{/if}>
<{if $info.date}>
- <span class="itemPostDate">
- <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
- </span>
+ <span class="itemPostDate"><{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}></span>
<{/if}>
<{if $info.hits}>
<span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
@@ -155,26 +133,12 @@
<div class="itemFoot">
<{if $xoops_isadmin}>
<span class="itemAdminLink">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
</span>
<{/if}>
<{if $info.coms}>
- <span class="itemPermaLink">
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
- </span>
+ <span class="itemPermaLink"><{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}></span>
<{/if}>
</div>
</div>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-30 09:04:52 UTC (rev 6496)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-30 09:34:42 UTC (rev 6497)
@@ -32,9 +32,7 @@
<{if $content.content_titleview}>
<!-- Display page content -->
- <div class="pad5 marg5 ui-widget-header ui-corner-all"><h2><{if $link.topicshow}><a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>"><{$link.topic}></a> : <{/if}><{$content.content_title}></h2>
- </div>
+ <div class="pad5 marg5 ui-widget-header ui-corner-all"><h2><{if $link.topicshow}><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>"><{$link.topic}></a> : <{/if}><{$content.content_title}></h2></div>
<{/if}>
<div class="pad5 marg5 ui-widget-content ui-corner-all">
@@ -62,72 +60,43 @@
</div>
<div class="pad5 marg5 ui-state-default ui-corner-all">
- <div class="left">
- <{if $content.author}>
- <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.author}></a>
- - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )
- <{/if}>
- <{if $link.date}>
- <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update !=
- $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
- <{/if}>
- <{if $link.hits}>
- <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
- <{/if}>
- <{if $link.coms}>
- <span class="itemPermaLink">
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
- </span>
+ <div class="left">
+ <{if $content.author}>
+ <span class="itemPoster"><{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.author}></a> - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}> </a> )</span>
<{/if}>
- </div>
+ <{if $link.date}>
+ <span class="itemPostDate"><{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}><{/if}></span>
+ <{/if}>
+ <{if $link.hits}>
+ <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
+ <{/if}>
+ <{if $link.coms}>
+ <span class="itemPermaLink"><{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}></span>
+ <{/if}>
+ </div>
<div class="right">
- <span><a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a></span>
- <{if $link.prev}>
- <a href="<{$link.prev}>" title="<{$smarty.const._FMCONTENT_PREV}> : <{$link.prev_title}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/prev.png"
- alt="<{$smarty.const._FMCONTENT_PREV}>"/>
- </a>
- <{/if}>
- <{if $link.next}>
- <a href="<{$link.next}>" title="<{$smarty.const._FMCONTENT_NEXT}> : <{$link.next_title}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/next.png"
- alt="<{$smarty.const._FMCONTENT_NEXT}>"/>
- </a>
- <{/if}>
- <{if $link.print}>
- <a href="<{$link.print}>" title="<{$smarty.const._FMCONTENT_PRINT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/printer.png"
- alt="<{$smarty.const._FMCONTENT_PRINT}>"/>
- </a>
- <{/if}>
- <{if $link.pdf}>
- <a href="<{$link.pdf}>" title="<{$smarty.const._FMCONTENT_PDF}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/pdf.png"
- alt="<{$smarty.const._FMCONTENT_PDF}>"/>
- </a>
- <{/if}>
- <{if $link.mail}>
- <a href="<{$link.mail}>" title="<{$smarty.const._FMCONTENT_MAIL}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/mail.png"
- alt="<{$smarty.const._FMCONTENT_MAIL}>"/>
- </a>
- <{/if}>
- <{if $xoops_isadmin}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
- <{/if}>
+ <span class="itemAuthor"><a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a></span>
+ <span class="itemIcons">
+ <{if $link.prev}>
+ <a href="<{$link.prev}>" title="<{$smarty.const._FMCONTENT_PREV}> : <{$link.prev_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/prev.png" alt="<{$smarty.const._FMCONTENT_PREV}>"/></a>
+ <{/if}>
+ <{if $link.next}>
+ <a href="<{$link.next}>" title="<{$smarty.const._FMCONTENT_NEXT}> : <{$link.next_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/next.png" alt="<{$smarty.const._FMCONTENT_NEXT}>"/></a>
+ <{/if}>
+ <{if $link.print}>
+ <a href="<{$link.print}>" title="<{$smarty.const._FMCONTENT_PRINT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/printer.png" alt="<{$smarty.const._FMCONTENT_PRINT}>"/></a>
+ <{/if}>
+ <{if $link.pdf}>
+ <a href="<{$link.pdf}>" title="<{$smarty.const._FMCONTENT_PDF}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/pdf.png" alt="<{$smarty.const._FMCONTENT_PDF}>"/></a>
+ <{/if}>
+ <{if $link.mail}>
+ <a href="<{$link.mail}>" title="<{$smarty.const._FMCONTENT_MAIL}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/mail.png" alt="<{$smarty.const._FMCONTENT_MAIL}>"/></a>
+ <{/if}>
+ <{if $xoops_isadmin}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
+ <{/if}>
+ </span>
</div>
</div>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html 2011-03-30 09:04:52 UTC (rev 6496)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html 2011-03-30 09:34:42 UTC (rev 6497)
@@ -63,27 +63,14 @@
<{/if}>
<{if $info.hits}>
( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )
- <{/if}>
- <{if $info.coms}>
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
+ <{if $info.coms}>
+ <{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}>
<{/if}>
</span>
<{if $xoops_isadmin}>
<span class="itemAdminLink left">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
</span>
<{/if}>
</div>
@@ -132,8 +119,7 @@
<div class="pad5 marg5 ui-state-default ui-corner-all">
<span class="itemPermaLink right">
<{if $info.author}>
- <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
+ <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
<{/if}>
<{if $info.date}>
<{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
@@ -141,26 +127,14 @@
<{if $info.hits}>
( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )
<{/if}>
- <{if $info.coms}>
- <{if $content.content_comments}>
- <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
- <{else}>
- <{$smarty.const._FMCONTENT_NOCOMS}>
- <{/if}>
+ <{if $info.coms}>
+ <{if $content.content_comments}><{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}><{else}><{$smarty.const._FMCONTENT_NOCOMS}><{/if}>
<{/if}>
</span>
<{if $xoops_isadmin}>
<span class="itemAdminLink left">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_EDIT}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png" alt="<{$smarty.const._CONTENT_EDIT}>"/></a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>" title="<{$smarty.const._FMCONTENT_DELETE}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png" alt="<{$smarty.const._CONTENT_DELETE}>"/></a>
</span>
<{/if}>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-30 09:04:58
|
Revision: 6496
http://xoops.svn.sourceforge.net/xoops/?rev=6496&view=rev
Author: voltan1
Date: 2011-03-30 09:04:52 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Fix page meta
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html 2011-03-30 09:01:48 UTC (rev 6495)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html 2011-03-30 09:04:52 UTC (rev 6496)
@@ -7,13 +7,13 @@
<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>"/>
<meta name="keywords" content="<{$meta_keywords}>" />
<meta name="description" content="<{$meta_description}>" />
- <meta name="author" content="Unknown" />
+ <meta name="author" content="<{$meta_author}>" />
<meta name="copyright" content="<{$meta_copyright}>"/>
- <meta name="generator" content="Bluefish 2.0.3" />
+ <meta name="generator" content="XOOPS" />
<link rel="shortcut icon" type="image/ico" href="<{$xoops_url}>/favicon.ico"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css"/>
- <link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/modules/<{$module}>/css/style.css"/>
+ <link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/modules/<{$module}>/css/style.css"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/modules/<{$module}>/css/print.css"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$localstyle}>"/></link>
@@ -32,18 +32,18 @@
</span>
<{/if}>
<{if $print_short && $content.short}><div class="itemText spacer txtjustify"><{$content.short}></div><{/if}>
- <{if $print_text && $content.text}><div class="itemText spacer txtjustify"><{$content.text}></div><{/if}>
+ <{if $print_text && $content.text}><div class="itemText spacer txtjustify"><{$content.text}></div><{/if}>
<div class="endline"></div>
</div>
- <{if $print_author || $print_date}>
+ <{if $print_author || $print_date}>
<div class="itemInfo spacer">
- <{if $print_author}><span class="itemText"><{$smarty.const._FMCONTENT_AUTHOR}><{$content.author}></span><{/if}>
+ <{if $print_author}><span class="itemText"><{$smarty.const._FMCONTENT_AUTHOR}><{$content.author}></span><{/if}>
<{if $print_date}><span class="itemText"><{$smarty.const._FMCONTENT_DATE}><{$content.date}></span><{/if}>
- </div>
- <{/if}>
- <{if $print_link}>
- <div class="itemLink spacer"><{$content.link}></div>
+ </div>
<{/if}>
+ <{if $print_link}>
+ <div class="itemLink spacer"><{$content.link}></div>
+ <{/if}>
</div>
</div>
</div>
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-30 09:01:48 UTC (rev 6495)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-30 09:04:52 UTC (rev 6496)
@@ -90,7 +90,7 @@
// Index Variable
$xoopsTpl->assign('xoops_sitename', $xoopsConfig['sitename']);
$xoopsTpl->assign('xoops_pagetitle', $page['title']);
-$xoopsTpl->assign('meta_author', 'MusS');
+$xoopsTpl->assign('meta_author', XoopsUser::getUnameFromId($obj->getVar('content_uid')));
$xoopsTpl->assign('meta_copyright', $xoopsConfig['sitename']);
$xoopsTpl->assign('meta_keywords', $obj->getVar('content_words'));
$xoopsTpl->assign('meta_description', $obj->getVar('content_desc'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-30 09:01:55
|
Revision: 6495
http://xoops.svn.sourceforge.net/xoops/?rev=6495&view=rev
Author: voltan1
Date: 2011-03-30 09:01:48 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
improve print page and add some options for setting
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/modinfo.php
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php
Added Paths:
-----------
XoopsModules/content/branches/fmcontent/modules/fmcontent/css/print.css
Added: XoopsModules/content/branches/fmcontent/modules/fmcontent/css/print.css
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/css/print.css (rev 0)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/css/print.css 2011-03-30 09:01:48 UTC (rev 6495)
@@ -0,0 +1,151 @@
+body {
+ background-color: #fff;
+}
+
+#xo-print {
+ width: 640px;
+ border: 1px solid #575757;
+ padding: 1px;
+ margin: 1px
+}
+#xo-print-content {
+ margin: 1px;
+ padding: 1px;
+}
+.item {
+ margin: 1px;
+ padding: 1px;
+}
+.itemTitle {
+ font-size: 1.3em;
+ font-weight: bold;
+ font-variant: small-caps;
+ background-color: transparent;
+ text-align: left;
+}
+.itemBody {
+ font-size: 1em;
+ background-color: transparent;
+}
+.itemText {
+ font-size: 1em;
+ background-color: transparent;
+}
+.itemLink {
+ font-size: 1em;
+ background-color: transparent;
+ text-align: center;
+}
+.itemInfo {
+ text-align: right;
+ padding: 3px;
+ background-color: transparent;
+ font-size: 0.9em;
+}
+.itemImg {
+ text-align: center;
+ outline: none;
+ font-weight: bold;
+}
+li {
+ list-style: none;
+}
+html, body {
+ margin: 0;
+ padding: 0;
+ font-size: 9pt;
+ font-family: "Lucida Grande", Verdana, sans-serif;
+ background-color: #fff;
+ color: #000;
+ width: 95%;
+}
+a {
+ text-decoration: none;
+ color: #575757;
+ font-weight: bold;
+}
+
+/* display none */
+#xo-noprint { display: none;}
+#xo-canvas-leftcolumn { display: none;}
+#xo-canvas-rightcolumn { display: none;}
+#xo-language, #xo-userbar, xo-searchbar { display: none;}
+#xo-top { display: none}
+body.theme-dialog #xo-banner {display: none;}
+/*#xo-banner, */#xo-banner-ad { display: none;}
+#xo-globalnav { display: none;}
+#xo-uptop {display: none;}
+#xo-breadcrumb {display: none;}
+#xo-footer .validw3c {display: none;}
+#xo-footer span.design {display:none;}
+#xo-footer .rss {display:none;}
+#xo-logger-output {display:none;}
+#system-select_notifications {display:none;}
+.itemFoot { display: none;}
+#xo-smiley { display: none;}
+#user_sigSmiley { display: none;}
+#user_sigStyletext { display: none;}
+select#user_sigFont, select#user_sigColor, select#user_sigFont, select#user_sigSize { display: none;}
+span#xoopsHiddenText { display: none;}
+hr { display: none;}
+form [name=notification_select] { display: none;}
+input[type=submit], input[type=reset], input[type=button] {display:none;}
+/*select { display: none;}*/
+/*textarea { display: none;}*/
+
+/* display for print */
+h1, h2, h3, h4, h5, h6 { text-decoration: none;}
+h1 { font-size: 1.2em; font-weight: bold;}
+h2 { font-size: 1.1em;}
+h3,h4,h5,h6 {font-size: 1em;}
+h1,h2,h3,h4,h5,h6 { page-break-after : avoid !important;}
+img { border: 0;}
+
+abbr, acronym { border: 0;}
+abbr[title]:after,acronym[title]:after{ content: " (" attr(title) ")"; font-style: italic;}
+blockquote,q { font-style: italic; quotes: "\00AB\00A0" "\00A0\00BB" "\0022" "\0022";}
+pre, code, table { page-break-inside : avoid !important;}
+pre { border: 1px dotted; padding: 12pt;}
+table th {
+ font-size: 1.4em;
+ font-weight: bold;
+ padding-bottom: 1em;
+}
+/* formulaire */
+form, input, select { font-size: .9em;}
+input[type=text] {
+ border-width: 0 0 1px 0 !important;
+ border-style: dotted;
+ border-color: #666;
+}
+input[type=checkbox] {
+ margin: 0;
+ border: none;
+}
+select {
+ font-size: .8em;
+ border-width: 0 0 1px 0 !important;
+ border-style: dotted;
+ border-color: #666;
+}
+textarea {
+ border: 1px dotted #666 !important;
+ height: auto;
+ overflow: hidden;
+ font-size: .9em;
+ font-style: italic;
+}
+
+/* for newbb/cbb */
+td.foot {
+ display: none;
+}
+form#quick_reply {
+ display: none;
+}
+form[name=forum_jumpbox] {
+ display: none;
+}
+select#topicoption, select#viewmode {
+ display: none;
+}
\ No newline at end of file
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/modinfo.php
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/modinfo.php 2011-03-30 06:46:34 UTC (rev 6494)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/modinfo.php 2011-03-30 09:01:48 UTC (rev 6495)
@@ -187,7 +187,31 @@
define('_FMCONTENT_RSS_PERPAGE', 'RSS number');
define('_FMCONTENT_RSS_PERPAGE_DESC', 'Select number of new items in RSS page');
define('_FMCONTENT_RSS_LOGO', 'Rss logo');
- define('_FMCONTENT_RSS_LOGO_DESC', 'Site logo for RSS pages');
+ define('_FMCONTENT_RSS_LOGO_DESC', 'Site logo for RSS pages');
+// Print
+ define('_FMCONTENT_PRINT_LOGO', 'Show site title');
+ define('_FMCONTENT_PRINT_LOGO_DESC', 'Shows-hides site title in print page');
+ define('_FMCONTENT_PRINT_LOGOFLOAT', 'Print logo float');
+ define('_FMCONTENT_PRINT_LOGOFLOAT_DESC', 'Select left or right or center position for show print logo');
+ define('_FMCONTENT_PRINT_LEFT', 'Left');
+ define('_FMCONTENT_PRINT_RIGHT', 'Right');
+ define('_FMCONTENT_PRINT_CENTER', 'Center');
+ define('_FMCONTENT_PRINT_LOGOURL', 'Print logo URL');
+ define('_FMCONTENT_PRINT_LOGOURL_DESC', 'Print logo for print page');
+ define('_FMCONTENT_PRINT_TITLE', 'Display Title ?');
+ define('_FMCONTENT_PRINT_TITLE_DESC', '');
+ define('_FMCONTENT_PRINT_IMG', 'Display Image ?');
+ define('_FMCONTENT_PRINT_IMG_DESC', '');
+ define('_FMCONTENT_PRINT_SHORT', 'Display short text ?');
+ define('_FMCONTENT_PRINT_SHORT_DESC', '');
+ define('_FMCONTENT_PRINT_TEXT', 'Display main text ?');
+ define('_FMCONTENT_PRINT_TEXT_DESC', '');
+ define('_FMCONTENT_PRINT_DATE', 'Display date ?');
+ define('_FMCONTENT_PRINT_DATE_DESC', '');
+ define('_FMCONTENT_PRINT_AUTHOR', 'Display author ?');
+ define('_FMCONTENT_PRINT_AUTHOR_DESC', '');
+ define('_FMCONTENT_PRINT_LINK', 'Display page link ?');
+ define('_FMCONTENT_PRINT_LINK_DESC', '');
//img
define('_FMCONTENT_IMAGE_DIR', 'Image upload path');
define('_FMCONTENT_IMAGE_DIR_DESC', 'Upload path for images content');
@@ -223,7 +247,8 @@
define('_FMCONTENT_BREAK_DISPLAY', 'Display');
define('_FMCONTENT_BREAK_RSS', 'RSS');
define('_FMCONTENT_BREAK_IMAGE', 'Image');
- define('_FMCONTENT_BREAK_ADMIN', 'Admin');
+ define('_FMCONTENT_BREAK_ADMIN', 'Admin');
+ define('_FMCONTENT_BREAK_PRINT', 'Print');
define('_FMCONTENT_BREAK_COMNOTI', 'Comments and notifications');
// about
define('_FMCONTENT_ADMIN_ABOUT', 'About');
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html 2011-03-30 06:46:34 UTC (rev 6494)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html 2011-03-30 09:01:48 UTC (rev 6495)
@@ -5,14 +5,15 @@
<title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>"/>
- <meta name="keywords" content="<{$recipe_meta_keywords}>"/>
- <meta name="description" content="<{$recipe_meta_description}>"/>
- <meta name="author" content="<{$content.author}>" />
- <meta name="copyright" content="<{$recipe_meta_copyright}>"/>
- <meta name="generator" content="XOOPS" />
+ <meta name="keywords" content="<{$meta_keywords}>" />
+ <meta name="description" content="<{$meta_description}>" />
+ <meta name="author" content="Unknown" />
+ <meta name="copyright" content="<{$meta_copyright}>"/>
+ <meta name="generator" content="Bluefish 2.0.3" />
<link rel="shortcut icon" type="image/ico" href="<{$xoops_url}>/favicon.ico"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css"/>
+ <link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/modules/<{$module}>/css/style.css"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/modules/<{$module}>/css/print.css"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$localstyle}>"/></link>
@@ -21,21 +22,28 @@
<body >
<div id="xo-print">
<div id="xo-print-content">
- <div class="txtcenter spacer"><img src="<{$xoops_url}>/images/logo.png" alt=""/></div>
+ <{if $print_logo}><div class="<{$print_logofloat}> spacer"><img src="<{$print_logourl}>" alt="" /></div><{/if}>
<div class="item spacer">
- <div class="itemTitle spacer"><{$content.title}></div>
- <div class="itemBody spacer">
- <{if $content.imgurl}>
+ <{if $print_title}><div class="itemTitle spacer"><{$content.title}></div><{/if}>
+ <div class="itemBody spacer <{$print_columns}>">
+ <{if $print_img && $content.imgurl}>
<span class="itemImg">
<img width="<{$imgwidth}>" class="<{$imgfloat}> content_img" src="<{$content.imgurl}>" alt="<{$content.title}>"/>
</span>
<{/if}>
- <div class="itemText spacer txtjustify"><{$content.short}></div>
- <div class="itemText spacer txtjustify"><{$content.text}></div>
+ <{if $print_short && $content.short}><div class="itemText spacer txtjustify"><{$content.short}></div><{/if}>
+ <{if $print_text && $content.text}><div class="itemText spacer txtjustify"><{$content.text}></div><{/if}>
+ <div class="endline"></div>
</div>
+ <{if $print_author || $print_date}>
<div class="itemInfo spacer">
- <div class="itemText"><{$smarty.const._FMCONTENT_AUTHOR}><{$content.author}></div>
- </div>
+ <{if $print_author}><span class="itemText"><{$smarty.const._FMCONTENT_AUTHOR}><{$content.author}></span><{/if}>
+ <{if $print_date}><span class="itemText"><{$smarty.const._FMCONTENT_DATE}><{$content.date}></span><{/if}>
+ </div>
+ <{/if}>
+ <{if $print_link}>
+ <div class="itemLink spacer"><{$content.link}></div>
+ <{/if}>
</div>
</div>
</div>
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-30 06:46:34 UTC (rev 6494)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-30 09:01:48 UTC (rev 6495)
@@ -14,7 +14,8 @@
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Andricq Nicolas (AKA MusS)
+ * @author Andricq Nicolas (AKA MusS)
+ * @author Hossein Azizabadi (AKA Voltan)
* @version $Id:$
*/
@@ -42,7 +43,7 @@
}
$page = array();
-
+$page = $obj->toArray();
$content_topic = $obj->getVar('content_topic');
if (isset($content_topic) && $content_topic > 0) {
@@ -74,10 +75,12 @@
$page['title'] = $obj->getVar('content_title');
$page['alias'] = $obj->getVar('content_alias');
-$page['short'] = $obj->getVar('content_short', 's');
-$page['text'] = $obj->getVar('content_text', 's');
+$page['short'] = $obj->getVar('content_short');
+$page['text'] = $obj->getVar('content_text');
$page['imgurl'] = XOOPS_URL . xoops_getModuleOption('img_dir', $forMods->getVar('dirname')) . $obj->getVar('content_img', 's');
$page['author'] = XoopsUser::getUnameFromId($obj->getVar('content_uid'));
+$page['date'] = formatTimestamp($obj->getVar('content_create'), _MEDIUMDATESTRING);
+$page['link'] = fmcontent_Url($forMods->getVar('dirname'), $page);
$xoopsTpl->assign('content', $page);
$xoopsTpl->assign('module', $forMods->getVar('dirname'));
@@ -89,6 +92,8 @@
$xoopsTpl->assign('xoops_pagetitle', $page['title']);
$xoopsTpl->assign('meta_author', 'MusS');
$xoopsTpl->assign('meta_copyright', $xoopsConfig['sitename']);
+$xoopsTpl->assign('meta_keywords', $obj->getVar('content_words'));
+$xoopsTpl->assign('meta_description', $obj->getVar('content_desc'));
// Set xoops page title
$xoopsTpl->assign('xoops_pagetitle', $page['title'] . ' - ' . $forMods->getVar('name', 's'));
@@ -100,6 +105,19 @@
$xoopsTpl->assign('localstyle', XOOPS_URL . '/language/english/style.css' );
}
+// Print page config
+$xoopsTpl->assign('print_logo', xoops_getModuleOption('print_logo', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_logofloat', xoops_getModuleOption('print_logofloat', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_logourl', XOOPS_URL . xoops_getModuleOption('print_logourl', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_img', xoops_getModuleOption('print_img', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_short', xoops_getModuleOption('print_short', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_text', xoops_getModuleOption('print_text', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_date', xoops_getModuleOption('print_date', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_author', xoops_getModuleOption('print_author', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_link', xoops_getModuleOption('print_link', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_title', xoops_getModuleOption('print_title', $forMods->getVar('dirname')));
+$xoopsTpl->assign('print_columns', xoops_getModuleOption('print_columns', $forMods->getVar('dirname')));
+
// Display print page
echo $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getInfo('dirname') . '/templates/fmcontent_print.html');
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php 2011-03-30 06:46:34 UTC (rev 6494)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php 2011-03-30 09:01:48 UTC (rev 6495)
@@ -494,8 +494,106 @@
'formtype' => 'yesno',
'valuetype' => 'int',
'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'break',
+ 'title' => '_FMCONTENT_BREAK_PRINT',
+ 'description' => '',
+ 'formtype' => 'line_break',
+ 'valuetype' => 'textbox',
+ 'default' => 'head');
+
+$modversion['config'][] = array(
+ 'name' => 'print_logo',
+ 'title' => '_FMCONTENT_PRINT_LOGO',
+ 'description' => '_FMCONTENT_PRINT_LOGO_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'print_logofloat',
+ 'title' => '_FMCONTENT_PRINT_LOGOFLOAT',
+ 'description' => '_FMCONTENT_PRINT_LOGOFLOAT_DESC',
+ 'formtype' => 'select',
+ 'valuetype' => 'text',
+ 'options' => array(_FMCONTENT_PRINT_LEFT => 'txtleft', _FMCONTENT_PRINT_RIGHT => 'txtright', _FMCONTENT_PRINT_CENTER => 'txtcenter'),
+ 'default' => 'txtcenter');
$modversion['config'][] = array(
+ 'name' => 'print_logourl',
+ 'title' => '_FMCONTENT_PRINT_LOGOURL',
+ 'description' => '_FMCONTENT_PRINT_LOGOURL_DESC',
+ 'formtype' => 'textbox',
+ 'valuetype' => 'text',
+ 'default' => '/images/logo.png');
+
+$modversion['config'][] = array(
+ 'name' => 'print_title',
+ 'title' => '_FMCONTENT_PRINT_TITLE',
+ 'description' => '_FMCONTENT_PRINT_TITLE_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'print_img',
+ 'title' => '_FMCONTENT_PRINT_IMG',
+ 'description' => '_FMCONTENT_PRINT_IMG_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'print_short',
+ 'title' => '_FMCONTENT_PRINT_SHORT',
+ 'description' => '_FMCONTENT_PRINT_SHORT_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'print_text',
+ 'title' => '_FMCONTENT_PRINT_TEXT',
+ 'description' => '_FMCONTENT_PRINT_TEXT_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'print_date',
+ 'title' => '_FMCONTENT_PRINT_DATE',
+ 'description' => '_FMCONTENT_PRINT_DATE_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'print_author',
+ 'title' => '_FMCONTENT_PRINT_AUTHOR',
+ 'description' => '_FMCONTENT_PRINT_AUTHOR_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'print_link',
+ 'title' => '_FMCONTENT_PRINT_LINK',
+ 'description' => '_FMCONTENT_PRINT_LINK_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
+ 'name' => 'print_columns',
+ 'title' => '_FMCONTENT_MULTIPLE_COLUMNS',
+ 'description' => '_FMCONTENT_MULTIPLE_COLUMNS_DESC',
+ 'formtype' => 'select',
+ 'valuetype' => 'text',
+ 'options' => array(_FMCONTENT_MULTIPLE_COLUMNS_1 => 'onecolumn', _FMCONTENT_MULTIPLE_COLUMNS_2 => 'twocolumn', _FMCONTENT_MULTIPLE_COLUMNS_3 => 'threecolumn', _FMCONTENT_MULTIPLE_COLUMNS_4 => 'forcolumn'),
+ 'default' => 'onecolumn');
+
+$modversion['config'][] = array(
'name' => 'break',
'title' => '_FMCONTENT_BREAK_ADMIN',
'description' => '',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-30 06:46:42
|
Revision: 6494
http://xoops.svn.sourceforge.net/xoops/?rev=6494&view=rev
Author: voltan1
Date: 2011-03-30 06:46:34 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Improve print page ( part 1 )
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_bookmarkme.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_bookmarkme.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_bookmarkme.html 2011-03-30 06:08:49 UTC (rev 6493)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_bookmarkme.html 2011-03-30 06:46:34 UTC (rev 6494)
@@ -6,11 +6,12 @@
<li>
<div id="twitter">
<script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
- <a href="http://twitter.com/share/<{$link.url}>" rel="nofollow" class="twitter-share-button">Tweet</a></div>
+ <a href="http://twitter.com/share/<{$link.url}>" rel="nofollow" class="twitter-share-button">Tweet</a>
+ </div>
</li>
<li>
- <div id="buzz"><a title="Post to Google Buzz" class="google-buzz-button"
- href="http://www.google.com/buzz/post" data-button-style="small-count" rel="nofollow"></a>
+ <div id="buzz">
+ <a title="Post to Google Buzz" class="google-buzz-button" href="http://www.google.com/buzz/post" data-button-style="small-count" rel="nofollow"></a>
<script type="text/javascript" src="http://www.google.com/buzz/api/button.js"></script>
</div>
</li>
@@ -29,96 +30,28 @@
<div id="bookmarkmetitle"><{$smarty.const._FMCONTENT_BOOKMARK_ME}></div>
<div id="bookmarkmeitems">
<ul>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_BLINKLIST}>"
- href="http://www.blinklist.com/index.php?Action=Blink/addblink.php&Description=&Url=<{$link.url}>&Title=<{$content.content_title}>"
- title=""><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/blinklist.gif"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_DELICIOUS}>"
- href="http://del.icio.us/post?url=<{$link.url}>&title=<{$content.content_title}>" title=""><img
- border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/delicious.gif"/></a></li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_DIGG}>"
- href="http://digg.com/submit?phase=2&url=<{$link.url}>" title=""><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/diggman.gif"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_FARK}>"
- href="http://cgi.fark.com/cgi/fark/edit.pl?new_url=<{$link.url}>&new_comment=<{$content.content_title}>&new_link_other=<{$content.content_title}>&linktype=Misc"
- title=""><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/fark.gif"/></a></li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_FURL}>"
- href="http://www.furl.net/storeIt.jsp?t=<{$content.content_title}>&u=<{$link.url}>" title=""><img
- border="0" alt="" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/furl.gif"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_NEWSVINE}>"
- href="http://www.nwvine.com/_tools/seed&save?u=<{$link.url}>&h=<{$content.content_title}>"
- title=""><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/newsvine.gif"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_REDDIT}>"
- href="http://reddit.com/submit?url=<{$link.url}>&title=<{$content.content_title}>" title=""><img
- border="0" alt="" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/reddit.gif"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_SIMPY}>"
- href="http://www.simpy.com/simpy/LinkAdd.do?href=<{$link.url}>&title=<{$content.content_title}>"
- title=""><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/simpy.png"/></a></li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_SPURL}>"
- href="http://www.spurl.net/spurl.php?title=<{$content.content_title}>&url=<{$link.url}>"
- title=""><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/spurl.gif"/></a></li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_YAHOO}>"
- href="http://myweb2.search.yahoo.com/myresults/bookmarklet?t=<{$content.content_title}>&u=<{$link.url}>"
- title=""><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/yahoomyweb.gif"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_BALATARIN}>"
- href="http://balatarin.com/links/submit?phase=2&url=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/balatarin.png"></a>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_FACEBOOK}>"
- href="http://www.facebook.com/share.php?u=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/facebook_share_icon.gif"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_TWITTER}>"
- href="http://twitter.com/home?status=Browsing:%20<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/twitter_share_icon.gif"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_SCRIPSTYLE}>"
- href="http://scriptandstyle.com/submit?url=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/scriptandstyle.png"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_STUMBLE}>"
- href="http://www.stumbleupon.com/submit?url=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/stumbleupon.png"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_TECHNORATI}>"
- href="http://technorati.com/faves?add=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/technorati.png"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_MIXX}>"
- href="http://www.mixx.com/submit?page_url=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/mixx.png"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_MYSPACE}>"
- href="http://www.myspace.com/Modules/PostTo/Pages/?u=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/myspace.jpg"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_DESIGNFLOAT}>"
- href="http://www.designfloat.com/submit.php?url=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/designfloat.png"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_GOOLGEBUZZ}>"
- href="http://www.google.com/buzz/post?url=<{$link.url}>"><img border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/google_buzz_icon.png"/></a>
- </li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_GOOLGEREADER}>"
- href="http://www.google.com/reader/link?url=<{$link.url}>&title=<{$content.content_title}>"><img
- border="0" alt=""
- src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/google-reader-icon.png"/></a></li>
- <li><a target="_blank" rel="nofollow" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_GOOLGEBOOKMARKS}>"
- href="https://www.google.com/bookmarks/mark?op=add&bkmk=<{$link.url}>&title=<{$content.content_title}>"><img
- border="0" alt="" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/google-icon.png"/></a>
- </li>
+ <li id="bookmarkme-blinklist"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_BLINKLIST}>" href="http://www.blinklist.com/index.php?Action=Blink/addblink.php&Description=&Url=<{$link.url}>&Title=<{$content.content_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/blinklist.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-icio"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_DELICIOUS}>" href="http://del.icio.us/post?url=<{$link.url}>&title=<{$content.content_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/delicious.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-digg"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_DIGG}>" href="http://digg.com/submit?phase=2&url=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/diggman.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-fark"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_FARK}>" href="http://cgi.fark.com/cgi/fark/edit.pl?new_url=<{$link.url}>&new_comment=<{$content.content_title}>&new_link_other=<{$content.content_title}>&linktype=Misc"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/fark.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-furl"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_FURL}>" href="http://www.furl.net/storeIt.jsp?t=<{$content.content_title}>&u=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/furl.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-nwvine"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_NEWSVINE}>" href="http://www.nwvine.com/_tools/seed&save?u=<{$link.url}>&h=<{$content.content_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/newsvine.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-reddit"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_REDDIT}>" href="http://reddit.com/submit?url=<{$link.url}>&title=<{$content.content_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/reddit.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-simpy"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_SIMPY}>" href="http://www.simpy.com/simpy/LinkAdd.do?href=<{$link.url}>&title=<{$content.content_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/simpy.png" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-spurl"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_SPURL}>" href="http://www.spurl.net/spurl.php?title=<{$content.content_title}>&url=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/spurl.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-yahoo"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_YAHOO}>" href="http://myweb2.search.yahoo.com/myresults/bookmarklet?t=<{$content.content_title}>&u=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/yahoomyweb.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-balatarin"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_BALATARIN}>" href="http://balatarin.com/links/submit?phase=2&url=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/balatarin.png"></a></li>
+ <li id="bookmarkme-facebook"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_FACEBOOK}>" href="http://www.facebook.com/share.php?u=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/facebook_share_icon.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-twitter"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_TWITTER}>" href="http://twitter.com/home?status=Browsing:%20<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/twitter_share_icon.gif" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-scriptandstyle"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_SCRIPSTYLE}>" href="http://scriptandstyle.com/submit?url=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/scriptandstyle.png" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-stumbleupon"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_STUMBLE}>" href="http://www.stumbleupon.com/submit?url=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/stumbleupon.png" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-technorati"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_TECHNORATI}>" href="http://technorati.com/faves?add=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/technorati.png" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-mixx"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_MIXX}>" href="http://www.mixx.com/submit?page_url=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/mixx.png" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-myspace"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_MYSPACE}>" href="http://www.myspace.com/Modules/PostTo/Pages/?u=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/myspace.jpg" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-designfloat"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_DESIGNFLOAT}>" href="http://www.designfloat.com/submit.php?url=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/designfloat.png" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-google-buzz"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_GOOLGEBUZZ}>" href="http://www.google.com/buzz/post?url=<{$link.url}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/google_buzz_icon.png" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-google-reader"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_GOOLGEREADER}>" href="http://www.google.com/reader/link?url=<{$link.url}>&title=<{$content.content_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/google-reader-icon.png" alt="<{$content.content_title}>" /></a></li>
+ <li id="bookmarkme-google-bookmarks"><a target="_blank" rel="nofollow external" title="<{$smarty.const._FMCONTENT_BOOKMARK_TO_GOOLGEBOOKMARKS}>" href="https://www.google.com/bookmarks/mark?op=add&bkmk=<{$link.url}>&title=<{$content.content_title}>"><img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/bookmarks/google-icon.png" alt="<{$content.content_title}>" /></a></li>
</ul>
</div>
</div>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-30 06:08:49 UTC (rev 6493)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-30 06:46:34 UTC (rev 6494)
@@ -94,8 +94,9 @@
</aside>
<{/if}>
<{$content.content_text}>
+ <div class="endline"></div>
</div>
-
+
</article>
<footer class="itemFoot">
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-30 06:08:49 UTC (rev 6493)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-30 06:46:34 UTC (rev 6494)
@@ -81,10 +81,11 @@
</span>
<{/if}>
<{$content.content_text}>
+ <div class="endline"></div>
</div>
</div>
<div class="itemFoot">
- <span class="itemAuthor"><a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a></span>
+ <span class="itemAuthor"><a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a></span>
<span class="itemIcons">
<{if $link.prev}>
<a href="<{$link.prev}>" title="<{$smarty.const._FMCONTENT_PREV}> : <{$link.prev_title}>">
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html 2011-03-30 06:08:49 UTC (rev 6493)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_print.html 2011-03-30 06:46:34 UTC (rev 6494)
@@ -3,24 +3,34 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
<head>
<title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
+
<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>"/>
<meta name="keywords" content="<{$recipe_meta_keywords}>"/>
<meta name="description" content="<{$recipe_meta_description}>"/>
- <meta name="author" content="Unknown" />
+ <meta name="author" content="<{$content.author}>" />
<meta name="copyright" content="<{$recipe_meta_copyright}>"/>
- <meta name="generator" content="Bluefish 2.0.2" />
+ <meta name="generator" content="XOOPS" />
+
<link rel="shortcut icon" type="image/ico" href="<{$xoops_url}>/favicon.ico"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css"/>
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/modules/<{$module}>/css/print.css"/>
+ <link rel="stylesheet" type="text/css" media="all" href="<{$localstyle}>"/></link>
+
</head>
<!-- -->
<body >
<div id="xo-print">
<div id="xo-print-content">
- <div class="txtcenter spacer"><img src="<{$xoops_url}>/images/logo.gif" alt=""/></div>
+ <div class="txtcenter spacer"><img src="<{$xoops_url}>/images/logo.png" alt=""/></div>
<div class="item spacer">
<div class="itemTitle spacer"><{$content.title}></div>
<div class="itemBody spacer">
+ <{if $content.imgurl}>
+ <span class="itemImg">
+ <img width="<{$imgwidth}>" class="<{$imgfloat}> content_img" src="<{$content.imgurl}>" alt="<{$content.title}>"/>
+ </span>
+ <{/if}>
+ <div class="itemText spacer txtjustify"><{$content.short}></div>
<div class="itemText spacer txtjustify"><{$content.text}></div>
</div>
<div class="itemInfo spacer">
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-30 06:08:49 UTC (rev 6493)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-30 06:46:34 UTC (rev 6494)
@@ -56,7 +56,8 @@
<{/if}>
</span>
<{/if}>
- <span class=""><{$content.content_text}></span>
+ <{$content.content_text}>
+ <div class="endline"></div>
</div>
</div>
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-30 06:08:49 UTC (rev 6493)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/print.php 2011-03-30 06:46:34 UTC (rev 6494)
@@ -26,7 +26,10 @@
$xoopsTpl = new XoopsTpl();
// Initialize content handler
$content_handler = xoops_getmodulehandler('page', 'fmcontent');
-$obj = $content_handler->get($content_id);
+$topic_handler = xoops_getmodulehandler('topic', 'fmcontent');
+
+$obj = $content_handler->get($content_id);
+
// Get user right
$group = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
$groups = explode(" ", $obj->getVar('content_groups'));
@@ -36,22 +39,67 @@
}
if ($group[0] == XOOPS_GROUP_ADMIN) {
$xoopsTpl->assign('admin', 1);
-}
-$page = array();
+}
+
+$page = array();
+
+$content_topic = $obj->getVar('content_topic');
+
+if (isset($content_topic) && $content_topic > 0) {
+
+ $view_topic = $topic_handler->get($content_topic);
+
+ if (!isset($view_topic)) {
+ redirect_header('index.php', 3, _FMCONTENT_TOPIC_ERROR);
+ exit();
+ }
+
+ if ($view_topic->getVar('topic_modid') != $forMods->getVar('mid')) {
+ redirect_header('index.php', 3, _FMCONTENT_TOPIC_ERROR);
+ exit();
+ }
+
+ if ($view_topic->getVar('topic_online') == '0') {
+ redirect_header('index.php', 3, _FMCONTENT_TOPIC_ERROR);
+ exit();
+ }
+
+ // Check the access permission
+ $perm_handler = fmcontentPermHandler::getHandler();
+ if (!$perm_handler->isAllowed($xoopsUser, 'fmcontent_access', $view_topic->getVar('topic_id'), $forMods)) {
+ redirect_header("index.php", 3, _NOPERM);
+ exit;
+ }
+}
+
$page['title'] = $obj->getVar('content_title');
$page['alias'] = $obj->getVar('content_alias');
-$page['text'] = $obj->getVar('content_text', 's');
+$page['short'] = $obj->getVar('content_short', 's');
+$page['text'] = $obj->getVar('content_text', 's');
+$page['imgurl'] = XOOPS_URL . xoops_getModuleOption('img_dir', $forMods->getVar('dirname')) . $obj->getVar('content_img', 's');
$page['author'] = XoopsUser::getUnameFromId($obj->getVar('content_uid'));
$xoopsTpl->assign('content', $page);
-$xoopsTpl->assign('module', $forMods->getVar('dirname'));
+$xoopsTpl->assign('module', $forMods->getVar('dirname'));
+$xoopsTpl->assign('imgwidth', xoops_getModuleOption('imgwidth', $forMods->getVar('dirname')));
+$xoopsTpl->assign('imgfloat', xoops_getModuleOption('imgfloat', $forMods->getVar('dirname')));
+
// Index Variable
$xoopsTpl->assign('xoops_sitename', $xoopsConfig['sitename']);
$xoopsTpl->assign('xoops_pagetitle', $page['title']);
$xoopsTpl->assign('meta_author', 'MusS');
-$xoopsTpl->assign('meta_copyright', $xoopsConfig['sitename']);
+$xoopsTpl->assign('meta_copyright', $xoopsConfig['sitename']);
+
// Set xoops page title
-$xoopsTpl->assign('xoops_pagetitle', $page['title'] . ' - ' . $forMods->getVar('name', 's'));
+$xoopsTpl->assign('xoops_pagetitle', $page['title'] . ' - ' . $forMods->getVar('name', 's'));
+
+// Set local style
+if ( file_exists( XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/style.css' ) ) {
+ $xoopsTpl->assign('localstyle', XOOPS_URL . '/language/' .$GLOBALS['xoopsConfig']['language'] . '/style.css' );
+} else {
+ $xoopsTpl->assign('localstyle', XOOPS_URL . '/language/english/style.css' );
+}
+
// Display print page
echo $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getInfo('dirname') . '/templates/fmcontent_print.html');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-30 06:08:59
|
Revision: 6493
http://xoops.svn.sourceforge.net/xoops/?rev=6493&view=rev
Author: voltan1
Date: 2011-03-30 06:08:49 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Add persian language of xpeyment
Added Paths:
-----------
XoopsLanguages/persian/modules/xpayment/
XoopsLanguages/persian/modules/xpayment/trunk/
XoopsLanguages/persian/modules/xpayment/trunk/language/
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/admin.php
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/index.html
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_collect.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_damaged.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_express.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_fraud.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_none.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_notice.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_pending.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_purchased.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_refunded.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_settled.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_undelieved.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_created.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_collect.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_damaged.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_express.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_fraud.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_none.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_notice.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_pending.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_purchased.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_refunded.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_settled.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_undelieved.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_notice.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_other.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_payment.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_pending.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_refund.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_notice.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_other.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_payment.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_pending.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_refund.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_notice.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_other.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_payment.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_pending.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_refund.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_collect.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_damaged.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_express.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_fraud.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_none.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_notice.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_pending.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_purchased.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_refunded.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_settled.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_unpaid_undelieved.tpl
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/main.php
XoopsLanguages/persian/modules/xpayment/trunk/language/persian/modinfo.php
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/admin.php
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/admin.php (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/admin.php 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,303 @@
+<?php
+/**
+ * Invoice Transaction Gateway with Modular Plugin set
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright Chronolabs Co-Op http://www.chronolabs.coop/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package xpayment
+ * @since 1.30.0
+ * @author Simon Roberts <si...@ch...>
+ * @author Erol Konik <ap...@ap...>
+ */
+
+ // Messages
+ define("_XPY_MSG_GATEWAY_INSTALL", "دروازه موفقیت نصب شد!");
+ define("_XPY_MSG_GATEWAY_UPDATED", "دروازه موفقیت به روز رسانی!");
+ define("_XPY_MSG_OPTIONS_SAVED", "تنظیمات با موفقیت ذخیره شد دروازه!");
+ define("_XPY_MSG_TESTMODES_SAVED", "دروازه با موفقیت ذخیره شد Testmode!");
+ define("_XPY_MSG_INVOICE_PAID", "Paided فاکتور موفقیت تمام شد!");
+ define("_XPY_MSG_INVOICE_CANCELLED", "لغو فاکتور موفقیت تمام شد!");
+ define("_XPY_MSG_CONFIRM_CANCEL", "آیا شما مطمئن هستید که میخواهید برای لغو این فاکتور؟");
+ define("_XPY_MSG_RULE_SAVED", "قانون گروه را نجات داد!");
+ define("_XPY_MSG_CONFIRM_DELETE", "آیا شما مطمئن هستید که میخواهید حذف این حکومت کرد؟");
+ define("_XPY_MSG_RULE_DELETED", "قانون حذف شده است!");
+
+ // Invoices Languages
+ define("_XPY_AM_DONATION", "اهداء");
+ define("_XPY_AM_CANCEL", "انصراف فاکتور");
+ define("_XPY_AM_VIEW", "نمایش فاکتور");
+ define("_XPY_AM_TRANSACTIONS", "معاملات فاکتور");
+ define("_XPY_AM_ACTIONS_TH", "اقدامات");
+ define("_XPY_AM_PAYMENT", "علامت گذاری پرداخت");
+ define("_XPY_AM_INVOICELIST_H1", "فهرست مالیات فاکتور");
+ define("_XPY_AM_INVOICELIST_P", "این لیست از فاکتورها در ایجاد سیستم ، شما می توانید صورتحساب پرداخت نشده ، لغو مشاهده فاکتور و تراکنش های مالی در صورت حساب.");
+ define("_XPY_AM_TH_MODE", "وضعیت");
+ define("_XPY_AM_TH_INVOICENUMBER", "شماره فاکتور");
+ define("_XPY_AM_TH_DRAWFOR", "کشیده شده برای");
+ define("_XPY_AM_TH_DRAWTO", "کشیده شده به");
+ define("_XPY_AM_TH_DRAWTO_EMAIL", "کشیده شده به");
+ define("_XPY_AM_TH_AMOUNT", "مقدار");
+ define("_XPY_AM_TH_GRAND", "مجموع بزرگ");
+ define("_XPY_AM_TH_SHIPPING", "کشتیرانی");
+ define("_XPY_AM_TH_HANDLING", "اداره");
+ define("_XPY_AM_TH_WEIGHT", "وزن");
+ define("_XPY_AM_TH_WEIGHT_UNIT", "وزن واحد");
+ define("_XPY_AM_TH_TAX", "مالیات");
+ define("_XPY_AM_TH_CURRENCY", "پول");
+ define("_XPY_AM_TH_ITEMS", "اقلام");
+ define("_XPY_AM_TH_TRANSACTIONID", "معامله شناسه");
+ define("_XPY_AM_TH_CREATED", "ساخته");
+ define("_XPY_AM_TH_UPDATED", "بههنگام شده در");
+ define("_XPY_AM_TH_ACTIONED", "ساخته");
+ define("_XPY_AM_TH_PLUGIN", "پلاگین");
+ define("_XPY_AM_TH_UID", "کاربر");
+ define("_XPY_AM_TH_LIMIT", "محدود");
+ define("_XPY_AM_TH_MINIMUM", "حداقل مبلغ");
+ define("_XPY_AM_TH_MAXIMUM", "حداکثر مبلغ");
+ define("_XPY_AM_TH_REMITTION", "Remittion");
+ define('_XPY_MSG_INVOICE_PAID', 'Invoice Marked Paid!');
+ define("_XPY_AM_PAID", "مبلغ پرداخت شده");
+ define("_XPY_AM_ADDRULE", "اضافه کردن / ویرایش قاعده گروه");
+ define("_XPY_AM_GROUP_FCT", "انتخاب گروه");
+ define("_XPY_AM_EDITGROUP", "ویرایش قانون");
+ define("_XPY_AM_DUE", "فاکتور با توجه");
+ define("_XPY_AM_COLLECT", "فاکتور جمع آوری در");
+ define("_XPY_AM_WAIT", "فاکتور صبر کنید");
+ define("_XPY_AM_OFFLINE", "فاکتور آفلاین");
+ define("_XPY_AM_REOCCURRENCE_H2", "Reoccurrence فاکتور");
+ define("_XPY_AM_REOCCURRENCE_P", "این جزئیات در reoccurrence از فاکتور است.");
+ define("_XPY_AM_REOCCURRENCE", "تعداد Reoccurrences");
+ define("_XPY_AM_REOCCURRENCES", "تعداد تکرار");
+ define("_XPY_AM_PERIOD", "Reoccurrence رخ می دهد هر فاکتور");
+ define("_XPY_AM_DAYS", "روز");
+ define("_XPY_AM_PREVIOUS", "وقوع قبل");
+ define("_XPY_AM_OCCURRENCE", "وقوع بعدی");
+ define("_XPY_AM_OCCURRENCE_PAID_TH", "پرداخت");
+ define("_XPY_AM_OCCURRENCE_LEFT_TH", "چپ");
+ define("_XPY_AM_OCCURRENCE_TOTAL_TH", "تعداد");
+ define("_XPY_AM_OCCURRENCE_GRAND", "بزرگ تعداد");
+ define("_XPY_AM_OCCURRENCE_AMOUNT", "مقدار");
+ define("_XPY_AM_OCCURRENCE_SHIPPING", "کشتیرانی");
+ define("_XPY_AM_OCCURRENCE_HANDLING", "اداره");
+ define("_XPY_AM_OCCURRENCE_TAX", "مالیات");
+ define("_XPY_AM_REOCCURRENCE_ONGOING", "فاکتور های در حال اجرا");
+ define("_XPY_AM_MAKEPAYMENT_MANUAL", "کتابچه راهنمای پرداخت بانک");
+ define("_XPY_AM_MAKEPAYMENT_ONLINE", "پرداخت آنلاین از طریق مسنجر");
+ define("_XPY_AM_SETTLE_H2", "علامت گذاری برای حل و فصل");
+ define("_XPY_AM_SETTLE_P", "اگر فاکتور تحت مقررات و یا مجموعه شما می توانید آن را برای حل و فصل است که دیگر ارزش تر از مقدار ارزش آن را علامت.");
+ define("_XPY_AM_REMITTION", "نحوه Remittion");
+ define("_XPY_AM_REMITTED", "Remittion تاریخ");
+
+ //Groups
+ define("_XPY_AM_GROUP_BROKERS", "کارگزاران");
+ define("_XPY_AM_GROUP_ACCOUNTS", "حسابداران");
+ define("_XPY_AM_GROUP_OFFICERS", "افسران مجموعه");
+
+ //Transactions Language
+ define("_XPY_AM_EMAIL", "پست الکترونیکی کسب و کار");
+ define("_XPY_AM_INVOICE", "کد فاکتور");
+ define("_XPY_AM_CUSTOM", "سفارشی کلیدی");
+ define("_XPY_AM_STATUS", "وضعیت");
+ define("_XPY_AM_DATE", "تاریخ");
+ define("_XPY_AM_GROSS", "درشت");
+ define("_XPY_AM_FEE", "شهریه");
+ define("_XPY_AM_SETTLE", "توافق");
+ define("_XPY_AM_EXCHANGERATE", "نرخ ارز");
+ define("_XPY_AM_FIRSTNAME", "Firstname");
+ define("_XPY_AM_LASTNAME", "نام خانوادگی");
+ define("_XPY_AM_STREET", "خیابان");
+ define("_XPY_AM_CITY", "شهرستان");
+ define("_XPY_AM_STATE", "دولت");
+ define("_XPY_AM_POSTCODE", "کد پستی");
+ define("_XPY_AM_COUNTRY", "کشور");
+ define("_XPY_AM_ADDRESSSTATUS", "وضعیت آدرس");
+ define("_XPY_AM_PAYEREMAIL", "پست الکترونیکی پرداخت کننده");
+ define("_XPY_AM_PAYERSTATUS", "وضعیت پرداخت کننده");
+ define("_XPY_AM_GATEWAY", "دروازه");
+ define("_XPY_AM_PLUGIN", "پلاگین");
+ define("_XPY_AM_TRANSACTION_H1", "معامله");
+ define("_XPY_AM_TRANSACTION_P", "این معامله به شما می خواستم برای مشاهده شده است.");
+
+ define("_XPY_AM_VIEWTRANSACTION", "مشاهده تراکنش");
+ define("_XPY_AM_VIEWINVOICE", "نمایش فاکتور");
+ define("_XPY_AM_TRANSACTIONSLIST_H1", "لیست معاملات");
+ define("_XPY_AM_TRANSACTIONSLIST_P", "این لیستی از عناوین تولید شده معامله بر روی سیستم ، شما می توانید صورتحساب پرداخت نشده ، لغو نمایش معامله در فاکتور.");
+ define("_XPY_AM_TH_INVOICE", "فاکتور شناسه");
+ define("_XPY_AM_TH_EMAIL", "پست الکترونیکی کسب و کار");
+ define("_XPY_AM_TH_STATUS", "وضعیت");
+ define("_XPY_AM_TH_DATE", "تاریخ");
+ define("_XPY_AM_TH_GROSS", "درشت");
+ define("_XPY_AM_TH_FEE", "شهریه");
+ define("_XPY_AM_TH_SETTLE", "حل و فصل");
+ define("_XPY_AM_TH_EXCHANGERATE", "نرخ ارز");
+ define("_XPY_AM_TH_FIRSTNAME", "نام اول");
+ define("_XPY_AM_TH_LASTNAME", "نام خانوادگی");
+ define("_XPY_AM_TH_STREET", "خیابان");
+ define("_XPY_AM_TH_CITY", "شهرستان");
+ define("_XPY_AM_TH_STATE", "دولت");
+ define("_XPY_AM_TH_POSTCODE", "کد پستی");
+ define("_XPY_AM_TH_COUNTRY", "کشور");
+ define("_XPY_AM_TH_ADDRESS_STATUS", "وضعیت آدرس");
+ define("_XPY_AM_TH_PAYER_EMAIL", "ایمیل پرداخت کننده");
+ define("_XPY_AM_TH_PAYER_STATUS", "وضعیت پرداخت کننده");
+ define("_XPY_AM_TH_GATEWAY", "دروازه");
+ define('_XPY_AM_TH_PLUGIN', 'Plugin');
+
+ //Invoice Language
+ define("_XPY_AM_INVOICE_H1", "مالیات فاکتور");
+ define("_XPY_AM_INVOICE_P", "این فاکتور فعلی شما است ، به پرداخت مراجعه کنید گزینه های زیر کلیک کنید.");
+ define("_XPY_AM_INVOICENUMBER", "شماره فاکتور");
+ define("_XPY_AM_DRAWNFOR", "کشیده شده برای");
+ define("_XPY_AM_DRAWNTO", "کشیده شده به");
+ define("_XPY_AM_AMOUNT", "مقدار");
+ define("_XPY_AM_CREATED", "ساخته");
+ define("_XPY_AM_MODE", "وضعیت");
+ define("_XPY_AM_ITEMS", "در مورد فاکتور");
+ define("_XPY_AM_ACTIONED", "Actioned");
+ define("_XPY_AM_ITEMS_H2", "مورد بودن صورتحساب");
+ define("_XPY_AM_ITEMS_P", "این اقلام که صورتحساب.");
+ define("_XPY_AM_CAT_TH", "گربه. شماره");
+ define("_XPY_AM_NAME_TH", "شرح");
+ define("_XPY_AM_QUANTITY_TH", "مقدار");
+ define("_XPY_AM_UNITAMOUUNT_TH", "مبلغ واحد");
+ define("_XPY_AM_TOTALAMOUUNT_TH", "مبلغ");
+ define("_XPY_AM_GRANDTOTAL_TD", "بزرگ تعداد");
+ define("_XPY_AM_MAKEPAYMENT_H2", "را پرداخت");
+ define("_XPY_AM_MAKEPAYMENT_P", "در زیر این گزینه برای ساخت پرداخت شده است.");
+ define("_XPY_AM_TOTALSHIPPING", "تعداد حمل و نقل");
+ define("_XPY_AM_TOTALHANDLING", "تعداد جابجایی");
+ define("_XPY_AM_TOTALTAX", "مجموع مالیات");
+ define("_XPY_AM_TOTALWEIGHT", "وزن کل");
+ define("_XPY_AM_TAX_TH", "مالیات بر ارزش گذاری");
+ define("_XPY_AM_SHIPPING_TH", "کشتیرانی");
+ define("_XPY_AM_HANDLING_TH", "اداره");
+ define("_XPY_AM_TOTALWEIGHT_TH", "وزن کل");
+ define("_XPY_AM_UNITWEIGHT_TH", "واحد وزن");
+ define("_XPY_AM_GRANDAMOUUNT_TH", "مجموع بزرگ");
+ define('_XPY_AM_TOTALAMOUUNT_TH', 'Total Amount');
+ define("_XPY_AM_TOTALSHIPPING_TH", "تعداد حمل و نقل");
+ define("_XPY_AM_TOTALHANDLING_TH", "تعداد جابجایی");
+ define("_XPY_AM_TOTALTAX_TH", "مجموع مالیات");
+ define("_XPY_AM_BREAKDOWN_H2", "تفکیک فاکتور در اتهامات");
+ define("_XPY_AM_BREAKDOWN_P", "این فاکتور شکستن در حمل و نقل ، دست زدن به ، مالیات و بالغ.");
+ define("_XPY_AM_BREAKDOWN_PB", "این فاکتور ادامه به شکسته شدن در بالغ است.");
+ define("_XPY_AM_BREAKDOWN_H2B", "تفکیک بالغ بر اتهامات");
+ define("_XPY_AM_GRANDAMOUNT", "کل مقدار بزرگ");
+ define("_XPY_AM_RULEEDIT_H1", "ویرایش قانون گروه");
+ define("_XPY_AM_RULEEDIT_P", "شما می توانید از اینجا رد گروه را ویرایش کنید.");
+ define("_XPY_AM_GROUPS_H1", "قوانین گروه");
+ define("_XPY_AM_GROUPS_P", "شما می توانید جستجو و ویرایش حاکمیت گروه از این لیست.");
+
+ //Gateway Language
+ define("_XPY_AM_TH_AUTHOR", "نویسنده");
+ define("_XPY_AM_TH_NAME", "نام پلاگین");
+ define("_XPY_AM_TH_DESCRIPTION", "شرح");
+ define("_XPY_AM_TH_TESTMODE", "Testmode");
+ define("_XPY_AM_INSTALLEDGATEWAYS_H1", "دروازه ها نصب شده");
+ define("_XPY_AM_INSTALLEDGATEWAYS_P", "این همه دروازه نصب شده است");
+ define("_XPY_AM_UNINSTALLEDGATEWAYS_H1", "دروازه آفلاین");
+ define("_XPY_AM_UNINSTALLEDGATEWAYS_P", "این یک لیست از دروازه لغو نصب است!");
+ define("_XPY_AM_OPTIONSGATEWAY_H1", "انتخاب دروازه");
+ define("_XPY_AM_OPTIONSGATEWAY_P", "این گزینه برای دروازه است!");
+ define("_XPY_AM_EDITOPTIONS", "گزینه های ویرایش");
+ define("_XPY_AM_UPDATEGATEWAY", "دروازه بروز");
+ define("_XPY_AM_INSTALLGATEWAY", "نصب دروازه");
+
+ //Enumerator Value/ID Enscapulation (Do Not Change)
+ define('_XPY_ENUM_MODE_PAID', 1);
+ define('_XPY_ENUM_MODE_CANCEL', 2);
+ define('_XPY_ENUM_MODE_UNPAID', 3);
+ define('_XPY_ENUM_REMITTION_NONE', 10);
+ define('_XPY_ENUM_REMITTION_PENDING', 15);
+ define('_XPY_ENUM_REMITTION_NOTICE', 20);
+ define('_XPY_ENUM_REMITTION_COLLECT', 25);
+ define('_XPY_ENUM_REMITTION_FRAUD', 30);
+ define('_XPY_ENUM_REMITTION_SETTLED', 35);
+ define('_XPY_ENUM_ITEMMODE_PURCHASED', 40);
+ define('_XPY_ENUM_ITEMMODE_REFUNDED', 45);
+ define('_XPY_ENUM_ITEMMODE_UNDELIEVED', 50);
+ define('_XPY_ENUM_ITEMMODE_DAMAGED', 55);
+ define('_XPY_ENUM_ITEMMODE_PENDING', 60);
+ define('_XPY_ENUM_ITEMMODE_EXPRESS', 65);
+ define('_XPY_ENUM_TRANSACTION_PAYMENT', 70);
+ define('_XPY_ENUM_TRANSACTION_REFUND', 75);
+ define('_XPY_ENUM_TRANSACTION_PENDING', 80);
+ define('_XPY_ENUM_TRANSACTION_NOTICE', 85);
+ define('_XPY_ENUM_TRANSACTION_OTHER', 90);
+
+ //permissions
+ define("_XPY_AM_PERM_FCT", "نوع مجوز");
+ define("_XPY_AM_PERM_EMAIL", "ایمیل انتقال");
+ define("_XPY_AM_PERM_GATEWAYS", "دسترسی به دروازه");
+
+ define("_XPY_AM_PERM_TITLE_EMAIL", "ایمیل های که ارسال خواهد شد و چه کسی به!");
+ define("_XPY_AM_PERM_NAME_EMAIL", "ایمیل");
+ define("_XPY_AM_PERM_DESC_EMAIL", "از اینجا شما می توانید مجموعه ای که ایمیل ها و ایمیل زیر به چه گروه ها و افراد بفرستید!");
+ define("_XPY_AM_PERM_TITLE_GATEWAY", "دروازه ها که در دسترس هستند!");
+ define("_XPY_AM_PERM_NAME_GATEWAY", "دروازه");
+ define("_XPY_AM_PERM_DESC_GATEWAY", "از اینجا شما می توانید مجموعه ای که دروازه یک کاربر متعلق به یک گروه می تواند امکان دسترسی و انتخاب کنید!");
+
+ define("_XPY_AM_MODE_DESC_PAID", "پرداخت فاکتور");
+ define("_XPY_AM_MODE_DESC_UNPAID", "فاکتور پرداخت نشده");
+ define("_XPY_AM_MODE_DESC_CANCEL", "لغو فاکتور");
+
+ define("_XPY_AM_MODE_DESC_PAID_NONE", "بدون Remittence (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_NONE", "بدون Remittence (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_NONE", "بدون Remittence (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_PENDING", "Remittence انتظار (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_PENDING", "Remittence انتظار (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_PENDING", "Remittence انتظار (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_NOTICE", "Remittence سر رسیده (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_NOTICE", "Remittence سر رسیده (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_NOTICE", "Remittence سر رسیده (انصراف فاکتور)");
+ define("_XPY_AM_MODE_DESC_PAID_COLLECT", "Remittence جمع آوری (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_COLLECT", "Remittence جمع آوری (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_COLLECT", "Remittence جمع آوری (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_FRAUD", "Remittence تقلب (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_FRAUD", "Remittence تقلب (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_FRAUD", "Remittence تقلب (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_SETTLED", "Remittence مستقر (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_SETTLED", "Remittence مستقر (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_SETTLED", "Remittence مستقر (انصراف فاکتور)");
+ define("_XPY_AM_MODE_DESC_PAID_ITEM_PURCHASED", "موردی خریداری شده (فاکتور پرداخت شده)");
+ define("_XPY_AM_MODE_DESC_UNPAID_ITEM_PURCHASED", "موردی خریداری شده (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_ITEM_PURCHASED", "موردی خریداری شده (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_ITEM_REFUNDED", "مورد مسترد (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_ITEM_REFUNDED", "مورد مسترد (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_ITEM_REFUNDED", "مورد مسترد (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_ITEM_UNDELIEVED", "موردی Undelieved (فاکتور پرداخت شده)");
+ define("_XPY_AM_MODE_DESC_UNPAID_ITEM_UNDELIEVED", "موردی Undelieved (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_ITEM_UNDELIEVED", "موردی Undelieved (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_ITEM_DAMAGED", "مورد آسیب دیده (فاکتور پرداخت شده)");
+ define("_XPY_AM_MODE_DESC_UNPAID_ITEM_DAMAGED", "مورد آسیب دیده (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_ITEM_DAMAGED", "مورد آسیب دیده (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_ITEM_PENDING", "مورد انتظار (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_ITEM_PENDING", "مورد انتظار (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_ITEM_PENDING", "مورد انتظار (لغو فاکتور)");
+ define("_XPY_AM_MODE_DESC_PAID_ITEM_EXPRESS", "موردی Delievery اکسپرس (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_ITEM_EXPRESS", "موردی Delievery اکسپرس (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_ITEM_EXPRESS", "موردی Delievery اکسپرس (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_TRANSACTION_PAYMENT", "پرداخت تراکنش (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_TRANSACTION_PAYMENT", "پرداخت مربوط به معاملات (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_TRANSACTION_PAYMENT", "پرداخت مربوط به معاملات (انصراف فاکتور)");
+ define("_XPY_AM_MODE_DESC_PAID_TRANSACTION_REFUND", "بازپرداخت معامله (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_TRANSACTION_REFUND", "بازپرداخت معاملات (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_TRANSACTION_REFUND", "بازپرداخت معاملات (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_TRANSACTION_PENDING", "معامله در انتظار (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_TRANSACTION_PENDING", "معامله در انتظار (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_TRANSACTION_PENDING", "معامله در انتظار (لغو فاکتور)");
+ define("_XPY_AM_MODE_DESC_PAID_TRANSACTION_NOTICE", "مقررات مربوط به معاملات (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_TRANSACTION_NOTICE", "مقررات مربوط به معاملات (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_TRANSACTION_NOTICE", "مقررات مربوط به معاملات (فاکتور لغو)");
+ define("_XPY_AM_MODE_DESC_PAID_TRANSACTION_OTHER", "دیگر معامله (پرداخت فاکتور)");
+ define("_XPY_AM_MODE_DESC_UNPAID_TRANSACTION_OTHER", "تراکنش های دیگر (فاکتور پرداخت نشده)");
+ define("_XPY_AM_MODE_DESC_CANCEL_TRANSACTION_OTHER", "تراکنش های دیگر (لغو فاکتور)");
+
+?>
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/index.html
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/index.html (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/index.html 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_collect.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_collect.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_collect.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_damaged.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_damaged.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_damaged.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_express.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_express.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_express.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_fraud.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_fraud.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_fraud.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_none.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_none.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_none.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_notice.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_notice.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_notice.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_pending.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_pending.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_pending.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_purchased.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_purchased.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_purchased.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_refunded.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_refunded.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_refunded.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_settled.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_settled.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_settled.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_undelieved.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_undelieved.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_cancelled_undelieved.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_created.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_created.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_created.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+The {SITENAME} has generated an invoice for you.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_collect.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_collect.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_collect.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_damaged.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_damaged.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_damaged.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_express.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_express.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_express.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_fraud.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_fraud.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_fraud.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_none.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_none.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_none.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_notice.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_notice.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_notice.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_pending.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_pending.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_pending.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_purchased.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_purchased.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_purchased.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_refunded.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_refunded.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_refunded.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_settled.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_settled.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_settled.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_undelieved.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_undelieved.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_paid_undelieved.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_notice.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_notice.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_notice.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_other.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_other.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_other.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_payment.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_payment.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_payment.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_pending.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_pending.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_pending.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_refund.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_refund.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_cancelled_refund.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+سایت {SITENAME} برای شما فاکتوری ایجاد کرده بود و هم اکنون این فاکتور حذف شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_notice.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_notice.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_notice.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_other.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_other.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_other.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_payment.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_payment.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_payment.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_pending.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_pending.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_pending.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_refund.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_refund.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_paid_refund.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME}فاکتوری برای شما صادر کرده است و هم اکنون این فاکتور پرداخت شده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است..
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_notice.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_notice.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_notice.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME} فاکتوری برای شما صادر کرده است که پرداخت نشده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است.به احتمال استرداد یا تغییر دیگری دوباره صادر شده است .
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_other.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_other.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_other.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0,0 +1,19 @@
+وب سایت {SITENAME} فاکتوری برای شما صادر کرده است که پرداخت نشده است.
+
+فاکتور شماره {INVOICENUMBER} توسط {DRAWFOR} برای {DRAWTO} صادر شده است.
+
+این مبلغ برای کل {AMOUNT} {CURRENCY} است.به احتمال استرداد یا تغییر دیگری دوباره صادر شده است .
+
+اگر تمایل دارید این درخواست را پرداخت نمایید لطفا به لینک زیر مراجعه نمایید :
+
+ * {INVURL}
+
+نسخه پی دی اف در آدرس زیر در دسترس شماست :
+
+ * {PDFURL}
+
+با تشکر
+
+
+{SITENAME}
+{SITEURL}
\ No newline at end of file
Added: XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_payment.tpl
===================================================================
--- XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_payment.tpl (rev 0)
+++ XoopsLanguages/persian/modules/xpayment/trunk/language/persian/mail_templates/xpayment_invoice_transaction_unpaid_payment.tpl 2011-03-30 06:08:49 UTC (rev 6493)
@@ -0...
[truncated message content] |
|
From: <be...@us...> - 2011-03-30 05:10:05
|
Revision: 6492
http://xoops.svn.sourceforge.net/xoops/?rev=6492&view=rev
Author: beckmi
Date: 2011-03-30 05:09:59 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Changing Edit/Delete User icons to make them consistent
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_delete.png
XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_edit.png
Added: XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_delete.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_delete.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_edit.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_edit.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2011-03-30 05:09:26
|
Revision: 6491
http://xoops.svn.sourceforge.net/xoops/?rev=6491&view=rev
Author: beckmi
Date: 2011-03-30 05:09:20 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Changing Edit/Delete User icons to make them consistent
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_delete.png
XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_edit.png
Deleted: XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_delete.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/images/icons/default/user_edit.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-30 05:06:09
|
Revision: 6490
http://xoops.svn.sourceforge.net/xoops/?rev=6490&view=rev
Author: voltan1
Date: 2011-03-30 05:06:02 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Fix templates
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/css/style.css
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/blocks/fmcontent_page.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/css/style.css
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/css/style.css 2011-03-30 04:18:08 UTC (rev 6489)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/css/style.css 2011-03-30 05:06:02 UTC (rev 6490)
@@ -67,4 +67,9 @@
text-align: justify;
margin: 2px;
padding: 2px;
+}
+
+.endline {
+ width: 100%;
+ clear: both;
}
\ No newline at end of file
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/blocks/fmcontent_page.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/blocks/fmcontent_page.html 2011-03-30 04:18:08 UTC (rev 6489)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/blocks/fmcontent_page.html 2011-03-30 05:06:02 UTC (rev 6490)
@@ -1,4 +1,4 @@
<h1><a href="<{$block.link}>"><{$block.content_title}></a></h1>
<div class="itemText">
- <{$block.content_text}>
+ <{$block.content_short}>
</div>
\ No newline at end of file
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-30 04:18:08 UTC (rev 6489)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-30 05:06:02 UTC (rev 6490)
@@ -32,10 +32,12 @@
<header>
<{if $content.content_titleview}>
<!-- Display page content -->
- <div class="itemTitle"><{if $link.topicshow}><a
+ <div class="itemHead">
+ <div class="itemTitle"><h2><{if $link.topicshow}><a
href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>">x<{$link.topic}></a> :
- <{/if}><{$content.content_title}>
+ <{/if}><{$content.content_title}></h2>
</div>
+ </div>
<{/if}>
<div class="itemInfo">
<{if $content.author}>
@@ -66,15 +68,15 @@
</div>
</header>
- <section class="itemBody">
+ <article class="itemBody">
- <article class="itemShort"><{$content.content_short}></article>
+ <div class="itemShort"><{$content.content_short}></div>
<{if $advertisement}>
<div class="itemAde"><{$advertisement}></div>
<{/if}>
- <article class="itemText editable <{$multiple_columns}>" id="content_<{$content.content_id}>">
+ <div class="itemText editable <{$multiple_columns}>" id="content_<{$content.content_id}>">
<{if $content.content_img}>
<aside class="sideimg">
<figure>
@@ -92,11 +94,11 @@
</aside>
<{/if}>
<{$content.content_text}>
- </article>
+ </div>
- </section>
+ </article>
- <footer>
+ <footer class="itemFoot">
<address>
<a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a>
</address>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html 2011-03-30 04:18:08 UTC (rev 6489)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html 2011-03-30 05:06:02 UTC (rev 6490)
@@ -41,9 +41,11 @@
<article class="item">
<header>
- <div class="itemTitle"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> :
- <a href="<{$content.url}>"><{$content.content_title}></a></div>
- <hgroup class="itemInfo">
+ <div class="itemHead">
+ <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> :
+ <a href="<{$content.url}>"><{$content.content_title}></a></h2></div>
+ </div>
+ <div class="itemInfo">
<{if $info.author}>
<span class="itemPoster">
<{$smarty.const._FMCONTENT_AUTHOR}><a
@@ -61,7 +63,7 @@
<{if $info.hits}>
<span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
<{/if}>
- </hgroup>
+ </div>
</header>
<div class="itemBody" id="content_<{$content.content_id}>">
@@ -81,10 +83,11 @@
</figure>
</aside>
<{/if}>
- <{$content.content_short}>
+ <span class="itemText"><{$content.content_short}></span>
+ <div class="endline"></div>
</div>
- <footer>
+ <footer class="itemFoot">
<{if $xoops_isadmin}>
<span class="itemAdminLink">
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
@@ -154,9 +157,11 @@
</div>
<header>
- <div class="itemTitle"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
- href="<{$content.url}>"><{$content.content_title}></a></div>
- <hgroup class="itemInfo">
+ <div class="itemHead">
+ <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
+ href="<{$content.url}>"><{$content.content_title}></a></h2></div>
+ </div>
+ <div class="itemInfo">
<{if $info.author}>
<span class="itemPoster">
<{$smarty.const._FMCONTENT_AUTHOR}><a
@@ -174,10 +179,10 @@
<{if $info.hits}>
<span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
<{/if}>
- </hgroup>
+ </div>
</header>
- <footer>
+ <footer class="itemFoot">
<{if $xoops_isadmin}>
<span class="itemAdminLink">
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-30 04:18:08 UTC (rev 6489)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-30 05:06:02 UTC (rev 6490)
@@ -31,9 +31,9 @@
<div class="itemHead">
<{if $content.content_titleview}>
<!-- Display page content -->
- <div class="itemTitle"><{if $link.topicshow}><a
+ <div class="itemTitle"><h2><{if $link.topicshow}><a
href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>"><{$link.topic}></a> :
- <{/if}><{$content.content_title}>
+ <{/if}><{$content.content_title}></h2>
</div>
<{/if}>
</div>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html 2011-03-30 04:18:08 UTC (rev 6489)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html 2011-03-30 05:06:02 UTC (rev 6490)
@@ -32,8 +32,8 @@
<{foreach item=content from=$contents}>
<div class="item">
<div class="itemHead">
- <div class="itemTitle"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
- href="<{$content.url}>"><{$content.content_title}></a></div>
+ <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
+ href="<{$content.url}>"><{$content.content_title}></a></h2></div>
</div>
<div class="itemInfo">
<{if $info.author}>
@@ -65,6 +65,7 @@
</span>
<{/if}>
<span class="itemText"><{$content.content_short}></span>
+ <div class="endline"></div>
</div>
<div class="itemFoot">
<{if $xoops_isadmin}>
@@ -130,26 +131,27 @@
<div class="itemText"><{$content.content_short}></div>
</div>
<div class="itemHead">
- <div class="itemTitle"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
- href="<{$content.url}>"><{$content.content_title}></a></div>
- <div class="itemInfo">
- <{if $info.author}>
- <span class="itemPoster">
- <{$smarty.const._FMCONTENT_AUTHOR}><a
- href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
- </span>
- <{/if}>
- <{if $info.date}>
- <span class="itemPostDate">
- <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
- </span>
- <{/if}>
- <{if $info.hits}>
- <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
- <{/if}>
- </div>
- </div>
+ <div class="itemTitle"><h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
+ href="<{$content.url}>"><{$content.content_title}></a></h2></div>
+ </div>
+ <div class="itemInfo">
+ <{if $info.author}>
+ <span class="itemPoster">
+ <{$smarty.const._FMCONTENT_AUTHOR}><a
+ href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
+ href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
+ </span>
+ <{/if}>
+ <{if $info.date}>
+ <span class="itemPostDate">
+ <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
+ </span>
+ <{/if}>
+ <{if $info.hits}>
+ <span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
+ <{/if}>
+ </div>
+
<div class="itemFoot">
<{if $xoops_isadmin}>
<span class="itemAdminLink">
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-30 04:18:08 UTC (rev 6489)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-30 05:06:02 UTC (rev 6490)
@@ -32,8 +32,8 @@
<{if $content.content_titleview}>
<!-- Display page content -->
- <div class="pad5 marg5 ui-widget-header ui-corner-all"><{if $link.topicshow}><a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>"><{$link.topic}></a> : <{/if}><{$content.content_title}>
+ <div class="pad5 marg5 ui-widget-header ui-corner-all"><h2><{if $link.topicshow}><a
+ href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>"><{$link.topic}></a> : <{/if}><{$content.content_title}></h2>
</div>
<{/if}>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html 2011-03-30 04:18:08 UTC (rev 6489)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html 2011-03-30 05:06:02 UTC (rev 6490)
@@ -17,8 +17,10 @@
<{/if}>
</span>
<{/if}>
- <{$default.content_short}>
+ <{$content.content_short}>
+ <div class="endline"></div>
</div>
+
<div class="pad5 marg5 ui-state-default ui-corner-all">
<span class="left"><{$smarty.const._FMCONTENT_DATE}><{$default.content_create}></span>
<span class="right"><a href="<{$default.url}>"><{$smarty.const._FMCONTENT_MORE}></span>
@@ -34,7 +36,7 @@
<{foreach item=content from=$contents}>
<div class="pad5 marg5 ui-widget-content ui-corner-all">
<div class="pad5 marg5 ui-widget-header ui-corner-all">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a>
+ <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a></h2>
</div>
<div class="pad5 marg5 ui-widget-content ui-corner-all" id="content_<{$content.content_id}>">
<{if $content.content_img}>
@@ -125,7 +127,7 @@
<div class=""><{$content.content_short}></div>
</div>
<div class="pad5 marg5 ui-widget-header ui-corner-all">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a>
+ <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a></h2>
</div>
<div class="pad5 marg5 ui-state-default ui-corner-all">
<span class="itemPermaLink right">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2011-03-30 04:18:15
|
Revision: 6489
http://xoops.svn.sourceforge.net/xoops/?rev=6489&view=rev
Author: beckmi
Date: 2011-03-30 04:18:08 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Correcting Typo in English
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/language/english/admin/comments.php
Modified: XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/language/english/admin/comments.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/language/english/admin/comments.php 2011-03-28 19:55:51 UTC (rev 6488)
+++ XoopsCore/branches/2.5.x/2.5.1/htdocs/modules/system/language/english/admin/comments.php 2011-03-30 04:18:08 UTC (rev 6489)
@@ -37,7 +37,7 @@
// Tab
define("_AM_SYSTEM_COMMENTS_TITLE","Title");
-define("_AM_SYSTEM_COMMENTS_POSTED","Posted");
+define("_AM_SYSTEM_COMMENTS_POSTED","Poster");
define("_AM_SYSTEM_COMMENTS_IP","IP");
define("_AM_SYSTEM_COMMENTS_MODULE","Module");
define("_AM_SYSTEM_COMMENTS_STATUS","Status");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <luc...@us...> - 2011-03-28 19:56:00
|
Revision: 6488
http://xoops.svn.sourceforge.net/xoops/?rev=6488&view=rev
Author: luciorota
Date: 2011-03-28 19:55:51 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
- zip/unzip support (in progress)
Modified Paths:
--------------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/index.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaxfilemanager.js
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/langs/en.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/language/english/admin.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/xoops_version.php
Added Paths:
-----------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/index.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/index.php 2011-03-28 19:48:25 UTC (rev 6487)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/admin/index.php 2011-03-28 19:55:51 UTC (rev 6488)
@@ -102,6 +102,7 @@
$registerGlobals = (!ini_get('register_globals')) ? '<span style="color: green;">' . _AJAXFM_AM_INDEX_OFF . '</span>' : '<span style="color: red;">' . _AJAXFM_AM_INDEX_ON . '</span>';
$downloads = (ini_get('file_uploads')) ? '<span style="color: green;">' . _AJAXFM_AM_INDEX_ON . '</span>' : '<span style="color: red;">' . _AJAXFM_AM_INDEX_OFF . '</span>';
$gdLib = (function_exists('gd_info')) ? '<span style="color: green;">' . _AJAXFM_AM_INDEX_GDON . '</span>' : '<span style="color: red;">' . _AJAXFM_AM_INDEX_GDOFF . '</span>';
+$zipLib = (class_exists('ZipArchive')) ? '<span style="color: green;">' . _AJAXFM_AM_INDEX_ZIPON . '</span>' : '<span style="color: red;">' . _AJAXFM_AM_INDEX_ZIPOFF . '</span>';
echo '<ul>';
echo '<li>' . _AJAXFM_AM_INDEX_GDLIBSTATUS . $gdLib;
if (function_exists('gd_info')) {
@@ -109,6 +110,7 @@
echo '<li>' . _AJAXFM_AM_INDEX_GDLIBVERSION . '<b>' . $gdLib['GD Version'] . '</b>';
}
}
+echo '<li>' . _AJAXFM_AM_INDEX_ZIPLIBSTATUS . $zipLib;
echo '</ul>';
echo '<ul>';
echo '<li>' . _AJAXFM_AM_INDEX_SAFEMODESTATUS . $safeMode;
@@ -117,6 +119,7 @@
echo '<li>' . _AJAXFM_AM_INDEX_MAXUPLOADSIZE . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . '</span></b>';
echo '<li>' . _AJAXFM_AM_INDEX_MAXPOSTSIZE . ' <b><span style="color: blue;">' . ini_get('post_max_size') . '</span></b>';
echo '<li>' . _AJAXFM_AM_INDEX_SERVERPATH . ' <b>' . XOOPS_ROOT_PATH . '</b>';
+
echo '</ul>';
echo '</fieldset>';
Added: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php (rev 0)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_unzip.php 2011-03-28 19:55:51 UTC (rev 6488)
@@ -0,0 +1,62 @@
+<?php
+// IN PROGRESS
+// IN PROGRESS
+// IN PROGRESS
+/**
+ * unzip selected file
+ * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+ * @link www.phpletter.com
+ * @since 22/April/2007
+ *
+ */
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+$error = "";
+if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_ZIP) {
+ $error = SYS_DISABLED;
+} elseif(!empty($_GET['zip'])) {
+ //zip the selected file from context menu
+ if(!file_exists($_GET['zip'])) {
+ $error = ERR_FILE_NOT_AVAILABLE;
+ } elseif(!isUnderRoot($_GET['zip'])) {
+ $error = ERR_FOLDER_PATH_NOT_ALLOWED;
+ } else {
+ include_once(CLASS_FILE);
+ $file = new file();
+ if(is_dir($_GET['zip'])
+ && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, getBaseName($_GET['zip']))
+ && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, getBaseName($_GET['zip'])))
+ {
+ $file->delete(addTrailingSlash(backslashToSlash($_GET['zip'])));
+ } elseif(is_file($_GET['zip'])
+ && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, getBaseName($_GET['zip']))
+ && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, getBaseName($_GET['zip']))
+ )
+ {
+ $file->zip(($_GET['zip']));
+ }
+ }
+} else {
+ if(!isset($_POST['selectedDoc']) || !is_array($_POST['selectedDoc']) || sizeof($_POST['selectedDoc']) < 1) {
+ $error = ERR_NOT_FILE_SELECTED;
+ } else {
+ include_once(CLASS_FILE);
+ $file = new file();
+ foreach($_POST['selectedDoc'] as $doc) {
+ if(file_exists($doc) && isUnderRoot($doc)) {
+ if(is_dir($doc)
+ && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $doc)
+ && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $doc))
+ {
+ $file->delete(addTrailingSlash(backslashToSlash($doc)));
+ } elseif(is_file($doc)
+ && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $doc)
+ && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $doc))
+ {
+ $file->zip($doc);
+ }
+ }
+ }
+ }
+}
+echo "{error:'" . $error . "'}";
+?>
\ No newline at end of file
Added: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php (rev 0)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajax_file_zip.php 2011-03-28 19:55:51 UTC (rev 6488)
@@ -0,0 +1,62 @@
+<?php
+// IN PROGRESS
+// IN PROGRESS
+// IN PROGRESS
+/**
+ * zip selected files
+ * @author Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+ * @link www.phpletter.com
+ * @since 22/April/2007
+ *
+ */
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
+$error = "";
+if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_ZIP) {
+ $error = SYS_DISABLED;
+} elseif(!empty($_GET['zip'])) {
+ //zip the selected file from context menu
+ if(!file_exists($_GET['zip'])) {
+ $error = ERR_FILE_NOT_AVAILABLE;
+ } elseif(!isUnderRoot($_GET['zip'])) {
+ $error = ERR_FOLDER_PATH_NOT_ALLOWED;
+ } else {
+ include_once(CLASS_FILE);
+ $file = new file();
+ if(is_dir($_GET['zip'])
+ && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, getBaseName($_GET['zip']))
+ && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, getBaseName($_GET['zip'])))
+ {
+ $file->delete(addTrailingSlash(backslashToSlash($_GET['zip'])));
+ } elseif(is_file($_GET['zip'])
+ && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, getBaseName($_GET['zip']))
+ && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, getBaseName($_GET['zip']))
+ )
+ {
+ $file->zip(($_GET['zip']));
+ }
+ }
+} else {
+ if(!isset($_POST['selectedDoc']) || !is_array($_POST['selectedDoc']) || sizeof($_POST['selectedDoc']) < 1) {
+ $error = ERR_NOT_FILE_SELECTED;
+ } else {
+ include_once(CLASS_FILE);
+ $file = new file();
+ foreach($_POST['selectedDoc'] as $doc) {
+ if(file_exists($doc) && isUnderRoot($doc)) {
+ if(is_dir($doc)
+ && isValidPattern(CONFIG_SYS_INC_DIR_PATTERN, $doc)
+ && !isInvalidPattern(CONFIG_SYS_EXC_DIR_PATTERN, $doc))
+ {
+ $file->delete(addTrailingSlash(backslashToSlash($doc)));
+ } elseif(is_file($doc)
+ && isValidPattern(CONFIG_SYS_INC_FILE_PATTERN, $doc)
+ && !isInvalidPattern(CONFIG_SYS_EXC_FILE_PATTERN, $doc))
+ {
+ $file->zip($doc);
+ }
+ }
+ }
+ }
+}
+echo "{error:'" . $error . "'}";
+?>
\ No newline at end of file
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php 2011-03-28 19:48:25 UTC (rev 6487)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/ajaxfilemanager.php 2011-03-28 19:55:51 UTC (rev 6488)
@@ -83,7 +83,9 @@
'download':'<?php echo CONFIG_URL_DOWNLOAD; ?>',
'present':'<?php echo getCurrentUrl(); ?>',
'home':'<?php echo CONFIG_URL_HOME; ?>',
- 'view':'<?php echo CONFIG_URL_LIST_LISTING; ?>'
+ 'view':'<?php echo CONFIG_URL_LIST_LISTING; ?>',
+ 'zip':'<?php echo CONFIG_URL_ZIP; ?>',
+ 'unzip':'<?php echo CONFIG_URL_UNZIP; ?>'
};
var permits = {'del':<?php echo (CONFIG_OPTIONS_DELETE?1:0); ?>, 'cut':<?php echo (CONFIG_OPTIONS_CUT?'1':'0'); ?>, 'copy':<?php echo (CONFIG_OPTIONS_COPY?1:0); ?>, 'newfolder':<?php echo (CONFIG_OPTIONS_NEWFOLDER?1:0); ?>, 'rename':<?php echo (CONFIG_OPTIONS_RENAME?1:0); ?>, 'upload':<?php echo (CONFIG_OPTIONS_UPLOAD?1:0); ?>, 'edit':<?php echo (CONFIG_OPTIONS_EDITABLE?1:0); ?>, 'view_only':<?php echo (CONFIG_SYS_VIEW_ONLY?1:0); ?>};
var currentFolder = {};
@@ -104,6 +106,8 @@
var msgInvalidExt = '<?php echo ERR_FILE_TYPE_NOT_ALLOWED; ?>';
var msgNotPreview = '<?php echo PREVIEW_NOT_PREVIEW; ?>';
+ var warningZip = '<?php echo WARNING_ZIP; ?>';
+
var warningCutPaste = '<?php echo WARNING_CUT_PASTE; ?>';
var warningCopyPaste = '<?php echo WARNING_COPY_PASTE; ?>';
var warningDel = '<?php echo WARNING_DELETE; ?>';
@@ -224,8 +228,12 @@
if(CONFIG_OPTIONS_UPLOAD) {
echo '<li><a id="actionUpload" href="#" ><span>' .LBL_BTN_UPLOAD . '</span></a></li>';
}
- //echo '<li ><a href="#" id="actionZip"><span>' .LBL_BTN_ZIP . '</span></a><li>';
- //echo '<li ><a href="#" id="actionUnzip"><span>' .LBL_BTN_UNZIP . '</span></a><li>';
+ if(CONFIG_OPTIONS_ZIP && class_exists('ZipArchive')) {
+ echo '<li ><a href="#" id="actionZip" ><span>' .LBL_BTN_ZIP . '</span></a><li>';
+ }
+ if(CONFIG_OPTIONS_UNZIP && class_exists('ZipArchive')) {
+ echo '<li ><a href="#" id="actionUnzip" ><span>' .LBL_BTN_UNZIP . '</span></a><li>';
+ }
?>
<!--<li><a href="#" id="actionClose" ><?php echo IMG_BTN_CLOSE; ?></a></li>-->
<li><a href="#" class="thickbox" id="actionInfo" ><span>Info</span></a></li>
@@ -686,15 +694,23 @@
<div id="contextMenu" style="display:none">
<ul>
<li><a href="#" class="contentMenuItem" id="menuSelect"><?php echo MENU_SELECT; ?></a></li>
- <li><a href="#" class="contentMenuItem" id="menuPreview"><?php echo MENU_PREVIEW; ?></a></li>
- <li><a href="#" class="contentMenuItem" id="menuDownload"><?php echo MENU_DOWNLOAD; ?></a></li>
- <li><a href="#" class="contentMenuItem" id="menuRename"><?php echo MENU_RENAME; ?></a></li>
- <li><a href="#" class="contentMenuItem" id="menuEdit"><?php echo MENU_EDIT; ?></a></li>
- <li><a href="#" class="contentMenuItem" id="menuCut"><?php echo MENU_CUT; ?></a></li>
+ <li><a href="#" class="contentMenuItem" id="menuPreview"><?php echo MENU_PREVIEW; ?></a></li>
+ <li><a href="#" class="contentMenuItem" id="menuDownload"><?php echo MENU_DOWNLOAD; ?></a></li>
+ <li><a href="#" class="contentMenuItem" id="menuRename"><?php echo MENU_RENAME; ?></a></li>
+ <li><a href="#" class="contentMenuItem" id="menuEdit"><?php echo MENU_EDIT; ?></a></li>
+ <li><a href="#" class="contentMenuItem" id="menuCut"><?php echo MENU_CUT; ?></a></li>
<li><a href="#" class="contentMenuItem" id="menuCopy"><?php echo MENU_COPY; ?></a></li>
- <li><a href="#" class="contentMenuItem" id="menuPaste"><?php echo MENU_PASTE; ?></a></li>
- <li><a href="#" class="contentMenuItem" id="menuDelete"><?php echo MENU_DELETE; ?></a></li>
- <li><a href="#" class="contentMenuItem" id="menuPlay"><?php echo MENU_PLAY; ?></a></li>
+ <li><a href="#" class="contentMenuItem" id="menuPaste"><?php echo MENU_PASTE; ?></a></li>
+ <li><a href="#" class="contentMenuItem" id="menuDelete"><?php echo MENU_DELETE; ?></a></li>
+ <li><a href="#" class="contentMenuItem" id="menuPlay"><?php echo MENU_PLAY; ?></a></li>
+ <?php
+ if(CONFIG_OPTIONS_ZIP && class_exists('ZipArchive')) {
+ echo '<li><a href="#" class="contentMenuItem" id="menuZip">' . MENU_ZIP . '</a></li>';
+ }
+ if(CONFIG_OPTIONS_UNZIP && class_exists('ZipArchive')) {
+ echo '<li><a href="#" class="contentMenuItem" id="menuUnzip">' . MENU_UNZIP . '</a></li>';
+ }
+ ?>
</ul>
</div>
</body>
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt 2011-03-28 19:48:25 UTC (rev 6487)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/change_notes.txt 2011-03-28 19:55:51 UTC (rev 6488)
@@ -5,7 +5,8 @@
+ Xoops Preferences system support (Upload valid extensions, Max upload size, Default items per page, Navigation mode, Text editor)
+ added filetypes (.kml = GoogleMaps Kml, ...)
+ added create new file
-+ fixed bug pasting files/filders
++ fixed bug pasting files/folders
++ added zip/unzip support (in progress)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php 2011-03-28 19:48:25 UTC (rev 6487)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.ajaxfilemanager.php 2011-03-28 19:55:51 UTC (rev 6488)
@@ -74,6 +74,10 @@
define('CONFIG_OPTIONS_NEWFOLDER', $permNewfolder);
$permNewfile = $permNewfolder;
define('CONFIG_OPTIONS_NEWFILE', $permNewfile);
+ $permZip = false; // IN PROGRESS
+ define('CONFIG_OPTIONS_ZIP', $permZip);
+ $permUnzip = false; // IN PROGRESS
+ define('CONFIG_OPTIONS_UNZIP', $permUnzip);
$permRename = ($gpermHandler->checkRight('ajaxfilemanager_extra', 64, $groups, $ajaxfilemanagerModule->mid())) ? true : false ;
define('CONFIG_OPTIONS_RENAME', $permRename);
$permUpload = ($gpermHandler->checkRight('ajaxfilemanager_extra', 2, $groups, $ajaxfilemanagerModule->mid())) ? true : false ;
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.php 2011-03-28 19:48:25 UTC (rev 6487)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/config.php 2011-03-28 19:55:51 UTC (rev 6488)
@@ -131,6 +131,8 @@
define('CONFIG_URL_IMAGE_UNDO', 'ajax_image_undo.php');
define('CONFIG_URL_CUT', 'ajax_file_cut.php');
define('CONFIG_URL_COPY', 'ajax_file_copy.php');
+define('CONFIG_URL_ZIP', 'ajax_file_zip.php');
+define('CONFIG_URL_UNZIP', 'ajax_file_unzip.php');
define('CONFIG_URL_LOAD_FOLDERS', '_ajax_load_folders.php');
define('CONFIG_URL_DOWNLOAD', 'ajax_download.php');
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php 2011-03-28 19:48:25 UTC (rev 6487)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/inc/data.php 2011-03-28 19:55:51 UTC (rev 6488)
@@ -1,9 +1,9 @@
<pre>Array
(
- [currentFilePath] => ../../../uploads/ajaxfilemanager/uploaded/new/
- [new_file] => i
- [ext] => mp3
+ [currentFilePath] => ../../../uploads/ajaxfilemanager/uploaded/
+ [new_file] => qqq
+ [ext] => gif
)
</pre>
-26/Mar/2011 01:33:02
\ No newline at end of file
+28/Mar/2011 10:08:37
\ No newline at end of file
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaxfilemanager.js
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaxfilemanager.js 2011-03-28 19:48:25 UTC (rev 6487)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/jscripts/ajaxfilemanager.js 2011-03-28 19:55:51 UTC (rev 6488)
@@ -1,176 +1,149 @@
/*
/*
- * author: Logan Cai
- * Email: cailongqun [at] yahoo [dot] com [dot] cn
- * Website: www.phpletter.com
- * Created At: 21/April/2007
- * Modified At: 1/June/2007
-*/
+ * author: Logan Cai
+ * Email: cailongqun [at] yahoo [dot] com [dot] cn
+ * Website: www.phpletter.com
+ * Created At: 21/April/2007
+ * Modified At: 1/June/2007
+ */
// Returns true if the passed value is found in the
// array. Returns false if it is not.
Array.prototype.inArray = function (value,caseSensitive)
{
- var i;
- for (i=0; i < this.length; i++)
- {
- // use === to check for Matches. ie., identical (===),
- if(caseSensitive){ //performs match even the string is case sensitive
- if (this[i].toLowerCase() == value.toLowerCase())
- {
- return true;
- }
- }else
- {
- if (this[i] == value)
- {
- return true;
- }
- }
- }
- return false;
+ var i;
+ for (i=0; i < this.length; i++) {
+ // use === to check for Matches. ie., identical (===),
+ if(caseSensitive) {
+ //performs match even the string is case sensitive
+ if (this[i].toLowerCase() == value.toLowerCase()) {
+ return true;
+ }
+ } else {
+ if (this[i] == value) {
+ return true;
+ }
+ }
+ }
+ return false;
};
- var dcTime=250; // doubleclick time
- var dcDelay=100; // no clicks after doubleclick
- var dcAt=0; // time of doubleclick
- var savEvent=null; // save Event for handling doClick().
- var savEvtTime=0; // save time of click event.
- var savTO=null; // handle of click setTimeOut
- var linkElem = null;
-
-
- function hadDoubleClick()
- {
- var d = new Date();
- var now = d.getTime();
- if ((now - dcAt) < dcDelay)
- {
- return true;
- }
- return false;
- };
-
+
+
+var dcTime=250; // doubleclick time
+var dcDelay=100; // no clicks after doubleclick
+var dcAt=0; // time of doubleclick
+var savEvent=null; // save Event for handling doClick().
+var savEvtTime=0; // save time of click event.
+var savTO=null; // handle of click setTimeOut
+var linkElem = null;
+
+
+
+function hadDoubleClick()
+{
+ var d = new Date();
+ var now = d.getTime();
+ if ((now - dcAt) < dcDelay) {
+ return true;
+ }
+ return false;
+};
+
+
+
/**
-* enable left click to preview certain files
-*/
+ * enable left click to preview certain files
+ */
function enablePreview(elem, num)
{
-
- $(elem).each(
- function()
- {
-
- $(this).click(function ()
- {
-
- //alert('single click');
- var num = getNum(this.id);
- var path = files[num].path;
- //alert('now: ' + now + '; dcat: ' + dcAt + '; dcDelay: ' + dcDelay);
- if (hadDoubleClick())
- {
- return false;
- }else
- {
- linkElem = $('#a' + num).get(0);
- }
-
- d = new Date();
- savEvtTime = d.getTime();
- savTO = setTimeout(function()
- {
- if (savEvtTime - dcAt > 0)
- {
- //check if this file is previewable
-
-
- var ext = getFileExtension(path);
- var supportedExts = supporedPreviewExts.split(",");
- var isSupportedExt = false;
- for (i in supportedExts)
- {
- var typeOf = typeof(supportedExts[i]);
- //alert(supportedExts[i]);
- if(typeOf.toLowerCase() == 'string' && supportedExts[i].toLowerCase() == ext.toLowerCase())
- {
- isSupportedExt = true;
- break;
- }
-
- }
-
- if(isSupportedExt)
- {
- switch(files[num].cssClass)
- {
- case 'fileVideo':
- case 'fileMusic':
- case 'fileFlash':
- case 'fileSwf':
- $('#playGround').html('<a id="playGround' + num + '" href="' + files[num].path + '"><div id="player"> this is mine</div></a> ');
- $('#playGround' + num).html('');
- $('#playGround' + num).media({ width: 255, height: 210, autoplay: true });
- //alert($('#playGround' + num).html());
- showThickBox($('#a' + num).get(0), appendQueryString('#TB_inline', 'height=250' + '&width=256' + '&inlineId=winPlay&modal=true'));
- break;
- case 'fileAcrobat':
- $('#playGround').html('<a id="playGround' + num + '" href="' + files[num].path + '"><div id="player"> this is mine</div></a> ');
- $('#playGround' + num).html('');
- $('#playGround' + num).media({ width: 255, height: 210, autoplay: true });
- //alert($('#playGround' + num).html());
- showThickBox($('#a' + num).get(0), appendQueryString('#TB_inline', 'height=250' + '&width=256' + '&inlineId=winPlay&modal=true'));
- break;
+ $(elem).each(
+ function() {
+
+ $(this).click(
+ function () {
+
+ //alert('single click');
+ var num = getNum(this.id);
+ var path = files[num].path;
+ //alert('now: ' + now + '; dcat: ' + dcAt + '; dcDelay: ' + dcDelay);
+ if (hadDoubleClick()) {
+ return false;
+ } else {
+ linkElem = $('#a' + num).get(0);
+ }
+ d = new Date();
+ savEvtTime = d.getTime();
+ savTO = setTimeout(
+ function() {
+ if (savEvtTime - dcAt > 0) {
+ //check if this file is previewable
+ var ext = getFileExtension(path);
+ var supportedExts = supporedPreviewExts.split(",");
+ var isSupportedExt = false;
+ for (i in supportedExts) {
+ var typeOf = typeof(supportedExts[i]);
+ //alert(supportedExts[i]);
+ if(typeOf.toLowerCase() == 'string' && supportedExts[i].toLowerCase() == ext.toLowerCase()) {
+ isSupportedExt = true;
+ break;
+ }
+ }
+ if(isSupportedExt) {
+ switch(files[num].cssClass) {
+ case 'fileVideo':
+ case 'fileMusic':
+ case 'fileFlash':
+ case 'fileSwf':
+ $('#playGround').html('<a id="playGround' + num + '" href="' + files[num].path + '"><div id="player"> this is mine</div></a> ');
+ $('#playGround' + num).html('');
+ $('#playGround' + num).media({ width: 255, height: 210, autoplay: true });
+ //alert($('#playGround' + num).html());
+ showThickBox($('#a' + num).get(0), appendQueryString('#TB_inline', 'height=250' + '&width=256' + '&inlineId=winPlay&modal=true'));
+ break;
+ case 'fileAcrobat':
+ $('#playGround').html('<a id="playGround' + num + '" href="' + files[num].path + '"><div id="player"> this is mine</div></a> ');
+ $('#playGround' + num).html('');
+ $('#playGround' + num).media({ width: 255, height: 210, autoplay: true });
+ //alert($('#playGround' + num).html());
+ showThickBox($('#a' + num).get(0), appendQueryString('#TB_inline', 'height=250' + '&width=256' + '&inlineId=winPlay&modal=true'));
+ break;
+ default:
+ showThickBox(linkElem, appendQueryString(path, 'KeepThis=true&TB_iframe=true&height=' + thickbox.height + '&width=' + thickbox.width));
+ }
+ }
+ }
+ return false;
+ }, dcTime);
+ return false;
+ });
+ $(this).dblclick(function() {
+ var d = new Date();
+ dcAt = d.getTime();
+ if (savTO != null) {
+ // Clear pending Click
+ clearTimeout( savTO );
+ savTO = null;
+ }
+ if(typeof(selectFile) != 'undefined') {
+ selectFile(files[num].url);
+ } else
+ generateDownloadIframe(appendQueryString(getUrl('download'), 'path=' + files[num].path, ['path']));
+ {
+ }
+ }
+ );
+ }
+ );
+};
- default:
- showThickBox(linkElem, appendQueryString(path, 'KeepThis=true&TB_iframe=true&height=' + thickbox.height + '&width=' + thickbox.width));
-
- }
-
- }
-
- }
-
-
- return false;
-
- }, dcTime);
-
- return false;
-
- });
- $(this).dblclick(function()
- {
- var d = new Date();
- dcAt = d.getTime();
- if (savTO != null) {
- clearTimeout( savTO ); // Clear pending Click
- savTO = null;
-
- }
-
- if(typeof(selectFile) != 'undefined')
- {
-
- selectFile(files[num].url);
- }else
- generateDownloadIframe(appendQueryString(getUrl('download'), 'path=' + files[num].path, ['path'])); {
-
- }
-
- }
- );
- }
- );
-};
+
/**
-* add over class to the specific table
-*/
+ * add over class to the specific table
+ */
function tableRuler(element)
{
-
var rows = $(element);
-
$(rows).each(function(){
$(this).mouseover(function(){
$(this).addClass('over');
@@ -181,998 +154,887 @@
});
};
-
-
-
-
function previewMedia(rowNum)
{
- $('#preview' +rowNum).html('');
- $('#preview' +rowNum).media({ width: 255, height: 210, autoplay: true });
- return false;
+ $('#preview' +rowNum).html('');
+ $('#preview' +rowNum).media({ width: 255, height: 210, autoplay: true });
+ return false;
};
+
+
function getFileExtension(filename)
{
- if( filename.length == 0 ) return "";
- var dot = filename.lastIndexOf(".");
- if( dot == -1 ) return "";
- var extension = filename.substr(dot + 1,filename.length);
- return extension;
+ if( filename.length == 0 ) return "";
+ var dot = filename.lastIndexOf(".");
+ if( dot == -1 ) return "";
+ var extension = filename.substr(dot + 1,filename.length);
+ return extension;
};
+
+
function closeWindow()
{
- if(window.confirm(warningCloseWindow))
- {
- window.close();
- }
- return false;
+ if(window.confirm(warningCloseWindow)) {
+ window.close();
+ }
+ return false;
};
+
+
/**
-* return the url with query string
-*/
+ * return the url with query string
+ */
function getUrl(index,limitNeeded , viewNeeded, searchNeeded)
{
+ var queryStr = '';
+ var excluded = new Array();
+ if(typeof(limitNeeded) == 'boolean' && limitNeeded) {
+ var limit = document.getElementById('limit');
+ var typeLimit = typeof(limit);
+ if(typeLimit != 'undefined' && limit ) {
+ excluded[excluded.length] = 'limit';
+ queryStr += (queryStr == ''?'':'&') + 'limit=' + limit.options[limit.selectedIndex].value;
+ }
+ }
+ if(typeof(viewNeeded) == 'boolean' && viewNeeded) {
+ queryStr += (queryStr == ''?'':'&') + 'view=' + getView();
+ excluded[excluded.length] = 'view';
+ }
+ if(typeof(searchNeeded) == 'boolean' && searchNeeded && searchRequired) {
+ var search_recursively = 0;
+ $('input[@name=search_recursively][@checked]').each(
+ function() {
+ search_recursively = this.value;
+ }
+ );
+ var searchFolder = document.getElementById('search_folder');
+ queryStr += (queryStr == ''?'':'&') + 'search=1&search_name=' + $('#search_name').val() + '&search_recursively=' + search_recursively + '&search_mtime_from=' + $('#search_mtime_from').val() + '&search_mtime_to=' + $('#search_mtime_to').val() + '&search_folder=' + searchFolder.options[searchFolder.selectedIndex].value;
+ excluded[excluded.length] = 'search';
+ excluded[excluded.length] = 'search_recursively';
+ excluded[excluded.length] = 'search_mtime_from';
+ excluded[excluded.length] = 'search_mtime_to';
+ excluded[excluded.length] = 'search_folder';
+ excluded[excluded.length] = 'search_name';
+ excluded[excluded.length] = 'search';
+ }
+ return appendQueryString(appendQueryString(urls[index], queryString), queryStr, excluded);
+};
- var queryStr = '';
- var excluded = new Array();
-
- if(typeof(limitNeeded) == 'boolean' && limitNeeded)
- {
- var limit = document.getElementById('limit');
- var typeLimit = typeof(limit);
-
- if(typeLimit != 'undefined' && limit )
- {
- excluded[excluded.length] = 'limit';
- queryStr += (queryStr == ''?'':'&') + 'limit=' + limit.options[limit.selectedIndex].value;
- }
-
- }
- if(typeof(viewNeeded) == 'boolean' && viewNeeded)
- {
- queryStr += (queryStr == ''?'':'&') + 'view=' + getView();
- excluded[excluded.length] = 'view';
-
- }
-
- if(typeof(searchNeeded) == 'boolean' && searchNeeded && searchRequired)
- {
- var search_recursively = 0;
- $('input[@name=search_recursively][@checked]').each(
- function()
- {
- search_recursively = this.value;
- }
- );
- var searchFolder = document.getElementById('search_folder');
- queryStr += (queryStr == ''?'':'&') + 'search=1&search_name=' + $('#search_name').val() + '&search_recursively=' + search_recursively + '&search_mtime_from=' + $('#search_mtime_from').val() + '&search_mtime_to=' + $('#search_mtime_to').val() + '&search_folder=' + searchFolder.options[searchFolder.selectedIndex].value;
- excluded[excluded.length] = 'search';
- excluded[excluded.length] = 'search_recursively';
- excluded[excluded.length] = 'search_mtime_from';
- excluded[excluded.length] = 'search_mtime_to';
- excluded[excluded.length] = 'search_folder';
- excluded[excluded.length] = 'search_name';
- excluded[excluded.length] = 'search';
-
- }
-
-
- return appendQueryString(appendQueryString(urls[index], queryString), queryStr, excluded);
-};
+
/**
-* change view
-*/
+ * change view
+ */
function changeView()
{
+ var url = getUrl('view', true, true);
+ $('#rightCol').empty();
+ ajaxStart('#rightCol');
+ $('#rightCol').load(url,
+ {},
+ function(){
+ ajaxStop('#rightCol img.ajaxLoadingImg');
+ urls.present = getUrl('home', true, true);
+ initAfterListingLoaded();
+ }
+ );
+};
- var url = getUrl('view', true, true);
- $('#rightCol').empty();
- ajaxStart('#rightCol');
-
- $('#rightCol').load(url,
- {},
- function(){
- ajaxStop('#rightCol img.ajaxLoadingImg');
- urls.present = getUrl('home', true, true);
- initAfterListingLoaded();
- });
-};
function goParentFolder()
{
+ searchRequired = false;
+ var url = appendQueryString(getUrl('view', true, true), 'path=' + parentFolder.path , ['path']);
+ $('#rightCol').empty();
+ ajaxStart('#rightCol');
+
+ $('#rightCol').load(url,
+ {},
+ function() {
+ urls.present = appendQueryString(getUrl('home', true, true), 'path=' + parentFolder.path , ['path']);
+ ajaxStop('#rightCol img.ajaxLoadingImg');
+ initAfterListingLoaded();
+ }
+ );
+};
- searchRequired = false;
- var url = appendQueryString(getUrl('view', true, true), 'path=' + parentFolder.path , ['path']);
- $('#rightCol').empty();
- ajaxStart('#rightCol');
-
- $('#rightCol').load(url,
- {},
- function(){
- urls.present = appendQueryString(getUrl('home', true, true), 'path=' + parentFolder.path , ['path']);
- ajaxStop('#rightCol img.ajaxLoadingImg');
- initAfterListingLoaded();
- });
-};
/**
-* append Query string to the base url
-* @param string baseUrl the base url
-* @param string the query string
-* @param array remove thost url variable from base url if any matches
-*/
+ * append Query string to the base url
+ * @param string baseUrl the base url
+ * @param string the query string
+ * @param array remove thost url variable from base url if any matches
+ */
function appendQueryString(baseUrl, queryStr, excludedQueryStr)
{
-
- if(typeof(excludedQueryStr) == 'object' && excludedQueryStr.length)
- {
- var isMatched = false;
- var urlParts = baseUrl.split("?");
- baseUrl = urlParts[0];
- var count = 1;
- if(typeof(urlParts[1]) != 'undefined' && urlParts[1] != '')
- {//this is the query string parts
- var queryStrParts = urlParts[1].split("&");
- for(var i=0; i < queryStrParts.length; i++)
- {
- //split into query string variable name & value
- var queryStrVariables = queryStrParts[i].split('=');
- for(var j=0; j < excludedQueryStr.length; j++)
- {
- if(queryStrVariables[0] == excludedQueryStr[j])
- {
- isMatched = true;
- }
- }
- if(!isMatched)
- {
- baseUrl += ((count==1?'?':'&') + queryStrVariables[0] + '=' + queryStrVariables[1]);
- count++;
- }
- }
- }
-
- }
- if(queryStr != '')
- {
- return (baseUrl.indexOf('?')> -1?baseUrl + '&' + queryStr:baseUrl + '?' + queryStr);
- }else
- {
- return baseUrl;
- }
-
-
-
-
+ if(typeof(excludedQueryStr) == 'object' && excludedQueryStr.length) {
+ var isMatched = false;
+ var urlParts = baseUrl.split("?");
+ baseUrl = urlParts[0];
+ var count = 1;
+ if(typeof(urlParts[1]) != 'undefined' && urlParts[1] != '') {
+ //this is the query string parts
+ var queryStrParts = urlParts[1].split("&");
+ for(var i=0; i < queryStrParts.length; i++) {
+ //split into query string variable name & value
+ var queryStrVariables = queryStrParts[i].split('=');
+ for(var j=0; j < excludedQueryStr.length; j++) {
+ if(queryStrVariables[0] == excludedQueryStr[j]) {
+ isMatched = true;
+ }
+ }
+ if(!isMatched) {
+ baseUrl += ((count==1?'?':'&') + queryStrVariables[0] + '=' + queryStrVariables[1]);
+ count++;
+ }
+ }
+ }
+ }
+ if(queryStr != '') {
+ return (baseUrl.indexOf('?')> -1?baseUrl + '&' + queryStr:baseUrl + '?' + queryStr);
+ } else {
+ return baseUrl;
+ }
};
+
/**
-* initiate when the listing page is loaded
-* add main features according to the view
-*/
+ * initiate when the listing page is loaded
+ * add main features according to the view
+ */
function initAfterListingLoaded()
{
-
-
- parsePagination();
-
- parseCurrentFolder();
- var view = getView();
-
- setDocInfo('root');
-
- if(view != '')
- {
-
- switch(view)
- {
-
-
- case 'thumbnail':
- //enableContextMenu('dl.thumbnailListing, dl.thumbnailListing dt, dl.thumbnailListing dd, dl.thumbnailListing a');
- enableContextMenu('dl.thumbnailListing');
- for(i in files)
- {
- if(files[i].type== 'folder')
- {//this is foder item
-
- enableFolderBrowsable(i);
- }else
- {//this is file item
-
- switch(files[i].cssClass)
- {
- case 'filePicture':
- //$('#a' + i).attr('rel', 'ajaxphotos');
- //retrieveThumbnail(i);
-
- break;
- case 'fileFlash':
- break;
- case 'fileSwf':
- break;
- case 'fileVideo':
- break;
- case 'fileMusic':
- break;
- default:
-
-
- }
- enablePreview('#dt' + i, i);
- enablePreview('#thumbUrl' + i, i);
- enablePreview('#a' + i, i);
-
- }
+ parsePagination();
+ parseCurrentFolder();
+ var view = getView();
+ setDocInfo('root');
+ if(view != '') {
+ switch(view) {
+ case 'thumbnail':
+ //enableContextMenu('dl.thumbnailListing, dl.thumbnailListing dt, dl.thumbnailListing dd, dl.thumbnailListing a');
+ enableContextMenu('dl.thumbnailListing');
+ for(i in files)
+ {
+ if(files[i].type== 'folder') {
+ //this is foder item
+ enableFolderBrowsable(i);
+ } else {
+ //this is file item
+
+ switch(files[i].cssClass) {
+ case 'filePicture':
+ //$('#a' + i).attr('rel', 'ajaxphotos');
+ //retrieveThumbnail(i);
+
+ break;
+ case 'fileFlash':
+ break;
+ case 'fileSwf':
+ break;
+ case 'fileVideo':
+ break;
+ case 'fileMusic':
+ break;
+ default:
+
+
+ }
+ enablePreview('#dt' + i, i);
+ enablePreview('#thumbUrl' + i, i);
+ enablePreview('#a' + i, i);
+ }
enableShowDocInfo( i);
-
- }
- break;
- case 'detail':
- default:
-
- enableContextMenu('#fileList tr');
- for(i in files)
- {
- if(files[i].type== 'folder')
- {//this is foder item
- enableFolderBrowsable(i);
- }else
- {//this is file item
- switch(files[i].cssClass)
- {
- case 'filePicture':
- $('#row' + i + ' td a').attr('rel', 'ajaxphotos');
- break;
- case 'fileFlash':
- break;
- case 'fileSwf':
- break;
- case 'fileVideo':
- break;
- case 'fileMusic':
- break;
- default:
-
- };
- enablePreview('#row' + i + ' td a', i);
-
- }
- enableShowDocInfo(i);
- }
- break;
-
-
- }
- }
-
-
+ }
+ break;
+ case 'detail':
+ default:
+
+ enableContextMenu('#fileList tr');
+ for(i in files) {
+ if(files[i].type== 'folder') {
+ //this is foder item
+ enableFolderBrowsable(i);
+ } else {
+ //this is file item
+ switch(files[i].cssClass) {
+ case 'filePicture':
+ $('#row' + i + ' td a').attr('rel', 'ajaxphotos');
+ break;
+ case 'fileFlash':
+ break;
+ case 'fileSwf':
+ break;
+ case 'fileVideo':
+ break;
+ case 'fileMusic':
+ break;
+ default:
+ // NOP
+ };
+ enablePreview('#row' + i + ' td a', i);
+ }
+ enableShowDocInfo(i);
+ }
+ break;
+ }
+ }
};
+
+
function enableFolderBrowsable(num, debug)
{
-
- switch(getView())
- {
- case 'thumbnail':
- $('#dt'+ num + ' , #dd' + num + ' a').each(function()
-
- {
-/* if(typeof(debug) != 'undefined' && debug)
- {
- alert(this.tagName + ' ' + files[num].path);
- }*/
- doEnableFolderBrowsable(this, num);
- }
- );
- break;
- case 'detail':
- default:
-
- $('#row' + num + ' td a').each(function()
-
- {
-
- doEnableFolderBrowsable(this, num );
- }
- );
-
- }
-
-
-
-
+ switch(getView()) {
+ case 'thumbnail':
+ $('#dt'+ num + ' , #dd' + num + ' a').each(
+ function() {
+ /*
+ if(typeof(debug) != 'undefined' && debug) {
+ alert(this.tagName + ' ' + files[num].path);
+ }
+ */
+ doEnableFolderBrowsable(this, num);
+ }
+ );
+ break;
+ case 'detail':
+ default:
+ $('#row' + num + ' td a').each(
+ function() {
+ doEnableFolderBrowsable(this, num );
+ }
+ );
+ }
};
+
+
function doEnableFolderBrowsable(elem, num)
{
- $(elem).click(function()
- {
- {
- searchRequired = false;
- var typeNum = typeof(num);
- if(typeNum.toUpperCase() == 'STRING')
- {
- var fpath = (num.indexOf(urls.view) >=0?num:files[num].path);
- }else
- {
- var fpath = files[num].path;
- }
-
-
- var url = appendQueryString(getUrl('view', true, true), 'path=' + fpath, ['path']);
-
-
- $('#rightCol').empty();
- ajaxStart('#rightCol');
- $('#rightCol').load(url,
- {},
- function(){
- urls.present = appendQueryString(getUrl('home', true, true), 'path=' + fpath, ['path']);
- ajaxStop('#rightCol img.ajaxLoadingImg');
- initAfterListingLoaded();
- });
- };
- return false;
-
- }
- );
+ $(elem).click(function() {
+ {
+ searchRequired = false;
+ var typeNum = typeof(num);
+ if(typeNum.toUpperCase() == 'STRING') {
+ var fpath = (num.indexOf(urls.view) >=0?num:files[num].path);
+ } else {
+ var fpath = files[num].path;
+ }
+ var url = appendQueryString(getUrl('view', true, true), 'path=' + fpath, ['path']);
+ $('#rightCol').empty();
+ ajaxStart('#rightCol');
+ $('#rightCol').load(url,
+ {},
+ function(){
+ urls.present = appendQueryString(getUrl('home', true, true), 'path=' + fpath, ['path']);
+ ajaxStop('#rightCol img.ajaxLoadingImg');
+ initAfterListingLoaded();
+ }
+ );
+ };
+ return false;
+ }
+ );
};
+
+
/**
-* @param mixed destinationSelector where the animation image will be append to
-* @param mixed selectorOfAnimation the jquery selector of the animation
-*/
+ * @param mixed destinationSelector where the animation image will be append to
+ * @param mixed selectorOfAnimation the jquery selector of the animation
+ */
function ajaxStart(destinationSelector, id, selectorOfAnimation)
{
- if(typeof(selectorOfAnimation) == 'undefined')
- {//set defaullt animation
- selectorOfAnimation = '#ajaxLoading img';
- }
- if(typeof(id) != 'undefined')
- {
- $(selectorOfAnimation).clone().attr('id', id).appendTo(destinationSelector);
-
- }else
- {
- $(selectorOfAnimation).clone(true).appendTo(destinationSelector);
-
- }
-
-
+ if(typeof(selectorOfAnimation) == 'undefined') {
+ //set defaullt animation
+ selectorOfAnimation = '#ajaxLoading img';
+ }
+ if(typeof(id) != 'undefined') {
+ $(selectorOfAnimation).clone().attr('id', id).appendTo(destinationSelector);
+ } else {
+ $(selectorOfAnimation).clone(true).appendTo(destinationSelector);
+ }
};
+
+
+
/**
-* remove the ajax animation
-* @param mixed selectorOfAnimation the jquery selector of the animation
-*/
+ * remove the ajax animation
+ * @param mixed selectorOfAnimation the jquery selector of the animation
+ */
function ajaxStop(selectorOfAnimation)
{
- $(selectorOfAnimation).remove();
+ $(selectorOfAnimation).remove();
};
+
+
+
/**
-* change pagination limit
-*/
+ * change pagination limit
+ */
function changePaginationLimit(elem)
{
- var url = getUrl('view', true, true, true);
- $('#rightCol').empty();
- ajaxStart('#rightCol');
- $('#rightCol').load(url,
- {},
- function(){
- urls.present = appendQueryString(getUrl('home', true, true), 'path=' + parentFolder.path , ['path'])
- ajaxStop('#rightCol img.ajaxLoadingImg');
- initAfterListingLoaded();
- });
+ var url = getUrl('view', true, true, true);
+ $('#rightCol').empty();
+ ajaxStart('#rightCol');
+ $('#rightCol').load(url,
+ {},
+ function(){
+ urls.present = appendQueryString(getUrl('home', true, true), 'path=' + parentFolder.path , ['path'])
+ ajaxStop('#rightCol img.ajaxLoadingImg');
+ initAfterListingLoaded();
+ }
+ );
};
+
+
+
/**
-* get a query string variable value from an url
-* @param string index
-* @param string url
-*/
+ * get a query string variable value from an url
+ * @param string index
+ * @param string url
+ */
function getUrlVarValue(url, index)
{
-
- if(url != '' && index != '')
- {
- var urlParts = url.split("?");
- baseUrl = urlParts[0];
- var count = 1;
- if(typeof(urlParts[1]) != 'undefined' && urlParts[1] != '')
- {//this is the query string parts
- var queryStrParts = urlParts[1].split("&");
- for(var i=0; i < queryStrParts.length; i++)
- {
- //split into query string variable name & value
- var queryStrVariables = queryStrParts[i].split('=');
- if(queryStrVariables[0] == index)
- {
- return queryStrVariables[1];
- }
- }
- }
- }
- return '';
-
+ if(url != '' && index != '') {
+ var urlParts = url.split("?");
+ baseUrl = urlParts[0];
+ var count = 1;
+ if(typeof(urlParts[1]) != 'undefined' && urlParts[1] != '') {
+ //this is the query string parts
+ var queryStrParts = urlParts[1].split("&");
+ for(var i=0; i < queryStrParts.length; i++) {
+ //split into query string variable name & value
+ var queryStrVariables = queryStrParts[i].split('=');
+ if(queryStrVariables[0] == index) {
+ return queryStrVariables[1];
+ }
+ }
+ }
+ }
+ return '';
};
+
+
+
/**
-* parse current folder
-*/
+ * parse current folder
+ */
function parseCurrentFolder()
{
- var folders = currentFolder.friendly_path.split('/');
- var str = '';
- var url = getUrl('view', true, true);
+ var folders = currentFolder.friendly_path.split('/');
+ var str = '';
+ var url = getUrl('view', true, true);
- var parentPath = '';
- for(var i = 0; i < folders.length; i++)
- {
- if(i == 0)
- {
- parentPath += paths.root;
- str += '/<a href="' + appendQueryString(url, 'path='+ parentPath, ['path']) + '"><span class="folderRoot">' + paths.root_title + '</span></a>'
-
- }else
- {
- if(folders[i] != '')
- {
-
- parentPath += folders[i] + '/';
- str += '/<a href="' + appendQueryString(url, 'path='+ parentPath , ['path']) + '"><span class="folderSub">' + folders[i] + '</span></a>';
- }
- }
- }
- $('#currentFolderPath').empty().append(str);
- $('#currentFolderPath a').each(
- function()
- {
- doEnableFolderBrowsable(this, $(this).attr('href'));
- }
- );
+ var parentPath = '';
+ for(var i = 0; i < folders.length; i++) {
+ if(i == 0) {
+ parentPath += paths.root;
+ str += '/<a href="' + appendQueryString(url, 'path='+ parentPath, ['path']) + '"><span class="folderRoot">' + paths.root_title + '</span></a>'
+ } else {
+ if(folders[i] != '') {
+ parentPath += folders[i] + '/';
+ str += '/<a href="' + appendQueryString(url, 'path='+ parentPath , ['path']) + '"><span class="folderSub">' + folders[i] + '</span></a>';
+ }
+ }
+ }
+ $('#currentFolderPath').empty().append(str);
+ $('#currentFolderPath a').each(
+ function() {
+ doEnableFolderBrowsable(this, $(this).attr('href'));
+ }
+ );
};
+
+
+
/**
-* enable pagination as ajax function call
-*/
+ * enable pagination as ajax function call
+ */
function parsePagination()
{
- $('p.pagination a[@id!=pagination_parent_link]').each(function ()
- {
- $(this).click(
- function()
- {
-
-
- var page = getUrlVarValue($(this).attr('href'), 'page');
- var url = appendQueryString(getUrl('view', true, true, searchRequired),'page=' + page, ['page']);
- $('#rightCol').empty();
- ajaxStart('#rightCol');
- $('#rightCol').load(url,
- {},
- function(){
- urls.present = appendQueryString(getUrl('home', true, true, searchRequired),'page=' + page, ['page']);
- ajaxStop('#rightCol img.ajaxLoadingImg');
- initAfterListingLoaded();
- });
- return false;
- }
-
- );
- }
- );
+ $('p.pagination a[@id!=pagination_parent_link]').each(function () {
+ $(this).click(
+ function() {
+ var page = getUrlVarValue($(this).attr('href'), 'page');
+ var url = appendQueryString(getUrl('view', true, true, searchRequired),'page=' + page, ['page']);
+ $('#rightCol').empty();
+ ajaxStart('#rightCol');
+ $('#rightCol').load(url,
+ {},
+ function() {
+ urls.present = appendQueryString(getUrl('home', true, true, searchRequired),'page=' + page, ['page']);
+ ajaxStop('#rightCol img.ajaxLoadingImg');
+ initAfterListingLoaded();
+ });
+ return false;
+ }
+ );
+ }
+ );
};
+
+
+
/**
-* get current view
-*/
+ * get current view
+ */
function getView()
{
- var view = $('input[@name=view][@checked]').get(0);
- if(typeof(view) != 'undefined')
- {
- return view.value;
- }else
- {
- return '';
- }
+ var view = $('input[@name=view][@checked]').get(0);
+ if(typeof(view) != 'undefined') {
+ return view.value;
+ } else {
+ return '';
+ }
};
+
+
function getNum(elemId)
{
-
- if(typeof(elemId) != 'undefined' && elemId != '')
- {
- var r = elemId.match(/[\d\.]+/g);
- if(typeof(r) != 'undefined' && r && typeof(r[0]) != 'undefined')
- {
- return r[0];
- }
- }
-
- return 0;
+ if(typeof(elemId) != 'undefined' && elemId != '') {
+ var r = elemId.match(/[\d\.]+/g);
+ if(typeof(r) != 'undefined' && r && typeof(r[0]) != 'undefined') {
+ return r[0];
+ }
+ }
+ return 0;
};
-function enableContextMenu(jquerySelectors)
-{
-
- $(jquerySelectors).contextMenu('contextMenu',
- {
- bindings:
- {
- 'menuSelect':function(t)
- {
- var num = (getNum($(t).attr('id')));
-
- selectFile(files[num].url);
- },
- 'menuPlay':function(t)
- {
- var num = (getNum($(t).attr('id')));
- $('#playGround').html('<a id="playGround' + num + '" href="' + files[num].path + '"><div id="player"> this is mine</div></a> ');
- $('#playGround' + num).html('');
- $('#playGround' + num).media({ width: 405, height: 340, autoplay: true });
- //alert($('#playGround' + num).html());
- showThickBox($('#a' + num).get(0), appendQueryString('#TB_inline', 'height=350' + '&width=408' + '&inlineId=winPlay&modal=true'));
- },
- 'menuPreview':function(t)
- {
- var num = (getNum($(t).attr('id')));
- $('#a' + num).click();
- },
- 'menuDownload':function(t)
- {
- var num = (getNum($(t).attr('id')));
- generateDownloadIframe(appendQueryString(getUrl('download', false, false), 'path=' + files[num].path, ['path']));
- },
- 'menuRename':function(t)
- {
- var num = (getNum($(t).attr('id')));
- showThickBox($('#a' + num).get(0), appendQueryString('#TB_inline', 'height=100' + '&width=350' + '&inlineId=winRename&modal=true'));
-
- $('div#TB_window #renameName').val(files[num].name);
- $('div#TB_window #original_path').val(files[num].path);
- $('div#TB_window #renameNum').val(num);
- },
- 'menuEdit':function(t)
- {
- var num = (getNum($(t).attr('id')));
- var url = '';
- switch(files[num].cssClass)
- {
- case 'filePicture':
- url = getUrl('image_editor');
- break;
- default:
- url = getUrl('text_editor');
-
- }
- var param = "status=yes,menubar=no,resizable=yes,scrollbars=yes,location=no,toolbar=no";
- param += ",height=" + screen.height + ",width=" + screen.width;
- if(typeof(window.screenX) != 'undefined')
- {
- param += ",screenX = 0,screenY=0";
- }else if(typeof(window.screenTop) != 'undefined' )
- {
- param += ",left = 0,top=0" ;
- }
- var newWindow = window.open(url + ((url.lastIndexOf("?") > - 1)?"&":"?") + "path=" + files[num].path,'', param);
- newWindow.focus( );
-
-
- },
- 'menuCut':function(t)
- {
-
- },
- 'menuCopy':function(t)
- {
-
- },
- 'menuPaste':function(t)
- {
-
- },
- 'menuDelete':function(t)
- {
- var num = (getNum($(t).attr('id')));
- if(window.confirm(warningDelete))
- {
- $.getJSON(appendQueryString(getUrl('delete', false,false), 'delete=' + files[num].path, ['delete']),
- function(data)
- {
- if(typeof(data.error) == 'undefined')
- {
- alert('Unexpected Error.');
- }
- else if(data.error != '')
- {
- alert(data.error);
- }else
- {//remove deleted files
- switch(getView())
- {
- case 'thumbnail': $('#dl' + num ).remove();
- break;
- case 'detail':
- default:
- $('#row' + num).remove();
-
- }
- files[num] = null;
- }
- }
- );
-
-
- }
- }
- },
- onContextMenu:function(events)
- {
-
- return true;
- },
- onShowMenu:function(events, menu)
- {
-
- switch(getView())
- {
- case 'thumbnail':
- var num = getNum(events.target.id);
-
- break;
- case 'detail':
- default:
- switch(events.target.tagName.toLowerCase())
- {
- case 'span':
-
- if($(events.target).parent().get(0).tagName.toLowerCase() == 'a')
- {
-
- var num = getNum($(events.target).parent().parent().parent().attr('id'));
- }else
- {
- var num = getNum($(events.target).parent().parent().parent().parent().attr('id'));
- }
-
-
-
- break;
- case 'td':
- var num = getNum($(events.target).parent().attr('id'));
- ...
[truncated message content] |
|
From: <luc...@us...> - 2011-03-28 19:48:31
|
Revision: 6487
http://xoops.svn.sourceforge.net/xoops/?rev=6487&view=rev
Author: luciorota
Date: 2011-03-28 19:48:25 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
better ajax file manager icons
Modified Paths:
--------------
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/ajaxfilemanager.css
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/folder_add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/page_add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/add.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/folder.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/folderEmpty.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/delete.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/flagYes.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/folder.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/go_parent.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/info.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/refresh.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/tickAll.png
XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/uncheckAll.png
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/ajaxfilemanager.css
===================================================================
--- XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/ajaxfilemanager.css 2011-03-27 12:06:19 UTC (rev 6486)
+++ XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/css/ajaxfilemanager.css 2011-03-28 19:48:25 UTC (rev 6487)
@@ -241,7 +241,6 @@
#actionZip{background-image:url(../images/zip.png);}
#actionRefresh{background-image:url(../images/refresh.png);}
#actionUnzip{background-image:url(../images/unzip.png);}
-#actionUnzip{background-image:url(../images/unzip.png);}
#actionUpload{background-image:url(../images/action/upload.png);}
#actionClose{background-image:url(../images/action/cross.png);}
#actionNewFolder{background-image:url(../images/action/folder_add.png);}
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/folder_add.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/action/page_add.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/add.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/folder.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/big_icon/folderEmpty.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/delete.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/flagYes.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/folder.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/go_parent.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/info.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/refresh.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/tickAll.png
===================================================================
(Binary files differ)
Modified: XoopsModules/ajaxfilemanager/trunk/ajaxfilemanager/ajaxfilemanager/theme/xoops/images/uncheckAll.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-27 12:06:25
|
Revision: 6486
http://xoops.svn.sourceforge.net/xoops/?rev=6486&view=rev
Author: voltan1
Date: 2011-03-27 12:06:19 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
fix templates
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-27 11:57:42 UTC (rev 6485)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-27 12:06:19 UTC (rev 6486)
@@ -8,7 +8,7 @@
return false;
});
- $('#content_<{$content.content_id}>').editable('<{$xoops_url}>/modules/fmcontent/ajax.php', {
+ $('#content_<{$content.content_id}>').editable('<{$xoops_url}>/modules/<{$xoops_dirname}>/ajax.php', {
indicator : '<img src="images/indicator.gif">',
type : 'wysiwyg',
width : 640,
@@ -21,7 +21,7 @@
});
</script>
-<section>
+<section id="content">
<!-- Display error message -->
<{if $content_error}>
<article class="errorMsg"><{$content_error}></article>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-27 11:57:42 UTC (rev 6485)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-27 12:06:19 UTC (rev 6486)
@@ -8,7 +8,7 @@
return false;
});
- $('#content_<{$content.content_id}>').editable('<{$xoops_url}>/modules/fmcontent/ajax.php', {
+ $('#content_<{$content.content_id}>').editable('<{$xoops_url}>/modules/<{$xoops_dirname}>/ajax.php', {
indicator : '<img src="images/indicator.gif">',
type : 'wysiwyg',
width : 640,
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-27 11:57:42 UTC (rev 6485)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-27 12:06:19 UTC (rev 6486)
@@ -8,7 +8,7 @@
return false;
});
- $('#content_<{$content.content_id}>').editable('<{$xoops_url}>/modules/fmcontent/ajax.php', {
+ $('#content_<{$content.content_id}>').editable('<{$xoops_url}>/modules/<{$xoops_dirname}>/ajax.php', {
indicator : '<img src="images/indicator.gif">',
type : 'wysiwyg',
width : 640,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-27 11:57:49
|
Revision: 6485
http://xoops.svn.sourceforge.net/xoops/?rev=6485&view=rev
Author: voltan1
Date: 2011-03-27 11:57:42 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
Add options for show/hide Comments counts in content templates
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-27 11:51:49 UTC (rev 6484)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-27 11:57:42 UTC (rev 6485)
@@ -37,7 +37,7 @@
<{/if}><{$content.content_title}>
</div>
<{/if}>
- <hgroup class="itemInfo">
+ <div class="itemInfo">
<{if $content.author}>
<span class="itemPoster">
<{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.author}></a> - ( <a
@@ -54,7 +54,16 @@
<{if $link.hits}>
<span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
<{/if}>
- </hgroup>
+ <{if $link.coms}>
+ <span class="itemPermaLink">
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ </span>
+ <{/if}>
+ </div>
</header>
<section class="itemBody">
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-27 11:51:49 UTC (rev 6484)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-27 11:57:42 UTC (rev 6485)
@@ -52,6 +52,15 @@
<{if $link.hits}>
<span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
<{/if}>
+ <{if $link.coms}>
+ <span class="itemPermaLink">
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ </span>
+ <{/if}>
</div>
<div class="itemBody">
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-27 11:51:49 UTC (rev 6484)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_content.html 2011-03-27 11:57:42 UTC (rev 6485)
@@ -73,6 +73,15 @@
<{if $link.hits}>
<span class="itemStats">( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )</span>
<{/if}>
+ <{if $link.coms}>
+ <span class="itemPermaLink">
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ </span>
+ <{/if}>
</div>
<div class="right">
<span><a href="<{$content.content_source}>" rel="nofollow"><{$content.content_author}></a></span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-27 11:51:55
|
Revision: 6484
http://xoops.svn.sourceforge.net/xoops/?rev=6484&view=rev
Author: voltan1
Date: 2011-03-27 11:51:49 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
Add options for show/hide Comments counts in index templates
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/main.php
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/main.php
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/main.php 2011-03-27 11:35:02 UTC (rev 6483)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/main.php 2011-03-27 11:51:49 UTC (rev 6484)
@@ -32,7 +32,9 @@
define('_FMCONTENT_DELETE', 'Delete page');
define('_FMCONTENT_PRINT', 'Print page');
define('_FMCONTENT_PDF', 'PDF');
- define('_FMCONTENT_MAIL', 'Mail');
+ define('_FMCONTENT_MAIL', 'Mail');
+ define('_FMCONTENT_COMS', 'comments');
+ define('_FMCONTENT_NOCOMS', 'No comment ');
// Pdf
define('_FMCONTENT_AUTHOR', 'Author: ');
define('_FMCONTENT_DATE', 'Publication date: ');
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html 2011-03-27 11:35:02 UTC (rev 6483)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html 2011-03-27 11:51:49 UTC (rev 6484)
@@ -86,17 +86,28 @@
<footer>
<{if $xoops_isadmin}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <span class="itemAdminLink">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_EDIT}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
+ alt="<{$smarty.const._CONTENT_EDIT}>"/>
+ </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_DELETE}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
+ alt="<{$smarty.const._CONTENT_DELETE}>"/>
+ </a>
+ </span>
<{/if}>
+ <{if $info.coms}>
+ <span class="itemPermaLink">
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ </span>
+ <{/if}>
</footer>
</article>
@@ -168,17 +179,28 @@
<footer>
<{if $xoops_isadmin}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <span class="itemAdminLink">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_EDIT}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
+ alt="<{$smarty.const._CONTENT_EDIT}>"/>
+ </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_DELETE}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
+ alt="<{$smarty.const._CONTENT_DELETE}>"/>
+ </a>
+ </span>
<{/if}>
+ <{if $info.coms}>
+ <span class="itemPermaLink">
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ </span>
+ <{/if}>
</footer>
</article>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html 2011-03-27 11:35:02 UTC (rev 6483)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_index.html 2011-03-27 11:51:49 UTC (rev 6484)
@@ -68,17 +68,28 @@
</div>
<div class="itemFoot">
<{if $xoops_isadmin}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <span class="itemAdminLink">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_EDIT}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
+ alt="<{$smarty.const._CONTENT_EDIT}>"/>
+ </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_DELETE}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
+ alt="<{$smarty.const._CONTENT_DELETE}>"/>
+ </a>
+ </span>
<{/if}>
+ <{if $info.coms}>
+ <span class="itemPermaLink">
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ </span>
+ <{/if}>
</div>
</div>
<{/foreach}>
@@ -141,17 +152,28 @@
</div>
<div class="itemFoot">
<{if $xoops_isadmin}>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
+ <span class="itemAdminLink">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_EDIT}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
+ alt="<{$smarty.const._CONTENT_EDIT}>"/>
+ </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_DELETE}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
+ alt="<{$smarty.const._CONTENT_DELETE}>"/>
+ </a>
+ </span>
<{/if}>
+ <{if $info.coms}>
+ <span class="itemPermaLink">
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ </span>
+ <{/if}>
</div>
</div>
<{/foreach}>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html 2011-03-27 11:35:02 UTC (rev 6483)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_ui_index.html 2011-03-27 11:51:49 UTC (rev 6484)
@@ -51,31 +51,38 @@
<span class=""><{$content.content_short}></span>
</div>
<div class="pad5 marg5 ui-state-default ui-corner-all">
- <span class="right">
- <{if $info.author}>
- <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
- <{/if}>
- <{if $info.date}>
- <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
- <{/if}>
- <{if $info.hits}>
- ( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )
- <{/if}>
- </span>
+ <span class="itemPermaLink right">
+ <{if $info.author}>
+ <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
+ href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
+ <{/if}>
+ <{if $info.date}>
+ <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
+ <{/if}>
+ <{if $info.hits}>
+ ( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )
+ <{/if}>
+ <{if $info.coms}>
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ <{/if}>
+ </span>
<{if $xoops_isadmin}>
- <span class="<{$imgfloat}>">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
- </span>
+ <span class="itemAdminLink left">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_EDIT}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
+ alt="<{$smarty.const._CONTENT_EDIT}>"/>
+ </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_DELETE}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
+ alt="<{$smarty.const._CONTENT_DELETE}>"/>
+ </a>
+ </span>
<{/if}>
</div>
</div>
@@ -121,31 +128,38 @@
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a href="<{$content.url}>"><{$content.content_title}></a>
</div>
<div class="pad5 marg5 ui-state-default ui-corner-all">
- <span class="right">
- <{if $info.author}>
- <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
- <{/if}>
- <{if $info.date}>
- <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
- <{/if}>
- <{if $info.hits}>
- ( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )
- <{/if}>
- </span>
+ <span class="itemPermaLink right">
+ <{if $info.author}>
+ <{$smarty.const._FMCONTENT_AUTHOR}><a href="<{$xoops_url}>/user.php?id=<{$content.content_uid}>"><{$content.owner}></a> - ( <a
+ href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?user=<{$content.content_uid}>"><{$smarty.const._ALL}></a> )
+ <{/if}>
+ <{if $info.date}>
+ <{$smarty.const._FMCONTENT_DATE}><{$content.content_create}> <{if $content.content_update != $content.content_create}><{$smarty.const._FMCONTENT_UPDATE}><{$content.content_update}> <{/if}>
+ <{/if}>
+ <{if $info.hits}>
+ ( <{$content.content_hits}> <{$smarty.const._FMCONTENT_HITS}> )
+ <{/if}>
+ <{if $info.coms}>
+ <{if $content.content_comments}>
+ <{$content.content_comments}> <{$smarty.const._FMCONTENT_COMS}>
+ <{else}>
+ <{$smarty.const._FMCONTENT_NOCOMS}>
+ <{/if}>
+ <{/if}>
+ </span>
<{if $xoops_isadmin}>
- <span class="<{$imgfloat}>">
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_EDIT}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
- alt="<{$smarty.const._CONTENT_EDIT}>"/>
- </a>
- <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
- title="<{$smarty.const._FMCONTENT_DELETE}>">
- <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
- alt="<{$smarty.const._CONTENT_DELETE}>"/>
- </a>
- </span>
+ <span class="itemAdminLink left">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=edit_content&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_EDIT}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/edit.png"
+ alt="<{$smarty.const._CONTENT_EDIT}>"/>
+ </a>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/content.php?op=delete&content_id=<{$content.content_id}>"
+ title="<{$smarty.const._FMCONTENT_DELETE}>">
+ <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/images/icons/delete.png"
+ alt="<{$smarty.const._CONTENT_DELETE}>"/>
+ </a>
+ </span>
<{/if}>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-27 11:35:09
|
Revision: 6483
http://xoops.svn.sourceforge.net/xoops/?rev=6483&view=rev
Author: voltan1
Date: 2011-03-27 11:35:02 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
Add options for show/hide Comments counts
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/admin.php
XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/modinfo.php
XoopsModules/content/branches/fmcontent/modules/fmcontent/sql/mysql.sql
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/class/topic.php
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/content.php
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/index.php
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/admin.php
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/admin.php 2011-03-27 10:34:25 UTC (rev 6482)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/admin.php 2011-03-27 11:35:02 UTC (rev 6483)
@@ -53,7 +53,8 @@
define('_FMCONTENT_TOPIC_SHOWPRINT', 'Display Print');
define('_FMCONTENT_TOPIC_SHOWMAIL', 'Display Mail');
define('_FMCONTENT_TOPIC_SHOWNAV', 'Display Navigation');
- define('_FMCONTENT_TOPIC_SHOWHITS', 'Display Hits');
+ define('_FMCONTENT_TOPIC_SHOWHITS', 'Display Hits');
+ define('_FMCONTENT_TOPIC_SHOWCOMS', 'Display Comments');
// Content page
define('_FMCONTENT_FORM', 'Manage Content');
define('_FMCONTENT_FORMTYPE', 'Type');
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/modinfo.php
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/modinfo.php 2011-03-27 10:34:25 UTC (rev 6482)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/modinfo.php 2011-03-27 11:35:02 UTC (rev 6483)
@@ -117,7 +117,10 @@
define('_FMCONTENT_DISHITS_DESC', '');
// Mail Link
define('_FMCONTENT_DISPMAIL', 'Display the Mail link?');
- define('_FMCONTENT_DISPMAIL_DESC', '');
+ define('_FMCONTENT_DISPMAIL_DESC', '');
+// Mail Link
+ define('_FMCONTENT_DISPCOMS', 'Display Comments count?');
+ define('_FMCONTENT_DISPCOMS_DESC', '');
// Per page
define('_FMCONTENT_PERPAGE', 'Per page');
define('_FMCONTENT_PERPAGE_DESC', 'Content per each topic page');
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/sql/mysql.sql
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/sql/mysql.sql 2011-03-27 10:34:25 UTC (rev 6482)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/sql/mysql.sql 2011-03-27 11:35:02 UTC (rev 6483)
@@ -61,6 +61,7 @@
`topic_showmail` tinyint (1) NOT NULL default '1',
`topic_shownav` tinyint (1) NOT NULL default '1',
`topic_showhits` tinyint (1) NOT NULL default '1',
+`topic_showcoms` tinyint (1) NOT NULL default '1',
PRIMARY KEY (`topic_id`,`topic_modid`),
UNIQUE KEY `topic_id` (`topic_id`,`topic_modid`)
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/class/topic.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/class/topic.php 2011-03-27 10:34:25 UTC (rev 6482)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/class/topic.php 2011-03-27 11:35:02 UTC (rev 6483)
@@ -51,6 +51,7 @@
$this->initVar("topic_showmail", XOBJ_DTYPE_INT, 1);
$this->initVar("topic_shownav", XOBJ_DTYPE_INT, 1);
$this->initVar("topic_showhits", XOBJ_DTYPE_INT, 1);
+ $this->initVar("topic_showcoms", XOBJ_DTYPE_INT, 1);
// Pour autoriser le html
$this->initVar("dohtml", XOBJ_DTYPE_INT, 1, false);
@@ -109,8 +110,8 @@
$form->addElement(new XoopsFormRadioYN(_FMCONTENT_TOPIC_SHOWMAIL, 'topic_showmail', $this->getVar('topic_showmail', 'e')));
$form->addElement(new XoopsFormRadioYN(_FMCONTENT_TOPIC_SHOWNAV, 'topic_shownav', $this->getVar('topic_shownav', 'e')));
$form->addElement(new XoopsFormRadioYN(_FMCONTENT_TOPIC_SHOWHITS, 'topic_showhits', $this->getVar('topic_showhits', 'e')));
+ $form->addElement(new XoopsFormRadioYN(_FMCONTENT_TOPIC_SHOWCOMS, 'topic_showcoms', $this->getVar('topic_showcoms', 'e')));
-
//permissions
$member_handler = & xoops_gethandler('member');
$group_list = &$member_handler->getGroupList();
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/content.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/content.php 2011-03-27 10:34:25 UTC (rev 6482)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/content.php 2011-03-27 11:35:02 UTC (rev 6483)
@@ -133,6 +133,9 @@
}
if ($view_topic->getVar('topic_showhits')) {
$link['hits'] = '1';
+ }
+ if ($view_topic->getVar('topic_showcoms')) {
+ $link['coms'] = '1';
}
if ($view_topic->getVar('topic_showmail')) {
// Mail link & label
@@ -185,6 +188,9 @@
}
if (xoops_getModuleOption('disp_hits', $forMods->getVar('dirname'))) {
$link['hits'] = '1';
+ }
+ if (xoops_getModuleOption('disp_coms', $forMods->getVar('dirname'))) {
+ $link['coms'] = '1';
}
if (xoops_getModuleOption('disp_maillink', $forMods->getVar('dirname'))) {
// Mail link & label
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/index.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/index.php 2011-03-27 10:34:25 UTC (rev 6482)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/index.php 2011-03-27 11:35:02 UTC (rev 6483)
@@ -179,6 +179,9 @@
}
if ($view_topic->getVar('topic_showhits')) {
$info['hits'] = '1';
+ }
+ if ($view_topic->getVar('topic_showcoms')) {
+ $info['coms'] = '1';
}
} else {
@@ -188,8 +191,11 @@
if (xoops_getModuleOption('disp_author', $forMods->getVar('dirname'))) {
$info['author'] = '1';
}
- if (xoops_getModuleOption('disp_hits', $forMods->getVar('dirname'))) {
+ if (xoops_getModuleOption('disp_hits', $forMods->getVar('dirname'))) {
$info['hits'] = '1';
+ }
+ if (xoops_getModuleOption('disp_coms', $forMods->getVar('dirname'))) {
+ $info['coms'] = '1';
}
}
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php 2011-03-27 10:34:25 UTC (rev 6482)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php 2011-03-27 11:35:02 UTC (rev 6483)
@@ -313,6 +313,14 @@
'default' => 1);
$modversion['config'][] = array(
+ 'name' => 'disp_coms',
+ 'title' => '_FMCONTENT_DISPCOMS',
+ 'description' => '_FMCONTENT_DISPCOMS_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1);
+
+$modversion['config'][] = array(
'name' => 'perpage',
'title' => '_FMCONTENT_PERPAGE',
'description' => '_FMCONTENT_PERPAGE_DESC',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-27 10:34:32
|
Revision: 6482
http://xoops.svn.sourceforge.net/xoops/?rev=6482&view=rev
Author: voltan1
Date: 2011-03-27 10:34:25 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
fix template
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html 2011-03-27 09:41:45 UTC (rev 6481)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_index.html 2011-03-27 10:34:25 UTC (rev 6482)
@@ -1,5 +1,5 @@
<{include file="db:fmcontent_header.html"}>
-<section>
+<section id="content">
<div class="pagenave"><{$content_pagenav}></div>
<{if $default}>
@@ -38,7 +38,7 @@
<{if $showtype == 1}>
<{foreach item=content from=$contents}>
- <section class="item">
+ <article class="item">
<header>
<div class="itemTitle"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> :
@@ -64,7 +64,7 @@
</hgroup>
</header>
- <article class="itemBody" id="content_<{$content.content_id}>">
+ <div class="itemBody" id="content_<{$content.content_id}>">
<{if $content.content_img}>
<aside class="sideimg">
<figure>
@@ -77,12 +77,12 @@
<img width="<{$imgwidth}>" class="<{$imgfloat}> content_img" src="<{$content.imgurl}>" alt="<{$content.content_title}>"/>
<{/if}>
</span>
- <figcaption><{$content.content_imgdesc}></figcaption>
+ <figcaption><{$content.content_title}></figcaption>
</figure>
</aside>
<{/if}>
<{$content.content_short}>
- </article>
+ </div>
<footer>
<{if $xoops_isadmin}>
@@ -99,7 +99,7 @@
<{/if}>
</footer>
- </section>
+ </article>
<{/foreach}>
<{/if}>
@@ -124,10 +124,9 @@
<{if $showtype == 3}>
<{foreach item=content from=$contents}>
- <section class="item">
+ <article class="item">
- <article class="itemBody" id="content_<{$content.content_id}>">
- <figure>
+ <div class="itemBody" id="content_<{$content.content_id}>">
<figure>
<div class="itemImg center gallery">
<{if $img_lightbox}>
@@ -138,11 +137,10 @@
<img width="<{$imgwidth}>" class="content_img" src="<{$content.imgurl}>" alt="<{$content.content_title}>"/>
<{/if}>
</div>
- </figure>
<figcaption><{$content.content_imgdesc}></figcaption>
</figure>
<div class="itemText"><{$content.content_short}></div>
- </article>
+ </div>
<header>
<div class="itemTitle"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$content.content_topic}>"><{$content.topic}></a> : <a
@@ -183,7 +181,7 @@
<{/if}>
</footer>
- </section>
+ </article>
<{/foreach}>
<{/if}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2011-03-27 09:41:52
|
Revision: 6481
http://xoops.svn.sourceforge.net/xoops/?rev=6481&view=rev
Author: voltan1
Date: 2011-03-27 09:41:45 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
fix list block
Modified Paths:
--------------
XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/blocks.php
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/blocks/fmcontent_list.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/blocks/list.php
XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/blocks.php
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/blocks.php 2011-03-27 08:53:54 UTC (rev 6480)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/language/english/blocks.php 2011-03-27 09:41:45 UTC (rev 6481)
@@ -33,6 +33,7 @@
define('_FMCONTENT_CHARS', 'Title Lenght ');
define('_FMCONTENT_IMG', 'Image');
define('_FMCONTENT_WIDTH', 'Image width');
- define('_FMCONTENT_DESCRIPTION', 'Description');
+ define('_FMCONTENT_DESCRIPTION', 'Description');
+ define('_FMCONTENT_DATE', 'Publication date');
}
?>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/blocks/fmcontent_list.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/blocks/fmcontent_list.html 2011-03-27 08:53:54 UTC (rev 6480)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/blocks/fmcontent_list.html 2011-03-27 09:41:45 UTC (rev 6481)
@@ -1,14 +1,21 @@
-<div class="content_list">
+<div class="itemList">
<{foreach item=content from=$block.contents}>
- <div class="content_item marg3">
- <div class="content_title"><a href="<{$content.url}>"><{$content.title}></a> (<{$content.date}>)</div>
+ <div class="item">
+ <div class="itemHead">
+ <div class="itemTitle"><a href="<{$content.url}>"><{$content.title}></a></div>
+ </div>
+ <{if $block.date}>
+ <div class="itemInfo"><{$smarty.const._FMCONTENT_DATE}> : <{$content.date}></div>
+ <{/if}>
<{if $block.img || $block.description}>
- <div class="content_body">
+ <div class="itemBody" id="content_<{$content.content_id}>">
<{if $block.img && $content.content_img}>
- <img width="<{$block.width}>" class="<{$block.float}>" src="<{$block.imgurl}><{$content.content_img}>" alt="<{$content.title}>" />
+ <span class="itemImg">
+ <img width="<{$block.width}>" class="<{$block.float}>" src="<{$block.imgurl}><{$content.content_img}>" alt="<{$content.title}>" />
+ </span>
<{/if}>
- <{if $block.description && $content.content_short}><{$content.title}>
- <{$content.content_short}>
+ <{if $block.description && $content.content_short}>
+ <span class="itemText"><{$content.content_short}></span>
<{/if}>
</div>
<{/if}>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-27 08:53:54 UTC (rev 6480)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_html5_content.html 2011-03-27 09:41:45 UTC (rev 6481)
@@ -33,7 +33,7 @@
<{if $content.content_titleview}>
<!-- Display page content -->
<div class="itemTitle"><{if $link.topicshow}><a
- href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>"><{$link.topic}></a> :
+ href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?topic=<{$link.topicid}>">x<{$link.topic}></a> :
<{/if}><{$content.content_title}>
</div>
<{/if}>
Modified: XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html
===================================================================
--- XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-27 08:53:54 UTC (rev 6480)
+++ XoopsModules/content/branches/fmcontent/modules/fmcontent/templates/fmcontent_legacy_content.html 2011-03-27 09:41:45 UTC (rev 6481)
@@ -124,6 +124,7 @@
</span>
</div>
</div>
+
<{if $tags}>
<div class="tagbar"><{include file="db:tag_bar.html"}></div>
<{/if}>
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/blocks/list.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/blocks/list.php 2011-03-27 08:53:54 UTC (rev 6480)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/blocks/list.php 2011-03-27 09:41:45 UTC (rev 6481)
@@ -20,7 +20,7 @@
* @version $Id:$
*/
function fmcontent_list_show($options) {
-
+
$content_handler = xoops_getmodulehandler('page', 'fmcontent');
$block = array();
@@ -28,11 +28,13 @@
$content_limit = $options[1];
$lenght_title = $options[2];
$showimg = $options[3];
- $showdescription = $options[4];
- $content_sort = $options[5];
- $width = $options[6];
- $float = $options[7];
+ $showdescription = $options[4];
+ $showdate = $options[5];
+ $content_sort = $options[6];
+ $width = $options[7];
+ $float = $options[8];
+ array_shift($options);
array_shift($options);
array_shift($options);
array_shift($options);
@@ -49,11 +51,12 @@
// Add block data
$block['img'] = $showimg;
$block['imgurl'] = XOOPS_URL . xoops_getModuleOption('img_dir', 'fmcontent');
- $block['description'] = $showdescription;
+ $block['description'] = $showdescription;
+ $block['date'] = $showdate;
$block['contents'] = $contents;
$block['width'] = $width;
$block['float'] = $float;
-
+
return $block;
}
@@ -69,7 +72,8 @@
$form = _FMCONTENT_DISP . " \n";
$form = "<input type=\"hidden\" name=\"options[]\" value=\"" . $options[0] . "\" />";
$form .= _FMCONTENT_NUMBER . " : <input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"" . $options[1] . "\" type=\"text\" /><br />\n";
- $form .= _FMCONTENT_CHARS . " : <input name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\"" . $options[2] . "\" type=\"text\" /><br />\n";
+ $form .= _FMCONTENT_CHARS . " : <input name=\"options[2]\" size=\"5\" maxlength=\"255\" value=\"" . $options[2] . "\" type=\"text\" /><br />\n";
+
if ($options[3] == false) {
$checked_yes = '';
$checked_no = 'checked="checked"';
@@ -78,7 +82,8 @@
$checked_no = '';
}
$form .= _FMCONTENT_IMG . " : <input name=\"options[3]\" value=\"1\" type=\"radio\" " . $checked_yes . "/>" . _YES . " \n";
- $form .= "<input name=\"options[3]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
+ $form .= "<input name=\"options[3]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
+
if ($options[4] == false) {
$checked_yes = '';
$checked_no = 'checked="checked"';
@@ -86,11 +91,20 @@
$checked_yes = 'checked="checked"';
$checked_no = '';
}
+ $form .= _FMCONTENT_DESCRIPTION . " : <input name=\"options[4]\" value=\"1\" type=\"radio\" " . $checked_yes . "/>" . _YES . " \n";
+ $form .= "<input name=\"options[4]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
+
+ if ($options[5] == false) {
+ $checked_yes = '';
+ $checked_no = 'checked="checked"';
+ } else {
+ $checked_yes = 'checked="checked"';
+ $checked_no = '';
+ }
+ $form .= _FMCONTENT_DATE . " : <input name=\"options[5]\" value=\"1\" type=\"radio\" " . $checked_yes . "/>" . _YES . " \n";
+ $form .= "<input name=\"options[5]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
- $form .= _FMCONTENT_DESCRIPTION . " : <input name=\"options[4]\" value=\"1\" type=\"radio\" " . $checked_yes . "/>" . _YES . " \n";
- $form .= "<input name=\"options[4]\" value=\"0\" type=\"radio\" " . $checked_no . "/>" . _NO . "<br />\n";
-
- $content_sort = new XoopsFormSelect(_FMCONTENT_SHOWTYPE, 'options[]', $options[5]);
+ $content_sort = new XoopsFormSelect(_FMCONTENT_SHOWTYPE, 'options[]', $options[6]);
$content_sort->addOption("content_id", _FMCONTENT_SHOWSORT_1);
$content_sort->addOption("content_create", _FMCONTENT_SHOWSORT_2);
$content_sort->addOption("content_update", _FMCONTENT_SHOWSORT_3);
@@ -99,9 +113,9 @@
$content_sort->addOption("RAND()", _FMCONTENT_SHOWSORT_6);
$form .= _FMCONTENT_SHOWTYPE . " : " . $content_sort->render() . '<br />';
- $form .= _FMCONTENT_WIDTH . " : <input name=\"options[6]\" size=\"5\" maxlength=\"255\" value=\"" . $options[6] . "\" type=\"text\" /><br />\n";
+ $form .= _FMCONTENT_WIDTH . " : <input name=\"options[7]\" size=\"5\" maxlength=\"255\" value=\"" . $options[7] . "\" type=\"text\" /><br />\n";
- $float_select = new XoopsFormSelect(_FMCONTENT_IMAGE_FLOAT, 'options[]', $options[7]);
+ $float_select = new XoopsFormSelect(_FMCONTENT_IMAGE_FLOAT, 'options[]', $options[8]);
$float_select->addOption("left", _FMCONTENT_IMAGE_LEFT);
$float_select->addOption("right", _FMCONTENT_IMAGE_RIGHT);
$form .= _FMCONTENT_IMAGE_FLOAT . " : " . $float_select->render() . '<br />';
@@ -113,6 +127,7 @@
array_shift($options);
array_shift($options);
array_shift($options);
+ array_shift($options);
array_shift($options);
$form .= _FMCONTENT_TOPICDISPLAY . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">\n";
Modified: XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php
===================================================================
--- XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php 2011-03-27 08:53:54 UTC (rev 6480)
+++ XoopsModules/content/branches/fmcontent/xoops_lib/modules/fmcontent/xoops_version.php 2011-03-27 09:41:45 UTC (rev 6481)
@@ -101,7 +101,7 @@
'description' => '',
'show_func' => 'fmcontent_list_show',
'edit_func' => 'fmcontent_list_edit',
- 'options' => $modversion['dirname'] . '|10|100|1|1|content_create|180|left|0',
+ 'options' => $modversion['dirname'] . '|10|100|1|1|1|content_create|180|left|0',
'template' => 'fmcontent_list.html');
// Settings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.