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
(4) |
2
(3) |
|
3
(4) |
4
(7) |
5
(10) |
6
(6) |
7
(7) |
8
(2) |
9
(8) |
|
10
(16) |
11
(5) |
12
(7) |
13
(4) |
14
(3) |
15
(12) |
16
(3) |
|
17
(1) |
18
(3) |
19
(10) |
20
|
21
(3) |
22
(4) |
23
(5) |
|
24
(12) |
25
(2) |
26
(3) |
27
(13) |
28
(12) |
29
(3) |
30
(7) |
|
31
(9) |
|
|
|
|
|
|
|
From: <for...@us...> - 2010-01-31 22:27:34
|
Revision: 4255
http://xoops.svn.sourceforge.net/xoops/?rev=4255&view=rev
Author: forxoops
Date: 2010-01-31 22:27:28 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
xhange css name style for module log
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2010-01-31 22:23:15 UTC (rev 4254)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2010-01-31 22:27:28 UTC (rev 4255)
@@ -405,7 +405,7 @@
} else {
$newmid = $module->getVar('mid');
$msgs = array();
- $msgs[] = '<div id="xo-ModuleLog"><div class="header">';
+ $msgs[] = '<div id="xo-module-log"><div class="header">';
$msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UPDATING . $module->getInfo('name', 's') . '</h4>';
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
$msgs[] ='<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" />';
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2010-01-31 22:23:15 UTC (rev 4254)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2010-01-31 22:27:28 UTC (rev 4255)
@@ -33,7 +33,7 @@
$errs = array();
$msgs = array();
- $msgs[] = '<div id="xo-ModuleLog"><div class="header">';
+ $msgs[] = '<div id="xo-module-log"><div class="header">';
$msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_INSTALLING . $module->getInfo('name', 's') . '</h4>';
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
$msgs[] ='<a href="'.XOOPS_URL.'/modules/'.$module->getInfo('dirname', 'e').'/'.$module->getInfo('adminindex').'"><img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" /></a>';
@@ -453,7 +453,7 @@
return "<p>" . sprintf(_AM_SYSTEM_MODULES_FAILUNINS, "<strong>" . $module->getVar('name') . "</strong>") . " " . _AM_SYSTEM_MODULES_ERRORSC . "<br /> - " . _AM_SYSTEM_MODULES_STRTNO . "</p>";
} else {
$msgs = array();
- $msgs[] = '<div id="xo-ModuleLog"><div class="header">';
+ $msgs[] = '<div id="xo-module-log"><div class="header">';
$msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UNINSTAL . $module->getInfo('name', 's') . '</h4>';
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
$msgs[] ='<img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" />';
@@ -622,7 +622,7 @@
include_once XOOPS_ROOT_PATH . '/class/template.php';
xoops_template_clear_module_cache($module->getVar('mid'));
// Display header
- $msgs[] = '<div id="xo-ModuleLog">';
+ $msgs[] = '<div id="xo-module-log">';
$msgs = $msgs + xoops_module_log_header( $module, _AM_SYSTEM_MODULES_ACTIVATE );
// Change value
$module->setVar('isactive', 1);
@@ -652,7 +652,7 @@
include_once XOOPS_ROOT_PATH . '/class/template.php';
xoops_template_clear_module_cache($mid);
// Display header
- $msgs[] = '<div id="xo-ModuleLog">';
+ $msgs[] = '<div id="xo-module-log">';
$msgs = $msgs + xoops_module_log_header( $module, _AM_SYSTEM_MODULES_DEACTIVATE );
// Change value
$module->setVar('isactive', 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2010-01-31 22:23:22
|
Revision: 4254
http://xoops.svn.sourceforge.net/xoops/?rev=4254&view=rev
Author: forxoops
Date: 2010-01-31 22:23:15 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
fix problem with update date
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2010-01-31 21:26:55 UTC (rev 4253)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2010-01-31 22:23:15 UTC (rev 4254)
@@ -387,6 +387,7 @@
$temp_name = $module->getVar('name');
$module->loadInfoAsVar($dirname);
$module->setVar('name', $temp_name);
+ $module->setVar('last_update', time() );
// Call Header
// Define main template
$xoopsOption['template_main'] = 'system_header.html';
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2010-01-31 21:26:55 UTC (rev 4253)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2010-01-31 22:23:15 UTC (rev 4254)
@@ -28,7 +28,7 @@
$module->loadInfoAsVar($dirname);
$module->setVar('weight', 1);
$module->setVar('isactive', 1);
-
+ $module->setVar('last_update', time() );
$error = false;
$errs = array();
$msgs = array();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2010-01-31 21:27:03
|
Revision: 4253
http://xoops.svn.sourceforge.net/xoops/?rev=4253&view=rev
Author: forxoops
Date: 2010-01-31 21:26:55 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
change header and remove futur help link
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_header.html
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_header.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_header.html 2010-01-31 18:07:27 UTC (rev 4252)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_header.html 2010-01-31 21:26:55 UTC (rev 4253)
@@ -10,7 +10,6 @@
<{/if}>
<{/if}>
<{/foreach}>
- <li class="xo-help"><a href=""><img src="<{xoAdminIcons apps/khelpcenter.png}>" alt="Help" /></a></li>
</ul>
<{if $xo_sys_tips}>
<div class="tips ui-corner-all">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ara...@us...> - 2010-01-31 18:07:47
|
Revision: 4252
http://xoops.svn.sourceforge.net/xoops/?rev=4252&view=rev
Author: arabxoops
Date: 2010-01-31 18:07:27 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
arabic lang 2.4.4
Modified Paths:
--------------
XoopsLanguages/arabic/core/2.4_win1256/install/language/arabic/welcome.php
XoopsLanguages/arabic/core/2.4_win1256/language/arabic/logger.php
XoopsLanguages/arabic/core/2.4_win1256/language/arabic/style.css
XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/admin.php
XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/preferences.php
XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/blocks.php
XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/modinfo.php
XoopsLanguages/arabic/core/2.4_win1256/upgrade/language/arabic/upgrade.php
Modified: XoopsLanguages/arabic/core/2.4_win1256/install/language/arabic/welcome.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/install/language/arabic/welcome.php 2010-01-31 16:54:19 UTC (rev 4251)
+++ XoopsLanguages/arabic/core/2.4_win1256/install/language/arabic/welcome.php 2010-01-31 18:07:27 UTC (rev 4252)
@@ -16,13 +16,13 @@
\xE6 \xE1\xDF \xCD\xD1\xED\xC9 \xC7\xD3\xCA\xCE\xCF\xC7\xE3\xE5 \xE6 \xCA\xDA\xCF\xED\xE1\xE5.
\xED\xE3\xDF\xE4\xDF \xC5\xDA\xC7\xCF\xC9 \xCA\xE6\xD2\xED\xDA\xE5 \xC8\xE3\xC7 \xC3\xE4\xDF \xE3\xE1\xCA\xD2\xE3 \xC8\xD4\xD1\xE6\xD8 \xC7\xE1\xCA\xE6\xD2\xED\xDA \xC7\xE1\xE3\xCA\xDA\xC7\xD1\xDD \xDA\xE1\xED\xE5\xC7.
</p>
-<h3>\xE3\xCA\xD8\xE1\xC8\xC7\xCA \xCA\xD1\xDF\xED\xC8 \xC7\xE1\xE3\xCC\xE1\xC9</h3>
+<h3>\xE3\xCA\xD8\xE1\xC8\xC7\xCA \xCA\xD1\xDF\xED\xC8 \xE4\xD9\xC7\xE3 \xC5\xCF\xC7\xD1\xC9 \xC7\xE1\xE3\xCD\xCA\xE6\xEC</h3>
<ul>
<li>\xCE\xC7\xCF\xE3 \xE6\xED\xC8: <a href="http://www.apache.org/" rel="external">Apache</a> \xE6 IIS \xE6 Roxen \xE6 \xDB\xED\xD1\xE5\xC7</li>
<li>\xC8\xED\xC6\xC9 <a href="http://www.php.net/" rel="external">PHP</a>: \xC7\xE1\xC5\xD5\xCF\xC7\xD1\xC9 4.3.0 \xC3\xE6 \xC3\xDA\xE1\xEC \xE6 \xED\xE6\xD5\xEC \xC8\xC7\xE1\xC5\xD5\xCF\xC7\xD1\xC9 5.2 \xDD\xE3\xC7 \xDD\xE6\xDE</li>
<li>\xDE\xC7\xDA\xCF\xC9 \xC8\xED\xC7\xE4\xC7\xCA <a href="http://www.mysql.com/" rel="external">MySQL</a>: \xC7\xE1\xC5\xD5\xCF\xC7\xD1\xC9 32.3 \xC3\xE6 \xC3\xDA\xE1\xEC \xE6 \xED\xE6\xD5\xEC \xC8\xC7\xE1\xC5\xD5\xCF\xC7\xD1\xC9 4.1 \xDD\xE3\xC7 \xDD\xE6\xDE</li>
</ul>
-<h3>\xDE\xC8\xE1 \xCA\xD1\xDF\xED\xC8 \xC7\xE1\xE3\xCC\xE1\xC9</h3>
+<h3>\xDE\xC8\xE1 \xCA\xD1\xDF\xED\xC8 \xE4\xD9\xC7\xE3 \xC5\xCF\xC7\xD1\xC9 \xC7\xE1\xE3\xCD\xCA\xE6\xEC</h3>
<ol>
<li>\xCA\xC3\xDF\xCF \xE3\xE4 \xC3\xE4 \xC8\xD1\xE3\xCC\xC9 \xC8\xED \xC3\xCA\xD4 \xC8\xED \xCA\xDD\xCA\xCD \xDF\xE1 \xE3\xE3\xED\xD2\xC7\xCA\xE5\xC7 \xE1\xE3\xE6\xDE\xDA\xDF</li>
<li>\xC5\xE4\xD4\xC7\xC1 \xDE\xC7\xDA\xCF\xC9 \xC8\xED\xC7\xE4\xC7\xCA \xE1\xE1\xE3\xCC\xE1\xC9</li>
Modified: XoopsLanguages/arabic/core/2.4_win1256/language/arabic/logger.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/language/arabic/logger.php 2010-01-31 16:54:19 UTC (rev 4251)
+++ XoopsLanguages/arabic/core/2.4_win1256/language/arabic/logger.php 2010-01-31 18:07:27 UTC (rev 4252)
@@ -31,6 +31,7 @@
define('_LOGGER_NONE', '\xE1\xC7 \xD4\xED\xC1');
define('_LOGGER_ALL', '\xC7\xE1\xDF\xE1');
define('_LOGGER_ERRORS', '\xC7\xE1\xC3\xCE\xD8\xC7\xC1');
+define('_LOGGER_DEPRECATED', "\xED\xCD\xCA\xC7\xCC \xE1\xE1\xCA\xD8\xE6\xED\xD1");
define('_LOGGER_QUERIES', '\xC7\xE1\xC7\xD3\xCA\xDA\xE1\xC7\xE3\xC7\xCA');
define('_LOGGER_BLOCKS', '\xC7\xE1\xC8\xE1\xE6\xDF\xC7\xCA');
define('_LOGGER_EXTRA', '\xC3\xCE\xD1\xEC');
Modified: XoopsLanguages/arabic/core/2.4_win1256/language/arabic/style.css
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/language/arabic/style.css 2010-01-31 16:54:19 UTC (rev 4251)
+++ XoopsLanguages/arabic/core/2.4_win1256/language/arabic/style.css 2010-01-31 18:07:27 UTC (rev 4252)
@@ -1,45 +1,101 @@
/* $Id$ */
-table {text-align : right;}
-table.toptable , table.maintable , table.footertable{direction : rtl;}
-table td {direction : rtl;text-align : right;}
-body td , p {direction : rtl;}
-a:link , a:active , a:visited {direction : rtl;}
-a:hover {direction : rtl;}
-h1 {direction : rtl;text-align: Justify;}
-h2 {direction : rtl;text-align: Justify;}
-h4 {direction : rtl;text-align: Justify;}
-ul {text-align : right;direction : rtl;}
-select , textarea {direction : rtl;text-align : right;}
-.item {direction : rtl;text-align : right;}
-th {direction : rtl;}
-th a:link , th a:active , th a:visited {direction : rtl;}
-.outer {direction : rtl;text-align : right;}
-.head {direction : rtl;text-align : right;}
-.even {direction: rtl; text-align: right;}
-.odd {direction: rtl; text-align: right;}
-.foot {direction : rtl;}
-div.confirmMsg {direction : rtl;text-align : right;}
-div.xoopsCode {direction : ltr;}
-div.xoopsQuote {direction : rtl;text-align : right;}
-.comTitle {direction : rtl;text-align : right;}
-.comText {direction : rtl;text-align : justify;}
-.comUserStat {direction : rtl;}
-.comUserName { direction : rtl;text-align : right;}
-.sCommentThread {text-align : right;}
-.sCommentRank {text-align : right;}
-.headerlogo {direction: rtl;}
-.blockTitle {direction: rtl;}
-.blockContent{direction: rtl;}
-.footerbar {text-align:center;}
-tr.even td {direction : rtl;text-align: right;}
-tr.odd td {direction : rtl;text-align: right;}
-th {direction : rtl;text-align: right;}
-div#content {direction : rtl;text-align: right;}
-div#forum_header{direction : rtl;text-align: right;}
-p.desc { direction : rtl;text-align : right;}
-tr.head td{direction : rtl;text-align : right;}
-td.sideboxcontent{direction : rtl;}
-td#content{direction : rtl;text-align : right;}
-#xo-logger-output td, #xo-logger-output th, #xo-logger-tabs {direction: ltr; text-align: left;}
-#imageform, #imageform td {direction : rtl;text-align : right;}
-/* localization stylesheet */
\ No newline at end of file
+table.toptable,table.maintable,table.footertable,.itemTitle a,.itemPoster,.foot,th a:link,th a:active,th a:visited,.headerlogo,td.sideboxcontent
+ {
+ direction: rtl !important;
+}
+
+.sCommentThread,.sCommentRank {
+ text-align: right !important;
+}
+
+table,.formButton,.comUserName,th,div#content,div#forum_header,p.desc,tr.head td
+ {
+ direction: rtl !important;
+ text-align: right !important;
+}
+
+div#xo-logger-output,div#xo-logger-tabs {
+ direction: ltr !important;
+ text-align: left !important;
+}
+
+body td,p,div,a:link,a:active,a:visited,a:hover,h1,h2,h4,.item,.itemHead,th,.comTitle,.comUserStat,.blockTitle,.blockContent
+ {
+ direction: rtl !important;
+}
+
+input,select,textarea,.itemTitle,.itemStats,.outer,.head,.even,.odd,div.confirmMsg,div.xoopsQuote,td#mainmenu a,td#usermenu a,tr.even td,tr.odd td,td#content
+ {
+ direction: rtl !important;
+ text-align: right !important;
+}
+
+.itemBody,.itemText,.comText {
+ direction: rtl !important;
+ text-align: Justify !important;
+}
+
+/* =================== for Titles =================== */
+ul {
+ padding-left: 0 !important;
+ padding-right: 10px !important;
+ text-align: right !important;
+ direction: rtl !important;
+ margin-left: 0 !important;
+ margin-right: 10px !important;
+}
+
+ol {
+ padding-left: 0 !important;
+ padding-right: 10px !important;
+ margin-left: 0 !important;
+ margin-right: 10px !important;
+}
+
+ul ul {
+ margin-left: 0 !important;
+ margin-right: 10px !important;
+}
+
+ol ol {
+ margin-left: 0 !important;
+ margin-right: 12px !important;
+}
+
+li {
+ padding-left: 0 !important;
+ padding-right: 3px !important;
+ margin-left: 0 !important;
+ margin-right: 4px !important;
+}
+
+/* ========== styles used in the article of contents (exemple : news) ============*/
+.itemPostDate,.itemInfo,.itemFoot {
+ direction: rtl !important;
+ text-align: left !important;
+}
+
+/* ===== core messages ===== */
+div.xoopsCode {
+ direction: ltr !important;
+}
+
+/*=========== for main menu and user menu ===========*/
+td#mainmenu a.menuSub {
+ padding-right: 10px !important;
+}
+
+/*================== for block ======================*/
+.footerbar {
+ text-align: center !important;
+}
+
+#xo-canvas-content ul {
+ text-align: right !important;
+}
+
+/*================== for image manager ======================*/
+#imageform,#imageform td {
+ direction: rtl !important;
+ text-align: right !important;
+}
Modified: XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/admin.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/admin.php 2010-01-31 16:54:19 UTC (rev 4251)
+++ XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/admin.php 2010-01-31 18:07:27 UTC (rev 4252)
@@ -53,7 +53,8 @@
define('_MD_OXYGEN_MAILER','\xCA\xE5\xED\xC6\xC9 \xC7\xE1\xC8\xD1\xED\xCF');
define('_MD_OXYGEN_AUTHENTICATION','\xCE\xED\xC7\xD1\xC7\xCA \xC7\xE1\xCA\xCD\xDE\xDE \xE3\xE4 \xC7\xE1\xE5\xF5\xE6\xED\xF8\xC9');
-//Add for styles name
+//add for styles name
+
define('_MD_LANG_SILVER','\xDD\xD6\xF8\xED');
define('_MD_LANG_DARK','\xC3\xD3\xE6\xCF');
define('_MD_LANG_ORANGE','\xC8\xD1\xCA\xDE\xC7\xE1\xED');
Modified: XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/preferences.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/preferences.php 2010-01-31 16:54:19 UTC (rev 4251)
+++ XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/preferences.php 2010-01-31 18:07:27 UTC (rev 4252)
@@ -115,7 +115,7 @@
define("_MD_AM_METAAUTHOR", "\xC7\xE1\xE4\xC7\xD4\xD1");
define("_MD_AM_METAAUTHORDSC", "\xC7\xDF\xCA\xC8 \xC7\xD3\xE3 \xE4\xC7\xD4\xD1 \xC7\xE1\xE3\xE6\xDE\xDA \xC3\xE6 \xD5\xC7\xCD\xC8\xE5 \xA1 \xC7\xDF\xCA\xC8 \xC8\xD1\xED\xCF\xE5 \xC3\xE6 \xC7\xD3\xE3 \xD4\xDF\xD1\xCA\xE5 \xC3\xE6 \xC7\xD3\xE3 \xE3\xD3\xCA\xCE\xCF\xE3\xE5");
define("_MD_AM_METACOPYR", "\xCD\xDE\xE6\xDE \xC7\xE1\xE3\xE6\xDE\xDA");
-define("_MD_AM_METACOPYRDSC", "\xC7\xDF\xCA\xC8 \xCD\xDE\xE6\xDE \xE3\xE6\xDE\xDA\xDF \xE3\xCB\xE1 \xC8\xD1\xDA\xC7\xED\xC9 \xDD\xE6\xDB\xC7 \xDD\xE6\xD1 \xE5\xED\xE1\xC8");
+define("_MD_AM_METACOPYRDSC", "\xC7\xDF\xCA\xC8 \xCD\xDE\xE6\xDE \xE3\xE6\xDE\xDA\xDF \xE5\xE4\xC7");
define("_MD_AM_METADESC", "\xE6\xD5\xDD \xE3\xE6\xDE\xDA\xDF");
define("_MD_AM_METADESCDSC", "\xC7\xDF\xCA\xC8 \xE6\xD5\xDD \xE3\xE6\xDE\xDA\xDF \xE1\xE1\xCA\xDA\xD1\xED\xDD \xC8\xE5 \xDD\xED \xE3\xCD\xD1\xDF\xC7\xCA \xC7\xE1\xC8\xCD\xCB");
define("_MD_AM_METAFOOTER", "\xC7\xE1\xE3\xED\xCA\xC7 \xCA\xC7\xDB \xC7\xE1\xE5\xED\xCF\xD1 \xE6\xC7\xE1\xDD\xE6\xCA\xD1");
Modified: XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/blocks.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/blocks.php 2010-01-31 16:54:19 UTC (rev 4251)
+++ XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/blocks.php 2010-01-31 18:07:27 UTC (rev 4252)
@@ -42,7 +42,7 @@
define("_MB_SYSTEM_DISPLAYC","\xDA\xD1\xD6 %s \xCA\xDA\xE1\xED\xDE\xC7\xCA");
define("_MB_SYSTEM_SECURE", "\xCA\xD3\xCC\xED\xE1 \xCF\xCE\xE6\xE1 \xC2\xE3\xE4");
-define("_MB_SYSTEM_NUMTHEME", "%s \xDE\xC7\xE1\xC8");
+define("_MB_SYSTEM_NUMTHEME", "%s \xCB\xED\xE3");
define("_MB_SYSTEM_THSHOW", "\xDA\xD1\xD6 \xC7\xE1\xD5\xE6\xD1\xC9 \xC7\xE1\xCA\xE6\xD6\xED\xCD\xED\xC9");
define("_MB_SYSTEM_THWIDTH", "\xCD\xCC\xE3 \xDA\xD1\xD6 \xC7\xE1\xD5\xE6\xD1\xC9 \xC7\xE1\xCA\xE6\xD6\xED\xCD\xED\xC9");
define('_MB_SYSTEM_REMEMBERME', '\xCA\xD0\xDF\xD1\xE4\xED');
Modified: XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/modinfo.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/modinfo.php 2010-01-31 16:54:19 UTC (rev 4251)
+++ XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/modinfo.php 2010-01-31 18:07:27 UTC (rev 4252)
@@ -25,7 +25,7 @@
define('_MI_SYSTEM_BNAME11', "\xC2\xCE\xD1 \xC7\xE1\xCA\xDA\xE1\xED\xDE\xC7\xCA");
// RMV-NOTIFY
define('_MI_SYSTEM_BNAME12', "\xCE\xED\xC7\xD1\xC7\xCA \xC7\xE1\xCA\xC8\xE1\xED\xDB");
-define('_MI_SYSTEM_BNAME13', "\xC7\xE1\xDE\xE6\xC7\xE1\xC8");
+define('_MI_SYSTEM_BNAME13', "\xC7\xE1\xCB\xED\xE3\xC7\xCA");
// Names of admin menu items
define("_MI_SYSTEM_ADMENU1","\xC7\xE1\xC5\xDA\xE1\xC7\xE4\xC7\xCA");
Modified: XoopsLanguages/arabic/core/2.4_win1256/upgrade/language/arabic/upgrade.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/upgrade/language/arabic/upgrade.php 2010-01-31 16:54:19 UTC (rev 4251)
+++ XoopsLanguages/arabic/core/2.4_win1256/upgrade/language/arabic/upgrade.php 2010-01-31 18:07:27 UTC (rev 4252)
@@ -4,9 +4,9 @@
// _CHARSET : windows-1256
// Translator: Arab XOOPS Team
-define( "_XOOPS_UPGRADE", "\xE3\xDA\xC7\xE1\xCC \xCA\xD1\xDE\xED\xC9 \xC7\xE1\xE3\xCC\xE1\xC9" );
+define( "_XOOPS_UPGRADE", "\xE3\xDA\xC7\xE1\xCC \xCA\xD1\xDE\xED\xC9 \xE4\xD9\xC7\xE3 \xC5\xCF\xC7\xD1\xC9 \xC7\xE1\xE3\xCD\xCA\xE6\xEC" );
define( "_CHECKING_APPLIED", "\xC7\xE1\xCA\xCD\xDE\xDE \xE3\xE4 \xCA\xD1\xDE\xED\xC7\xCA \xD3\xC7\xC8\xDE\xC9:" );
-define( "_SET_FILES_WRITABLE", "\xCA\xC3\xDF\xCF \xE3\xE4 \xC3\xE4 \xC7\xE1\xE3\xE1\xDD\xC7\xCA \xC7\xE1\xCA\xC7\xE1\xED\xC9 \xDE\xC7\xC8\xE1\xC9 \xE1\xE1\xDF\xCA\xC7\xC8\xC9 \xDE\xC8\xE1 \xCA\xD1\xDE\xED\xC9 \xC7\xE1\xE3\xCC\xE1\xC9:" );
+define( "_SET_FILES_WRITABLE", "\xCA\xC3\xDF\xCF \xE3\xE4 \xC3\xE4 \xC7\xE1\xE3\xE1\xDD\xC7\xCA \xC7\xE1\xCA\xC7\xE1\xED\xC9 \xDE\xC7\xC8\xE1\xC9 \xE1\xE1\xDF\xCA\xC7\xC8\xC9 \xDE\xC8\xE1 \xCA\xD1\xDE\xED\xC9 \xE4\xD9\xC7\xE3 \xC5\xCF\xC7\xD1\xC9 \xC7\xE1\xE3\xCD\xCA\xE6\xEC:" );
define( "_NO_NEED_UPGRADE", "\xE1\xC7 \xCA\xCD\xCA\xC7\xCC \xC5\xE1\xEC \xC7\xE1\xCA\xD1\xDE\xED\xC9 \xC7\xE1\xC2\xE4 \xA1 \xC7\xE1\xD1\xCC\xC7\xC1 \xCD\xD0\xDD \xE3\xCC\xE1\xCF \xC7\xE1\xCA\xD1\xDE\xED\xC9 \xE3\xE4 \xE3\xE6\xDE\xDA\xDF" );
define( "_NEED_UPGRADE", "\xCA\xD1\xDE\xED\xC9 \xD6\xD1\xE6\xD1\xED\xC9" );
define( "_PROCEED_UPGRADE", "\xC5\xCC\xD1\xC7\xC1 \xC7\xE1\xCA\xD1\xDE\xED\xC9" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2010-01-31 16:54:26
|
Revision: 4251
http://xoops.svn.sourceforge.net/xoops/?rev=4251&view=rev
Author: forxoops
Date: 2010-01-31 16:54:19 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
fix some problem and add drag n drop for module order
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/maintenance/main.php
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/trunk/htdocs/modules/system/css/admin.css
XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin.php
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_groups.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_header.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_images.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules.html
Added Paths:
-----------
XoopsCore/trunk/htdocs/modules/system/js/module.js
Modified: XoopsCore/trunk/htdocs/modules/system/admin/maintenance/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/maintenance/main.php 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/admin/maintenance/main.php 2010-01-31 16:54:19 UTC (rev 4251)
@@ -44,10 +44,13 @@
$form_maintenance = new XoopsThemeForm(_AM_SYSTEM_MAINTENANCE, "maintenance_save", "admin.php?fct=maintenance", 'post', true);
- $form_maintenance->addElement(new XoopsFormRadioYN(_AM_SYSTEM_MAINTENANCE_CACHE, 'cache', '', _YES, _NO));
+ $cache = new XoopsFormRadioYN(_AM_SYSTEM_MAINTENANCE_CACHE, 'cache', '', _YES, _NO);
+ $cache->setDescription( XOOPS_VAR_PATH . "/cache/smarty_compile/" );
+ $form_maintenance->addElement( $cache );
$form_maintenance->addElement(new XoopsFormRadioYN(_AM_SYSTEM_MAINTENANCE_SESSION, 'session', '', _YES, _NO));
$tables_tray = new XoopsFormElementTray(_AM_SYSTEM_MAINTENANCE_TABLES ,'');
+ $tables_tray->setDescription(_AM_SYSTEM_MAINTENANCE_TABLES_DESC);
$maintenance = new SystemMaintenance();
$select_tables = new XoopsFormSelect('', "tables", '', 7, true);
$select_tables->addOptionArray($maintenance->displayTables(true));
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2010-01-31 16:54:19 UTC (rev 4251)
@@ -56,15 +56,17 @@
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$xoTheme->addScript('browse.php?modules/system/js/admin.js');
+ $xoTheme->addScript('browse.php?modules/system/js/module.js');
// Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
- //$xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_LIST );
$xoBreadCrumb->addTips( _AM_SYSTEM_MODULES_TIPS );
$xoBreadCrumb->render();
// Get Module Handler
$module_handler =& xoops_gethandler('module');
+ $criteria = new CriteriaCompo();
+ $criteria->setOrder('weight');
// Get all installed modules
- $installed_mods = $module_handler->getObjects();
+ $installed_mods = $module_handler->getObjects( $criteria );
$listed_mods = array();
$i = 0;
foreach ( $installed_mods as $module ) {
@@ -141,6 +143,23 @@
//xoops_module_list();
break;
+ case 'order':
+ // Get Module Handler
+ $module_handler =& xoops_getmodulehandler('module');
+ $i=0;
+ foreach ($_POST['mod'] as $order) {
+ if( $order > 0 ) {
+ $module = $module_handler->get($order);
+ $module->setVar('weight', $i);
+ if (!$module_handler->insert($module)) {
+ $error=true;
+ }
+ $i++;
+ }
+ }
+ exit;
+ break;
+
case 'confirm':
// Define main template
$xoopsOption['template_main'] = 'system_modules_confirm.html';
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2010-01-31 16:54:19 UTC (rev 4251)
@@ -27,6 +27,7 @@
$module =& $module_handler->create();
$module->loadInfoAsVar($dirname);
$module->setVar('weight', 1);
+ $module->setVar('isactive', 1);
$error = false;
$errs = array();
@@ -35,7 +36,7 @@
$msgs[] = '<div id="xo-ModuleLog"><div class="header">';
$msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_INSTALLING . $module->getInfo('name', 's') . '</h4>';
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
- $msgs[] ='<a href="'.XOOPS_URL.'/modules/'.$module->getInfo('name', 's').'/admin/"><img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" /></a>';
+ $msgs[] ='<a href="'.XOOPS_URL.'/modules/'.$module->getInfo('dirname', 'e').'/'.$module->getInfo('adminindex').'"><img src="' . XOOPS_URL . '/modules/' . $dirname . '/' . trim($module->getInfo('image')) . '" alt="" /></a>';
}
$msgs[] ='<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version');
if ($module->getInfo('author') != false && trim($module->getInfo('author')) != '') {
Modified: XoopsCore/trunk/htdocs/modules/system/css/admin.css
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/css/admin.css 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/css/admin.css 2010-01-31 16:54:19 UTC (rev 4251)
@@ -17,7 +17,7 @@
height: 20px;
}
/* Breadcrumb navigation */
-#xo-Breadcrumb {
+#xo-breadcrumb {
font: 11px Arial, Helvetica, sans-serif;
background-repeat:repeat-x;
height:30px;
@@ -29,12 +29,12 @@
margin:0;
padding:0px;
}
-#xo-Breadcrumb li {
+#xo-breadcrumb li {
list-style-type:none;
float:left;
padding-left:10px;
}
-#xo-Breadcrumb a {
+#xo-breadcrumb a {
height:30px;
display:block;
background-repeat:no-repeat;
@@ -43,14 +43,30 @@
text-decoration: none;
color:#454545;
}
-#xo-Breadcrumb .home {
+#xo-breadcrumb a:hover {
+ color:#35acc5;
+}
+#xo-breadcrumb .home {
border:none;
margin: 8px 0px;
}
-
-#xo-Breadcrumb a:hover {
- color:#35acc5;
+#xo-breadcrumb .xo-help {
+ float:right;
}
+#xo-breadcrumb .xo-help img {
+ padding:4px 0;
+ width:22px;
+ height:22px;
+}
+#xo-breadcrumb .xo-help a {
+ height:30px;
+ display:block;
+ background-repeat:no-repeat;
+ background-position:right;
+ padding-right: 15px;
+ text-decoration: none;
+ color:#454545;
+}
/* Blocks Administration */
#xo-block-managment td {
vertical-align: top;
@@ -136,14 +152,24 @@
opacity:0.60;
}
/* Modules */
-#xo-ModuleLog {
+.xo-module-header {
padding: 5px;
}
-#xo-ModuleLog h4 {
+ul.xo-log-success li {
+ list-style-image: url('../images/yes.png');
+}
+.xo-module-header h4 {
margin: 0px;
border-bottom: dashed 1px #000000;
}
-#xo-ModuleLog .logger {
+#xo-module-log {
+ padding: 5px;
+}
+#xo-module-log h4 {
+ margin: 0px;
+ border-bottom: dashed 1px #000000;
+}
+#xo-module-log .logger {
padding: 0 .5em;
margin: 5px;
min-height: 200px;
Added: XoopsCore/trunk/htdocs/modules/system/js/module.js
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/js/module.js (rev 0)
+++ XoopsCore/trunk/htdocs/modules/system/js/module.js 2010-01-31 16:54:19 UTC (rev 4251)
@@ -0,0 +1,33 @@
+/*
+ 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.
+*/
+
+/**
+ * Modules Javascript
+ *
+ * @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)
+ * @version $Id:$
+ */
+
+$(document).ready(
+ function(){
+ // Controls Drag + Drop
+ $('#xo-module-sort tbody.xo-module').sortable({
+ placeholder: 'ui-state-highlight',
+ update: function(event, ui) {
+ var list = $(this).sortable( 'serialize');
+ $.post( 'admin.php?fct=modulesadmin&op=order', list );
+ }
+ }
+ );
+ $("#xo-module-sort tbody.xo-module").disableSelection();
+ }
+);
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php 2010-01-31 16:54:19 UTC (rev 4251)
@@ -4,33 +4,39 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* _LANGCODE en
* _CHARSET UTF-8
- * @version $Id$
+ * @version $Id:$
*/
- //Nav
+
+//Nav
define("_AM_SYSTEM_MAINTENANCE_NAV_MANAGER", "Maintenance");
define("_AM_SYSTEM_MAINTENANCE_NAV_LIST","All maintenance");
-define("_AM_SYSTEM_MAINTENANCE_SESSION","Empty Sessions Table");
-define("_AM_SYSTEM_MAINTENANCE_SESSION_OK","Session maintenance: OK");
-define("_AM_SYSTEM_MAINTENANCE_SESSION_NOTOK","Session maintenance: Error");
-define("_AM_SYSTEM_MAINTENANCE_CACHE","Clean your cache './xoops_data/caches/smarty_compile'");
-define("_AM_SYSTEM_MAINTENANCE_CACHE_OK","Cache maintenance: OK");
-define("_AM_SYSTEM_MAINTENANCE_CACHE_NOTOK","Cache maintenance: Error");
-define("_AM_SYSTEM_MAINTENANCE_TABLES","Select tables");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_OK","Cache maintenance: OK");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_NOTOK","Cache maintenance: Error");
-define("_AM_SYSTEM_MAINTENANCE_QUERY_DESC","This will Optimize, Check, Repair and Analyze your tables");
-define("_AM_SYSTEM_MAINTENANCE_QUERY_OK","Maintain database: OK");
-define("_AM_SYSTEM_MAINTENANCE_QUERY_NOTOK","Maintain database: Error");
+define("_AM_SYSTEM_MAINTENANCE_SESSION","Emtpy the sessions table");
+define("_AM_SYSTEM_MAINTENANCE_SESSION_OK","Session maintenance : OK");
+define("_AM_SYSTEM_MAINTENANCE_SESSION_NOTOK","Session maintenance : Error");
+define("_AM_SYSTEM_MAINTENANCE_CACHE","Clean cache folder");
+define("_AM_SYSTEM_MAINTENANCE_CACHE_OK","Cache maintenance : OK");
+define("_AM_SYSTEM_MAINTENANCE_CACHE_NOTOK","Cache maintenance : Error");
+define("_AM_SYSTEM_MAINTENANCE_TABLES","Tables maintenance");
+define("_AM_SYSTEM_MAINTENANCE_TABLES_OK","Cache maintenance : OK");
+define("_AM_SYSTEM_MAINTENANCE_TABLES_NOTOK","Cache maintenance : Error");
+define("_AM_SYSTEM_MAINTENANCE_QUERY_DESC","Optimize, Check, Repair and Analyze your tables");
+define("_AM_SYSTEM_MAINTENANCE_QUERY_OK","Maintain database : OK");
+define("_AM_SYSTEM_MAINTENANCE_QUERY_NOTOK","Maintain database : Error");
define("_AM_SYSTEM_MAINTENANCE_CHOICE1","Optimize table(s)");
define("_AM_SYSTEM_MAINTENANCE_CHOICE2","Check table(s)");
define("_AM_SYSTEM_MAINTENANCE_CHOICE3","Repair table(s)");
define("_AM_SYSTEM_MAINTENANCE_CHOICE4","Analyze table(s)");
+define("_AM_SYSTEM_MAINTENANCE_TABLES_DESC",
+"ANALYZE TABLE analyzes and stores the key distribution for a table. During the analysis, the table is locked with a read lock.<br />
+CHECK TABLE checks a table or tables for errors.<br />
+OPTIMIZE TABLE to reclaim the unused space and to defragment the data file.<br />
+REPAIR TABLE repairs a possibly corrupted table.");
define("_AM_SYSTEM_MAINTENANCE_RESULT","Result");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_NO_RESULT","No Result");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_CACHE","Clean Cache");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_SESSION","Clean Sessions Table");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_QUERY","Query");
+define("_AM_SYSTEM_MAINTENANCE_RESULT_NO_RESULT","Not Result");
+define("_AM_SYSTEM_MAINTENANCE_RESULT_CACHE","Clean Cache task");
+define("_AM_SYSTEM_MAINTENANCE_RESULT_SESSION","Clean sessions table task");
+define("_AM_SYSTEM_MAINTENANCE_RESULT_QUERY","Database task");
?>
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin.php 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin.php 2010-01-31 16:54:19 UTC (rev 4251)
@@ -49,7 +49,7 @@
define( '_AM_SYSTEM_FILEMANAGER', 'File Manager');
define( '_AM_SYSTEM_FILEMANAGER_DESC', 'You can add some changes <br /> in any file inside your xoops');
define( '_AM_SYSTEM_MAINTENANCE', 'Maintenance');
-define( '_AM_SYSTEM_MAINTENANCE_DESC', 'Maintenance inside your xoops');
+define( '_AM_SYSTEM_MAINTENANCE_DESC', 'Maintenance tools for database tables, <br /> clean cache folder and session table');
// Messages
define('_AM_SYSTEM_DBUPDATED', 'Database Updated Successfully!');
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_groups.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_groups.html 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_groups.html 2010-01-31 16:54:19 UTC (rev 4251)
@@ -18,9 +18,13 @@
<th class="txtcenter width10"><{$smarty.const._AM_SYSTEM_GROUPS_ACTION}></th>
</tr>
<{foreach item=groups from=$groups}>
- <tr class="<{cycle values='even,odd'}>" valign='middle'>
+ <tr class="<{cycle values='odd, even'}>" valign='middle'>
<td class="txtcenter"><{$groups.groups_id}></td>
- <td class="txtleft"><{$groups.name}></td>
+ <td class="txtleft">
+ <a class="tooltip" href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>">
+ <{$groups.name}>
+ </a>
+ </td>
<td class="txtleft"><{$groups.description}></td>
<td class="txtcenter width25">
<a href="./admin.php?fct=users&selgroups=<{$groups.groups_id}>"><{$groups.nb_users_by_groups}></a>
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_header.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_header.html 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_header.html 2010-01-31 16:54:19 UTC (rev 4251)
@@ -1,4 +1,4 @@
-<ul id="xo-Breadcrumb" class="ui-corner-all" style="background-image:url('<{xoAdminNav bc_bg.png}>'); ">
+<ul id="xo-breadcrumb" class="ui-corner-all" style="background-image:url('<{xoAdminNav bc_bg.png}>'); ">
<{foreach item=breadcrumb from=$xo_sys_breadcrumb}>
<{if $breadcrumb.home}>
<li><a class="tooltip" href="<{$breadcrumb.link}>" title="<{$breadcrumb.title}>" style="background-image:url('<{xoAdminNav bc_separator.png}>');"><img class="home" src="<{xoAdminNav home.png}>" alt="<{$breadcrumb.title}>" /></a></li>
@@ -10,6 +10,7 @@
<{/if}>
<{/if}>
<{/foreach}>
+ <li class="xo-help"><a href=""><img src="<{xoAdminIcons apps/khelpcenter.png}>" alt="Help" /></a></li>
</ul>
<{if $xo_sys_tips}>
<div class="tips ui-corner-all">
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_images.html 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_images.html 2010-01-31 16:54:19 UTC (rev 4251)
@@ -37,8 +37,12 @@
</thead>
<tbody>
<{foreach item=cat from=$cat_img}>
- <tr class="<{cycle values='even,odd'}> txtcenter">
- <td><{$cat.name}></td>
+ <tr class="<{cycle values='odd, even'}> txtcenter">
+ <td>
+ <a class="tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
+ <{$cat.name}>
+ </a>
+ </td>
<td><{$cat.count}></td>
<td><{$cat.maxsize}></td>
<td><{$cat.maxwidth}></td>
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules.html 2010-01-31 16:15:32 UTC (rev 4250)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules.html 2010-01-31 16:54:19 UTC (rev 4251)
@@ -18,21 +18,54 @@
</div>
<div class="clear spacer"></div>
<form action="admin.php" method="post" name="moduleadmin">
- <table class="outer" cellspacing="1">
+ <table id="xo-module-sort" class="outer" cellspacing="1">
<thead>
<tr class="txtcenter">
<th><{$smarty.const._AM_SYSTEM_MODULES_MODULE}></th>
<th><{$smarty.const._AM_SYSTEM_MODULES_VERSION}></th>
<th><{$smarty.const._AM_SYSTEM_MODULES_LASTUP}></th>
<th><{$smarty.const._AM_SYSTEM_MODULES_ACTIVE}></th>
- <th><{$smarty.const._AM_SYSTEM_MODULES_ORDER}></th>
<th><{$smarty.const._AM_SYSTEM_MODULES_ACTION}></th>
</tr>
</thead>
<tbody>
<{foreach item=row from=$install_mods}>
- <tr class="txtcenter <{cycle values='odd, even'}>">
+ <{if $row.dirname == 'system'}>
+ <tr class="txtcenter foot">
<td>
+ <a class="xo-logonormal tooltip" href="<{$xoops_url}>/modules/<{$row.dirname}>/<{$row.adminindex}>" title="<{$row.name}>">
+ <img src="<{$xoops_url}>/modules/<{$row.dirname}>/<{$row.image}>" alt="<{$row.name}>" />
+ </a>
+ <div class="spacer xo-modsimages">
+ <a class="tooltip" href="<{$xoops_url}>/modules/<{$row.dirname}>/<{$row.adminindex}>" title="<{$row.name}>">
+ <img class="xo-mods hide" src="<{xoAdminIcons apps/package_applications.png}>" alt="<{$row.name}>" title="<{$row.name}>" />
+ </a>
+ <input type="text" name="newname[<{$row.mid}>]" value="<{$row.name}>" maxlength="150" size="20" />
+ <input type="hidden" name="oldname[<{$row.mid}>]" value="<{$row.name}>" />
+ </div>
+ </td>
+ <td><{$row.version}></td>
+ <td><{$row.last_update}></td>
+ <td class="xo-modsimages"></td>
+ <td class="xo-modsimages">
+ <{if $row.isactive == 1}>
+ <a class="tooltip" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>">
+ <img src="<{xoAdminIcons actions/agt_reload.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>" />
+ </a>
+ <{/if}>
+ <img class="cursorpointer tooltip" src="<{xoAdminIcons actions/info.png}>" alt="<{$smarty.const._INFO}>" title="<{$smarty.const._INFO}>" />
+ <input type="hidden" name="module[]" value="<{$row.mid}>" />
+ </td>
+ </tr>
+ <{/if}>
+ <{/foreach}>
+ <tr class="head"><td colspan="5"></td></tr>
+ </tbody>
+ <tbody class="xo-module">
+ <{foreach item=row from=$install_mods}>
+ <{if $row.dirname != 'system' && $row.hasmain}>
+ <tr id="mod_<{$row.mid}>" class="<{if $row.dirname == 'system'}>xo-system <{/if}>txtcenter <{cycle values='odd, even'}>">
+ <td>
<{if $row.hasadmin == 1 && $row.isactive == 1}>
<a class="xo-logonormal tooltip" href="<{$xoops_url}>/modules/<{$row.dirname}>/<{$row.adminindex}>" title="<{$row.name}>">
<img src="<{$xoops_url}>/modules/<{$row.dirname}>/<{$row.image}>" alt="<{$row.name}>" />
@@ -55,32 +88,60 @@
<td><{$row.version}></td>
<td><{$row.last_update}></td>
<td class="xo-modsimages">
- <{if $row.dirname != 'system'}>
<img class="cursorpointer tooltip" id="mid<{$row.mid}>" src="<{if $row.isactive}><{xoAdminIcons actions/agt_action_success.png}><{else}><{xoAdminIcons actions/agt_action_fail.png}><{/if}>" alt="<{if $row.isactive}><{$smarty.const._AM_SYSTEM_MODULES_DEACTIVATE}><{else}><{$smarty.const._AM_SYSTEM_MODULES_ACTIVATE}><{/if}>" title="<{if $row.isactive}><{$smarty.const._AM_SYSTEM_MODULES_DEACTIVATE}><{else}><{$smarty.const._AM_SYSTEM_MODULES_ACTIVATE}><{/if}>" />
+ </td>
+ <td class="xo-modsimages">
+ <{if $row.isactive == 1}>
+ <a class="tooltip" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>">
+ <img src="<{xoAdminIcons actions/agt_reload.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>" />
+ </a>
<{/if}>
+ <a class="tooltip" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=uninstall&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UNINSTALL}>">
+ <img src="<{xoAdminIcons actions/agt_uninstall-product.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_UNINSTALL}>" />
+ </a>
+ <img class="cursorpointer tooltip" src="<{xoAdminIcons actions/info.png}>" alt="<{$smarty.const._INFO}>" title="<{$smarty.const._INFO}>" />
+ <input type="hidden" name="module[]" value="<{$row.mid}>" />
</td>
+ </tr>
+ <{/if}>
+ <{/foreach}>
+ </tbody>
+ <tbody>
+ <tr class="head"><td colspan="5"></td></tr>
+ <{foreach item=row from=$install_mods}>
+ <{if $row.dirname != 'system' && !$row.hasmain}>
+ <tr class="txtcenter foot">
<td>
- <{if $row.hasmain == 1}>
- <input type="hidden" name="oldweight[<{$row.mid}>]" value="<{$row.weight}>" /><input type="text" name="weight[<{$row.mid}>]" size="3" maxlength="5" value="<{$row.weight}>" />
- <{else}>
- <input type="hidden" name="oldweight[<{$row.mid}>]" value="0" /><input type="hidden" name="weight[<{$row.mid}>]" value="0" />
- <{/if}>
+ <a class="xo-logonormal tooltip" href="<{$xoops_url}>/modules/<{$row.dirname}>/<{$row.adminindex}>" title="<{$row.name}>">
+ <img src="<{$xoops_url}>/modules/<{$row.dirname}>/<{$row.image}>" alt="<{$row.name}>" />
+ </a>
+ <div class="spacer xo-modsimages">
+ <a class="tooltip" href="<{$xoops_url}>/modules/<{$row.dirname}>/<{$row.adminindex}>" title="<{$row.name}>">
+ <img class="xo-mods hide" src="<{xoAdminIcons apps/package_applications.png}>" alt="<{$row.name}>" title="<{$row.name}>" />
+ </a>
+ <input type="text" name="newname[<{$row.mid}>]" value="<{$row.name}>" maxlength="150" size="20" />
+ <input type="hidden" name="oldname[<{$row.mid}>]" value="<{$row.name}>" />
+ </div>
</td>
+ <td><{$row.version}></td>
+ <td><{$row.last_update}></td>
<td class="xo-modsimages">
+ <img class="cursorpointer tooltip" id="mid<{$row.mid}>" src="<{if $row.isactive}><{xoAdminIcons actions/agt_action_success.png}><{else}><{xoAdminIcons actions/agt_action_fail.png}><{/if}>" alt="<{if $row.isactive}><{$smarty.const._AM_SYSTEM_MODULES_DEACTIVATE}><{else}><{$smarty.const._AM_SYSTEM_MODULES_ACTIVATE}><{/if}>" title="<{if $row.isactive}><{$smarty.const._AM_SYSTEM_MODULES_DEACTIVATE}><{else}><{$smarty.const._AM_SYSTEM_MODULES_ACTIVATE}><{/if}>" />
+ </td>
+ <td class="xo-modsimages">
<{if $row.isactive == 1}>
<a class="tooltip" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>">
<img src="<{xoAdminIcons actions/agt_reload.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>" />
</a>
<{/if}>
- <{if $row.dirname != 'system'}>
<a class="tooltip" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=uninstall&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UNINSTALL}>">
<img src="<{xoAdminIcons actions/agt_uninstall-product.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_UNINSTALL}>" />
</a>
- <{/if}>
<img class="cursorpointer tooltip" src="<{xoAdminIcons actions/info.png}>" alt="<{$smarty.const._INFO}>" title="<{$smarty.const._INFO}>" />
<input type="hidden" name="module[]" value="<{$row.mid}>" />
</td>
</tr>
+ <{/if}>
<{/foreach}>
</tbody>
<tfoot>
@@ -94,7 +155,8 @@
</tfoot>
</table>
</form>
-<{/if}>
+<{/if}>
+
<{if $toinstall_mods}>
<div class="floatleft">
<img class="cursorpointer tooltip" src="<{xoAdminIcons actions/view_detailed.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2010-01-31 16:15:38
|
Revision: 4250
http://xoops.svn.sourceforge.net/xoops/?rev=4250&view=rev
Author: trabis
Date: 2010-01-31 16:15:32 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Replacing xoops_load('file') with xoops_load('XoopsFile')
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php
XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
Modified: XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-31 15:55:07 UTC (rev 4249)
+++ XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-31 16:15:32 UTC (rev 4250)
@@ -12,11 +12,11 @@
/**
* Filemanager settings
* jQuery File Tree PHP Connector
- * Output a list of files for jQuery File Tree
- *
+ * Output a list of files for jQuery File Tree
+ *
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Maxime Cointin (AKA Kraven30)
+ * @author Maxime Cointin (AKA Kraven30)
* @package system
* @version $Id$
*/
@@ -43,12 +43,12 @@
$_REQUEST['dir'] = urldecode($_REQUEST['dir']);
$root = XOOPS_ROOT_PATH.'/';
-
- if( file_exists($root . $_REQUEST['dir']) )
+
+ if( file_exists($root . $_REQUEST['dir']) )
{
$files = scandir($root . $_REQUEST['dir']);
natcasesort($files);
-
+
if( count($files) > 2 ) { /* The 2 accounts for . and .. */
echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
if ('/' == $_REQUEST['dir'])
@@ -65,13 +65,13 @@
}
}
}
- echo "</ul>";
+ echo "</ul>";
}
}
break;
-
+
// Display files
- case 'filemanager_display_file':
+ case 'filemanager_display_file':
$nbcolonnes_file = 4;
$width = 100/$nbcolonnes_file;
$_REQUEST['file'] = urldecode($_REQUEST['file']);
@@ -82,7 +82,7 @@
$file_arr = explode("/",$_REQUEST['file']);
$path_file = XOOPS_ROOT_PATH.'/';
$url_file = XOOPS_URL.'/';
-
+
for ($i=3 ; $i<count($file_arr) ; $i++ ) {
$path_file .= $file_arr[$i].'/';
$url_file .= $file_arr[$i].'/';
@@ -92,7 +92,7 @@
if( file_exists($path_file) ) {
$files = scandir($path_file);
natcasesort($files);
- xoops_load('file');
+ xoops_load('XoopsFile');
XoopsFile::load('file');
// The 2 accounts for . and ..
if( count($files) > 2 ) {
@@ -114,26 +114,26 @@
<button class="ui-corner-all tooltip" title="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'">
<img src="'.system_AdminIcons('apps/up_alt.png').'" alt="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'" />
</button>
- </div>
- <div class="clear"> </div>
+ </div>
+ <div class="clear"> </div>
</div>';
$count_file = 1;
// All files
echo '<table cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
- <td align="center" width="'.$width.'%" style="padding-bottom:12px">';
- foreach( $files as $file )
+ <td align="center" width="'.$width.'%" style="padding-bottom:12px">';
+ foreach( $files as $file )
{
if (!preg_match('#.back#', $file))
{
- if( file_exists($path_file . $file) && $file != '.' && $file != '..' && !is_dir($path_file . $file) )
- {
+ if( file_exists($path_file . $file) && $file != '.' && $file != '..' && !is_dir($path_file . $file) )
+ {
//echo $path_file . $file.'<br />';
$unzip = '';
$edit = false;
$file1 = XoopsFile::getHandler('file', $path_file . $file);
$extension_verif = $file1->ext();
-
+
switch ( $extension_verif ) {
case 'ico': case 'png': case 'gif': case 'jpg': case 'jpeg':
$extension_verif = 'picture';
@@ -172,7 +172,7 @@
default:
$extension_verif = 'file';
$edit = true;
- break;
+ break;
}
if($edit == true) {
$edit = '<img class="cursorpointer" src="'.system_AdminIcons('actions/edit.png').'" 'filemanager_edit_file("'.$path_file . $file.'", "'.$path_file.'", "'.$file.'");\' width="16" alt="edit" />';
@@ -181,9 +181,9 @@
}
//Chmod
$chmod = substr($file1->perms(), 1);
-
+
$chmod = modify_chmod($chmod, $path_file.$file, $count_file);
-
+
//Img
if($extension_verif == 'picture') {
list($width, $height) = getimagesize($path_file . $file);
@@ -213,7 +213,7 @@
$count_file++;
$newline = ($count_file % $nbcolonnes_file == 1) ? true : false;
-
+
if ($newline) {
echo '</tr><tr><td align="center" style="padding-bottom:12px">';
} else {
@@ -226,17 +226,17 @@
}
}
break;
-
+
//Edit file
- case 'filemanager_edit_file':
+ case 'filemanager_edit_file':
$path_file = trim($_REQUEST['path_file']);
-
+
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
-
+
//Button restore
if(file_exists($path_file.'.back')){
$restore = '<button class="ui-corner-all tooltip" type="button" value="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" title="'._AM_SYSTEM_FILEMANAGER_RESTORE.'">
@@ -244,10 +244,10 @@
</button>';
}else{
$restore = '';
- }
- xoops_load('file');
+ }
+ xoops_load('XoopsFile');
XoopsFile::load('file');
-
+
$file = XoopsFile::getHandler('file', $path_file);
$content = $file->read();
if(empty($content))
@@ -281,20 +281,20 @@
</table>';
echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="path" value="'.$path.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
break;
-
+
case 'filemanager_unzip_file':
$path_file = trim($_REQUEST['path_file']);
-
+
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
$file = $_REQUEST['file'];
-
+
xoops_load('pclzip','system');
xoops_load('pcltar','system');
- xoops_load('file');
+ xoops_load('XoopsFile');
XoopsFile::load('file');
$file1 = XoopsFile::getHandler('file', $path_file );
$extension = $file1->ext();
@@ -311,17 +311,17 @@
PclTarExtract( $path_file, $path );
break;
}
-
+
break;
-
+
//Confirm delete file
case 'filemanager_confirm_delete_file':
echo '<div class="confirmMsg">'.sprintf(_AM_SYSTEM_FILEMANAGER_SUREDEL, $_REQUEST['file']).'<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" >'._AM_SYSTEM_FILEMANER_DELETE.'</a> <a href="#" class="ui-corner-all" >'._AM_SYSTEM_FILEMANAGER_CANCEL.'</a></div></div>';
break;
-
+
// Delete one file
- case 'filemanager_delete_file':
- xoops_load('file');
+ case 'filemanager_delete_file':
+ xoops_load('XoopsFile');
XoopsFile::load('file');
$file = XoopsFile::getHandler('file', $_REQUEST['path_file']);
if(!$file->delete())
@@ -331,17 +331,17 @@
xoops_result(_AM_SYSTEM_FILEMANAGER_DELETE_FILE);
}
break;
-
+
case 'filemanager_upload':
-
+
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
-
+
xoops_load('xoopsformloader');
-
+
$form = new XoopsThemeForm( '', 'upload_form', 'admin.php?fct=filemanager', "post", true);
$form->setExtra('enctype="multipart/form-data"');
$form->addElement( new XoopsFormFile( _AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE, 'upload_file', 500000), false );
@@ -350,7 +350,7 @@
$form->addElement( new XoopsFormButton( '', 'up_button', _SUBMIT, 'submit'));
echo $form->render();
break;
-
+
case 'filemanager_add_dir':
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
@@ -358,8 +358,8 @@
$path = XOOPS_ROOT_PATH.'/';
}
-
+
$form = new XoopsThemeForm( '', 'newdir_form', 'admin.php?fct=filemanager', "post", true);
$form->setExtra('enctype="multipart/form-data"');
$form->addElement( new XoopsFormText( _AM_SYSTEM_FILEMANAGER_ADDDIR_NAME, 'dir_name', 50, 255), true );
@@ -383,7 +383,7 @@
exit;
}
}
-
+
xoops_confirm( array('path'=>$path) , 'admin.php', _AM_SYSTEM_FILEMANAGER_DIR_RYSDEL . '<div class="spacer bold">' . $path . '</div>' );
break;
@@ -405,20 +405,20 @@
break;
case 'filemanager_modify_chmod':
-
+
if($_REQUEST['path_file'] != '') {
$path = trim($_REQUEST['path_file']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
-
+
if(chmod($path,'0'.$_REQUEST['chmod'])) {
$new_chmod = modify_chmod($_REQUEST['chmod'], $path, $_REQUEST['id']);
echo $new_chmod;
}
//echo $_REQUEST['chmod'];
break;
-
+
//Restore
case 'filemanager_restore':
$old_file = $_REQUEST['path_file'].'.back';
Modified: XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php 2010-01-31 15:55:07 UTC (rev 4249)
+++ XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php 2010-01-31 16:15:32 UTC (rev 4250)
@@ -11,10 +11,10 @@
/**
* Filemanager main page
- *
+ *
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Maxime Cointin (AKA Kraven30)
+ * @author Maxime Cointin (AKA Kraven30)
* @package system
* @version $Id$
*/
@@ -41,12 +41,12 @@
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui.theme.css');
// Define Breadcrumb and tips
-$xoBreadCrumb->addLink( _AM_SYSTEM_FILEMANAGER_NAV_MAIN, system_adminVersion('filemanager', 'adminpath') );
+$xoBreadCrumb->addLink( _AM_SYSTEM_FILEMANAGER_NAV_MAIN, system_adminVersion('filemanager', 'adminpath') );
-xoops_load('file');
+xoops_load('XoopsFile');
XoopsFile::load('file');
-
+
switch ($op) {
default:
// Assign Breadcrumb menu
@@ -55,32 +55,32 @@
$xoopsTpl->assign('index', true);
$xoopsTpl->debugging = false;
-
+
$nbcolonnes_file = 4;
$width = 100/$nbcolonnes_file;
$root = XOOPS_ROOT_PATH.'/';
$url_file = XOOPS_URL.'/';
$xoopsTpl->assign('width', $width);
-
- if( file_exists($root) )
+
+ if( file_exists($root) )
{
$files = scandir($root);
natcasesort($files);
- if( count($files) > 2 )
+ if( count($files) > 2 )
{
$count_file = 1;
$file_arr = array();
$edit = false;
// All files
- foreach( $files as $file )
+ foreach( $files as $file )
{
if (!preg_match('#.back#', $file))
{
- if( file_exists($root . $file) && $file != '.' && $file != '..' && !is_dir($root . $file) )
+ if( file_exists($root . $file) && $file != '.' && $file != '..' && !is_dir($root . $file) )
{
$folder = XoopsFile::getHandler('file', $root.$file);
$extension_verif = $folder->ext();
-
+
switch ( $extension_verif ) {
case 'ico': case 'png': case 'gif': case 'jpg': case 'jpeg':
$extension_verif = 'picture';
@@ -119,9 +119,9 @@
default:
$extension_verif = 'file';
$edit = true;
- break;
+ break;
}
-
+
//Edit ?
$file_arr['edit'] = $edit;
//File
@@ -129,9 +129,9 @@
$file_arr['path'] = $root;
//Chmod
$file_arr['chmod'] = substr($folder->perms(), 1);
-
+
$file_arr['chmod'] = modify_chmod($file_arr['chmod'], $file_arr['path_file'], $count_file);
-
+
if($extension_verif == 'picture') {
list($width, $height) = getimagesize($root . $file);
if($height > 60){
@@ -142,20 +142,20 @@
} else {
$file_arr['img'] = '<img src="./images/mimetypes/'.$extension_verif.'_48.png" title="" alt="" />';
}
-
+
$file_arr['file'] = htmlentities($file);
$count_file++;
$file_arr['newline'] = ($count_file % $nbcolonnes_file == 1) ? true : false;
$xoopsTpl->assign('newline', $file_arr['newline']);
$xoopsTpl->append('files', $file_arr);
}
- $edit = false;
+ $edit = false;
}
}
}
}
break;
-
+
//save
case 'filemanager_save':
//Save the file or restore file
@@ -168,7 +168,7 @@
if(isset($_REQUEST['filemanager']))
{
$open = fopen("".$_REQUEST['path_file']."","w+");
- if(!fwrite($open, utf8_encode(stripslashes($_REQUEST['filemanager']))))
+ if(!fwrite($open, utf8_encode(stripslashes($_REQUEST['filemanager']))))
{
redirect_header("admin.php?fct=filemanager", 2, _AM_SYSTEM_FILEMANAGER_ERROR);
}
@@ -198,10 +198,10 @@
redirect_header("admin.php?fct=filemanager", 2, _AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS);
}
}
-
-
+
+
break;
-
+
case 'filemanager_upload_save':
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
@@ -212,7 +212,7 @@
$mimetypes = include $GLOBALS['xoops']->path('include/mimetypes.inc.php');
$uploader = new XoopsMediaUploader( $path, $mimetypes, 500000);
if ($uploader->fetchMedia('upload_file')) {
-
+
if (!$uploader->upload()) {
$err[] = $uploader->getErrors();
}
@@ -224,13 +224,13 @@
}
redirect_header("admin.php?fct=filemanager", 2, _AM_SYSTEM_FILEMANAGER_UPLOAD_FILE);
break;
-
+
case 'filemanager_add_dir_save':
$path = system_CleanVars ( $_REQUEST, 'path', XOOPS_ROOT_PATH . '/', 'string' );
- xoops_load('file');
+ xoops_load('XoopsFile');
XoopsFile::load('folder');
- $folder = XoopsFile::getHandler('folder');
+ $folder = XoopsFile::getHandler('folder');
if ($folder->create ($path . $_REQUEST['dir_name'], 0777)) {
$indexFile = XOOPS_ROOT_PATH."/modules/system/index.html";
copy($indexFile, $path.$_REQUEST['dir_name']."/index.html");
@@ -239,7 +239,7 @@
redirect_header( 'admin.php?fct=filemanager', 2, _AM_SYSTEM_FILEMANAGER_DIR_ERROR );
}
break;
-
+
case 'filemanager_add_file_save':
$path = system_CleanVars ( $_REQUEST, 'path', XOOPS_ROOT_PATH . '/', 'string' );
if ( $path == '' ) $path = XOOPS_ROOT_PATH . '/';
Modified: XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php 2010-01-31 15:55:07 UTC (rev 4249)
+++ XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php 2010-01-31 16:15:32 UTC (rev 4250)
@@ -12,7 +12,7 @@
/**
* Template Manager
* Manage all templates: theme and module
- *
+ *
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Maxime Cointin (AKA Kraven30)
@@ -102,7 +102,7 @@
fclose($open);
$ext = preg_replace('/^.*\./', '', $_REQUEST['file']);
-
+
$return = '<form name="myform" action="admin.php?fct=tplsets" method="post">';
$return .= '<table>';
$return .= '<tr><input class="xo-BtnSave" type="submit" value="'._AM_SYSTEM_TEMPLATES_SAVE.'" /></tr>';
@@ -125,7 +125,7 @@
}else{
$restore = '';
}
- xoops_load('file');
+ xoops_load('XoopsFile');
XoopsFile::load('file');
//echo $path_file;
$file = XoopsFile::getHandler('file', $path_file);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2010-01-31 15:55:14
|
Revision: 4249
http://xoops.svn.sourceforge.net/xoops/?rev=4249&view=rev
Author: trabis
Date: 2010-01-31 15:55:07 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Fixing @version of last commit
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/groupperm.php
Modified: XoopsCore/trunk/htdocs/modules/system/admin/groupperm.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/groupperm.php 2010-01-31 15:51:02 UTC (rev 4248)
+++ XoopsCore/trunk/htdocs/modules/system/admin/groupperm.php 2010-01-31 15:55:07 UTC (rev 4249)
@@ -14,7 +14,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Kazumi Ono (AKA onokazu)
* @package system
- * @version groupperm.php 4091 2010-01-05 17:02:11Z forxoops $
+ * @version $Id$
*/
//max
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2010-01-31 15:51:09
|
Revision: 4248
http://xoops.svn.sourceforge.net/xoops/?rev=4248&view=rev
Author: trabis
Date: 2010-01-31 15:51:02 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Fixing group permissions deletion check (adapting it to new object handler)
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/groupperm.php
Modified: XoopsCore/trunk/htdocs/modules/system/admin/groupperm.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/groupperm.php 2010-01-31 14:42:21 UTC (rev 4247)
+++ XoopsCore/trunk/htdocs/modules/system/admin/groupperm.php 2010-01-31 15:51:02 UTC (rev 4248)
@@ -1,19 +1,36 @@
<?php
-// $Id$
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (AKA onokazu)
+ * @package system
+ * @version groupperm.php 4091 2010-01-05 17:02:11Z forxoops $
+ */
+
//max
-include '../../../include/cp_header.php';
+include dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
$modid = isset($_POST['modid']) ? intval($_POST['modid']) : 0;
// we dont want system module permissions to be changed here
if ($modid <= 1 || !is_object($xoopsUser) || !$xoopsUser->isAdmin($modid)) {
- redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
- exit();
+ redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
+ exit();
}
$module_handler =& xoops_gethandler('module');
$module =& $module_handler->get($modid);
if (!is_object($module) || !$module->getVar('isactive')) {
- redirect_header(XOOPS_URL.'/admin.php', 1, _MODULENOEXIST);
- exit();
+ redirect_header(XOOPS_URL.'/admin.php', 1, _MODULENOEXIST);
+ exit();
}
$msg = array();
@@ -21,49 +38,49 @@
$member_handler =& xoops_gethandler('member');
$group_list = $member_handler->getGroupList();
if (is_array($_POST['perms']) && !empty($_POST['perms'])) {
- $gperm_handler = xoops_gethandler('groupperm');
- foreach ($_POST['perms'] as $perm_name => $perm_data) {
- if (false != $gperm_handler->deleteByModule($modid, $perm_name)) {
- foreach ($perm_data['groups'] as $group_id => $item_ids) {
- foreach ($item_ids as $item_id => $selected) {
- if ($selected == 1) {
- // make sure that all parent ids are selected as well
- if ($perm_data['parents'][$item_id] != '') {
- $parent_ids = explode(':', $perm_data['parents'][$item_id]);
- foreach ($parent_ids as $pid) {
- if ($pid != 0 && !in_array($pid, array_keys($item_ids))) {
- // one of the parent items were not selected, so skip this item
- $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>').' ('._MD_AM_PERMADDNGP.')';
- continue 2;
- }
- }
- }
- $gperm =& $gperm_handler->create();
- $gperm->setVar('gperm_groupid', $group_id);
- $gperm->setVar('gperm_name', $perm_name);
- $gperm->setVar('gperm_modid', $modid);
- $gperm->setVar('gperm_itemid', $item_id);
- if (!$gperm_handler->insert($gperm)) {
- $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>');
- } else {
- $msg[] = sprintf(_MD_AM_PERMADDOK, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>');
- }
- unset($gperm);
- }
- }
- }
- } else {
- $msg[] = sprintf(_MD_AM_PERMRESETNG, $module->getVar('name').'('.$perm_name.')');
- }
- }
+ $gperm_handler = xoops_gethandler('groupperm');
+ foreach ($_POST['perms'] as $perm_name => $perm_data) {
+ if (false !== $gperm_handler->deleteByModule($modid, $perm_name)) {
+ foreach ($perm_data['groups'] as $group_id => $item_ids) {
+ foreach ($item_ids as $item_id => $selected) {
+ if ($selected == 1) {
+ // make sure that all parent ids are selected as well
+ if ($perm_data['parents'][$item_id] != '') {
+ $parent_ids = explode(':', $perm_data['parents'][$item_id]);
+ foreach ($parent_ids as $pid) {
+ if ($pid != 0 && !in_array($pid, array_keys($item_ids))) {
+ // one of the parent items were not selected, so skip this item
+ $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>').' ('._MD_AM_PERMADDNGP.')';
+ continue 2;
+ }
+ }
+ }
+ $gperm =& $gperm_handler->create();
+ $gperm->setVar('gperm_groupid', $group_id);
+ $gperm->setVar('gperm_name', $perm_name);
+ $gperm->setVar('gperm_modid', $modid);
+ $gperm->setVar('gperm_itemid', $item_id);
+ if (!$gperm_handler->insert($gperm)) {
+ $msg[] = sprintf(_MD_AM_PERMADDNG, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>');
+ } else {
+ $msg[] = sprintf(_MD_AM_PERMADDOK, '<strong>'.$perm_name.'</strong>', '<strong>'.$perm_data['itemname'][$item_id].'</strong>', '<strong>'.$group_list[$group_id].'</strong>');
+ }
+ unset($gperm);
+ }
+ }
+ }
+ } else {
+ $msg[] = sprintf(_MD_AM_PERMRESETNG, $module->getVar('name').'('.$perm_name.')');
+ }
+ }
}
$backlink = xoops_getenv("HTTP_REFERER");
if ($module->getVar('hasadmin')) {
$adminindex = isset($_POST['redirect_url']) ? $_POST['redirect_url'] : $module->getInfo('adminindex');
- if ($adminindex) {
- $backlink = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$adminindex;
- }
+ if ($adminindex) {
+ $backlink = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$adminindex;
+ }
}
$backlink = ($backlink) ? $backlink : XOOPS_URL.'/admin.php';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-01-31 14:42:28
|
Revision: 4247
http://xoops.svn.sourceforge.net/xoops/?rev=4247&view=rev
Author: beckmi
Date: 2010-01-31 14:42:21 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
translation update
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php 2010-01-30 22:26:29 UTC (rev 4246)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php 2010-01-31 14:42:21 UTC (rev 4247)
@@ -10,25 +10,25 @@
define("_AM_SYSTEM_MAINTENANCE_NAV_MANAGER", "Maintenance");
define("_AM_SYSTEM_MAINTENANCE_NAV_LIST","All maintenance");
-define("_AM_SYSTEM_MAINTENANCE_SESSION","Emtpy Sessions Table");
-define("_AM_SYSTEM_MAINTENANCE_SESSION_OK","Session maintenance : OK");
-define("_AM_SYSTEM_MAINTENANCE_SESSION_NOTOK","Session maintenance : Error");
+define("_AM_SYSTEM_MAINTENANCE_SESSION","Empty Sessions Table");
+define("_AM_SYSTEM_MAINTENANCE_SESSION_OK","Session maintenance: OK");
+define("_AM_SYSTEM_MAINTENANCE_SESSION_NOTOK","Session maintenance: Error");
define("_AM_SYSTEM_MAINTENANCE_CACHE","Clean your cache './xoops_data/caches/smarty_compile'");
-define("_AM_SYSTEM_MAINTENANCE_CACHE_OK","Cache maintenance : OK");
-define("_AM_SYSTEM_MAINTENANCE_CACHE_NOTOK","Cache maintenance : Error");
+define("_AM_SYSTEM_MAINTENANCE_CACHE_OK","Cache maintenance: OK");
+define("_AM_SYSTEM_MAINTENANCE_CACHE_NOTOK","Cache maintenance: Error");
define("_AM_SYSTEM_MAINTENANCE_TABLES","Select tables");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_OK","Cache maintenance : OK");
-define("_AM_SYSTEM_MAINTENANCE_TABLES_NOTOK","Cache maintenance : Error");
+define("_AM_SYSTEM_MAINTENANCE_TABLES_OK","Cache maintenance: OK");
+define("_AM_SYSTEM_MAINTENANCE_TABLES_NOTOK","Cache maintenance: Error");
define("_AM_SYSTEM_MAINTENANCE_QUERY_DESC","This will Optimize, Check, Repair and Analyze your tables");
-define("_AM_SYSTEM_MAINTENANCE_QUERY_OK","Maintain database : OK");
-define("_AM_SYSTEM_MAINTENANCE_QUERY_NOTOK","Maintain database : Error");
+define("_AM_SYSTEM_MAINTENANCE_QUERY_OK","Maintain database: OK");
+define("_AM_SYSTEM_MAINTENANCE_QUERY_NOTOK","Maintain database: Error");
define("_AM_SYSTEM_MAINTENANCE_CHOICE1","Optimize table(s)");
define("_AM_SYSTEM_MAINTENANCE_CHOICE2","Check table(s)");
define("_AM_SYSTEM_MAINTENANCE_CHOICE3","Repair table(s)");
define("_AM_SYSTEM_MAINTENANCE_CHOICE4","Analyze table(s)");
define("_AM_SYSTEM_MAINTENANCE_RESULT","Result");
-define("_AM_SYSTEM_MAINTENANCE_RESULT_NO_RESULT","Not Result");
+define("_AM_SYSTEM_MAINTENANCE_RESULT_NO_RESULT","No Result");
define("_AM_SYSTEM_MAINTENANCE_RESULT_CACHE","Clean Cache");
define("_AM_SYSTEM_MAINTENANCE_RESULT_SESSION","Clean Sessions Table");
define("_AM_SYSTEM_MAINTENANCE_RESULT_QUERY","Query");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kra...@us...> - 2010-01-30 22:26:35
|
Revision: 4246
http://xoops.svn.sourceforge.net/xoops/?rev=4246&view=rev
Author: kraven30
Date: 2010-01-30 22:26:29 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
Templates : Add loading + redirect after restore
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/trunk/htdocs/modules/system/js/templates.js
XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_templates.html
Modified: XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php 2010-01-30 22:13:37 UTC (rev 4245)
+++ XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php 2010-01-30 22:26:29 UTC (rev 4246)
@@ -92,10 +92,6 @@
//Affichage des fichiers
case "tpls_display_contenu":
- //echo $_REQUEST['file'];
- //echo 'display_contenu';
- //echo $_REQUEST['file'];
- //include(XOOPS_ROOT_PATH.'/class/textsanitizer/syntaxhighlight/geshi.php');
$content = '';
$path_file = XOOPS_THEME_PATH.$_REQUEST['file'];
$open = fopen("".$path_file."","r"); // ouverture fichier en lecture "r"
@@ -106,14 +102,7 @@
fclose($open);
$ext = preg_replace('/^.*\./', '', $_REQUEST['file']);
- //$geshi = new GeSHi($content, strtolower($ext));
- //$geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS, 2);
- //$geshi->start_line_numbers_at(1);
- //$geshi->set_line_style('background:#f2f1ed;', 'background:#ffffff;');
- //$geshi->set_case_keywords(GESHI_CAPS_LOWER);
- //$geshi = $geshi->parse_code();
-
-//<table><tr><td><strong>'._AM_SYSTEM_TEMPLATES_EDIT.'</strong> '.$_REQUEST['file'].'<td><td align="right"><input type="submit" value="'._AM_SYSTEM_TEMPLATES_SAVE.'"></td></table><br />
+
$return = '<form name="myform" action="admin.php?fct=tplsets" method="post">';
$return .= '<table>';
$return .= '<tr><input class="xo-BtnSave" type="submit" value="'._AM_SYSTEM_TEMPLATES_SAVE.'" /></tr>';
@@ -122,13 +111,7 @@
$return .= '<input type="hidden" name="op" value="tpls_save"><input type="hidden" name="path_file" value="'.$path_file.'">';
$return .= '</form>';
$rt = $_REQUEST['file'].'~'.$content.'~'.$path_file.'~';
- /*$rt = array(
- 'test' => 'coucou',
- 'autre' => 'bla');*/
echo $rt;
- //echo '<form name="myform" action="admin.php?fct=tplsets" method="post">';
- //echo '<textarea id="templates" name="templates" class="codepress html" rows="20" cols="122">'.$content.'</textarea><input type="hidden" name="op" value="tpls_save"><input type="hidden" name="path_file" value="'.$path_file.'"></form>';
- //html_entity_decode(
break;
case 'tpls_edit_file':
@@ -188,17 +171,14 @@
{
if(rename($old_file, $new_file))
{
- //redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_DBUPDATED);
- }else{
- //redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_RENAME);
+ xoops_result(_AM_SYSTEM_TEMPLATES_RESTORE_OK);
+ exit();
}
- }else{
- //redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_DELETE);
}
- }else{
- //redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_EXISTS);
}
+ xoops_error(_AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
break;
+
}
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php 2010-01-30 22:13:37 UTC (rev 4245)
+++ XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php 2010-01-30 22:26:29 UTC (rev 4246)
@@ -166,9 +166,9 @@
{
$text .= '<tr class="'.$class.'"><td align="center">'._AM_SYSTEM_TEMPLATES_TEMPLATES.'</td><td>'.$physical_file.'</td><td align="center">';
if(file_exists($physical_file)) {
- $text .= '<img width="16" src="./images/icons/default/actions/agt_action_success.png" /></td></tr>';
+ $text .= '<img width="16" src="'.system_AdminIcons('actions/agt_action_success.png').'" /></td></tr>';
}else{
- $text .= '<img width="16" src="./images/icons/default/actions/button_cancel.png" /></td></tr>';
+ $text .= '<img width="16" src="'.system_AdminIcons('actions/button_cancel.png').'" /></td></tr>';
}
$verif_write = true;
}
@@ -198,9 +198,9 @@
{
$text .= '<tr class="'.$class.'"><td align="center">'._AM_SYSTEM_TEMPLATES_BLOCKS.'</td><td>'.$physical_file.'</td><td align="center">';
if(file_exists($physical_file)) {
- $text .= '<img width="16" src="./images/icons/default/actions/agt_action_success.png" /></td></tr>';
+ $text .= '<img width="16" src="'.system_AdminIcons('actions/agt_action_success.png').'" /></td></tr>';
}else{
- $text .= '<img width="16" src="./images/icons/default/actions/button_cancel.png" /></td></tr>';
+ $text .= '<img width="16" src="'.system_AdminIcons('actions/button_cancel.png').'" /></td></tr>';
}
$verif_write = true;
}
@@ -248,7 +248,6 @@
$class = "odd";
$text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">'._AM_SYSTEM_TEMPLATES_MODULES.ucfirst($module->getVar('dirname')).'</th></tr><tr><th align="center">'._AM_SYSTEM_TEMPLATES_TYPES.'</th><th align="center">'._AM_SYSTEM_TEMPLATES_FILES.'</th><th>'._AM_SYSTEM_TEMPLATES_STATUS.'</th></tr>';
$select_templates_modules = $_REQUEST['select_templates_modules'];
-
for($l=0; $l<count($_REQUEST['select_templates_modules']); $l++)
{
//creation des templates "cote user"
@@ -272,9 +271,9 @@
{
$text .= '<tr class="'.$class.'"><td align="center">'._AM_SYSTEM_TEMPLATES_TEMPLATES.'</td><td>'.$physical_file.'</td><td align="center">';
if(file_exists($physical_file)) {
- $text .= '<img width="16" src="./images/icons/default/actions/agt_action_success.png" /></td></tr>';
+ $text .= '<img width="16" src="'.system_AdminIcons('actions/agt_action_success.png').'" /></td></tr>';
}else{
- $text .= '<img width="16" src="./images/icons/default/actions/button_cancel.png" /></td></tr>';
+ $text .= '<img width="16" src="'.system_AdminIcons('actions/button_cancel.png').'" /></td></tr>';
}
$verif_write = true;
}
@@ -307,9 +306,9 @@
{
$text .= '<tr class="'.$class.'"><td align="center">'._AM_SYSTEM_TEMPLATES_BLOCKS.'</td><td>'.$physical_file.'</td><td align="center">';
if(file_exists($physical_file)) {
- $text .= '<img width="16" src="./images/icons/default/actions/agt_action_success.png" /></td></tr>';
+ $text .= '<img width="16" src="'.system_AdminIcons('actions/agt_action_success.png').'" /></td></tr>';
}else{
- $text .= '<img width="16" src="./images/icons/default/actions/button_cancel.png" /></td></tr>';
+ $text .= '<img width="16" src="'.system_AdminIcons('actions/button_cancel.png').'" /></td></tr>';
}
$verif_write = true;
}
Modified: XoopsCore/trunk/htdocs/modules/system/js/templates.js
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/js/templates.js 2010-01-30 22:13:37 UTC (rev 4245)
+++ XoopsCore/trunk/htdocs/modules/system/js/templates.js 2010-01-30 22:26:29 UTC (rev 4246)
@@ -6,13 +6,17 @@
function tpls_edit_file(path_file, file)
{
+ $('#display_contenu').hide();
+ $('#display_form').hide();
+ $('#loading').show();
$.ajax({
type: "POST",
url: "./admin/tplsets/jquery.php",
data: "op=tpls_edit_file&path_file="+path_file+"&file="+file,
success: function(msg){
- $('#display_form').fadeOut('fast');
+
$('#display_contenu').html(msg);
+ $('#loading').hide();
$('#display_contenu').fadeIn('fast');
}
});
@@ -21,15 +25,21 @@
function tpls_restore(path_file)
{
+ $('#display_contenu').hide();
$.ajax({
type: "POST",
url: "./admin/tplsets/jquery.php",
data: "op=tpls_restore&path_file="+path_file,
success: function(msg){
- $('#display_contenu').fadeOut('fast');
- $('#display_contenu').html(msg);
- $('#display_form').fadeIn('slow');
+ $('#display_message').html(msg);
+ $('#display_message').show();
+ setTimeout(function(){
+ $('#display_message').hide();
+ $('#display_form').fadeIn('fast');
+ }, 1500);
+
}
});
return false;
}
+
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php 2010-01-30 22:13:37 UTC (rev 4245)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php 2010-01-30 22:26:29 UTC (rev 4246)
@@ -25,7 +25,7 @@
define('_AM_SYSTEM_TEMPLATES_FORCE_GENERATED','Forced the generate');
define('_AM_SYSTEM_TEMPLATES_NAV_FILE_GENERATED','Files generated');
define('_AM_SYSTEM_TEMPLATES_NOT_CREATED','Not files created');
-define('_AM_SYSTEM_TEMPLATES_SAVE','Save');
+define('_AM_SYSTEM_TEMPLATES_SAVE','Successfuly registred');
define('_AM_SYSTEM_TEMPLATES_RESTORE','Restore');
define('_AM_SYSTEM_TEMPLATES_CANCEL','Cancel');
define('_AM_SYSTEM_TEMPLATES_ERROR','Error');
@@ -39,5 +39,7 @@
define('_AM_SYSTEM_TEMPLATES_BLOCKS','Blocks');
define('_AM_SYSTEM_TEMPLATES_SELECT_TEMPLATES','Select Templates');
define('_AM_SYSTEM_TEMPLATES_ALL_MODULES','All modules');
+define('_AM_SYSTEM_TEMPLATES_RESTORE_OK','Successfuly restored');
+define('_AM_SYSTEM_TEMPLATES_RESTORE_NOTOK','Successfuly not restored');
?>
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_templates.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_templates.html 2010-01-30 22:13:37 UTC (rev 4245)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_templates.html 2010-01-30 22:26:29 UTC (rev 4246)
@@ -13,6 +13,8 @@
<td class="aligntop">
<div id="display_form"><{$form}></div>
<div id="display_contenu"></div>
+ <div id='display_message' align="center" style="display:none;"></div>
+ <div id='loading' align="center" style="display:none;"><br /><br /><img src="./images/filemanager.gif" title="Loading" alt="Loading" /></div>
</td>
</tr>
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2010-01-30 22:13:42
|
Revision: 4245
http://xoops.svn.sourceforge.net/xoops/?rev=4245&view=rev
Author: forxoops
Date: 2010-01-30 22:13:37 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
add maintenance and file manager setting
Modified Paths:
--------------
XoopsCore/trunk/htdocs/install/include/makedata.php
Modified: XoopsCore/trunk/htdocs/install/include/makedata.php
===================================================================
--- XoopsCore/trunk/htdocs/install/include/makedata.php 2010-01-30 22:12:35 UTC (rev 4244)
+++ XoopsCore/trunk/htdocs/install/include/makedata.php 2010-01-30 22:13:37 UTC (rev 4245)
@@ -285,6 +285,8 @@
$dbm->insert('config', " VALUES (128, 1, 0, 'general_editor', '_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR', 'dhtmltextarea', '_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR_DSC', 'select', 'text', 32)");
$dbm->insert('config', " VALUES (129, 1, 0, 'redirect', '_MI_SYSTEM_PREFERENCE_REDIRECT', 'admin.php?fct=preferences', '', 'hidden', 'text', 33)");
$dbm->insert('config', " VALUES (130, 1, 0, 'com_anonpost', '_MI_SYSTEM_PREFERENCE_ANONPOST', '', '', 'hidden', 'text', 34)");
+ $dbm->insert('config', " VALUES (131, 1, 0, 'active_filemanager', '_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER', '1', '', 'yesno', 'int', 9)");
+ $dbm->insert('config', " VALUES (131, 1, 0, 'active_maintenance', '_MI_SYSTEM_PREFERENCE_ACTIVE_MAINTENANCE', '1', '', 'yesno', 'int', 13)");
require_once '../class/xoopslists.php';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2010-01-30 22:12:42
|
Revision: 4244
http://xoops.svn.sourceforge.net/xoops/?rev=4244&view=rev
Author: forxoops
Date: 2010-01-30 22:12:35 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
update class with Id
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/class/avatar.php
XoopsCore/trunk/htdocs/modules/system/class/block.php
XoopsCore/trunk/htdocs/modules/system/class/blocklinkmodule.php
XoopsCore/trunk/htdocs/modules/system/class/breadcrumb.php
XoopsCore/trunk/htdocs/modules/system/class/cookie.php
XoopsCore/trunk/htdocs/modules/system/class/group.php
XoopsCore/trunk/htdocs/modules/system/class/maintenance.php
XoopsCore/trunk/htdocs/modules/system/class/menu.php
XoopsCore/trunk/htdocs/modules/system/class/smilies.php
XoopsCore/trunk/htdocs/modules/system/class/system_banner.php
XoopsCore/trunk/htdocs/modules/system/class/system_banner_client.php
XoopsCore/trunk/htdocs/modules/system/class/system_banner_finish.php
XoopsCore/trunk/htdocs/modules/system/class/userrank.php
XoopsCore/trunk/htdocs/modules/system/class/users.php
Modified: XoopsCore/trunk/htdocs/modules/system/class/avatar.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/avatar.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/avatar.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
Modified: XoopsCore/trunk/htdocs/modules/system/class/block.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/block.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/block.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
Modified: XoopsCore/trunk/htdocs/modules/system/class/blocklinkmodule.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/blocklinkmodule.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/blocklinkmodule.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
Modified: XoopsCore/trunk/htdocs/modules/system/class/breadcrumb.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/breadcrumb.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/breadcrumb.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -14,8 +14,9 @@
*
* @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)
* @package system
- * @version $Id$
+ * @version $Id:$
*/
class SystemBreadcrumb
Modified: XoopsCore/trunk/htdocs/modules/system/class/cookie.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/cookie.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/cookie.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -1,6 +1,22 @@
<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+/**
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Andricq Nicolas (AKA MusS)
+ * @package system
+ * @version $Id:$
+ */
+
class Cookie
{
// Reserved session keys
Modified: XoopsCore/trunk/htdocs/modules/system/class/group.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/group.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/group.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -14,7 +14,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Gregory Mage (AKA Mage)
* @package system
- * @version $Id$
+ * @version $Id:$
*/
Modified: XoopsCore/trunk/htdocs/modules/system/class/maintenance.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/maintenance.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/maintenance.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -14,7 +14,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Cointin Maxime (AKA Kraven30)
* @package system
- * @version $Id$
+ * @version $Id:$
*/
if (!defined('XOOPS_ROOT_PATH')) {
Modified: XoopsCore/trunk/htdocs/modules/system/class/menu.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/menu.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/menu.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -16,8 +16,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author John Neill (AKA Catzwolf)
* @author Andricq Nicolas (AKA MusS)
- * @version $Id$
- * @since 2.3.0
+ * @version $Id:$
*/
defined( 'XOOPS_ROOT_PATH' ) or die();
Modified: XoopsCore/trunk/htdocs/modules/system/class/smilies.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/smilies.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/smilies.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -15,7 +15,7 @@
* @author Kazumi Ono (AKA onokazu)
* @author Gregory Mage (AKA Mage)
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
Modified: XoopsCore/trunk/htdocs/modules/system/class/system_banner.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/system_banner.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/system_banner.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -14,7 +14,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Gregory Mage (AKA Mage)
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
Modified: XoopsCore/trunk/htdocs/modules/system/class/system_banner_client.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/system_banner_client.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/system_banner_client.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -14,7 +14,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Gregory Mage (AKA Mage)
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
Modified: XoopsCore/trunk/htdocs/modules/system/class/system_banner_finish.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/system_banner_finish.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/system_banner_finish.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -14,7 +14,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Gregory Mage (AKA Mage)
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
Modified: XoopsCore/trunk/htdocs/modules/system/class/userrank.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/userrank.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/userrank.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -14,7 +14,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Gregory Mage (AKA Mage)
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
Modified: XoopsCore/trunk/htdocs/modules/system/class/users.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/users.php 2010-01-30 22:08:35 UTC (rev 4243)
+++ XoopsCore/trunk/htdocs/modules/system/class/users.php 2010-01-30 22:12:35 UTC (rev 4244)
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package system
- * @version $Id$
+ * @version $Id:$
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nie...@us...> - 2010-01-30 22:08:44
|
Revision: 4243
http://xoops.svn.sourceforge.net/xoops/?rev=4243&view=rev
Author: niei0637
Date: 2010-01-30 22:08:35 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/xoopspoll/trunk/blocks/xoopspoll.php
XoopsModules/xoopspoll/trunk/class/xoopspoll.php
XoopsModules/xoopspoll/trunk/class/xoopspollrenderer.php
XoopsModules/xoopspoll/trunk/index.php
XoopsModules/xoopspoll/trunk/language/english/blocks.php
XoopsModules/xoopspoll/trunk/language/swedish/blocks.php
XoopsModules/xoopspoll/trunk/templates/blocks/xoopspoll_block_poll.html
XoopsModules/xoopspoll/trunk/templates/xoopspoll_results.html
XoopsModules/xoopspoll/trunk/templates/xoopspoll_view.html
Modified: XoopsModules/xoopspoll/trunk/blocks/xoopspoll.php
===================================================================
--- XoopsModules/xoopspoll/trunk/blocks/xoopspoll.php 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/blocks/xoopspoll.php 2010-01-30 22:08:35 UTC (rev 4243)
@@ -41,6 +41,9 @@
$block['lang_results'] = _PL_RESULTS;
$block['lang_expires'] = _PL_WILLEXPIRE;
$block['lang_expired'] = _PL_HASEXPIRED;
+ $block['lang_comments'] = _PL_COMMENTS;
+ $block['lang_comment'] = _PL_COMMENT;
+ $block['url'] = "http" . ((!empty($_SERVER['HTTPS'])) ? "s" : "") . "://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'];
for ($i = 0; $i < $count; $i++) {
$options_arr =& XoopsPollOption::getAllByPollId($polls[$i]->getVar('poll_id'));
@@ -58,12 +61,12 @@
}else{
$hasVoted=0;
}
-
+
foreach ($options_arr as $option) {
$percent = intval(100 * $option->getVar("option_count") / $totalVotes).'%';
$options[] = array('id' => $option->getVar('option_id'), 'text' => $option->getVar('option_text'), 'count' => $option->getVar('option_count'), 'percent'=>$percent, 'color'=>$option->getVar('option_color'));
}
- $poll = array('id' => $polls[$i]->getVar('poll_id'), 'question' => $polls[$i]->getVar('question'), 'option_type' => $option_type, 'option_name' => $option_name, 'options' => $options,'has_expired'=>$polls[$i]->hasExpired(), 'votes' => $polls[$i]->getVar('votes'), 'has_voted'=>$hasVoted, 'end_time'=>formatTimeStamp($polls[$i]->getVar('end_time'), "m"));
+ $poll = array('id' => $polls[$i]->getVar('poll_id'), 'question' => $polls[$i]->getVar('question'), 'option_type' => $option_type, 'option_name' => $option_name, 'options' => $options,'has_expired'=>$polls[$i]->hasExpired(), 'votes' => $polls[$i]->getVar('votes'), 'has_voted'=>$hasVoted, 'totalVotes' => sprintf(_PL_TOTALVOTES, 5), 'comments' => XoopsPoll::getcomments($polls[$i]->getVar('poll_id')), 'end_time'=>formatTimeStamp($polls[$i]->getVar('end_time'), "m"));
$block['polls'][] =& $poll;
unset($options);
unset($poll);
Modified: XoopsModules/xoopspoll/trunk/class/xoopspoll.php
===================================================================
--- XoopsModules/xoopspoll/trunk/class/xoopspoll.php 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/class/xoopspoll.php 2010-01-30 22:08:35 UTC (rev 4243)
@@ -207,5 +207,19 @@
$sql ="UPDATE ".$this->db->prefix("xoopspoll_desc")." SET votes=$votes, voters=$voters WHERE poll_id=".$this->getVar("poll_id")."";
$this->db->query($sql);
}
+
+ function getcomments($poll_id)
+ {
+ $db =& Database::getInstance();
+ global $module_handler;
+ $pollmod = $module_handler->getByDirname('xoopspoll');
+ $sql= "SELECT count(com_id) FROM ".$db->prefix('xoopscomments')." WHERE com_modid = '".$pollmod->getVar('mid')."' AND com_itemid = '".$poll_id."'";
+ $result = $db->query($sql);
+ while ($row = $db->fetchArray($result)) {
+ $amt=$row['count(com_id)'];
+ }
+ unset($pollmod);
+ return $amt;
+ }
}
?>
\ No newline at end of file
Modified: XoopsModules/xoopspoll/trunk/class/xoopspollrenderer.php
===================================================================
--- XoopsModules/xoopspoll/trunk/class/xoopspollrenderer.php 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/class/xoopspollrenderer.php 2010-01-30 22:08:35 UTC (rev 4243)
@@ -29,6 +29,7 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
include_once XOOPS_ROOT_PATH."/modules/xoopspoll/language/".$xoopsConfig['language']."/main.php";
+include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspolllog.php";
class XoopsPollRenderer
{
@@ -80,7 +81,7 @@
$options[$i]['text'] = $option->getVar("option_text");
$i++;
}
- $tpl->assign('poll', array('question' => $this->poll->getVar("question"), 'pollId' => $this->poll->getVar("poll_id"), 'viewresults' => XOOPS_URL."/modules/xoopspoll/pollresults.php?poll_id=".$this->poll->getVar("poll_id"), 'action' => XOOPS_URL."/modules/xoopspoll/index.php", 'options' => $options));
+ $tpl->assign('poll', array('question' => $this->poll->getVar("question"), 'pollId' => $this->poll->getVar("poll_id"), 'viewresults' => XOOPS_URL."/modules/xoopspoll/pollresults.php?poll_id=".$this->poll->getVar("poll_id"), 'action' => XOOPS_URL."/modules/xoopspoll/index.php", 'options' => $options, 'description' => $this->poll->getVar("description")));
}
// public
@@ -142,10 +143,15 @@
$options[$i]['total'] = $option->getVar("option_count");
$i++;
}
- if ( !$this->poll->hasExpired() ) {
+ global $xoopsUser;
+ $uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ if ( !$this->poll->hasExpired() && !XoopsPollLog::hasVoted($this->poll->getVar('poll_id'), xoops_getenv('REMOTE_ADDR'),$uid)) {
$vote = "<a href='".XOOPS_URL."/modules/xoopspoll/index.php?poll_id=".$this->poll->getVar("poll_id")."'>"._PL_VOTE."</a>";
+ } else {
+ $vote = null;
}
- $tpl->assign('poll', array('question' => $this->poll->getVar("question"),'end_text' => $end_text,'totalVotes' => sprintf(_PL_TOTALVOTES, $total), 'totalVoters' => sprintf(_PL_TOTALVOTERS, $this->poll->getVar("voters")),'vote' => $vote, 'options' => $options));
+
+ $tpl->assign('poll', array('question' => $this->poll->getVar("question"),'end_text' => $end_text,'totalVotes' => sprintf(_PL_TOTALVOTES, $total), 'totalVoters' => sprintf(_PL_TOTALVOTERS, $this->poll->getVar("voters")),'vote' => $vote, 'options' => $options, 'description' => $this->poll->getVar("description")));
}
}
?>
\ No newline at end of file
Modified: XoopsModules/xoopspoll/trunk/index.php
===================================================================
--- XoopsModules/xoopspoll/trunk/index.php 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/index.php 2010-01-30 22:08:35 UTC (rev 4243)
@@ -30,11 +30,15 @@
include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspolloption.php";
include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspolllog.php";
include_once XOOPS_ROOT_PATH."/modules/xoopspoll/class/xoopspollrenderer.php";
+
+global $xoopsUser;
+
if ( !empty($_POST['poll_id']) ) {
$poll_id = intval($_POST['poll_id']);
} elseif (!empty($_GET['poll_id'])) {
$poll_id = intval($_GET['poll_id']);
}
+$url = $_POST['url'];
if ( empty($poll_id) ) {
$xoopsOption['template_main'] = 'xoopspoll_index.html';
@@ -57,7 +61,12 @@
$polls['pollId'] = $polls_arr[$i]->getVar("poll_id");
if ( $polls_arr[$i]->getVar("end_time") > time() ) {
$polls['pollEnd'] = formatTimestamp($polls_arr[$i]->getVar("end_time"),"m");
- $polls['pollQuestion'] = "<a href='index.php?poll_id=".$polls_arr[$i]->getVar("poll_id")."'>".$polls_arr[$i]->getVar("question")."</a>";
+ $uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ if ( XoopsPollLog::hasVoted($polls_arr[$i]->getVar('poll_id'), xoops_getenv('REMOTE_ADDR'),$uid)){
+ $polls['pollQuestion'] = $polls_arr[$i]->getVar("question");
+ }else{
+ $polls['pollQuestion'] = "<a href='index.php?poll_id=".$polls_arr[$i]->getVar("poll_id")."'>".$polls_arr[$i]->getVar("question")."</a>";
+ }
} else {
$polls['pollEnd'] = "<span style='color:#ff0000;'>"._PL_EXPIRED."</span>";
$polls['pollQuestion'] = $polls_arr[$i]->getVar("question");
@@ -130,7 +139,12 @@
}
}
}
- redirect_header(XOOPS_URL."/modules/xoopspoll/pollresults.php?poll_id=$poll_id", 1, $msg);
+ if ($url != null){
+ redirect_header($url, 1, $msg);
+ }else{
+ redirect_header(XOOPS_URL."/modules/xoopspoll/pollresults.php?poll_id=$poll_id", 1, $msg);
+ }
+
exit();
} elseif ( !empty($poll_id) ) {
$xoopsOption['template_main'] = 'xoopspoll_view.html';
Modified: XoopsModules/xoopspoll/trunk/language/english/blocks.php
===================================================================
--- XoopsModules/xoopspoll/trunk/language/english/blocks.php 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/language/english/blocks.php 2010-01-30 22:08:35 UTC (rev 4243)
@@ -4,5 +4,7 @@
define("_PL_WILLEXPIRE","The poll will close at");
define("_PL_HASEXPIRED","The poll closed at");
+define("_PL_COMMENTS","Comments");
+define("_PL_COMMENT","Comment");
?>
\ No newline at end of file
Modified: XoopsModules/xoopspoll/trunk/language/swedish/blocks.php
===================================================================
--- XoopsModules/xoopspoll/trunk/language/swedish/blocks.php 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/language/swedish/blocks.php 2010-01-30 22:08:35 UTC (rev 4243)
@@ -4,5 +4,6 @@
define("_PL_WILLEXPIRE","Omröstningen stänger");
define("_PL_HASEXPIRED","Omröstningen stängde");
-
+define("_PL_COMMENTS","Kommentarer");
+define("_PL_COMMENT","Kommentar");
?>
\ No newline at end of file
Modified: XoopsModules/xoopspoll/trunk/templates/blocks/xoopspoll_block_poll.html
===================================================================
--- XoopsModules/xoopspoll/trunk/templates/blocks/xoopspoll_block_poll.html 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/templates/blocks/xoopspoll_block_poll.html 2010-01-30 22:08:35 UTC (rev 4243)
@@ -30,9 +30,15 @@
<{if ($poll.has_expired OR $poll.has_voted>0)}>
<td class="foot" align="center" colspan="2"><input type="button" value="<{$block.lang_results}>" /></td>
<{else}>
+ <input type="hidden" name="url" value="<{$block.url}>">
<td class="foot" align="center" colspan="2"><input type="submit" value="<{$block.lang_vote}>" /> <input type="button" value="<{$block.lang_results}>" /></td>
<{/if}>
</tr>
+ <tr>
+ <td class="foot" align="center" colspan="2">
+ <{$poll.totalVotes}>
+ </td>
+ </tr>
<tr>
<{if ($poll.has_expired)}>
<td class="foot" align="center" colspan="2"><{$block.lang_expired}> <{$poll.end_time}></td>
@@ -40,6 +46,18 @@
<td class="foot" align="center" colspan="2"><{$block.lang_expires}> <{$poll.end_time}></td>
<{/if}>
</tr>
+ <tr>
+ <td class="foot" align="center" colspan="2">
+ <{if ($poll.comments == 1)}>
+ <a href='<{$xoops_url}>/modules/xoopspoll/pollresults.php?poll_id=<{$poll.id}>'><{$poll.comments}> <{$block.lang_comment}></a>
+ <{elseif ($poll.comments > 1)}>
+ <a href='<{$xoops_url}>/modules/xoopspoll/pollresults.php?poll_id=<{$poll.id}>'><{$poll.comments}> <{$block.lang_comments}></a>
+ <{else}>
+ <a href='<{$xoops_url}>/modules/xoopspoll/pollresults.php?poll_id=<{$poll.id}>'><{$block.lang_comments}>?</a>
+ <{/if}>
+ </td>
+ </tr>
+
</table>
</form>
<{/foreach}>
\ No newline at end of file
Modified: XoopsModules/xoopspoll/trunk/templates/xoopspoll_results.html
===================================================================
--- XoopsModules/xoopspoll/trunk/templates/xoopspoll_results.html 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/templates/xoopspoll_results.html 2010-01-30 22:08:35 UTC (rev 4243)
@@ -4,7 +4,10 @@
<th colspan="2"><{$poll.question}></th>
</tr>
<tr>
- <td class="head" align="right" colspan="2">
+ <td class="head">
+ <{$poll.description}>
+ </td>
+ <td class="head" align="right">
<{$poll.end_text}>
</td>
</tr>
Modified: XoopsModules/xoopspoll/trunk/templates/xoopspoll_view.html
===================================================================
--- XoopsModules/xoopspoll/trunk/templates/xoopspoll_view.html 2010-01-30 21:33:38 UTC (rev 4242)
+++ XoopsModules/xoopspoll/trunk/templates/xoopspoll_view.html 2010-01-30 22:08:35 UTC (rev 4243)
@@ -3,6 +3,11 @@
<tr>
<th align="center" colspan="2"><input type="hidden" name="poll_id" value="<{$poll.pollId}>" /><{$poll.question}></th>
</tr>
+ <tr>
+ <td class="head" colspan="2" align="center">
+ <{$poll.description}>
+ </td>
+ </tr>
<{foreach item=option from=$poll.options}>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2010-01-30 21:33:48
|
Revision: 4242
http://xoops.svn.sourceforge.net/xoops/?rev=4242&view=rev
Author: forxoops
Date: 2010-01-30 21:33:38 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
remove duplicate define
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/themes/default/language/english/admin.php
Modified: XoopsCore/trunk/htdocs/modules/system/themes/default/language/english/admin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/themes/default/language/english/admin.php 2010-01-30 19:50:46 UTC (rev 4241)
+++ XoopsCore/trunk/htdocs/modules/system/themes/default/language/english/admin.php 2010-01-30 21:33:38 UTC (rev 4242)
@@ -23,7 +23,6 @@
define('_OXYGEN_XOOPS_LINKS','XOOPS Links');
define('_OXYGEN_XOOPSPROJECT','XOOPS Project');
-define('_OXYGEN_LOCALSUPPORT','XOOPS Local supports');
define('_OXYGEN_XOOPSCORE','XOOPS Core');
define('_OXYGEN_XOOPSTHEME','XOOPS Themes');
define('_OXYGEN_XOOPSWIKI','XOOPS Wiki');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kra...@us...> - 2010-01-30 19:50:53
|
Revision: 4241
http://xoops.svn.sourceforge.net/xoops/?rev=4241&view=rev
Author: kraven30
Date: 2010-01-30 19:50:46 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
fix problem CSS in filemanager
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_filemanager.html
Modified: XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-30 10:54:08 UTC (rev 4240)
+++ XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-30 19:50:46 UTC (rev 4241)
@@ -121,7 +121,7 @@
// All files
echo '<table cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
- <td align="center" width="'.$width.'%">';
+ <td align="center" width="'.$width.'%" style="padding-bottom:12px">';
foreach( $files as $file )
{
if (!preg_match('#.back#', $file))
@@ -215,9 +215,9 @@
$newline = ($count_file % $nbcolonnes_file == 1) ? true : false;
if ($newline) {
- echo '</tr><br /><tr><td align="center">';
+ echo '</tr><tr><td align="center" style="padding-bottom:12px">';
} else {
- echo '<td align="center">';
+ echo '<td align="center" style="padding-bottom:12px">';
}
}
}
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_filemanager.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_filemanager.html 2010-01-30 10:54:08 UTC (rev 4240)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_filemanager.html 2010-01-30 19:50:46 UTC (rev 4241)
@@ -16,32 +16,31 @@
<div class="upload_file" id="upload_file"></div>
<div id='loading' align="center" style="display:none;"><br /><br /><img src="./images/filemanager.gif" title="Loading" alt="Loading" /></div>
<div class="display_file" id="display_file">
-
+ <div class="xo-BtnActions">
+ <div class="xo-buttons">
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_HOME}>">
+ <img src="<{xoAdminIcons actions/gohome.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_HOME}>" />
+ </button>
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDDIR}>">
+ <img src="<{xoAdminIcons actions/folder_add.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDDIR}>" />
+ </button>
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_DELDIR}>">
+ <img src="<{xoAdminIcons actions/folder_delete.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_DELDIR}>" />
+ </button>
+
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDFILE}>">
+ <img src="<{xoAdminIcons actions/new_file.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDFILE}>" />
+ </button>
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_UPLOAD}>">
+ <img src="<{xoAdminIcons apps/up_alt.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_UPLOAD}>" />
+ </button>
+ </div>
+ <div class="clear"> </div>
+ </div>
<table cellpadding="0" cellspacing='0' border="0" align="center">
<tr>
- <div class="xo-BtnActions">
- <div class="xo-buttons">
- <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_HOME}>">
- <img src="<{xoAdminIcons actions/gohome.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_HOME}>" />
- </button>
- <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDDIR}>">
- <img src="<{xoAdminIcons actions/folder_add.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDDIR}>" />
- </button>
- <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_DELDIR}>">
- <img src="<{xoAdminIcons actions/folder_delete.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_DELDIR}>" />
- </button>
-
- <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDFILE}>">
- <img src="<{xoAdminIcons actions/new_file.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDFILE}>" />
- </button>
- <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_UPLOAD}>">
- <img src="<{xoAdminIcons apps/up_alt.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_UPLOAD}>" />
- </button>
- </div>
- <div class="clear"> </div>
- </div>
<{foreach item=files from=$files}>
- <td align="center" width="<{$width}>%">
+ <td align="center" width="<{$width}>%" style="padding-bottom:12px">
<div style="border: 1px solid #cccccc; ">
<table cellpadding="0" cellspacing='0'>
<tr class="odd">
@@ -56,7 +55,7 @@
</tr>
</table>
</div>
- <br /></td>
+ </td>
<{if $files.newline}>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kra...@us...> - 2010-01-30 10:54:15
|
Revision: 4240
http://xoops.svn.sourceforge.net/xoops/?rev=4240&view=rev
Author: kraven30
Date: 2010-01-30 10:54:08 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
Add icon in edit template and fixe bug in edit file of filemanager
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php
XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/trunk/htdocs/modules/system/js/filemanager.js
Modified: XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-29 16:31:41 UTC (rev 4239)
+++ XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-30 10:54:08 UTC (rev 4240)
@@ -238,8 +238,8 @@
}
//Button restore
- if(file_exists($path.$_REQUEST['file'].'.back')){
- $restore = '<button class="ui-corner-all tooltip" type="submit" value="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" title="'._AM_SYSTEM_FILEMANAGER_RESTORE.'">
+ if(file_exists($path_file.'.back')){
+ $restore = '<button class="ui-corner-all tooltip" type="button" value="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" title="'._AM_SYSTEM_FILEMANAGER_RESTORE.'">
<img src="'.system_AdminIcons('actions/revert.png').'" alt="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" />
</button>';
}else{
@@ -418,6 +418,28 @@
}
//echo $_REQUEST['chmod'];
break;
+
+ //Restore
+ case 'filemanager_restore':
+ $old_file = $_REQUEST['path_file'].'.back';
+ $new_file = $_REQUEST['path_file'];
+ if(file_exists($old_file))
+ {
+ if(unlink($new_file))
+ {
+ if(rename($old_file, $new_file))
+ {
+ //redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_DBUPDATED);
+ }else{
+ //redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_RENAME);
+ }
+ }else{
+ //redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_DELETE);
+ }
+ }else{
+ //redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_RESTORE_ERROR_FILE_EXISTS);
+ }
+ break;
}
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php 2010-01-29 16:31:41 UTC (rev 4239)
+++ XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php 2010-01-30 10:54:08 UTC (rev 4240)
@@ -159,7 +159,7 @@
//save
case 'filemanager_save':
//Save the file or restore file
- if(isset($_POST[_AM_SYSTEM_FILEMANAGER_SAVE]))
+ if(isset($_REQUEST['path_file']))
{
//save file
$copy_file = $_REQUEST['path_file'];
Modified: XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php 2010-01-29 16:31:41 UTC (rev 4239)
+++ XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php 2010-01-30 10:54:08 UTC (rev 4240)
@@ -1,21 +1,25 @@
<?php
-//
-// jQuery File Tree PHP Connector
-//
-// Version 1.01
-//
-// Cory S.N. LaViska
-// A Beautiful Site (http://abeautifulsite.net/)
-// 24 March 2008
-//
-// History:
-//
-// 1.01 - updated to work with foreign characters in directory/file names (12 April 2008)
-// 1.00 - released (24 March 2008)
-//
-// Output a list of files for jQuery File Tree
-//
+/*
+ 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.
+*/
+
+/**
+ * Template Manager
+ * Manage all templates: theme and module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Maxime Cointin (AKA Kraven30)
+ * @package system
+ * @version $Id: main.php 4202 2010-01-24 16:18:08Z kraven30 $
+ */
+
//include dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ) . '/mainfile.php';
include dirname( dirname( dirname( __FILE__ ) ) ) . '/header.php';
@@ -132,7 +136,9 @@
//Button restore
if(file_exists($path_file.'.back')){
- $restore = '<button class="ui-corner-all tooltip" type="button" >'._AM_SYSTEM_TEMPLATES_RESTORE.'</button>';
+ $restore = '<button class="ui-corner-all tooltip" type="button" value="'._AM_SYSTEM_TEMPLATES_RESTORE.'" title="'._AM_SYSTEM_TEMPLATES_RESTORE.'">
+ <img src="'.system_AdminIcons('actions/revert.png').'" alt="'._AM_SYSTEM_TEMPLATES_RESTORE.'" />
+ </button>';
}else{
$restore = '';
}
@@ -149,9 +155,20 @@
echo '<form name="back" action="admin.php?fct=tplsets&op=tpls_save" method="POST">
<table border="0">
<tr>
- <td><div class="xo-buttons">
- <button type="submit" class="ui-corner-all tooltip">'._AM_SYSTEM_TEMPLATES_SAVE.'</button> '.$restore.' <button class="ui-corner-all tooltip" type="button" >'._AM_SYSTEM_TEMPLATES_CANCEL.'</button>
- </div></td>
+ <td>
+ <div class="xo-BtnActions">
+ <div class="xo-buttons">
+ <button class="ui-corner-all tooltip" type="submit" value="'._AM_SYSTEM_TEMPLATES_SAVE.'" title="'._AM_SYSTEM_TEMPLATES_SAVE.'">
+ <img src="'.system_AdminIcons('actions/filesave.png').'" alt="'._AM_SYSTEM_TEMPLATES_SAVE.'" />
+ </button>
+ '.$restore.'
+ <button class="ui-corner-all tooltip" type="button" title="'._AM_SYSTEM_TEMPLATES_CANCEL.'">
+ <img src="'.system_AdminIcons('actions/reload.png').'" alt="'._AM_SYSTEM_TEMPLATES_CANCEL.'" />
+ </button>
+ <div class="clear"></div>
+ </div>
+ </div>
+ </td>
</tr>
<tr><td>
<textarea name="templates" rows=24 cols=110>'.$content.'</textarea>
Modified: XoopsCore/trunk/htdocs/modules/system/js/filemanager.js
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/js/filemanager.js 2010-01-29 16:31:41 UTC (rev 4239)
+++ XoopsCore/trunk/htdocs/modules/system/js/filemanager.js 2010-01-30 10:54:08 UTC (rev 4240)
@@ -286,4 +286,22 @@
}
});
return false;
-}
\ No newline at end of file
+}
+
+//Restore
+function filemanager_restore(path_file)
+{
+ $.ajax({
+ type: "POST",
+ url: "./admin/filemanager/jquery.php",
+ data: "op=filemanager_restore&path_file="+path_file,
+ success: function(msg){
+ $('#edit_file').fadeOut('fast');
+ $('#display_file').html(msg);
+ filemanager_load_tree();
+ filemanager_display_file('', 0)
+ //$('#display_file').fadeIn('slow');
+ }
+ });
+ return false;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2010-01-29 16:31:49
|
Revision: 4239
http://xoops.svn.sourceforge.net/xoops/?rev=4239&view=rev
Author: djculex
Date: 2010-01-29 16:31:41 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Corrected wrong winnt checksum value
Modified Paths:
--------------
XoopsModules/indexscan/admin/md5parser.php
Modified: XoopsModules/indexscan/admin/md5parser.php
===================================================================
--- XoopsModules/indexscan/admin/md5parser.php 2010-01-29 11:20:37 UTC (rev 4238)
+++ XoopsModules/indexscan/admin/md5parser.php 2010-01-29 16:31:41 UTC (rev 4239)
@@ -4,7 +4,7 @@
$verifyMessage="";
//
$checksum ="ba18ea51bebb89919e323e7b76dfe093"; // php checksum Linux
- $checksumNT = "299fa4b44d737535c910602a236e3416"; // php checksum Winnt
+ $checksumNT = "c6314c4948048321bb0ad9493564b619"; // php checksum Winnt
$indexscanfile = $dir.$file;
//echo "<br><br>".$dir.$file." : ".md5_file("$indexscanfile")." = ".$checksum;
if ( md5_file($indexscanfile) != $checksum && md5_file($indexscanfile) != $checksumNT) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2010-01-29 11:20:44
|
Revision: 4238
http://xoops.svn.sourceforge.net/xoops/?rev=4238&view=rev
Author: voltan1
Date: 2010-01-29 11:20:37 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Update to xoopspoll 1.3
Modified Paths:
--------------
XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/admin.php
XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/blocks.php
XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/main.php
XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/modinfo.php
Modified: XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/admin.php
===================================================================
--- XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/admin.php 2010-01-29 09:48:54 UTC (rev 4237)
+++ XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/admin.php 2010-01-29 11:20:37 UTC (rev 4238)
@@ -1,40 +1,41 @@
<?php
// $Id: admin.php,v 1.2 2003/10/14 13:18:04 wellwine Exp $
-//%%%%%% Admin Module Name Polls %%%%%
+//%%%%%% Admin Module Name Polls %%%%%
+
define("_AM_DBUPDATED","پایگاه داده با موفقیت به روز شد!");
define("_AM_POLLCONF","تنظیمات نظرسنجی ها");
-define("_AM_POLLSLIST", "فهرست نظر سنجی ها");
-define("_AM_AUTHOR", "سازنده این نظر سنجی");
+define("_AM_POLLSLIST", "فهرست نظرسنجی ها");
+define("_AM_AUTHOR", "سازنده این نظرسنجی");
define("_AM_DISPLAYBLOCK", "در بلاک نمایش داده شود؟");
-define("_AM_POLLQUESTION", "پرسش نظر سنجی");
+define("_AM_POLLQUESTION", "پرسش نظرسنجی");
define("_AM_VOTERS", "همه رای دهنده ها");
define("_AM_VOTES", "همه رای ها");
-define("_AM_EXPIRATION", "تاریخ به پایان رسیدن نظر سنجی");
+define("_AM_EXPIRATION", "تاریخ به پایان رسیدن نظرسنجی");
define("_AM_EXPIRED", "به پایان رسیده است");
define("_AM_VIEWLOG","دیدن اطلاعات");
-define("_AM_CREATNEWPOLL", "ساختن نظر سنجی جدید");
-define("_AM_POLLDESC", "شرح نظر سنجی");
+define("_AM_CREATNEWPOLL", "ساختن نظرسنجی جدید");
+define("_AM_POLLDESC", "شرح نظرسنجی");
define("_AM_DISPLAYORDER", "مکان نظرسنجی");
define("_AM_ALLOWMULTI", "اجازه برای انتخاب چند گزینه؟");
-define("_AM_NOTIFY", "وقتی که نظر سنجی تمام شد به سازنده نظر سنجی اطلاع بده؟");
+define("_AM_NOTIFY", "وقتی که نظرسنجی تمام شد به سازنده نظرسنجی اطلاع بده؟");
define("_AM_POLLOPTIONS", "گزینه ها");
-define("_AM_EDITPOLL", "ویرایش نظر سنجی");
-define("_AM_FORMAT", "فرمت: yyyy-mm-dd hh:mm:ss<br> توجه: تاریخ باید هجری شمسی وارد شود.");
+define("_AM_EDITPOLL", "ویرایش نظرسنجی");
+define("_AM_FORMAT", "فرمت: yyyy-mm-dd hh:mm:ss<br> توجه: تاریخ باید به صورت میلادی وارد شود.");
define("_AM_CURRENTTIME", "تاریخ و ساعت در حال حاضر %s است");
define("_AM_EXPIREDAT", "در تاریخ %s به اتمام رسیده است");
-define("_AM_RESTART", "این نظر سنجی را دوباره شروع کن");
+define("_AM_RESTART", "این نظرسنجی را دوباره شروع کن");
define("_AM_ADDMORE", "اضافه کردن گزینه های بیشتر");
-define("_AM_RUSUREDEL", "آیا اطمینان دارید که میخواهید این نظر سنجی و نظر هایش را حذف کنید؟");
-define("_AM_RESTARTPOLL", "نظر سنجی را دوباره شروع کن");
-define("_AM_RESET", "تمام اطلاعات این نظر سنجی پاک شود؟");
-define("_AM_ADDPOLL","اضافه کردن نظر سنجی");
-
+define("_AM_RUSUREDEL", "آیا اطمینان دارید که میخواهید این نظرسنجی و نظر هایش را حذف کنید؟");
+define("_AM_RESTARTPOLL", "نظرسنجی را دوباره شروع کن");
+define("_AM_RESET", "تمام اطلاعات این نظرسنجی پاک شود؟");
+define("_AM_ADDPOLL","اضافه کردن نظرسنجی");
+/*
// wellwine
define("_AM_LOGSLIST", "فهرست اطلاعات");
-define("_AM_RETURNLIST", "بازگشت به فهرست نظر سنجی ها");
+define("_AM_RETURNLIST", "بازگشت به فهرست نظرسنجی ها");
define("_AM_LOGID", "شماره شناسه (ID) رای");
define("_AM_OPTIONID", "انتخاب گزینه");
define("_AM_IP", "آدرس IP");
define("_AM_VOTER", "رای دهنده");
-define("_AM_VOTETIME", "زمانی که رای داده شده است");
+define("_AM_VOTETIME", "زمانی که رای داده شده است"); */
?>
\ No newline at end of file
Modified: XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/blocks.php
===================================================================
--- XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/blocks.php 2010-01-29 09:48:54 UTC (rev 4237)
+++ XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/blocks.php 2010-01-29 11:20:37 UTC (rev 4238)
@@ -1,7 +1,8 @@
<?php
-// $Id: blocks.php,v 1.3 2003/10/23 13:16:41 wellwine Exp $
-// Blocks
-define('_BL_POLL_EDIT_SHOWRESULTS', 'بعد از اتمام نظر سنجی آیا برای کسی که رای داده است نتایج نشان داده شوند؟ (0=نه, 1=بله)');
-define('_BL_POLL_EDIT_SHOWPERCENT', 'درصد در نتایج نشان داده شود؟ (0=نه, 1=بله)');
-define('_BL_POLL_EDIT_SHOWBAR', 'ستون ها در نتایج نشان داده شود (0=نه, 1=بله)');
+// $Id: blocks.php,v 1.8 2004/12/26 19:12:13 onokazu Exp $
+// Blocks
+
+define("_PL_WILLEXPIRE","نظرسنجی در تاریخ زیر بسته خواهد شد");
+define("_PL_HASEXPIRED","نظرسنجی در تاریخ زیر بسته شده است");
+
?>
\ No newline at end of file
Modified: XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/main.php
===================================================================
--- XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/main.php 2010-01-29 09:48:54 UTC (rev 4237)
+++ XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/main.php 2010-01-29 11:20:37 UTC (rev 4238)
@@ -1,22 +1,24 @@
<?php
-// $Id: main.php,v 1.1 2003/10/14 12:15:34 wellwine Exp $
+// $Id: main.php,v 1.1 2003/10/14 12:15:34 wellwine Exp $
+
//%%%%%% File Name pollresults.php %%%%%
define("_PL_TOTALVOTES","همه رای ها: %s");
define("_PL_TOTALVOTERS","همه رای دهنده ها: %s");
//%%%%%% File Name index.php %%%%%
-define("_PL_POLLSLIST","فهرست نظر سنجی ها");
+define("_PL_POLLSLIST","فهرست نظرسنجی ها");
define("_PL_ALREADYVOTED", "متاسفانه، شما یک بار رای داده اید.");
define("_PL_THANKSFORVOTE","با تشکر از رای شما");
-define("_PL_SORRYEXPIRED", "متاسفانه تاریخ شرکت در این نظر سنجی به اتمام رسیده است.");
-define("_PL_YOURPOLLAT", "%s، نظر سنجی شما در سایت %s"); // 1st %s is user name, 2nd %s is site name
+define("_PL_SORRYEXPIRED", "متاسفانه تاریخ شرکت در این نظرسنجی به اتمام رسیده است.");
+define("_PL_YOURPOLLAT", "%s، نظرسنجی شما در سایت %s"); // 1st %s is user name, 2nd %s is site name
define("_PL_PREV", "قبلی");
define("_PL_NEXT", "بعدی");
-define("_PL_POLLQUESTION", "سوال نظر سنجی");
+define("_PL_POLLQUESTION", "سوال نظرسنجی");
define("_PL_VOTERS", "همه رای دهنده ها");
define("_PL_VOTES", "همه رای ها");
-define("_PL_EXPIRATION", "تاریخ به پایان رسیدن نظر سنجی");
-define("_PL_EXPIRED", "به اتمام رسیده است");
+define("_PL_EXPIRATION", "تاریخ به پایان رسیدن نظرسنجی");
+define("_PL_EXPIRED", "به اتمام رسیده است");
+define("_PL_MUSTLOGIN", "برای شرکت در نظرسنجی بایدبه سایت وارد شوید.");
//%%%%%% File Name xoopspollrenderer.php %%%%%
// %s represents date
Modified: XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/modinfo.php
===================================================================
--- XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/modinfo.php 2010-01-29 09:48:54 UTC (rev 4237)
+++ XoopsLanguages/persian/modules/xoopspoll/trunk/language/persian/modinfo.php 2010-01-29 11:20:37 UTC (rev 4238)
@@ -3,19 +3,22 @@
// Module Info
// The name of this module
-define("_MI_POLLS_NAME","نظر سنجی");
+define("_MI_POLLS_NAME","نظرسنجی");
// A brief description of this module
define("_MI_POLLS_DESC","برای گذاشتن نظرسنجی در بلاک");
// Names of blocks for this module (Not all module has blocks)
-define("_MI_POLLS_BNAME1","نظر سنجی");
+define("_MI_POLLS_BNAME1","نظرسنجی");
// Names of admin menu items
-define("_MI_POLLS_ADMENU1","فهرست نظر سنجی ها");
-define("_MI_POLLS_ADMENU2","اضافه کردن نظر سنجی");
+define("_MI_POLLS_ADMENU1","فهرست نظرسنجی ها");
+define("_MI_POLLS_ADMENU2","اضافه کردن نظرسنجی");
+
+//Module properties
+define("_MI_POLL_LIMITBYIP","محدود کردن شرکت در نظرسنجی به Ip کاربر");
+define("_MI_POLL_LIMITBYIPD","");
+define("_MI_POLL_LIMITBYUID","محدود کردن شرکت در نظرسنجی برای کاربر");
+define("_MI_POLL_LIMITBYUIDD","");
-// wellwine
-define("_MI_POLLS_LOOKUPHOST","یه جای آدرس IP نام host را نمایش بده");
-define("_MI_POLLS_LOOKUPHOSTDESC","فهرست نام هاست ها به جای آدرس IP در نمایش اطلاعات نظر سنجی ها. اگر نام هاست انتخاب شود زمان بیشتری برای نمایش نام ها طول خواهد کشید.");
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vo...@us...> - 2010-01-29 09:49:01
|
Revision: 4237
http://xoops.svn.sourceforge.net/xoops/?rev=4237&view=rev
Author: voltan1
Date: 2010-01-29 09:48:54 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Modified Paths:
--------------
XoopsLanguages/persian/core/trunk/htdocs/language/persian/banners.php
XoopsLanguages/persian/core/trunk/htdocs/language/persian/logger.php
XoopsLanguages/persian/core/trunk/htdocs/themes/zetagenesis/language/persian/main.php
Modified: XoopsLanguages/persian/core/trunk/htdocs/language/persian/banners.php
===================================================================
--- XoopsLanguages/persian/core/trunk/htdocs/language/persian/banners.php 2010-01-28 22:52:57 UTC (rev 4236)
+++ XoopsLanguages/persian/core/trunk/htdocs/language/persian/banners.php 2010-01-29 09:48:54 UTC (rev 4237)
@@ -70,4 +70,9 @@
define('_BANNERS_MAIL_ERROR','هیچ پستالکترونیکی برای این مشتری اختصاص نیافتهاست %s.<br />لطفا با مدیر سایت تماس بگیرید');
define('_BANNERS_DBUPDATED', 'گزینه ها ویرایش شدند و پایگاه داده ها به روز شد');
define('_BANNERS_DBERROR', 'پایگاه داده ها به روز نشده است و یک خطا روی داده است!');
+define('_BANNERS_CHANGE', 'تغییر');
+
+define('_BANNERS_NO_LOGIN_DATA', 'هیچ اطلاعات ورودی شناسایی نشد');
+define('_BANNERS_NO_REFERER', 'هیچ اجاع دهنده ای شناسایی نشد');
+define('_BANNERS_NO_ID', 'هیچ ID معتبری شناسایی نشد');
?>
\ No newline at end of file
Modified: XoopsLanguages/persian/core/trunk/htdocs/language/persian/logger.php
===================================================================
--- XoopsLanguages/persian/core/trunk/htdocs/language/persian/logger.php 2010-01-28 22:52:57 UTC (rev 4236)
+++ XoopsLanguages/persian/core/trunk/htdocs/language/persian/logger.php 2010-01-29 09:48:54 UTC (rev 4237)
@@ -33,6 +33,7 @@
define('_LOGGER_NONE', "هیچ");
define('_LOGGER_ALL', "همه");
define('_LOGGER_ERRORS', "خطاها");
+define('_LOGGER_DEPRECATED', "توصیه شده");
define('_LOGGER_QUERIES', "پرس و جو ها");
define('_LOGGER_BLOCKS', "بلاک ها");
define('_LOGGER_EXTRA', "اضافی");
Modified: XoopsLanguages/persian/core/trunk/htdocs/themes/zetagenesis/language/persian/main.php
===================================================================
--- XoopsLanguages/persian/core/trunk/htdocs/themes/zetagenesis/language/persian/main.php 2010-01-28 22:52:57 UTC (rev 4236)
+++ XoopsLanguages/persian/core/trunk/htdocs/themes/zetagenesis/language/persian/main.php 2010-01-29 09:48:54 UTC (rev 4237)
@@ -7,44 +7,4 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-/* ------------------- userbar.html ------------------- */
-define("_THEME_REGISTER", "ثبت نام کاربر");
-define("_THEME_INBOX", "نمایش پیام شخصی");
-define("_THEME_INBOX_NOTREAD", "پیام خوانده نشده");
-define("_THEME_NOTIFICATIONS", "نمایش آگاهی رسانی ها");
-define("_THEME_PROFILE", "نمایش ویژگی های فردی");
-define("_THEME_ADMINISTRATION", "مدیریت");
-define("_THEME_LOGOUT", "برای خروج کلیک کنید");
-
-define("THEME_WELLCOME", "خوش آمدید");
-define("THEME_EDITPROFILE", "ویرایش ویژگی های فردی");
-define("THEME_NOTIFICATION", "نمایش آگاهی رسانی ها");
-define("THEME_MESSAGE", "نمایش پیام ها");
-define("THEME_YOUHAVE", "شما");
-define("THEME_NOTREAD", "پیام خوانده نشده دارید");
-define("THEME_MYACCOUNT", "ویژگی های فردی من");
-define("THEME_SEARCH", "جستجو");
-define("THEME_DESC_SEARCH", "یافت شده در وب سایت");
-define("THEME_KEYWORDS", "کلمه کلیدی");
-define("THEME_UPTOP", "بالای صفحه");
-define("THEME_USER", "کاربران");
-
-/* footer admin */
-define("THEME_CPHOME", "مدیریت");
-define("THEME_SYSOPTIONS", "گزینه ها");
-define("THEME_BANS", "مدیریت بنر ها");
-define("THEME_BKAD", "مدیریت بلاک ها");
-define("THEME_ADGS", "مدیریت گروه ها");
-define("THEME_PREF", "ویژگی ها");
-define("THEME_INSTALLEDMODULES", "مدیریت ماژول ها");
-define("THEME_IMAGES", "تصاویر");
-define("THEME_MDAD", "ماژول ها");
-define("THEME_SMLS", "مدیریت لبخند ها");
-define("THEME_RANK", "نشان اعضا");
-define("THEME_EUSER", "ویرایش اعضا");
-define("THEME_FINDUSER", "جستجو اعضا");
-define("THEME_MLUS", "ارسال پیام با اعضا");
-define("THEME_AVATARS", "مدیریت تصاویر اعضا");
-define("THEME_TPLS", "مدیریت الگو ها");
-define("THEME_COMMENTS", "مدیریت نظر ها");
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2010-01-28 22:53:05
|
Revision: 4236
http://xoops.svn.sourceforge.net/xoops/?rev=4236&view=rev
Author: forxoops
Date: 2010-01-28 22:52:57 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
fix icons for buttons
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
XoopsCore/trunk/htdocs/modules/system/css/button.css
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_filemanager.html
Removed Paths:
-------------
XoopsCore/trunk/htdocs/modules/system/images/icons/default/actions/Thumbs.db
XoopsCore/trunk/htdocs/modules/system/images/icons/default/apps/Thumbs.db
Modified: XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-28 22:15:06 UTC (rev 4235)
+++ XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-28 22:52:57 UTC (rev 4236)
@@ -12,11 +12,11 @@
/**
* Filemanager settings
* jQuery File Tree PHP Connector
- * Output a list of files for jQuery File Tree
- *
+ * Output a list of files for jQuery File Tree
+ *
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Maxime Cointin (AKA Kraven30)
+ * @author Maxime Cointin (AKA Kraven30)
* @package system
* @version $Id$
*/
@@ -25,10 +25,8 @@
require '../../../../mainfile.php';
// Check Xoops define
if ( !defined('XOOPS_ROOT_PATH') ) die('XOOPS ROOT path not defined');
-
error_reporting(0);
$GLOBALS['xoopsLogger']->activated = false;
-
// Include module functions
include $GLOBALS['xoops']->path('modules/system/include/functions.php');
// Load language
@@ -40,110 +38,109 @@
switch ($op) {
- // Display files in tree
- case 'filemanager_display_folder':
+ // Display files in tree
+ case 'filemanager_display_folder':
- $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
- $root = XOOPS_ROOT_PATH.'/';
+ $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
+ $root = XOOPS_ROOT_PATH.'/';
+
+ if( file_exists($root . $_REQUEST['dir']) )
+ {
+ $files = scandir($root . $_REQUEST['dir']);
+ natcasesort($files);
+
+ if( count($files) > 2 ) { /* The 2 accounts for . and .. */
+ echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
+ if ('/' == $_REQUEST['dir'])
+ echo "<a href=\"admin.php?fct=filemanager\"><strong>/</strong></a>";
+ // All dirs
+ foreach( $files as $file ) {
+ if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file) ) {
+ //retirer .svn
+ $file_no_valid = array('.svn', 'conf', 'db', 'locks', 'hooks', 'cache', 'templates_c');
- if( file_exists($root . $_REQUEST['dir']) )
- {
- $files = scandir($root . $_REQUEST['dir']);
- natcasesort($files);
+ if(!in_array($file, $file_no_valid))
+ {
+ echo "<li class=\"directory collapsed\"><a href='".$_REQUEST['dir'] . $file."' rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
+ }
+ }
+ }
+ echo "</ul>";
+ }
+ }
+ break;
+
+ // Display files
+ case 'filemanager_display_file':
+ $nbcolonnes_file = 4;
+ $width = 100/$nbcolonnes_file;
+ $_REQUEST['file'] = urldecode($_REQUEST['file']);
+ //For come back and display files
+ if ($_REQUEST['status'] == 1 ) {
+ $path_file = $_REQUEST['file'];
+ } else {
+ $file_arr = explode("/",$_REQUEST['file']);
+ $path_file = XOOPS_ROOT_PATH.'/';
+ $url_file = XOOPS_URL.'/';
+
+ for ($i=3 ; $i<count($file_arr) ; $i++ ) {
+ $path_file .= $file_arr[$i].'/';
+ $url_file .= $file_arr[$i].'/';
+ }
+ }
- if( count($files) > 2 ) { /* The 2 accounts for . and .. */
- echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
- if ('/' == $_REQUEST['dir'])
- echo "<a href=\"admin.php?fct=filemanager\"><strong>/</strong></a>";
- // All dirs
- foreach( $files as $file ) {
- if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file) ) {
- //retirer .svn
- $file_no_valid = array('.svn', 'conf', 'db', 'locks', 'hooks', 'cache', 'templates_c');
-
- if(!in_array($file, $file_no_valid))
- {
- echo "<li class=\"directory collapsed\"><a href='".$_REQUEST['dir'] . $file."' rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
- }
- }
- }
- echo "</ul>";
- }
- }
- break;
-
- // Display files
- case 'filemanager_display_file':
- $nbcolonnes_file = 4;
- $width = 100/$nbcolonnes_file;
- $_REQUEST['file'] = urldecode($_REQUEST['file']);
- //For come back and display files
- if ($_REQUEST['status'] == 1 ) {
- $path_file = $_REQUEST['file'];
- } else {
- $file_arr = explode("/",$_REQUEST['file']);
- $path_file = XOOPS_ROOT_PATH.'/';
- $url_file = XOOPS_URL.'/';
-
- for ($i=3 ; $i<count($file_arr) ; $i++ ) {
- $path_file .= $file_arr[$i].'/';
- $url_file .= $file_arr[$i].'/';
- }
- }
-
- if( file_exists($path_file) ) {
- $files = scandir($path_file);
- natcasesort($files);
- xoops_load('file');
- XoopsFile::load('file');
- // The 2 accounts for . and ..
- if( count($files) > 2 ) {
+ if( file_exists($path_file) ) {
+ $files = scandir($path_file);
+ natcasesort($files);
+ xoops_load('file');
+ XoopsFile::load('file');
+ // The 2 accounts for . and ..
+ if( count($files) > 2 ) {
echo '
<div class="xo-BtnActions">
- <div class="xo-buttons">
- <a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_HOME.'">
- <img src="'.system_AdminIcons('actions/gohome.png').'" alt="'._AM_SYSTEM_FILEMANAGER_HOME.'" />
- </a>
- <a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_ADDDIR.'">
- <img src="'.system_AdminIcons('actions/folder_add.png').'" alt="'._AM_SYSTEM_FILEMANAGER_ADDDIR.'" />
- </a>
- <a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_DELDIR.'">
- <img src="'.system_AdminIcons('actions/folder_delete.png').'" alt="'._AM_SYSTEM_FILEMANAGER_DELDIR.'" />
- </a>
-
- <a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_ADDFILE.'">
- <img src="'.system_AdminIcons('actions/new_file.png').'" alt="'._AM_SYSTEM_FILEMANAGER_ADDFILE.'" />
- </a>
- <a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'">
- <img src="'.system_AdminIcons('apps/up_alt.png').'" alt="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'" />
- </a>
- </div>
- <div class="clear"> </div>
- </div>';
- $count_file = 1;
- // All files
- echo '<table cellpadding="0" cellspacing="0" border="0" align="center">
- <tr>
- <td align="center" width="'.$width.'%">';
- foreach( $files as $file )
- {
- if (!preg_match('#.back#', $file))
- {
- if( file_exists($path_file . $file) && $file != '.' && $file != '..' && !is_dir($path_file . $file) )
- {
- //echo $path_file . $file.'<br />';
- $unzip = '';
- $edit = false;
- $file1 = XoopsFile::getHandler('file', $path_file . $file);
- $extension_verif = $file1->ext();
-
- switch ( $extension_verif ) {
+ <div class="xo-buttons">
+ <button class="ui-corner-all tooltip" type="button" title="'._AM_SYSTEM_FILEMANAGER_HOME.'">
+ <img src="'.system_AdminIcons('actions/gohome.png').'" alt="'._AM_SYSTEM_FILEMANAGER_HOME.'" />
+ </button>
+ <button class="ui-corner-all tooltip" title="'._AM_SYSTEM_FILEMANAGER_ADDDIR.'">
+ <img src="'.system_AdminIcons('actions/folder_add.png').'" alt="'._AM_SYSTEM_FILEMANAGER_ADDDIR.'" />
+ </button>
+ <button class="ui-corner-all tooltip" title="'._AM_SYSTEM_FILEMANAGER_DELDIR.'">
+ <img src="'.system_AdminIcons('actions/folder_delete.png').'" alt="'._AM_SYSTEM_FILEMANAGER_DELDIR.'" />
+ </button>
+ <button class="ui-corner-all tooltip" title="'._AM_SYSTEM_FILEMANAGER_ADDFILE.'">
+ <img src="'.system_AdminIcons('actions/new_file.png').'" alt="'._AM_SYSTEM_FILEMANAGER_ADDFILE.'" />
+ </button>
+ <button class="ui-corner-all tooltip" title="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'">
+ <img src="'.system_AdminIcons('apps/up_alt.png').'" alt="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'" />
+ </button>
+ </div>
+ <div class="clear"> </div>
+ </div>';
+ $count_file = 1;
+ // All files
+ echo '<table cellpadding="0" cellspacing="0" border="0" align="center">
+ <tr>
+ <td align="center" width="'.$width.'%">';
+ foreach( $files as $file )
+ {
+ if (!preg_match('#.back#', $file))
+ {
+ if( file_exists($path_file . $file) && $file != '.' && $file != '..' && !is_dir($path_file . $file) )
+ {
+ //echo $path_file . $file.'<br />';
+ $unzip = '';
+ $edit = false;
+ $file1 = XoopsFile::getHandler('file', $path_file . $file);
+ $extension_verif = $file1->ext();
+
+ switch ( $extension_verif ) {
case 'ico': case 'png': case 'gif': case 'jpg': case 'jpeg':
$extension_verif = 'picture';
break;
case 'html': case 'htm':
$extension_verif = 'html';
- $edit = true;
+ $edit = true;
break;
case 'zip': case 'rar': case 'tar': case 'gz':
$extension_verif = 'rar';
@@ -152,147 +149,156 @@
break;
case 'css':
$extension_verif = 'css';
- $edit = true;
+ $edit = true;
break;
case 'avi': case 'mov': case 'real': case 'flv': case 'swf':
$extension_verif = 'movie';
break;
case 'log':
$extension_verif = 'log';
- $edit = true;
- break;
- case 'php':
- $extension_verif = 'php';
- $edit = true;
- break;
- case 'info': case 'htaccess':
- $extension_verif = 'info';
- break;
- case 'sql':
- $extension_verif = 'sql';
- $edit = true;
- break;
+ $edit = true;
+ break;
+ case 'php':
+ $extension_verif = 'php';
+ $edit = true;
+ break;
+ case 'info': case 'htaccess':
+ $extension_verif = 'info';
+ break;
+ case 'sql':
+ $extension_verif = 'sql';
+ $edit = true;
+ break;
default:
$extension_verif = 'file';
- $edit = true;
- break;
+ $edit = true;
+ break;
}
- if($edit == true) {
- $edit = '<img class="cursorpointer" src="'.system_AdminIcons('actions/edit.png').'" 'filemanager_edit_file("'.$path_file . $file.'", "'.$path_file.'", "'.$file.'");\' width="16" alt="edit" />';
- } else {
- $edit = '';
- }
- //Chmod
- $chmod = substr($file1->perms(), 1);
+ if($edit == true) {
+ $edit = '<img class="cursorpointer" src="'.system_AdminIcons('actions/edit.png').'" 'filemanager_edit_file("'.$path_file . $file.'", "'.$path_file.'", "'.$file.'");\' width="16" alt="edit" />';
+ } else {
+ $edit = '';
+ }
+ //Chmod
+ $chmod = substr($file1->perms(), 1);
+
+ $chmod = modify_chmod($chmod, $path_file.$file, $count_file);
+
+ //Img
+ if($extension_verif == 'picture') {
+ list($width, $height) = getimagesize($path_file . $file);
+ if($height > 60){
+ $img = '<img src="'.$url_file.$file.'" height="47" title="" alt="" />';
+ } else {
+ $img = '<img src="'.$url_file.$file.'" title="" alt="" />';
+ }
+ } else {
+ $img = '<img src="./images/mimetypes/'.$extension_verif.'_48.png" title="" alt="" />';
+ }
+ echo '<div style="border: 1px solid #cccccc;">
+ <table cellpadding="0" cellspacing="0">
+ <tr class="odd">
+ <td align="left">'.$chmod.'</td>
+ <td align="right">'.$unzip.$edit.' <img class="cursorpointer" src="'.system_AdminIcons('actions/editdelete.png').'" 'filemanager_confirm_delete_file("'.$path_file . $file.'", "'.$path_file.'");\' width="16" alt="delete" /></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center" height="60px"><br />'.$img.'</td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">'.$file.'<br /><br /></td>
+ </tr>
+ </table>
+ </div>
+ </td>';
- $chmod = modify_chmod($chmod, $path_file.$file, $count_file);
-
- //Img
- if($extension_verif == 'picture') {
- list($width, $height) = getimagesize($path_file . $file);
- if($height > 60){
- $img = '<img src="'.$url_file.$file.'" height="47" title="" alt="" />';
- } else {
- $img = '<img src="'.$url_file.$file.'" title="" alt="" />';
- }
- } else {
- $img = '<img src="./images/mimetypes/'.$extension_verif.'_48.png" title="" alt="" />';
- }
- echo '<div style="border: 1px solid #cccccc;">
- <table cellpadding="0" cellspacing="0">
- <tr class="odd">
- <td align="left">'.$chmod.'</td>
- <td align="right">'.$unzip.$edit.' <img class="cursorpointer" src="'.system_AdminIcons('actions/editdelete.png').'" 'filemanager_confirm_delete_file("'.$path_file . $file.'", "'.$path_file.'");\' width="16" alt="delete" /></td>
- </tr>
- <tr>
- <td colspan="2" align="center" height="60px"><br />'.$img.'</td>
- </tr>
- <tr>
- <td colspan="2" align="center">'.$file.'<br /><br /></td>
- </tr>
- </table>
- </div>
- </td>';
-
- $count_file++;
- $newline = ($count_file % $nbcolonnes_file == 1) ? true : false;
-
- if ($newline) {
- echo '</tr><br /><tr><td align="center">';
- } else {
- echo '<td align="center">';
- }
- }
- }
- }
- echo '</tr></table>';
- }
- }
- break;
-
- //Edit file
- case 'filemanager_edit_file':
- $path_file = trim($_REQUEST['path_file']);
-
- if($_REQUEST['path'] != '') {
- $path = trim($_REQUEST['path']);
- } else {
- $path = XOOPS_ROOT_PATH.'/';
- }
-
- //Button restore
- if(file_exists($path.$_REQUEST['file'].'.back')){
- $restore = '<input class="xo-BtnRestore ui-corner-all" type="button" value="" name="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" /> ';
- }else{
- $restore = '';
- }
- xoops_load('file');
+ $count_file++;
+ $newline = ($count_file % $nbcolonnes_file == 1) ? true : false;
+
+ if ($newline) {
+ echo '</tr><br /><tr><td align="center">';
+ } else {
+ echo '<td align="center">';
+ }
+ }
+ }
+ }
+ echo '</tr></table>';
+ }
+ }
+ break;
+
+ //Edit file
+ case 'filemanager_edit_file':
+ $path_file = trim($_REQUEST['path_file']);
+
+ if($_REQUEST['path'] != '') {
+ $path = trim($_REQUEST['path']);
+ } else {
+ $path = XOOPS_ROOT_PATH.'/';
+ }
+
+ //Button restore
+ if(file_exists($path.$_REQUEST['file'].'.back')){
+ $restore = '<button class="ui-corner-all tooltip" type="submit" value="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" title="'._AM_SYSTEM_FILEMANAGER_RESTORE.'">
+ <img src="'.system_AdminIcons('actions/revert.png').'" alt="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" />
+ </button>';
+ }else{
+ $restore = '';
+ }
+ xoops_load('file');
XoopsFile::load('file');
+
+ $file = XoopsFile::getHandler('file', $path_file);
+ $content = $file->read();
+ if(empty($content))
+ {
+ echo _AM_SYSTEM_FILEMANAGER_EMPTY_FILE;
+ }
- $file = XoopsFile::getHandler('file', $path_file);
- $content = $file->read();
- if(empty($content))
- {
- echo _AM_SYSTEM_FILEMANAGER_EMPTY_FILE;
- }
+ $ext = preg_replace('/^.*\./', '', $_REQUEST['file']);
- $ext = preg_replace('/^.*\./', '', $_REQUEST['file']);
-
- echo '<form name="back" action="admin.php?fct=filemanager&op=filemanager_save" method="POST">
- <table border="0">
- <tr>
- <td>
- <div class="xo-BtnActions">
- <div class="xo-buttons"><input class="ui-corner-all tooltip" type="submit" value="'._AM_SYSTEM_FILEMANAGER_SAVE.'" title="'._AM_SYSTEM_FILEMANAGER_SAVE.'" />
- '.$restore.'<a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_CANCEL.'">
- <img src="'.system_AdminIcons('actions/reload.png').'" alt="'._AM_SYSTEM_FILEMANAGER_CANCEL.'" />
- </a>
- </td>
- </tr>
- <tr><td>
- <textarea name="filemanager" rows=24 cols=110>'.$content.'</textarea>
- </td></tr>
- </table>';
- echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="path" value="'.$path.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
- break;
-
- case 'filemanager_unzip_file':
+ echo '<form name="back" action="admin.php?fct=filemanager&op=filemanager_save" method="POST">
+ <table border="0">
+ <tr>
+ <td>
+ <div class="xo-BtnActions">
+ <div class="xo-buttons">
+ <button class="ui-corner-all tooltip" type="submit" value="'._AM_SYSTEM_FILEMANAGER_SAVE.'" title="'._AM_SYSTEM_FILEMANAGER_SAVE.'">
+ <img src="'.system_AdminIcons('actions/filesave.png').'" alt="'._AM_SYSTEM_FILEMANAGER_SAVE.'" />
+ </button>
+ '.$restore.'
+ <button class="ui-corner-all tooltip" type="button" title="'._AM_SYSTEM_FILEMANAGER_CANCEL.'">
+ <img src="'.system_AdminIcons('actions/reload.png').'" alt="'._AM_SYSTEM_FILEMANAGER_CANCEL.'" />
+ </button>
+ <div class="clear"></div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr><td>
+ <textarea name="filemanager" rows=24 cols=110>'.$content.'</textarea>
+ </td></tr>
+ </table>';
+ echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="path" value="'.$path.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
+ break;
+
+ case 'filemanager_unzip_file':
$path_file = trim($_REQUEST['path_file']);
-
- if($_REQUEST['path'] != '') {
- $path = trim($_REQUEST['path']);
- } else {
- $path = XOOPS_ROOT_PATH.'/';
- }
- $file = $_REQUEST['file'];
-
- xoops_load('pclzip','system');
- xoops_load('pcltar','system');
- xoops_load('file');
- XoopsFile::load('file');
- $file1 = XoopsFile::getHandler('file', $path_file );
- $extension = $file1->ext();
- switch ( $extension ) {
+
+ if($_REQUEST['path'] != '') {
+ $path = trim($_REQUEST['path']);
+ } else {
+ $path = XOOPS_ROOT_PATH.'/';
+ }
+ $file = $_REQUEST['file'];
+
+ xoops_load('pclzip','system');
+ xoops_load('pcltar','system');
+ xoops_load('file');
+ XoopsFile::load('file');
+ $file1 = XoopsFile::getHandler('file', $path_file );
+ $extension = $file1->ext();
+ switch ( $extension ) {
case 'zip':
$archive = new PclZip( $path_file );
if ($archive->extract(PCLZIP_OPT_PATH, $path) == 0) {
@@ -305,37 +311,37 @@
PclTarExtract( $path_file, $path );
break;
}
-
+
break;
-
- //Confirm delete file
- case 'filemanager_confirm_delete_file':
- echo '<div class="confirmMsg">'.sprintf(_AM_SYSTEM_FILEMANAGER_SUREDEL, $_REQUEST['file']).'<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" >'._AM_SYSTEM_FILEMANER_DELETE.'</a> <a href="#" class="ui-corner-all" >'._AM_SYSTEM_FILEMANAGER_CANCEL.'</a></div></div>';
- break;
-
- // Delete one file
- case 'filemanager_delete_file':
- xoops_load('file');
+
+ //Confirm delete file
+ case 'filemanager_confirm_delete_file':
+ echo '<div class="confirmMsg">'.sprintf(_AM_SYSTEM_FILEMANAGER_SUREDEL, $_REQUEST['file']).'<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" >'._AM_SYSTEM_FILEMANER_DELETE.'</a> <a href="#" class="ui-corner-all" >'._AM_SYSTEM_FILEMANAGER_CANCEL.'</a></div></div>';
+ break;
+
+ // Delete one file
+ case 'filemanager_delete_file':
+ xoops_load('file');
XoopsFile::load('file');
- $file = XoopsFile::getHandler('file', $_REQUEST['path_file']);
- if(!$file->delete())
- {
+ $file = XoopsFile::getHandler('file', $_REQUEST['path_file']);
+ if(!$file->delete())
+ {
xoops_error(_AM_SYSTEM_FILEMANAGER_ERROR);
- } else {
+ } else {
xoops_result(_AM_SYSTEM_FILEMANAGER_DELETE_FILE);
- }
- break;
-
- case 'filemanager_upload':
-
- if($_REQUEST['path'] != '') {
- $path = trim($_REQUEST['path']);
- } else {
- $path = XOOPS_ROOT_PATH.'/';
- }
-
- xoops_load('xoopsformloader');
-
+ }
+ break;
+
+ case 'filemanager_upload':
+
+ if($_REQUEST['path'] != '') {
+ $path = trim($_REQUEST['path']);
+ } else {
+ $path = XOOPS_ROOT_PATH.'/';
+ }
+
+ xoops_load('xoopsformloader');
+
$form = new XoopsThemeForm( '', 'upload_form', 'admin.php?fct=filemanager', "post", true);
$form->setExtra('enctype="multipart/form-data"');
$form->addElement( new XoopsFormFile( _AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE, 'upload_file', 500000), false );
@@ -343,17 +349,17 @@
$form->addElement( new XoopsFormHidden( 'path', $path));
$form->addElement( new XoopsFormButton( '', 'up_button', _SUBMIT, 'submit'));
echo $form->render();
- break;
-
- case 'filemanager_add_dir':
+ break;
+
+ case 'filemanager_add_dir':
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
+
-
$form = new XoopsThemeForm( '', 'newdir_form', 'admin.php?fct=filemanager', "post", true);
$form->setExtra('enctype="multipart/form-data"');
$form->addElement( new XoopsFormText( _AM_SYSTEM_FILEMANAGER_ADDDIR_NAME, 'dir_name', 50, 255), true );
@@ -377,7 +383,7 @@
exit;
}
}
-
+
xoops_confirm( array('path'=>$path) , 'admin.php', _AM_SYSTEM_FILEMANAGER_DIR_RYSDEL . '<div class="spacer bold">' . $path . '</div>' );
break;
@@ -398,20 +404,20 @@
break;
break;
- case 'filemanager_modify_chmod':
-
- if($_REQUEST['path_file'] != '') {
- $path = trim($_REQUEST['path_file']);
- } else {
- $path = XOOPS_ROOT_PATH.'/';
- }
-
- if(chmod($path,'0'.$_REQUEST['chmod'])) {
- $new_chmod = modify_chmod($_REQUEST['chmod'], $path, $_REQUEST['id']);
- echo $new_chmod;
- }
- //echo $_REQUEST['chmod'];
- break;
+ case 'filemanager_modify_chmod':
+
+ if($_REQUEST['path_file'] != '') {
+ $path = trim($_REQUEST['path_file']);
+ } else {
+ $path = XOOPS_ROOT_PATH.'/';
+ }
+
+ if(chmod($path,'0'.$_REQUEST['chmod'])) {
+ $new_chmod = modify_chmod($_REQUEST['chmod'], $path, $_REQUEST['id']);
+ echo $new_chmod;
+ }
+ //echo $_REQUEST['chmod'];
+ break;
}
?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/modules/system/css/button.css
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/css/button.css 2010-01-28 22:15:06 UTC (rev 4235)
+++ XoopsCore/trunk/htdocs/modules/system/css/button.css 2010-01-28 22:52:57 UTC (rev 4236)
@@ -17,7 +17,6 @@
padding:3px 8px 4px 5px; /* Links */
}
.xo-buttons a:hover, .xo-buttons button:hover {
- /*background-color:#f1f1f1;*/
border:1px solid #ccc;
border-top:1px solid #d6d6d6;
border-left:1px solid #d6d6d6;
@@ -28,7 +27,7 @@
padding:3px 8px 4px 5px; /* IE6 */
}
.xo-buttons button[type]{
- padding:3px 8px 4px 5px; /* Firefox */
+ padding:3px 5px 4px 5px; /* Firefox */
line-height:15px; /* Safari */
}
*:first-child+html button[type]{
Deleted: XoopsCore/trunk/htdocs/modules/system/images/icons/default/actions/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsCore/trunk/htdocs/modules/system/images/icons/default/apps/Thumbs.db
===================================================================
(Binary files differ)
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_filemanager.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_filemanager.html 2010-01-28 22:15:06 UTC (rev 4235)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_filemanager.html 2010-01-28 22:52:57 UTC (rev 4236)
@@ -2,73 +2,73 @@
<{includeq file="db:system_header.html"}>
<{if $index}>
<br /><div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
- <table cellpadding="0" cellspacing='1' class="outer">
+ <table cellpadding="0" cellspacing='1' class="outer">
<tr>
<th><{$smarty.const._AM_SYSTEM_FILEMANAGER_DIRECTORY}></th>
<th><{$smarty.const._AM_SYSTEM_FILEMANAGER_FILES}></th>
</tr>
- <tr>
- <td class="aligntop width10">
- <div id="fileTree" class="display_folder"></div>
- </td>
- <td class="aligntop">
+ <tr>
+ <td class="aligntop width10">
+ <div id="fileTree" class="display_folder"></div>
+ </td>
+ <td class="aligntop">
<div class="edit_file" id="edit_file"></div>
<div class="upload_file" id="upload_file"></div>
- <div id='loading' align="center" style="display:none;"><br /><br /><img src="./images/filemanager.gif" title="Loading" alt="Loading" /></div>
- <div class="display_file" id="display_file">
-
- <table cellpadding="0" cellspacing='0' border="0" align="center">
- <tr>
+ <div id='loading' align="center" style="display:none;"><br /><br /><img src="./images/filemanager.gif" title="Loading" alt="Loading" /></div>
+ <div class="display_file" id="display_file">
+
+ <table cellpadding="0" cellspacing='0' border="0" align="center">
+ <tr>
<div class="xo-BtnActions">
- <div class="xo-buttons">
- <a class="ui-corner-all tooltip" href="#" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_HOME}>">
- <img src="<{xoAdminIcons actions/gohome.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_HOME}>" />
- </a>
- <a class="ui-corner-all tooltip" href="#" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDDIR}>">
- <img src="<{xoAdminIcons actions/folder_add.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDDIR}>" />
- </a>
- <a class="ui-corner-all tooltip" href="#" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_DELDIR}>">
- <img src="<{xoAdminIcons actions/folder_delete.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_DELDIR}>" />
- </a>
-
- <a class="ui-corner-all tooltip" href="#" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDFILE}>">
- <img src="<{xoAdminIcons actions/new_file.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDFILE}>" />
- </a>
- <a class="ui-corner-all tooltip" href="#" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_UPLOAD}>">
- <img src="<{xoAdminIcons apps/up_alt.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_UPLOAD}>" />
- </a>
- </div>
- <div class="clear"> </div>
- </div>
- <{foreach item=files from=$files}>
- <td align="center" width="<{$width}>%">
- <div style="border: 1px solid #cccccc; ">
- <table cellpadding="0" cellspacing='0'>
- <tr class="odd">
- <td align="left"><{$files.chmod}></td>
- <td align="right"><{if $files.edit}><img class='cursorpointer' src="<{xoAdminIcons actions/edit.png}>" width='16' alt='edit' /><{/if}> <img class='cursorpointer' src="<{xoAdminIcons actions/editdelete.png}>" width='16' alt='delete' /></td>
- </tr>
- <tr>
- <td colspan="2" align="center" height="60px"><br /><{$files.img}></td>
- </tr>
- <tr>
- <td colspan="2" align="center"><{$files.file}><br /><br /></td>
- </tr>
- </table>
- </div>
- <br /></td>
- <{if $files.newline}>
- </tr>
- <tr>
- <{/if}>
- <{/foreach}>
- </tr>
- </table>
- </div><br />
- <div id='confirm_delete' align="center" style="display:none;"></div>
- </td>
- </tr>
- </table>
+ <div class="xo-buttons">
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_HOME}>">
+ <img src="<{xoAdminIcons actions/gohome.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_HOME}>" />
+ </button>
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDDIR}>">
+ <img src="<{xoAdminIcons actions/folder_add.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDDIR}>" />
+ </button>
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_DELDIR}>">
+ <img src="<{xoAdminIcons actions/folder_delete.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_DELDIR}>" />
+ </button>
+
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDFILE}>">
+ <img src="<{xoAdminIcons actions/new_file.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_ADDFILE}>" />
+ </button>
+ <button class="ui-corner-all tooltip" type="button" title="<{$smarty.const._AM_SYSTEM_FILEMANAGER_UPLOAD}>">
+ <img src="<{xoAdminIcons apps/up_alt.png}>" alt="<{$smarty.const._AM_SYSTEM_FILEMANAGER_UPLOAD}>" />
+ </button>
+ </div>
+ <div class="clear"> </div>
+ </div>
+ <{foreach item=files from=$files}>
+ <td align="center" width="<{$width}>%">
+ <div style="border: 1px solid #cccccc; ">
+ <table cellpadding="0" cellspacing='0'>
+ <tr class="odd">
+ <td align="left"><{$files.chmod}></td>
+ <td align="right"><{if $files.edit}><img class='cursorpointer' src="<{xoAdminIcons actions/edit.png}>" width='16' alt='edit' /><{/if}> <img class='cursorpointer' src="<{xoAdminIcons actions/editdelete.png}>" width='16' alt='delete' /></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center" height="60px"><br /><{$files.img}></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center"><{$files.file}><br /><br /></td>
+ </tr>
+ </table>
+ </div>
+ <br /></td>
+ <{if $files.newline}>
+ </tr>
+ <tr>
+ <{/if}>
+ <{/foreach}>
+ </tr>
+ </table>
+ </div><br />
+ <div id='confirm_delete' align="center" style="display:none;"></div>
+ </td>
+ </tr>
+ </table>
<br class="clear">
</div>
<{/if}>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2010-01-28 22:15:13
|
Revision: 4235
http://xoops.svn.sourceforge.net/xoops/?rev=4235&view=rev
Author: trabis
Date: 2010-01-28 22:15:06 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
Checking if news module is installed and active before delivering and rss feed.
Modified Paths:
--------------
XoopsCore/trunk/htdocs/backend.php
Modified: XoopsCore/trunk/htdocs/backend.php
===================================================================
--- XoopsCore/trunk/htdocs/backend.php 2010-01-28 22:13:31 UTC (rev 4234)
+++ XoopsCore/trunk/htdocs/backend.php 2010-01-28 22:15:06 UTC (rev 4235)
@@ -21,7 +21,9 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
+error_reporting(0);
$GLOBALS['xoopsLogger']->activated = false;
+
if (function_exists('mb_http_output')) {
mb_http_output('pass');
}
@@ -56,7 +58,7 @@
}
$tpl->assign('image_width', $width);
$tpl->assign('image_height', $height);
- if (file_exists($fileinc = $GLOBALS['xoops']->path('modules/news/class/class.newsstory.php'))) {
+ if (xoops_isActiveModule('news') && file_exists($fileinc = $GLOBALS['xoops']->path('modules/news/class/class.newsstory.php'))) {
include $fileinc;
$sarray = NewsStory::getAllPublished(10, 0, true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2010-01-28 22:13:42
|
Revision: 4234
http://xoops.svn.sourceforge.net/xoops/?rev=4234&view=rev
Author: trabis
Date: 2010-01-28 22:13:31 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
Removing xoopsLogger from ajax calls, causing conflict in debug box(links not clickable in template and file manager)
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
Modified: XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-28 21:42:37 UTC (rev 4233)
+++ XoopsCore/trunk/htdocs/modules/system/admin/filemanager/jquery.php 2010-01-28 22:13:31 UTC (rev 4234)
@@ -12,11 +12,11 @@
/**
* Filemanager settings
* jQuery File Tree PHP Connector
- * Output a list of files for jQuery File Tree
- *
+ * Output a list of files for jQuery File Tree
+ *
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Maxime Cointin (AKA Kraven30)
+ * @author Maxime Cointin (AKA Kraven30)
* @package system
* @version $Id$
*/
@@ -25,6 +25,10 @@
require '../../../../mainfile.php';
// Check Xoops define
if ( !defined('XOOPS_ROOT_PATH') ) die('XOOPS ROOT path not defined');
+
+error_reporting(0);
+$GLOBALS['xoopsLogger']->activated = false;
+
// Include module functions
include $GLOBALS['xoops']->path('modules/system/include/functions.php');
// Load language
@@ -41,12 +45,12 @@
$_REQUEST['dir'] = urldecode($_REQUEST['dir']);
$root = XOOPS_ROOT_PATH.'/';
-
- if( file_exists($root . $_REQUEST['dir']) )
+
+ if( file_exists($root . $_REQUEST['dir']) )
{
$files = scandir($root . $_REQUEST['dir']);
natcasesort($files);
-
+
if( count($files) > 2 ) { /* The 2 accounts for . and .. */
echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
if ('/' == $_REQUEST['dir'])
@@ -63,13 +67,13 @@
}
}
}
- echo "</ul>";
+ echo "</ul>";
}
}
break;
-
+
// Display files
- case 'filemanager_display_file':
+ case 'filemanager_display_file':
$nbcolonnes_file = 4;
$width = 100/$nbcolonnes_file;
$_REQUEST['file'] = urldecode($_REQUEST['file']);
@@ -80,7 +84,7 @@
$file_arr = explode("/",$_REQUEST['file']);
$path_file = XOOPS_ROOT_PATH.'/';
$url_file = XOOPS_URL.'/';
-
+
for ($i=3 ; $i<count($file_arr) ; $i++ ) {
$path_file .= $file_arr[$i].'/';
$url_file .= $file_arr[$i].'/';
@@ -106,33 +110,33 @@
<a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_DELDIR.'">
<img src="'.system_AdminIcons('actions/folder_delete.png').'" alt="'._AM_SYSTEM_FILEMANAGER_DELDIR.'" />
</a>
-
+
<a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_ADDFILE.'">
<img src="'.system_AdminIcons('actions/new_file.png').'" alt="'._AM_SYSTEM_FILEMANAGER_ADDFILE.'" />
</a>
<a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'">
<img src="'.system_AdminIcons('apps/up_alt.png').'" alt="'._AM_SYSTEM_FILEMANAGER_UPLOAD.'" />
</a>
- </div>
- <div class="clear"> </div>
+ </div>
+ <div class="clear"> </div>
</div>';
$count_file = 1;
// All files
echo '<table cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
- <td align="center" width="'.$width.'%">';
- foreach( $files as $file )
+ <td align="center" width="'.$width.'%">';
+ foreach( $files as $file )
{
if (!preg_match('#.back#', $file))
{
- if( file_exists($path_file . $file) && $file != '.' && $file != '..' && !is_dir($path_file . $file) )
- {
+ if( file_exists($path_file . $file) && $file != '.' && $file != '..' && !is_dir($path_file . $file) )
+ {
//echo $path_file . $file.'<br />';
$unzip = '';
$edit = false;
$file1 = XoopsFile::getHandler('file', $path_file . $file);
$extension_verif = $file1->ext();
-
+
switch ( $extension_verif ) {
case 'ico': case 'png': case 'gif': case 'jpg': case 'jpeg':
$extension_verif = 'picture';
@@ -171,7 +175,7 @@
default:
$extension_verif = 'file';
$edit = true;
- break;
+ break;
}
if($edit == true) {
$edit = '<img class="cursorpointer" src="'.system_AdminIcons('actions/edit.png').'" 'filemanager_edit_file("'.$path_file . $file.'", "'.$path_file.'", "'.$file.'");\' width="16" alt="edit" />';
@@ -180,9 +184,9 @@
}
//Chmod
$chmod = substr($file1->perms(), 1);
-
+
$chmod = modify_chmod($chmod, $path_file.$file, $count_file);
-
+
//Img
if($extension_verif == 'picture') {
list($width, $height) = getimagesize($path_file . $file);
@@ -212,7 +216,7 @@
$count_file++;
$newline = ($count_file % $nbcolonnes_file == 1) ? true : false;
-
+
if ($newline) {
echo '</tr><br /><tr><td align="center">';
} else {
@@ -225,26 +229,26 @@
}
}
break;
-
+
//Edit file
- case 'filemanager_edit_file':
+ case 'filemanager_edit_file':
$path_file = trim($_REQUEST['path_file']);
-
+
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
-
+
//Button restore
if(file_exists($path.$_REQUEST['file'].'.back')){
$restore = '<input class="xo-BtnRestore ui-corner-all" type="button" value="" name="'._AM_SYSTEM_FILEMANAGER_RESTORE.'" /> ';
}else{
$restore = '';
- }
+ }
xoops_load('file');
XoopsFile::load('file');
-
+
$file = XoopsFile::getHandler('file', $path_file);
$content = $file->read();
if(empty($content))
@@ -263,7 +267,7 @@
'.$restore.'<a class="ui-corner-all tooltip" href="#" title="'._AM_SYSTEM_FILEMANAGER_CANCEL.'">
<img src="'.system_AdminIcons('actions/reload.png').'" alt="'._AM_SYSTEM_FILEMANAGER_CANCEL.'" />
</a>
- </td>
+ </td>
</tr>
<tr><td>
<textarea name="filemanager" rows=24 cols=110>'.$content.'</textarea>
@@ -271,17 +275,17 @@
</table>';
echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="path" value="'.$path.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
break;
-
+
case 'filemanager_unzip_file':
$path_file = trim($_REQUEST['path_file']);
-
+
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
$file = $_REQUEST['file'];
-
+
xoops_load('pclzip','system');
xoops_load('pcltar','system');
xoops_load('file');
@@ -301,16 +305,16 @@
PclTarExtract( $path_file, $path );
break;
}
-
+
break;
-
+
//Confirm delete file
case 'filemanager_confirm_delete_file':
echo '<div class="confirmMsg">'.sprintf(_AM_SYSTEM_FILEMANAGER_SUREDEL, $_REQUEST['file']).'<br /><br /><div class="buttons"><a href="#" class="ui-corner-all" >'._AM_SYSTEM_FILEMANER_DELETE.'</a> <a href="#" class="ui-corner-all" >'._AM_SYSTEM_FILEMANAGER_CANCEL.'</a></div></div>';
break;
-
+
// Delete one file
- case 'filemanager_delete_file':
+ case 'filemanager_delete_file':
xoops_load('file');
XoopsFile::load('file');
$file = XoopsFile::getHandler('file', $_REQUEST['path_file']);
@@ -321,17 +325,17 @@
xoops_result(_AM_SYSTEM_FILEMANAGER_DELETE_FILE);
}
break;
-
+
case 'filemanager_upload':
-
+
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
-
+
xoops_load('xoopsformloader');
-
+
$form = new XoopsThemeForm( '', 'upload_form', 'admin.php?fct=filemanager', "post", true);
$form->setExtra('enctype="multipart/form-data"');
$form->addElement( new XoopsFormFile( _AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE, 'upload_file', 500000), false );
@@ -340,7 +344,7 @@
$form->addElement( new XoopsFormButton( '', 'up_button', _SUBMIT, 'submit'));
echo $form->render();
break;
-
+
case 'filemanager_add_dir':
if($_REQUEST['path'] != '') {
$path = trim($_REQUEST['path']);
@@ -348,8 +352,8 @@
$path = XOOPS_ROOT_PATH.'/';
}
-
+
$form = new XoopsThemeForm( '', 'newdir_form', 'admin.php?fct=filemanager', "post", true);
$form->setExtra('enctype="multipart/form-data"');
$form->addElement( new XoopsFormText( _AM_SYSTEM_FILEMANAGER_ADDDIR_NAME, 'dir_name', 50, 255), true );
@@ -373,7 +377,7 @@
exit;
}
}
-
+
xoops_confirm( array('path'=>$path) , 'admin.php', _AM_SYSTEM_FILEMANAGER_DIR_RYSDEL . '<div class="spacer bold">' . $path . '</div>' );
break;
@@ -395,13 +399,13 @@
break;
case 'filemanager_modify_chmod':
-
+
if($_REQUEST['path_file'] != '') {
$path = trim($_REQUEST['path_file']);
} else {
$path = XOOPS_ROOT_PATH.'/';
}
-
+
if(chmod($path,'0'.$_REQUEST['chmod'])) {
$new_chmod = modify_chmod($_REQUEST['chmod'], $path, $_REQUEST['id']);
echo $new_chmod;
Modified: XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php 2010-01-28 21:42:37 UTC (rev 4233)
+++ XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php 2010-01-28 22:13:31 UTC (rev 4234)
@@ -19,6 +19,9 @@
//include dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ) . '/mainfile.php';
include dirname( dirname( dirname( __FILE__ ) ) ) . '/header.php';
+error_reporting(0);
+$GLOBALS['xoopsLogger']->activated = false;
+
if ( file_exists("./../../language/".$xoopsConfig['language']."/admin/tplsets.php") ) {
include_once("./../../language/".$xoopsConfig['language']."/admin/tplsets.php");
} else {
@@ -39,7 +42,7 @@
switch ($op) {
//Affichage des fichiers
- case "tpls_display_folder":
+ case "tpls_display_folder":
$_REQUEST['dir'] = urldecode($_REQUEST['dir']);
$root = XOOPS_THEME_PATH;
if( file_exists($root . $_REQUEST['dir']) ) {
@@ -49,7 +52,7 @@
echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
// All dirs
foreach( $files as $file ) {
-
+
if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file) ) {
//retirer .svn
$file_no_valid = array('.svn', 'icons', 'img', 'images', 'xotpl', 'language');
@@ -61,11 +64,11 @@
}
}
// All files
- foreach( $files as $file )
+ foreach( $files as $file )
{
if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && !is_dir($root . $_REQUEST['dir'] . $file) && $file != 'index.html' ) {
$ext = preg_replace('/^.*\./', '', $file);
-
+
$extensions = array('.html', '.htm', '.css');
$extension_verif = strrchr($file, '.');
@@ -75,16 +78,16 @@
} else {
//echo "<li class=\"file ext_$ext\">" . htmlentities($file) . "</li>";
}
-
+
}
}
- echo "</ul>";
+ echo "</ul>";
}
}
break;
-
+
//Affichage des fichiers
- case "tpls_display_contenu":
+ case "tpls_display_contenu":
//echo $_REQUEST['file'];
//echo 'display_contenu';
//echo $_REQUEST['file'];
@@ -100,10 +103,10 @@
$ext = preg_replace('/^.*\./', '', $_REQUEST['file']);
//$geshi = new GeSHi($content, strtolower($ext));
- //$geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS, 2);
- //$geshi->start_line_numbers_at(1);
- //$geshi->set_line_style('background:#f2f1ed;', 'background:#ffffff;');
- //$geshi->set_case_keywords(GESHI_CAPS_LOWER);
+ //$geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS, 2);
+ //$geshi->start_line_numbers_at(1);
+ //$geshi->set_line_style('background:#f2f1ed;', 'background:#ffffff;');
+ //$geshi->set_case_keywords(GESHI_CAPS_LOWER);
//$geshi = $geshi->parse_code();
//<table><tr><td><strong>'._AM_SYSTEM_TEMPLATES_EDIT.'</strong> '.$_REQUEST['file'].'<td><td align="right"><input type="submit" value="'._AM_SYSTEM_TEMPLATES_SAVE.'"></td></table><br />
@@ -123,10 +126,10 @@
//echo '<textarea id="templates" name="templates" class="codepress html" rows="20" cols="122">'.$content.'</textarea><input type="hidden" name="op" value="tpls_save"><input type="hidden" name="path_file" value="'.$path_file.'"></form>';
//html_entity_decode(
break;
-
+
case 'tpls_edit_file':
$path_file = XOOPS_ROOT_PATH.'/themes'.trim($_REQUEST['path_file']);
-
+
//Button restore
if(file_exists($path_file.'.back')){
$restore = '<button class="ui-corner-all tooltip" type="button" >'._AM_SYSTEM_TEMPLATES_RESTORE.'</button>';
@@ -142,7 +145,7 @@
echo _AM_SYSTEM_TEMPLATES_EMPTY_FILE;
}
$ext = preg_replace('/^.*\./', '', $_REQUEST['file']);
-
+
echo '<form name="back" action="admin.php?fct=tplsets&op=tpls_save" method="POST">
<table border="0">
<tr>
@@ -154,10 +157,10 @@
<textarea name="templates" rows=24 cols=110>'.$content.'</textarea>
</td></tr>
</table>';
-
+
echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
break;
-
+
//Restore
case 'tpls_restore':
$old_file = $_REQUEST['path_file'].'.back';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2010-01-28 21:42:49
|
Revision: 4233
http://xoops.svn.sourceforge.net/xoops/?rev=4233&view=rev
Author: trabis
Date: 2010-01-28 21:42:37 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
Adapting xoops_module_uninstall to the new return values of xoopsPersiatableObjectHandler->delete method (0 is valid return value)
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2010-01-28 21:32:34 UTC (rev 4232)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2010-01-28 21:42:37 UTC (rev 4233)
@@ -7,11 +7,11 @@
* 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.
- *
+ *
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Kazumi Ono (AKA onokazu)
- * @author Andricq Nicolas (AKA MusS)
+ * @author Andricq Nicolas (AKA MusS)
* @package system
* @version $Id$
*/
@@ -31,7 +31,7 @@
$error = false;
$errs = array();
$msgs = array();
-
+
$msgs[] = '<div id="xo-ModuleLog"><div class="header">';
$msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_INSTALLING . $module->getInfo('name', 's') . '</h4>';
if ($module->getInfo('image') != false && trim($module->getInfo('image')) != '') {
@@ -471,7 +471,7 @@
// If pre uninstall function is defined, execute
if (function_exists($func)) {
$result = $func($module);
- if (!$result) {
+ if (false === $result) {
$errs = $module->getErrors();
$errs[] = sprintf(_AM_SYSTEM_MODULES_FAILED_EXECUTE, $func);
return "<p>" . sprintf(_AM_SYSTEM_MODULES_FAILUNINS, "<strong>" . $module->getVar('name') . "</strong>") . " " . _AM_SYSTEM_MODULES_ERRORSC . "<br />" . implode("<br />", $errs) . "</p>";
@@ -481,7 +481,7 @@
}
}
- if (!$module_handler->delete($module)) {
+ if (false === $module_handler->delete($module)) {
$msgs[] = ' <span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_DELETE_ERROR, $module->getVar('name')) . '</span>';
} else {
@@ -492,7 +492,7 @@
if ($tcount > 0) {
$msgs[] = _AM_SYSTEM_MODULES_TEMPLATES_DELETE;
for ($i = 0; $i < $tcount; $i++) {
- if (!$tplfile_handler->delete($templates[$i])) {
+ if (false === $tplfile_handler->delete($templates[$i])) {
$msgs[] = ' <span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_DELETE_DATA_FAILD, $templates[$i]->getVar('tpl_file')) . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, "<strong>" . $templates[$i]->getVar('tpl_id') . "</strong>") . '</span>';
} else {
$msgs[] = " " . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_DELETE_DATA, "<strong>" . $templates[$i]->getVar('tpl_file') . "</strong>") . sprintf(_AM_SYSTEM_MODULES_TEMPLATE_ID, "<strong>" . $templates[$i]->getVar('tpl_id') . "</strong>");
@@ -507,7 +507,7 @@
$bcount = count($block_arr);
$msgs[] = _AM_SYSTEM_MODULES_BLOCKS_DELETE;
for ($i = 0; $i < $bcount; $i++) {
- if (!$block_arr[$i]->delete()) {
+ if (false === $block_arr[$i]->delete()) {
$msgs[] = ' <span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE_ERROR, "<strong>" . $block_arr[$i]->getVar('name') . "</strong>") . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>" . $block_arr[$i]->getVar('bid') . "</strong>") . '</span>';
} else {
$msgs[] = ' ' . sprintf(_AM_SYSTEM_MODULES_BLOCK_DELETE,"<strong>" . $block_arr[$i]->getVar('name') . "</strong>") . sprintf(_AM_SYSTEM_MODULES_BLOCK_ID, "<strong>" . $block_arr[$i]->getVar('bid') . "</strong>");
@@ -536,7 +536,7 @@
foreach ($modtables as $table) {
// prevent deletion of reserved core tables!
if (!in_array($table, $reservedTables)) {
- $sql = 'DROP TABLE ' . $db->prefix($table);
+ $sql = 'DROP TABLE ' . $db->prefix($table);
if (!$db->query($sql)) {
$msgs[] = ' <span style="color:#ff0000;">' . sprintf(_AM_SYSTEM_MODULES_TABLE_DROPPED_ERROR, "<strong>" . $db->prefix($table) . "<strong>") . "</span>";
} else {
@@ -552,7 +552,7 @@
if ($module->getVar('hascomments') != 0) {
$msgs[] = _AM_SYSTEM_MODULES_COMMENTS_DELETE;
$comment_handler =& xoops_gethandler('comment');
- if (!$comment_handler->deleteByModule($module->getVar('mid'))) {
+ if (false === $comment_handler->deleteByModule($module->getVar('mid'))) {
$msgs[] = ' <span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_COMMENTS_DELETE_ERROR . '</span>';
} else {
$msgs[] = ' ' . _AM_SYSTEM_MODULES_COMMENTS_DELETED;
@@ -563,7 +563,7 @@
// delete notifications if any
if ($module->getVar('hasnotification') != 0) {
$msgs[] = _AM_SYSTEM_MODULES_NOTIFICATIONS_DELETE;
- if (!xoops_notification_deletebymodule($module->getVar('mid'))) {
+ if (false === xoops_notification_deletebymodule($module->getVar('mid'))) {
$msgs[] = ' <span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_NOTIFICATIONS_DELETE_ERROR . '</span>';
} else {
$msgs[] = ' ' . _AM_SYSTEM_MODULES_NOTIFICATIONS_DELETED;
@@ -572,7 +572,7 @@
// delete permissions if any
$gperm_handler =& xoops_gethandler('groupperm');
- if (!$gperm_handler->deleteByModule($module->getVar('mid'))) {
+ if (false === $gperm_handler->deleteByModule($module->getVar('mid'))) {
$msgs[] = ' <span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_GROUP_PERMS_DELETE_ERROR . '</span>';
} else {
$msgs[] = ' ' . _AM_SYSTEM_MODULES_GROUP_PERMS_DELETED;
@@ -586,7 +586,7 @@
if ($confcount > 0) {
$msgs[] = _AM_SYSTEM_MODULES_MODULE_DATA_DELETE;
for ($i = 0; $i < $confcount; $i++) {
- if (!$config_handler->deleteConfig($configs[$i])) {
+ if (false === $config_handler->deleteConfig($configs[$i])) {
$msgs[] = ' <span style="color:#ff0000;">' . _AM_SYSTEM_MODULES_CONFIG_DATA_DELETE_ERROR . sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, "<strong>" . $configs[$i]->getvar('conf_id') . "</strong>") . '</span>';
} else {
$msgs[] = ' ' . _AM_SYSTEM_MODULES_GONFIG_DATA_DELETE . sprintf(_AM_SYSTEM_MODULES_GONFIG_ID, "<strong>" . $configs[$i]->getvar('conf_id') . "</strong>");
@@ -674,7 +674,7 @@
}
$msgs[] = '<a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a>';
$ret = implode('<br />', $msgs);
- return $ret;
+ return $ret;
}
function xoops_module_change($mid, $weight, $name)
@@ -692,7 +692,7 @@
return "<p>" . sprintf(_AM_SYSTEM_MODULES_OKORDER, "<strong>" . $myts->stripSlashesGPC($name) . "</strong>") . "</p>";
}
-function xoops_module_log_header( $module, $title )
+function xoops_module_log_header( $module, $title )
{
$msgs[] = '<div class="header">';
$msgs[] = $errs[] = '<h4>' . $title . $module->getInfo('name', 's') . '</h4>';
@@ -704,7 +704,7 @@
$msgs[] = '<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')));
}
$msgs[] = '</div>';
-
+
return $msgs;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kra...@us...> - 2010-01-28 21:32:40
|
Revision: 4232
http://xoops.svn.sourceforge.net/xoops/?rev=4232&view=rev
Author: kraven30
Date: 2010-01-28 21:32:34 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
Add index.html in new directory
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php
Modified: XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php 2010-01-28 21:23:23 UTC (rev 4231)
+++ XoopsCore/trunk/htdocs/modules/system/admin/filemanager/main.php 2010-01-28 21:32:34 UTC (rev 4232)
@@ -231,7 +231,9 @@
xoops_load('file');
XoopsFile::load('folder');
$folder = XoopsFile::getHandler('folder');
- if ($folder->create ($path . $_REQUEST['dir_name'], 0755)) {
+ if ($folder->create ($path . $_REQUEST['dir_name'], 0777)) {
+ $indexFile = XOOPS_ROOT_PATH."/modules/system/index.html";
+ copy($indexFile, $path.$_REQUEST['dir_name']."/index.html");
redirect_header( 'admin.php?fct=filemanager', 2, _AM_SYSTEM_FILEMANAGER_DIR_SUCCESS );
} else {
redirect_header( 'admin.php?fct=filemanager', 2, _AM_SYSTEM_FILEMANAGER_DIR_ERROR );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <for...@us...> - 2010-01-28 21:23:30
|
Revision: 4231
http://xoops.svn.sourceforge.net/xoops/?rev=4231&view=rev
Author: forxoops
Date: 2010-01-28 21:23:23 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
change image and avatar settings for grow up speed display
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/system/admin/images/main.php
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/trunk/htdocs/modules/system/class/thumbs/phpThumb.config.php
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_avatars.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_images.html
Modified: XoopsCore/trunk/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/images/main.php 2010-01-28 21:07:36 UTC (rev 4230)
+++ XoopsCore/trunk/htdocs/modules/system/admin/images/main.php 2010-01-28 21:23:23 UTC (rev 4231)
@@ -303,7 +303,6 @@
$xoTheme->addStylesheet( 'browse.php?Frameworks/jquery/css/thumbs/thumbs.css' );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.thumbs.js');
$xoTheme->addScript('browse.php?modules/system/js/thumbs.js');
// Get image id
$image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
@@ -511,7 +510,6 @@
$xoTheme->addStylesheet( 'browse.php?Frameworks/jquery/css/lightbox/lightbox.css' );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.thumbs.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
$xoTheme->addScript('browse.php?modules/system/js/admin.js');
$xoTheme->addScript('browse.php?modules/system/js/thumbs.js');
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2010-01-28 21:07:36 UTC (rev 4230)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2010-01-28 21:23:23 UTC (rev 4231)
@@ -403,7 +403,7 @@
// delete template file entry in db
$dcount = count($deltpl);
for ($i = 0; $i < $dcount; $i++) {
- if (!$tplfile_handler->delete($deltpl[$i])) {
+ if ( !$tplfile_handler->delete( $deltpl[$i] ) ) {
$delng[] = $deltpl[$i]->getVar('tpl_file');
}
}
Modified: XoopsCore/trunk/htdocs/modules/system/class/thumbs/phpThumb.config.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/thumbs/phpThumb.config.php 2010-01-28 21:07:36 UTC (rev 4230)
+++ XoopsCore/trunk/htdocs/modules/system/class/thumbs/phpThumb.config.php 2010-01-28 21:23:23 UTC (rev 4231)
@@ -219,7 +219,7 @@
// * Speed optimizations configuration
$PHPTHUMB_CONFIG['use_exif_thumbnail_for_speed'] = true; // If true, and EXIF thumbnail is available, and is larger or equal to output image dimensions, use EXIF thumbnail rather than actual source image for generating thumbnail. Benefit is only speed, avoiding resizing large image.
-$PHPTHUMB_CONFIG['allow_local_http_src'] = true; // If true, 'src' parameter can be "http://<thishostname>/path/image.ext" instead of just "/path/image.ext"; if false then display warning message to encourage more efficient local-filename calling.
+$PHPTHUMB_CONFIG['allow_local_http_src'] = false; // If true, 'src' parameter can be "http://<thishostname>/path/image.ext" instead of just "/path/image.ext"; if false then display warning message to encourage more efficient local-filename calling.
// END USER CONFIGURATION SECTION
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_avatars.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_avatars.html 2010-01-28 21:07:36 UTC (rev 4230)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_avatars.html 2010-01-28 21:23:23 UTC (rev 4231)
@@ -38,7 +38,7 @@
<div class="floatleft">
<div class="xo-thumb txtcenter">
<div class="xo-thumbimg">
- <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_upload_url}>/<{$avatar.avatar_file}>&h=120" alt="<{$avatar.avatar_name}>" title="<{$avatar.avatar_name}>" />
+ <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$avatar.avatar_file}>&h=120&w=120" alt="<{$avatar.avatar_name}>" title="<{$avatar.avatar_name}>" />
</div>
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$avatar.avatar_name}></div>
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_images.html 2010-01-28 21:07:36 UTC (rev 4230)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_images.html 2010-01-28 21:23:23 UTC (rev 4231)
@@ -1,177 +1,177 @@
-<!-- Header -->
-<{includeq file="db:system_header.html"}>
-<script type="text/javascript">
- IMG_ON = '<{xoAdminIcons actions/agt_action_success.png}>';
- IMG_OFF = '<{xoAdminIcons actions/button_cancel.png}>';
-</script>
-<!-- Buttons -->
-<div class="floatright">
- <div class="xo-buttons">
- <{if !$edit_form && !$images}>
- <button id="xo-addcat-btn" class="ui-corner-all tooltip" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>">
- <img src="<{xoAdminIcons actions/edit_add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>" />
- <{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>
- </button>
- <{/if}>
- <{if $cat_img}>
- <button id="xo-addimg-btn" class="ui-corner-all tooltip" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>">
- <img src="<{xoAdminIcons actions/edit_add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>" />
- <{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>
- </button>
- <{/if}>
- </div>
-</div>
-<!-- Category List -->
-<{if !$edit_form && !$images}>
-<table class="outer" cellspacing="1">
- <thead>
- <tr>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_NAME}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_NBIMAGES}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXSIZE}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXWIDTH}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXHEIGHT}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_DISPLAY}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_ACTIONS}></th>
- </tr>
- </thead>
- <tbody>
- <{foreach item=cat from=$cat_img}>
- <tr class="<{cycle values='even,odd'}> txtcenter">
- <td><{$cat.name}></td>
- <td><{$cat.count}></td>
- <td><{$cat.maxsize}></td>
- <td><{$cat.maxwidth}></td>
- <td><{$cat.maxheight}></td>
- <td class="xo-actions">
- <img class="cursorpointer tooltip" id="cat<{$cat.id}>" src="<{if $cat.display}><{xoAdminIcons actions/agt_action_success.png}><{else}><{xoAdminIcons actions/button_cancel.png}><{/if}>" alt="" title="<{if $cat.display}><{$smarty.const._AM_SYSTEM_IMAGES_OFF}><{else}><{$smarty.const._AM_SYSTEM_IMAGES_ON}><{/if}>" />
- </td>
- <td class="xo-actions txtcenter">
- <a class="tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
- <img src="<{xoAdminIcons actions/viewmag.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
- </a>
- <{if $xoops_isadmin}>
- <a class="tooltip" href="admin.php?fct=images&op=editcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
- <img src="<{xoAdminIcons actions/edit.png}>" alt="<{$smarty.const._EDIT}>" />
- </a>
- <a class="tooltip" href="admin.php?fct=images&op=delcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
- <img src="<{xoAdminIcons actions/editdelete.png}>" alt="" />
- </a>
- <{/if}>
- </td>
- </tr>
- <{/foreach}>
- <{if !$cat_img}>
- <tr>
- <td class="txtcenter bold odd" colspan="7"><{$smarty.const._AM_SYSTEM_IMAGES_NOCAT}></td>
- </tr>
- <{/if}>
- </tbody>
-</table>
-<!-- Nav menu -->
-<{if $nav_menu}><div class="xo-avatar-pagenav floatright"><{$nav_menu}></div><div class="clear spacer"></div><{/if}>
-<{/if}>
-<!-- Add Image form -->
-<div id="xo-images-add" class="hide">
- <br />
- <{$image_form.javascript}>
- <form name="<{$image_form.name}>" id="<{$image_form.name}>" action="<{$image_form.action}>" method="<{$image_form.method}>" <{$image_form.extra}> >
- <table class="outer">
- <tr>
- <th colspan="2"><{$image_form.title}></th>
- </tr>
- <{foreach item=element from=$image_form.elements}>
- <{if $element.hidden != true && $element.body != ''}>
- <tr>
- <td class="odd aligntop">
- <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
- <div class="spacer"><{$element.description}></div>
- </td>
- <td class="even"><{$element.body}></td>
- </tr>
- <{else}>
- <{$element.body}>
- <{/if}>
- <{/foreach}>
- </table>
- </form>
-</div>
-<!-- Add Category form -->
-<div id="xo-category-add" class="hide">
- <br />
- <{$imagecat_form.javascript}>
- <form name="<{$imagecat_form.name}>" id="<{$imagecat_form.name}>" action="<{$imagecat_form.action}>" method="<{$imagecat_form.method}>" <{$imagecat_form.extra}> >
- <table class="outer">
- <tr>
- <th colspan="2"><{$imagecat_form.title}></th>
- </tr>
- <{foreach item=element from=$imagecat_form.elements}>
- <{if $element.hidden != true && $element.body != ''}>
- <tr>
- <td class="odd aligntop">
- <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
- <div class="spacer"><{$element.description}></div>
- </td>
- <td class="even"><{$element.body}></td>
- </tr>
- <{else}>
- <{$element.body}>
- <{/if}>
- <{/foreach}>
- </table>
- </form>
-</div>
-<!-- Image list -->
-<div id="xo-category-add" class="">
- <{foreach item=img from=$images}>
- <div class="floatleft">
- <div class="ui-corner-all xo-thumb txtcenter">
- <div class="xo-thumbimg">
- <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_upload_url}>/<{$img.image_name}>&h=120&w=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" />
- </div>
- <div class="xo-actions txtcenter">
- <div class="spacer bold"><{$img.image_nicename}></div>
- <img class="cursorpointer tooltip" id="img<{$img.image_id}>" src="<{if $img.image_display}><{xoAdminIcons actions/agt_action_success.png}><{else}><{xoAdminIcons actions/button_cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
- <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$img.image_nicename}>">
- <img src="<{xoAdminIcons actions/viewmag.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
- </a>
- <a class="tooltip" href="admin.php?fct=images&op=editimg&image_id=<{$img.image_id}>" title="<{$smarty.const._EDIT}>">
- <img src="<{xoAdminIcons actions/edit.png}>" alt="<{$smarty.const._EDIT}>" />
- </a>
- <a class="tooltip" href="admin.php?fct=images&op=delfile&image_id=<{$img.image_id}>" title="<{$smarty.const._DELETE}>">
- <img src="<{xoAdminIcons actions/editdelete.png}>" alt="<{$smarty.const._DELETE}>" />
- </a>
- </div>
- </div>
- </div>
- <{/foreach}>
- <div class="clear"></div>
-</div>
-<!-- Edit form image -->
-<{if $edit_form}>
-<div id="xo-images-add" class="">
- <{$edit_thumbs}>
- <br />
- <{$edit_form.javascript}>
- <form name="<{$edit_form.name}>" id="<{$edit_form.name}>" action="<{$edit_form.action}>" method="<{$edit_form.method}>" <{$edit_form.extra}> >
- <table class="outer">
- <tr>
- <th colspan="2"><{$edit_form.title}></th>
- </tr>
- <{foreach item=element from=$edit_form.elements}>
- <{if $element.hidden != true && $element.body != ''}>
- <tr>
- <td class="odd aligntop">
- <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
- <div class="spacer"><{$element.description}></div>
- </td>
- <td class="even"><{$element.body}></td>
- </tr>
- <{else}>
- <{$element.body}>
- <{/if}>
- <{/foreach}>
- </table>
- </form>
-</div>
+<!-- Header -->
+<{includeq file="db:system_header.html"}>
+<script type="text/javascript">
+ IMG_ON = '<{xoAdminIcons actions/agt_action_success.png}>';
+ IMG_OFF = '<{xoAdminIcons actions/button_cancel.png}>';
+</script>
+<!-- Buttons -->
+<div class="floatright">
+ <div class="xo-buttons">
+ <{if !$edit_form && !$images}>
+ <button id="xo-addcat-btn" class="ui-corner-all tooltip" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>">
+ <img src="<{xoAdminIcons actions/edit_add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>" />
+ <{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>
+ </button>
+ <{/if}>
+ <{if $cat_img}>
+ <button id="xo-addimg-btn" class="ui-corner-all tooltip" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>">
+ <img src="<{xoAdminIcons actions/edit_add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>" />
+ <{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>
+ </button>
+ <{/if}>
+ </div>
+</div>
+<!-- Category List -->
+<{if !$edit_form && !$images}>
+<table class="outer" cellspacing="1">
+ <thead>
+ <tr>
+ <th><{$smarty.const._AM_SYSTEM_IMAGES_NAME}></th>
+ <th><{$smarty.const._AM_SYSTEM_IMAGES_NBIMAGES}></th>
+ <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXSIZE}></th>
+ <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXWIDTH}></th>
+ <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXHEIGHT}></th>
+ <th><{$smarty.const._AM_SYSTEM_IMAGES_DISPLAY}></th>
+ <th><{$smarty.const._AM_SYSTEM_IMAGES_ACTIONS}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <{foreach item=cat from=$cat_img}>
+ <tr class="<{cycle values='even,odd'}> txtcenter">
+ <td><{$cat.name}></td>
+ <td><{$cat.count}></td>
+ <td><{$cat.maxsize}></td>
+ <td><{$cat.maxwidth}></td>
+ <td><{$cat.maxheight}></td>
+ <td class="xo-actions">
+ <img class="cursorpointer tooltip" id="cat<{$cat.id}>" src="<{if $cat.display}><{xoAdminIcons actions/agt_action_success.png}><{else}><{xoAdminIcons actions/button_cancel.png}><{/if}>" alt="" title="<{if $cat.display}><{$smarty.const._AM_SYSTEM_IMAGES_OFF}><{else}><{$smarty.const._AM_SYSTEM_IMAGES_ON}><{/if}>" />
+ </td>
+ <td class="xo-actions txtcenter">
+ <a class="tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
+ <img src="<{xoAdminIcons actions/viewmag.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
+ </a>
+ <{if $xoops_isadmin}>
+ <a class="tooltip" href="admin.php?fct=images&op=editcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
+ <img src="<{xoAdminIcons actions/edit.png}>" alt="<{$smarty.const._EDIT}>" />
+ </a>
+ <a class="tooltip" href="admin.php?fct=images&op=delcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
+ <img src="<{xoAdminIcons actions/editdelete.png}>" alt="" />
+ </a>
+ <{/if}>
+ </td>
+ </tr>
+ <{/foreach}>
+ <{if !$cat_img}>
+ <tr>
+ <td class="txtcenter bold odd" colspan="7"><{$smarty.const._AM_SYSTEM_IMAGES_NOCAT}></td>
+ </tr>
+ <{/if}>
+ </tbody>
+</table>
+<!-- Nav menu -->
+<{if $nav_menu}><div class="xo-avatar-pagenav floatright"><{$nav_menu}></div><div class="clear spacer"></div><{/if}>
+<{/if}>
+<!-- Add Image form -->
+<div id="xo-images-add" class="hide">
+ <br />
+ <{$image_form.javascript}>
+ <form name="<{$image_form.name}>" id="<{$image_form.name}>" action="<{$image_form.action}>" method="<{$image_form.method}>" <{$image_form.extra}> >
+ <table class="outer">
+ <tr>
+ <th colspan="2"><{$image_form.title}></th>
+ </tr>
+ <{foreach item=element from=$image_form.elements}>
+ <{if $element.hidden != true && $element.body != ''}>
+ <tr>
+ <td class="odd aligntop">
+ <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
+ <div class="spacer"><{$element.description}></div>
+ </td>
+ <td class="even"><{$element.body}></td>
+ </tr>
+ <{else}>
+ <{$element.body}>
+ <{/if}>
+ <{/foreach}>
+ </table>
+ </form>
+</div>
+<!-- Add Category form -->
+<div id="xo-category-add" class="hide">
+ <br />
+ <{$imagecat_form.javascript}>
+ <form name="<{$imagecat_form.name}>" id="<{$imagecat_form.name}>" action="<{$imagecat_form.action}>" method="<{$imagecat_form.method}>" <{$imagecat_form.extra}> >
+ <table class="outer">
+ <tr>
+ <th colspan="2"><{$imagecat_form.title}></th>
+ </tr>
+ <{foreach item=element from=$imagecat_form.elements}>
+ <{if $element.hidden != true && $element.body != ''}>
+ <tr>
+ <td class="odd aligntop">
+ <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
+ <div class="spacer"><{$element.description}></div>
+ </td>
+ <td class="even"><{$element.body}></td>
+ </tr>
+ <{else}>
+ <{$element.body}>
+ <{/if}>
+ <{/foreach}>
+ </table>
+ </form>
+</div>
+<!-- Image list -->
+<div id="xo-category-add" class="">
+ <{foreach item=img from=$images}>
+ <div class="floatleft">
+ <div class="ui-corner-all xo-thumb txtcenter">
+ <div class="xo-thumbimg">
+ <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$img.image_name}>&h=120&w=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" />
+ </div>
+ <div class="xo-actions txtcenter">
+ <div class="spacer bold"><{$img.image_nicename}></div>
+ <img class="cursorpointer tooltip" id="img<{$img.image_id}>" src="<{if $img.image_display}><{xoAdminIcons actions/agt_action_success.png}><{else}><{xoAdminIcons actions/button_cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
+ <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$img.image_nicename}>">
+ <img src="<{xoAdminIcons actions/viewmag.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
+ </a>
+ <a class="tooltip" href="admin.php?fct=images&op=editimg&image_id=<{$img.image_id}>" title="<{$smarty.const._EDIT}>">
+ <img src="<{xoAdminIcons actions/edit.png}>" alt="<{$smarty.const._EDIT}>" />
+ </a>
+ <a class="tooltip" href="admin.php?fct=images&op=delfile&image_id=<{$img.image_id}>" title="<{$smarty.const._DELETE}>">
+ <img src="<{xoAdminIcons actions/editdelete.png}>" alt="<{$smarty.const._DELETE}>" />
+ </a>
+ </div>
+ </div>
+ </div>
+ <{/foreach}>
+ <div class="clear"></div>
+</div>
+<!-- Edit form image -->
+<{if $edit_form}>
+<div id="xo-images-add" class="">
+ <{$edit_thumbs}>
+ <br />
+ <{$edit_form.javascript}>
+ <form name="<{$edit_form.name}>" id="<{$edit_form.name}>" action="<{$edit_form.action}>" method="<{$edit_form.method}>" <{$edit_form.extra}> >
+ <table class="outer">
+ <tr>
+ <th colspan="2"><{$edit_form.title}></th>
+ </tr>
+ <{foreach item=element from=$edit_form.elements}>
+ <{if $element.hidden != true && $element.body != ''}>
+ <tr>
+ <td class="odd aligntop">
+ <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
+ <div class="spacer"><{$element.description}></div>
+ </td>
+ <td class="even"><{$element.body}></td>
+ </tr>
+ <{else}>
+ <{$element.body}>
+ <{/if}>
+ <{/foreach}>
+ </table>
+ </form>
+</div>
<{/if}>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|