Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(1) |
2
(4) |
3
(1) |
4
(2) |
5
(5) |
|
6
|
7
(7) |
8
(2) |
9
(4) |
10
(5) |
11
(6) |
12
(2) |
|
13
(4) |
14
(3) |
15
(1) |
16
(4) |
17
(1) |
18
|
19
(1) |
|
20
(2) |
21
|
22
(1) |
23
|
24
(1) |
25
(5) |
26
(2) |
|
27
|
28
(3) |
29
|
30
|
31
|
|
|
|
From: <txm...@us...> - 2014-07-28 20:17:59
|
Revision: 12733
http://sourceforge.net/p/xoops/svn/12733
Author: txmodxoops
Date: 2014-07-28 20:17:51 +0000 (Mon, 28 Jul 2014)
Log Message:
-----------
- Updated
- Default language is english
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/help.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/mail.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -31,16 +31,8 @@
/*
* @var mixed
*/
- private $structure = null;
+ private $structure = null;
/*
- * @var mixed
- */
- private $path = null;
- /*
- * @var mixed
- */
- private $uploadPath = null;
- /*
* @public function constructor class
* @param null
*/
@@ -166,13 +158,15 @@
$this->structure->makeDirAndCopyFile('language', $indexFile, 'index.html');
// Creation of 'default english' folder
if($language != 'english' ) {
- // Creation of "english" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/english', $indexFile, 'index.html');
+ // Creation of "language/local_language" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/'.$language, $indexFile, 'index.html');
+ // Creation of "language/local_language/help" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/'.$language. '/help', $indexFile, 'index.html');
}
- // Creation of "language/local_language" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$language, $indexFile, 'index.html');
- // Creation of "language/local_language/help" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$language. '/help', $indexFile, 'index.html');
+ // Creation of "english" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/english', $indexFile, 'index.html');
+ // Creation of "language/english/help" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/english/help', $indexFile, 'index.html');
if( $module->getVar('mod_admin') == 1 ) {
// Creation of "templates" folder and index.html file
$this->structure->makeDirAndCopyFile('templates', $indexFile, 'index.html');
@@ -191,8 +185,12 @@
$this->structure->makeDirAndCopyFile('sql', $indexFile, 'index.html');
}
if( $table->getVar('table_notifications') == 1 ) {
- // Creation of "mail_template" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$language.'/mail_template', $indexFile, 'index.html');
+ // Creation of "language/english/mail_template" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/english/mail_template', $indexFile, 'index.html');
+ if($language != 'english' ) {
+ // Creation of "language/local_language/mail_template" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/'.$language.'/mail_template', $indexFile, 'index.html');
+ }
}
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -232,7 +232,7 @@
}
$content .= $this->getLanguageAdminFoot($language);
//
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -114,7 +114,7 @@
$content .= $this->getLanguageBlock($module, $language);
$content .= $this->getLanguageFooter();
//
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/help.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/help.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/help.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -59,6 +59,7 @@
$filename = $this->getFileName();
$moduleName = $module->getVar('mod_name');
$moduleDirname = $module->getVar('mod_dirname');
+ $language = $GLOBALS['xoopsConfig']['language'];
$content = <<<EOT
<div id="help-template" class="outer">
<h1 class="head">Help:
@@ -88,7 +89,10 @@
<!-- -----Help Content ---------- -->
</div>
EOT;
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'].'/help', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ if($language != 'english' ) {
+ $this->tdmcfile->create($moduleDirname, 'language/'.$language.'/help', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ }
+ $this->tdmcfile->create($moduleDirname, 'language/english/help', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/mail.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/mail.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/mail.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -80,7 +80,7 @@
webmaster
{X_ADMINMAIL}
EOT;
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'].'/mail_template', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english/mail_template', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -122,7 +122,7 @@
$content .= $this->geLanguagetMain($module, $language);
$content .= $this->geLanguagetMainFooter($language);
//
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -303,7 +303,7 @@
}
$content .= $this->getLanguageFooter();
//
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -41,11 +41,11 @@
/*
* @var string
*/
- private $path = null;
+ protected $path = null;
/*
* @var mixed
*/
- //private $uploadPath = null;
+ protected $uploadPath = null;
/*
* @var string
*/
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -93,12 +93,13 @@
*/
private function getXoopsVersionHeader($module, $table, $language)
{
- $date = date('Y/m/d');
+ //$dateString = preg_replace('/[^0-9]/', '/', _DBDATESTRING);
+ $date = date(_DBDATESTRING); // _DBDATESTRING
$ret = <<<EOT
defined('XOOPS_ROOT_PATH') or die('Restricted access');
//
\$dirname = basename( dirname( __FILE__ ) ) ;
-// ---------------------- Informations ---------------------- //
+// ------------------- Informations ------------------- //
\$modversion = array(
'name' => {$language}NAME,
'version' => {$module->getVar('mod_version')},
@@ -148,16 +149,14 @@
'adminindex' => "admin/index.php",
'adminmenu' => "admin/menu.php",\n
EOT;
- if (is_object($table)) {
- if ( $table->getVar('table_user') == 1 ) {
+ if ( $module->getVar('mod_user') == 1 ) {
$ret .= <<<EOT
- // Menu
+ // Main things
'hasMain' => 1,\n
EOT;
- }
} else {
$ret .= <<<EOT
- // Menu
+ // Main things
'hasMain' => 0,\n
EOT;
}
@@ -189,7 +188,7 @@
$ret = '';
if ( !empty($tableName) ) {
$ret .= <<<EOT
-// ---------------------- Mysql ---------------------- //
+// ------------------- Mysql ------------------- //
\$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
// Tables\n
EOT;
@@ -212,7 +211,7 @@
private function getXoopsVersionSearch($moduleDirname)
{
$ret = <<<EOT
-// ---------------------- Search ---------------------- //
+// ------------------- Search ------------------- //
\$modversion['hasSearch'] = 1;
\$modversion['search']['file'] = "include/search.inc.php";
\$modversion['search']['func'] = "{$moduleDirname}_search";\n
@@ -226,7 +225,7 @@
private function getXoopsVersionComments($moduleDirname)
{
$ret = <<<EOT
-// ---------------------- Comments ---------------------- //
+// ------------------- Comments ------------------- //
\$modversion['comments']['pageName'] = "comments.php";
\$modversion['comments']['itemName'] = "com_id";
// Comment callback functions
@@ -244,7 +243,7 @@
{
$tables = $this->getTables();
$ret = <<<EOT
-// ---------------------- Templates ---------------------- //
+// ------------------- Templates ------------------- //
// Admin
\$modversion['templates'][] = array('file' => '{$moduleDirname}_admin_about.tpl', 'description' => '', 'type' => 'admin');
\$modversion['templates'][] = array('file' => '{$moduleDirname}_admin_header.tpl', 'description' => '', 'type' => 'admin');
@@ -297,7 +296,7 @@
private function getXoopsVersionSubmenu($language)
{
$ret = <<<EOT
-// ---------------------- Submenu ---------------------- //\n
+// ------------------- Submenu ------------------- //\n
EOT;
$tables = $this->getTables();
$i = 1;
@@ -325,7 +324,7 @@
{
$tables = $this->getTables();
$ret = <<<EOT
-// ---------------------- Blocks ---------------------- //\n
+// ------------------- Blocks ------------------- //\n
EOT;
foreach (array_keys($tables) as $i) {
$tableName = $tables[$i]->getVar('table_name');
@@ -703,9 +702,7 @@
}
if ($table->getVar('table_blocks') == 1) {
$content .= $this->getXoopsVersionBlocks($moduleDirname, $language);
- }
-
-
+ }
}
$content .= $this->getXoopsVersionConfig($module, $table, $language);
if (is_object($table)) {
|
|
From: <txm...@us...> - 2014-07-28 17:13:40
|
Revision: 12732
http://sourceforge.net/p/xoops/svn/12732
Author: txmodxoops
Date: 2014-07-28 17:13:26 +0000 (Mon, 28 Jul 2014)
Log Message:
-----------
- Updated
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/notifications.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/index.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_fields.tpl
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_modules.tpl
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_tables.tpl
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -22,14 +22,14 @@
// Recovered value of arguments op in the URL $
$op = XoopsRequest::getString('op', 'list');
// Get fields Variables
-$field_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
+/*$fieldMid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
$fieldTid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
$fieldNumb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
-$fieldName = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');/**/
-/*$field_mid = XoopsRequest::getInt('field_mid');
+$fieldName = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');*/
+$fieldMid = XoopsRequest::getInt('field_mid');
$fieldTid = XoopsRequest::getInt('field_tid');
$fieldNumb = XoopsRequest::getInt('field_numb');
-$fieldName = XoopsRequest::getString('field_name', ''); */
+$fieldName = XoopsRequest::getString('field_name'); /**/
//
switch ($op)
{
@@ -53,66 +53,67 @@
$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
//var_dump($sysPathIcon32);
// Redirect if there aren't modules
- $nb_modules = $tdmcreate->getHandler('modules')->getCount();
- if ( $nb_modules == 0 ) {
+ $countModules = $tdmcreate->getHandler('modules')->getCount();
+ if ( $countModules == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
}
- unset($nb_modules);
+ unset($countModules);
// Redirect if there aren't tables
- $nb_tables = $tdmcreate->getHandler('tables')->getCount();
- if ($nb_tables == 0) {
+ $countTables = $tdmcreate->getHandler('tables')->getCount();
+ if ($countTables == 0) {
redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
}
- unset($nb_tables);
+ unset($countTables);
// Get the list of tables
$criteria = new CriteriaCompo();
$criteria->setSort('table_id ASC, table_name');
$criteria->setOrder('ASC');
- $nb_tables = $tdmcreate->getHandler('tables')->getCount($criteria);
- $tables_arr = $tdmcreate->getHandler('tables')->getAll($criteria);
+ $countTables = $tdmcreate->getHandler('tables')->getCount($criteria);
+ $tablesAll = $tdmcreate->getHandler('tables')->getAll($criteria);
unset($criteria);
- if ($nb_tables > 0)
+ if ($countTables > 0)
{
- foreach (array_keys($tables_arr) as $tid)
+ foreach (array_keys($tablesAll) as $tid)
{
// Display tables list
$table['id'] = $tid;
- $table['mid'] = $tables_arr[$tid]->getVar('table_mid');
- $table['name'] = ucfirst($tables_arr[$tid]->getVar('table_name'));
- $table['image'] = $tables_arr[$tid]->getVar('table_image');
- $table['nbfields'] = $tables_arr[$tid]->getVar('table_nbfields');
- $table['autoincrement'] = $tables_arr[$tid]->getVar('table_autoincrement');
- $table['blocks'] = $tables_arr[$tid]->getVar('table_blocks');
- $table['admin'] = $tables_arr[$tid]->getVar('table_admin');
- $table['user'] = $tables_arr[$tid]->getVar('table_user');
- $table['search'] = $tables_arr[$tid]->getVar('table_search');
+ $table['mid'] = $tablesAll[$tid]->getVar('table_mid');
+ $table['name'] = ucfirst($tablesAll[$tid]->getVar('table_name'));
+ $table['image'] = $tablesAll[$tid]->getVar('table_image');
+ $table['nbfields'] = $tablesAll[$tid]->getVar('table_nbfields');
+ $table['autoincrement'] = $tablesAll[$tid]->getVar('table_autoincrement');
+ $table['blocks'] = $tablesAll[$tid]->getVar('table_blocks');
+ $table['admin'] = $tablesAll[$tid]->getVar('table_admin');
+ $table['user'] = $tablesAll[$tid]->getVar('table_user');
+ $table['search'] = $tablesAll[$tid]->getVar('table_search');
// Get the list of fields
$criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('field_mid', $table['mid']));
$criteria->add(new Criteria('field_tid', $tid));
$criteria->setSort('field_id ASC, field_name');
$criteria->setOrder('ASC');
- $nb_fields = $tdmcreate->getHandler('fields')->getCount($criteria);
- $fields_arr = $tdmcreate->getHandler('fields')->getObjects($criteria);
+ $countFields = $tdmcreate->getHandler('fields')->getCount($criteria);
+ $fieldsAll = $tdmcreate->getHandler('fields')->getObjects($criteria);
unset($criteria);
// Display fields list
$fields = array();
$lid = 1;
- if ( $nb_fields > 0 )
+ if ( $countFields > 0 )
{
- foreach (array_keys($fields_arr) as $fid)
+ foreach (array_keys($fieldsAll) as $fid)
{
$field['id'] = $fid;
$field['lid'] = $lid;
- $field['name'] = str_replace('_', ' ', ucfirst($fields_arr[$fid]->getVar('field_name')));
- $field['parent'] = $fields_arr[$fid]->getVar('field_parent');
- $field['inlist'] = $fields_arr[$fid]->getVar('field_inlist');
- $field['inform'] = $fields_arr[$fid]->getVar('field_inform');
- $field['admin'] = $fields_arr[$fid]->getVar('field_admin');
- $field['user'] = $fields_arr[$fid]->getVar('field_user');
- $field['block'] = $fields_arr[$fid]->getVar('field_block');
- $field['main'] = $fields_arr[$fid]->getVar('field_main');
- $field['search'] = $fields_arr[$fid]->getVar('field_search');
- $field['required'] = $fields_arr[$fid]->getVar('field_required');
+ $field['name'] = str_replace('_', ' ', ucfirst($fieldsAll[$fid]->getVar('field_name')));
+ $field['parent'] = $fieldsAll[$fid]->getVar('field_parent');
+ $field['inlist'] = $fieldsAll[$fid]->getVar('field_inlist');
+ $field['inform'] = $fieldsAll[$fid]->getVar('field_inform');
+ $field['admin'] = $fieldsAll[$fid]->getVar('field_admin');
+ $field['user'] = $fieldsAll[$fid]->getVar('field_user');
+ $field['block'] = $fieldsAll[$fid]->getVar('field_block');
+ $field['main'] = $fieldsAll[$fid]->getVar('field_main');
+ $field['search'] = $fieldsAll[$fid]->getVar('field_search');
+ $field['required'] = $fieldsAll[$fid]->getVar('field_required');
$fields[] = $field;
unset($field);
$lid++;
@@ -123,14 +124,18 @@
$GLOBALS['xoopsTpl']->append('tables_list', $table);
unset($table);
}
- if ( $nb_tables > $limit ) {
+ if ( $countTables > $limit ) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($nb_tables, $limit, $start, 'start', 'op=list&limit=' . $limit);
+ $pagenav = new XoopsPageNav($countTables, $limit, $start, 'start', 'op=list&limit=' . $limit);
$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
}
} else {
$GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_FIELDS);
- }
+ }
+ var_dump($fieldMid);
+ var_dump($fieldTid);
+ var_dump($fieldNumb);
+ var_dump($fieldName);
break;
case 'new':
@@ -144,10 +149,10 @@
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
// Form Add
$fieldsObj =& $tdmcreate->getHandler('fields')->create();
- $form = $fieldsObj->getFormNew($field_mid, $fieldTid, $fieldNumb, $fieldName);
+ $form = $fieldsObj->getFormNew($fieldMid, $fieldTid, $fieldNumb, $fieldName);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
// Test -> Will be removed
- var_dump($field_mid);
+ var_dump($fieldMid);
var_dump($fieldTid);
var_dump($fieldNumb);
var_dump($fieldName);
@@ -172,9 +177,9 @@
$fieldsObj =& $fields->get($value);
break;
}
- if (isset($field_mid) && isset($fieldTid) && !empty($_POST['field_name'][$key])) {
+ if (isset($fieldMid) && isset($fieldTid) && !empty($_POST['field_name'][$key])) {
// Set Data
- $fieldsObj->setVar( 'field_mid', $field_mid );
+ $fieldsObj->setVar( 'field_mid', $fieldMid );
$fieldsObj->setVar( 'field_tid', $fieldTid );
$fieldsObj->setVar( 'field_numb', $fieldNumb );
$fieldsObj->setVar( 'field_name', (isset($_POST['field_name'][$key]) ? $_POST['field_name'][$key] : '') );
@@ -205,7 +210,7 @@
if ($fieldsObj->isNew()) {
// Fields Elements Handler
$fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
- $fieldelementObj->setVar( 'fieldelement_mid', $field_mid );
+ $fieldelementObj->setVar( 'fieldelement_mid', $fieldMid );
$fieldelementObj->setVar( 'fieldelement_tid', $fieldTid );
$fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
$fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
@@ -234,7 +239,7 @@
// Form Edit
$fieldId = XoopsRequest::getInt('field_id');
$fieldsObj = $tdmcreate->getHandler('fields')->get( $fieldId );
- $form = $fieldsObj->getFormEdit($field_mid, $fieldTid);
+ $form = $fieldsObj->getFormEdit($fieldMid, $fieldTid);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
// Test -> Will be removed
var_dump($fieldTid);
@@ -270,61 +275,46 @@
exit;
break;
- case 'display':
- $fieldId = XoopsRequest::getInt('field_id');
- // Get the list of fields
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', $fieldTid));
- $fields = $tdmcreate->getHandler('fields')->getObjects($criteria);
- $fieldsObj =& $tdmcreate->getHandler('fields')->get($fieldId);
- if (isset($_GET['field_tid'])) {
- if (isset($_GET['field_parent'])) {
- foreach ($fields as $field) {
- $fld_parent = $field->getVar('field_parent');
- $field_parent = ($field->getVar('field_id') == $fld_parent) ? '1' : '0';
- $fieldsObj->setVar('field_parent', $field_parent);
- }
- } elseif (isset($_GET['field_inlist'])) {
- $fld_inlist = intval($_GET['field_inlist']);
- $field_inlist = ($fld_inlist == 1) ? '0' : '1';
- $fieldsObj->setVar('field_inlist', $field_inlist);
- } elseif (isset($_GET['field_inform'])) {
- $fld_inform = intval($_GET['field_inform']);
- $field_inform = ($fld_inform == 1) ? '0' : '1';
- $fieldsObj->setVar('field_inform', $field_inform);
- } elseif (isset($_GET['field_admin'])) {
- $fld_admin = intval($_GET['field_admin']);
- $field_admin = ($fld_admin == 1) ? '0' : '1';
- $fieldsObj->setVar('field_admin', $field_admin);
- } elseif (isset($_GET['field_user'])) {
- $fld_user = intval($_GET['field_user']);
- $field_user = ($fld_user == 1) ? '0' : '1';
- $fieldsObj->setVar('field_user', $field_user);
- } elseif (isset($_GET['field_block'])) {
- $fld_block = intval($_GET['field_block']);
- $field_block = ($fld_block == 1) ? '0' : '1';
- $fieldsObj->setVar('field_block', $field_block);
- } elseif (isset($_GET['field_main'])) {
- foreach ($fields as $field) {
- $fld_main = $field->getVar('field_main');
- $field_main = ($field->getVar('field_id') == $fld_main) ? '1' : '0';
- $fieldsObj->setVar('field_main', $field_main);
- }
- } elseif (isset($_GET['field_search'])) {
- $fld_search = intval($_GET['field_search']);
- $field_search = ($fld_search == 1) ? '0' : '1';
- $fieldsObj->setVar('field_search', $field_search);
- } elseif (isset($_GET['field_required'])) {
- $fld_required = intval($_GET['field_required']);
- $field_required = ($fld_required == 1) ? '0' : '1';
- $fieldsObj->setVar('field_required', $field_required);
- }
- if ($tdmcreate->getHandler('fields')->insert($fieldsObj, true)) {
- redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
- } else {
- redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_FAILED);
- }
- }
+ case 'display':
+ //
+ $fields = $tdmcreate->getHandler('fields');
+ // Fields Handler
+ foreach($_REQUEST['field_id'] as $key => $value)
+ {
+ /*$fieldId = XoopsRequest::getInt('field_id');
+ $fieldParent = XoopsRequest::getInt('field_parent');
+ $fieldInlist = XoopsRequest::getInt('field_inlist');
+ $fieldInform = XoopsRequest::getInt('field_inform');
+ $fieldAdmin = XoopsRequest::getInt('field_admin');
+ $fieldUser = XoopsRequest::getInt('field_user');
+ $fieldBlock = XoopsRequest::getInt('field_block');
+ $fieldMain = XoopsRequest::getInt('field_main');
+ $fieldSearch = XoopsRequest::getInt('field_search');
+ $fieldRequired = XoopsRequest::getInt('field_required');*/
+
+ $fieldsObj =& $fields->get($value);
+ /*$fieldsObj->setVar('field_parent', $fieldParent);
+ $fieldsObj->setVar('field_inlist', $fieldInlist);
+ $fieldsObj->setVar('field_inform', $fieldInform);
+ $fieldsObj->setVar('field_admin', $fieldAdmin);
+ $fieldsObj->setVar('field_user', $fieldUser);
+ $fieldsObj->setVar('field_block', $fieldBlock);
+ $fieldsObj->setVar('field_main', $fieldMain);
+ $fieldsObj->setVar('field_search', $fieldSearch);
+ $fieldsObj->setVar('field_required', $fieldRequired);*/
+ $fieldsObj->setVar( 'field_parent', $_POST['field_parent'][$key]);
+ $fieldsObj->setVar( 'field_inlist', $_POST['field_inlist'][$key]);
+ $fieldsObj->setVar( 'field_inform', $_POST['field_inform'][$key]);
+ $fieldsObj->setVar( 'field_admin', $_POST['field_admin'][$key]);
+ $fieldsObj->setVar( 'field_user', $_POST['field_user'][$key]);
+ $fieldsObj->setVar( 'field_block', $_POST['field_block'][$key]);
+ $fieldsObj->setVar( 'field_main', $_POST['field_main'][$key]);
+ $fieldsObj->setVar( 'field_search', $_POST['field_search'][$key]);
+ $fieldsObj->setVar( 'field_required', $_POST['field_required'][$key]);
+ //
+ $fields->insert($fieldsObj, true);
+ }
+ redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
break;
}
include 'footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/modules.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/modules.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -61,7 +61,8 @@
$mod['release'] = $mods_arr[$i]->getVar('mod_release');
$mod['status'] = $mods_arr[$i]->getVar('mod_status');
$mod['admin'] = $mods_arr[$i]->getVar('mod_admin');
- $mod['user'] = $mods_arr[$i]->getVar('mod_user');
+ $mod['user'] = $mods_arr[$i]->getVar('mod_user');
+ $mod['blocks'] = $mods_arr[$i]->getVar('mod_blocks');
$mod['search'] = $mods_arr[$i]->getVar('mod_search');
$mod['comments'] = $mods_arr[$i]->getVar('mod_comments');
$mod['notifications'] = $mods_arr[$i]->getVar('mod_notifications');
@@ -205,19 +206,32 @@
break;
case 'display':
- $mod_admin = XoopsRequest::getInt('mod_admin');
- $mod_user = XoopsRequest::getInt('mod_user');
- $mod_search = XoopsRequest::getInt('mod_search');
- $mod_comments = XoopsRequest::getInt('mod_comments');
- $mod_notifications = XoopsRequest::getInt('mod_notifications');
- $mod_permissions = XoopsRequest::getInt('mod_permissions');
-
- if ( $mod_id > 0 ) {
+ //if ( $mod_id > 0 ) {
+ $mod_admin = XoopsRequest::getInt('mod_admin');
+ $mod_user = XoopsRequest::getInt('mod_user');
+ $mod_blocks = XoopsRequest::getInt('mod_blocks');
+ $mod_search = XoopsRequest::getInt('mod_search');
+ $mod_comments = XoopsRequest::getInt('mod_comments');
+ $mod_notifications = XoopsRequest::getInt('mod_notifications');
+ $mod_permissions = XoopsRequest::getInt('mod_permissions');
+
+ //foreach($_POST['mod_id'] as $key => $value)
+ //{
+ /*$mod_admin = TDMCreate_CleanVars($_REQUEST, 'mod_admin');
+ $mod_user = TDMCreate_CleanVars($_REQUEST, 'mod_user');
+ $mod_blocks = TDMCreate_CleanVars($_REQUEST, 'mod_blocks');
+ $mod_search = TDMCreate_CleanVars($_REQUEST, 'mod_search');
+ $mod_comments = TDMCreate_CleanVars($_REQUEST, 'mod_comments');
+ $mod_notifications = TDMCreate_CleanVars($_REQUEST, 'mod_notifications');
+ $mod_permissions = TDMCreate_CleanVars($_REQUEST, 'mod_permissions'); */
+
$modulesObj =& $tdmcreate->getHandler('modules')->get($mod_id);
- if(isset($mod_adminm)) {
+ if(isset($mod_admin)) {
$modulesObj->setVar('mod_admin', $mod_admin);
} elseif(isset($mod_user)) {
$modulesObj->setVar('mod_user', $mod_user);
+ } elseif(isset($mod_blocks)) {
+ $modulesObj->setVar('mod_blocks', $mod_blocks);
} elseif(isset($mod_search)) {
$modulesObj->setVar('mod_search', $mod_search);
} elseif(isset($mod_comments)) {
@@ -232,7 +246,7 @@
} else {
redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
}
- }
+ //}
break;
}
include 'footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -76,7 +76,8 @@
$mod['name'] = $mods_arr[$i]->getVar('mod_name');
$mod['image'] = $mods_arr[$i]->getVar('mod_image');
$mod['admin'] = $mods_arr[$i]->getVar('mod_admin');
- $mod['user'] = $mods_arr[$i]->getVar('mod_user');
+ $mod['user'] = $mods_arr[$i]->getVar('mod_user');
+ $mod['blocks'] = $mods_arr[$i]->getVar('mod_blocks');
$mod['search'] = $mods_arr[$i]->getVar('mod_search');
$mod['comments'] = $mods_arr[$i]->getVar('mod_comments');
$mod['notifications'] = $mods_arr[$i]->getVar('mod_notifications');
@@ -248,41 +249,63 @@
}
break;
- case 'display':
- $tableBlocks = XoopsRequest::getInt('table_blocks');
- $tableAdmin = XoopsRequest::getInt('table_admin');
- $tableUser = XoopsRequest::getInt('table_user');
- $tableSubmenu = XoopsRequest::getInt('table_submenu');
- $tableSearch = XoopsRequest::getInt('table_search');
- $tableComments = XoopsRequest::getInt('table_comments');
- $tableNotifications = XoopsRequest::getInt('table_notifications');
- $tablePermissions = XoopsRequest::getInt('table_permissions');
-
- if ( $tableId > 0 ) {
- $tablesObj =& $tdmcreate->getHandler('tables')->get($tableId);
- if(isset($tableBlocks)) {
- $tablesObj->setVar('table_blocks', $tableBlocks);
- } elseif(isset($tableAdminm)) {
- $tablesObj->setVar('table_admin', $tableAdmin);
- } elseif(isset($tableUser)) {
- $tablesObj->setVar('table_user', $tableUser);
- } elseif(isset($tableSubmenu)) {
- $tablesObj->setVar('table_submenu', $tableSubmenu);
- } elseif(isset($tableSearch)) {
- $tablesObj->setVar('table_search', $tableSearch);
- } elseif(isset($tableComments)) {
- $tablesObj->setVar('table_comments', $tableComments);
- } elseif(isset($tableNotifications)) {
- $tablesObj->setVar('table_notifications', $tableNotifications);
- } elseif(isset($tablePermissions)) {
- $tablesObj->setVar('table_permissions', $tablePermissions);
+ case 'display_modules':
+ foreach($_POST['mod_id'] as $key => $value)
+ {
+ $moduleAdmin = XoopsRequest::getInt('mod_admin');
+ $moduleUser = XoopsRequest::getInt('mod_user');
+ $moduleBlocks = XoopsRequest::getInt('mod_blocks');
+ $moduleSearch = XoopsRequest::getInt('mod_search');
+ $moduleComments = XoopsRequest::getInt('mod_comments');
+ $moduleNotifications = XoopsRequest::getInt('mod_notifications');
+ $modulePermissions = XoopsRequest::getInt('mod_permissions');
+
+ if( $tableMid > 0 ) {
+ $modulesObj =& $tdmcreate->getHandler('modules')->get($tableMid);
+ $modulesObj->setVar('mod_admin', ((isset($_REQUEST['mod_admin'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_user', ((isset($_REQUEST['mod_user'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_blocks', ((isset($_REQUEST['mod_blocks'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_search', ((isset($_REQUEST['mod_search'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_comments', ((isset($_REQUEST['mod_comments'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_notifications', ((isset($_REQUEST['mod_notifications'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_permissions', ((isset($_REQUEST['mod_permissions'][$key]) == 1) ? 0 : 1));
+ if($tdmcreate->getHandler('modules')->insert($modulesObj, true)) {
+ redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ } else {
+ redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
+ }
}
- if ($tdmcreate->getHandler('tables')->insert($tablesObj, true)) {
- redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
- } else {
- redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
+ }
+ break;
+
+ case 'display_tables':
+ foreach($_POST['table_id'] as $key => $value)
+ {
+ $tableAdmin = XoopsRequest::getInt('table_admin');
+ $tableUser = XoopsRequest::getInt('table_user');
+ $tableBlocks = XoopsRequest::getInt('table_blocks');
+ $tableSubmenu = XoopsRequest::getInt('table_submenu');
+ $tableSearch = XoopsRequest::getInt('table_search');
+ $tableComments = XoopsRequest::getInt('table_comments');
+ $tableNotifications = XoopsRequest::getInt('table_notifications');
+ $tablePermissions = XoopsRequest::getInt('table_permissions');
+
+ if( $tableId > 0 ) {
+ $tablesObj =& $tdmcreate->getHandler('tables')->get($tableId);
+ $tablesObj->setVar('table_admin', ((isset($_REQUEST['table_admin'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_user', ((isset($_REQUEST['table_user'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_blocks', ((isset($_REQUEST['table_blocks'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_submenu', ((isset($_REQUEST['table_submenu'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_search', ((isset($_REQUEST['table_search'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_comments', ((isset($_REQUEST['table_comments'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_notifications', ((isset($_REQUEST['table_notifications'][$key]) == 1) ? 0 : 1));
+ if($tdmcreate->getHandler('tables')->insert($tablesObj, true)) {
+ redirect_header('tables.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ } else {
+ redirect_header('tables.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
+ }
}
- }
- break;
+ }
+ break;
}
include 'footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/header.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/header.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -45,13 +45,14 @@
* @public function write
* @param string $module
* @param mixed $table
+ * @param array $tables
* @param string $filename
*/
public function write($module, $table, $tables, $filename) {
- $this->setModule($module);
- $this->setFileName($filename);
+ $this->setModule($module);
$this->setTable($table);
$this->setTables($tables);
+ $this->setFileName($filename);
}
/*
* @public function render
@@ -63,39 +64,35 @@
$tables = $this->getTables();
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
- $ucfModuleName = ucfirst($moduleDirname);
+ $ucfModuleDirname = ucfirst($moduleDirname);
$language = $this->getLanguage('AM');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
\nrequire_once dirname(dirname(dirname(dirname(__FILE__)))). '/include/cp_header.php';
\$thisPath = dirname(dirname(__FILE__));
include_once \$thisPath.'/include/common.php';
-//\n
+\$sysPathIcon16 = '../' . \$xoopsModule->getInfo('sysicons16');
+\$sysPathIcon32 = '../' . \$xoopsModule->getInfo('sysicons32');
+\$pathModuleAdmin = \$GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
+//
+\$modPathIcon16 = \$xoopsModule->getInfo('modicons16');
+\$modPathIcon32 = \$xoopsModule->getInfo('modicons32');\n
EOT;
if (is_object($table)) {
if ( $table->getVar('table_name') != '' ) {
$content .= <<<EOT
// Get instance of module
-\${$moduleDirname} = {$ucfModuleName}Helper::getInstance();\n
+\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();\n
EOT;
- }
- }
- $content .= <<<EOT
-//
-\$sysPathIcon16 = '../' . \$xoopsModule->getInfo('sysicons16');
-\$sysPathIcon32 = '../' . \$xoopsModule->getInfo('sysicons32');
-\$pathModuleAdmin = \$GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
-//
-\$modPathIcon16 = \$xoopsModule->getInfo('modicons16');
-\$modPathIcon32 = \$xoopsModule->getInfo('modicons32');
-//\n
-EOT;
- foreach (array_keys($tables) as $i)
- {
- $tableName = $tables[$i]->getVar('table_name');
- $content .= <<<EOT
+ }
+ foreach (array_keys($tables) as $t)
+ {
+ $tableName = $tables[$t]->getVar('table_name');
+ $content .= <<<EOT
+// {$tableName}
\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}');\n
EOT;
+ }
}
$content .=<<<EOT
//
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -39,7 +39,7 @@
* @param string $tableName
* @param string $fieldName
*/
- public function getSimpleSetVar($tableName, $fieldName) {
+ public function getSimpleSetVar($tableName, $fieldName) {
$ret = <<<EOT
// Set Var {$fieldName}
\${$tableName}Obj->setVar('{$fieldName}', \$_POST['{$fieldName}']);\n
@@ -169,6 +169,23 @@
return $ret;
}
/*
+ * @public function getTopicGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $tableNameTopic
+ * @param string $fieldNameParent
+ * @param string $fieldNameTopic
+ */
+ public function getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNameTopic, $fieldNameParent, $fieldNameTopic) {
+ $ret = <<<EOT
+\t\t\t\t// Get Var {$fieldNameParent}
+\t\t\t\t\${$rpFieldName} =& \${$tableNameTopic}Handler->get(\${$tableName}_arr[\$i]->getVar('{$fieldNameParent}'));
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$rpFieldName}->getVar('{$fieldNameTopic}');\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getUploadImageGetVar
* @param string $lpFieldName
* @param string $rpFieldName
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -79,15 +79,17 @@
/*
* @public function getAdminPagesList
* @param string $moduleDirname
- * @param string $tableName
+ * @param string $table
* @param string $tableFieldname
* @param string $language
* @param string $fields
* @param string $fpif
* @param string $fpmf
*/
- public function getAdminPagesList($moduleDirname, $tableName, $tableFieldname, $tableAutoincrement, $language, $fields, $fpif, $fpmf) {
+ public function getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fpmf) {
$stuModuleDirname = strtoupper($moduleDirname);
+ $tableName = $table->getVar('table_name');
+ $tableAutoincrement = $table->getVar('table_autoincrement');
$stuTableName = strtoupper($tableName);
$stuTableFieldname = strtoupper($tableFieldname);
$ret = <<<EOT
@@ -116,6 +118,7 @@
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
+ $fieldParent = $fields[$f]->getVar('field_parent');
// Verify if table_fieldname is not empty
$lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
@@ -137,7 +140,30 @@
$ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
default:
- $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ if( ($fieldParent == 1) && !$table->getVar('table_category') ) {
+ if($fieldElement > 13) {
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
+ $fieldElementName = $fieldElements->getVar('fieldelement_name');
+ $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName));
+ }
+ //
+ $fieldNameParent = $fieldName;
+ //
+ $criteriaFieldsTopic = new CriteriaCompo();
+ $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid));
+ $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic);
+ unset($criteriaFieldsTopic);
+ foreach(array_keys($fieldsTopic) as $ft)
+ {
+ if( $fieldsTopic[$ft]->getVar('field_main') == 1 ) {
+ $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name');
+ }
+ }
+ $ret .= $this->adminobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldNameParent, $fieldNameTopic);
+ } else {
+ $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ }
break;
}
}
@@ -326,8 +352,7 @@
$table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
$tableName = $table->getVar('table_name');
- $tableFieldname = $table->getVar('table_fieldname');
- $tableAutoincrement = $table->getVar('table_autoincrement');
+ $tableFieldname = $table->getVar('table_fieldname');
$language = $this->getLanguage($moduleDirname, 'AM');
$fields = $this->getTableFields($table->getVar('table_id'));
foreach(array_keys($fields) as $f)
@@ -342,7 +367,7 @@
}
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getAdminPagesHeader($moduleDirname, $tableName, $fpif);
- $content .= $this->getAdminPagesList($moduleDirname, $tableName, $tableFieldname, $tableAutoincrement, $language, $fields, $fpif, $fpmf);
+ $content .= $this->getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fpmf);
$content .= $this->getAdminPagesNew($moduleDirname, $tableName, $language);
$content .= $this->getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fpif, $fpmf);
$content .= $this->getAdminPagesEdit($moduleDirname, $tableName, $tableFieldname, $language, $fpif);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -81,7 +81,8 @@
public function createBaseFoldersFiles( $module )
{
// Module
- $modId = $module->getVar('mod_id');
+ $modId = $module->getVar('mod_id');
+ $language = $GLOBALS['xoopsConfig']['language'];
// Id of tables
$criteriaTables = new CriteriaCompo();
$criteriaTables->add(new Criteria('table_mid', $modId));
@@ -142,7 +143,7 @@
$logoGifFrom = $uploadImagesRepository.'/'.$stlModuleAuthor.'_logo.gif';
if (!file_exists($logoGifFrom)) {
copy($logosFolder.'/'.$stlModuleAuthor.'_logo.gif', $logoGifFrom);
- }
+ }
// Creation of 'module_author_logo.gif' file
$this->structure->copyFile('assets/images', $logoGifFrom, $stlModuleAuthor.'_logo.gif');
// Creation of "images" folder and index.html file
@@ -163,10 +164,15 @@
$this->structure->makeDirAndCopyFile('include', $indexFile, 'index.html');
// Creation of "language" folder and index.html file
$this->structure->makeDirAndCopyFile('language', $indexFile, 'index.html');
+ // Creation of 'default english' folder
+ if($language != 'english' ) {
+ // Creation of "english" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/english', $indexFile, 'index.html');
+ }
// Creation of "language/local_language" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language'], $indexFile, 'index.html');
+ $this->structure->makeDirAndCopyFile('language/'.$language, $indexFile, 'index.html');
// Creation of "language/local_language/help" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/help', $indexFile, 'index.html');
+ $this->structure->makeDirAndCopyFile('language/'.$language. '/help', $indexFile, 'index.html');
if( $module->getVar('mod_admin') == 1 ) {
// Creation of "templates" folder and index.html file
$this->structure->makeDirAndCopyFile('templates', $indexFile, 'index.html');
@@ -186,7 +192,7 @@
}
if( $table->getVar('table_notifications') == 1 ) {
// Creation of "mail_template" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language'].'/mail_template', $indexFile, 'index.html');
+ $this->structure->makeDirAndCopyFile('language/'.$language.'/mail_template', $indexFile, 'index.html');
}
}
}
@@ -318,6 +324,14 @@
$languageAdmin->write($module, $tables, 'admin.php');
$ret[] = $languageAdmin->render();
}
+ // Class Helper File
+ $classHelper = ClassHelper::getInstance();
+ $classHelper->write($module, 'helper.php');
+ $ret[] = $classHelper->render();
+ // Include Functions File
+ $includeFunctions = IncludeFunctions::getInstance();
+ $includeFunctions->write($module, 'functions.php');
+ $ret[] = $includeFunctions->render();
// Creation of blocks language file
if (is_object($table)) {
// Include Install File
@@ -329,11 +343,7 @@
$languageBlocks = LanguageBlocks::getInstance();
$languageBlocks->write($module, $tables, 'blocks.php');
$ret[] = $languageBlocks->render();
- }
- // Class Helper File
- $classHelper = ClassHelper::getInstance();
- $classHelper->write($module, 'helper.php');
- $ret[] = $classHelper->render();
+ }
// Creation of admin files
if ( $table->getVar('table_admin') == 1) {
// Creation of admin permission file
@@ -364,11 +374,7 @@
// Sql File
$sqlFile = SqlFile::getInstance();
$sqlFile->write($module, $tables, 'mysql.sql');
- $ret[] = $sqlFile->render();
- // Include Functions File
- $includeFunctions = IncludeFunctions::getInstance();
- $includeFunctions->write($module, 'functions.php');
- $ret[] = $includeFunctions->render();
+ $ret[] = $sqlFile->render();
// Include Update File
$includeUpdate = IncludeUpdate::getInstance();
$includeUpdate->write($module, 'update.php');
@@ -407,33 +413,9 @@
$includeCommentFunctions = IncludeCommentFunctions::getInstance();
$includeCommentFunctions->write($module, $table, 'comment_functions.php');
$ret[] = $includeCommentFunctions->renderFile();
- }
- // Creation of user files
- if ( ($table->getVar('table_user') == 1)) {
- // User Footer File
- $userFooter = UserFooter::getInstance();
- $userFooter->write($module, 'footer.php');
- $ret[] = $userFooter->render();
- // User Header File
- $userHeader = UserHeader::getInstance();
- $userHeader->write($module, 'header.php');
- $ret[] = $userHeader->render();
- // User Notification Update File
- if ( ($table->getVar('table_notifications') == 1 )) {
- $userNotificationUpdate = UserNotificationUpdate::getInstance();
- $userNotificationUpdate->write($module, 'notification_update.php');
- $ret[] = $userNotificationUpdate->render();
- }
- // User Index File
- $userIndex = UserIndex::getInstance();
- $userIndex->write($module, 'index.php');
- $ret[] = $userIndex->render();
- // Language Main File
- $languageMain = LanguageMain::getInstance();
- $languageMain->write($module, $tables, 'main.php');
- $ret[] = $languageMain->render();
- }
+ }
}
+ // Creation of admin files
if( $module->getVar('mod_admin') == 1 ) {
// Templates Index File
$userTemplatesIndex = TemplatesUserIndex::getInstance();
@@ -447,6 +429,31 @@
$userTemplatesHeader = TemplatesUserHeader::getInstance();
$userTemplatesHeader->write($module, $tables, $moduleDirname.'_header.tpl');
$ret[] = $userTemplatesHeader->render();
+ }
+ // Creation of user files
+ if( $module->getVar('mod_user') == 1 ) {
+ // User Footer File
+ $userFooter = UserFooter::getInstance();
+ $userFooter->write($module, 'footer.php');
+ $ret[] = $userFooter->render();
+ // User Header File
+ $userHeader = UserHeader::getInstance();
+ $userHeader->write($module, $table, $tables, 'header.php');
+ $ret[] = $userHeader->render();
+ // User Notification Update File
+ if ( ($module->getVar('mod_notifications') == 1 )) {
+ $userNotificationUpdate = UserNotificationUpdate::getInstance();
+ $userNotificationUpdate->write($module, 'notification_update.php');
+ $ret[] = $userNotificationUpdate->render();
+ }
+ // User Index File
+ $userIndex = UserIndex::getInstance();
+ $userIndex->write($module, 'index.php');
+ $ret[] = $userIndex->render();
+ // Language Main File
+ $languageMain = LanguageMain::getInstance();
+ $languageMain->write($module, $tables, 'main.php');
+ $ret[] = $languageMain->render();
}
// Css Styles File
$cssStyles = CssStyles::getInstance();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/common.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/common.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -89,13 +89,9 @@
<img src='".\$local_logo."' alt='{$moduleAuthorWebsiteName}' /></a>";
include_once XOOPS_ROOT_PATH.'/class/xoopsrequest.php';
-EOT;
- if (is_object($table)) {
- $ret .= <<<EOT
include_once {$stuModuleDirname}_PATH.'/class/helper.php';
include_once {$stuModuleDirname}_PATH.'/include/functions.php';
EOT;
- }
return $ret;
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/notifications.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/notifications.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/notifications.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -51,8 +51,8 @@
*/
public function write($module, $table, $filename) {
$this->setModule($module);
- $this->setFileName($filename);
$this->setTable($table);
+ $this->setFileName($filename);
}
/*
* @static function getNotificationsFunction
@@ -72,15 +72,15 @@
}
if($fields[$f]->getVar('field_main') == 1) {
$fpmf = $fieldName;
- }
+ }
}
$ret = <<<EOT
\n// comment callback functions
function {$moduleDirname}_notify_iteminfo(\$category, \$item_id)
{
- global \$xoopsModule, \$xoopsModuleConfig, \$xoopsConfig;
-
+ global \$xoopsModule, \$xoopsModuleConfig, \$xoopsDB;
+ //
if (empty(\$xoopsModule) || \$xoopsModule->getVar('dirname') != '{$moduleDirname}')
{
\$module_handler =& xoops_gethandler('module');
@@ -90,11 +90,8 @@
} else {
\$module =& \$xoopsModule;
\$config =& \$xoopsModuleConfig;
- }
+ }
//
- xoops_loadLanguage('main', '{$moduleDirname}');
- //
- global \$xoopsDB;
switch(\$category) {
case 'global':
\$item['name'] = '';
@@ -103,7 +100,7 @@
break;
case 'category':
// Assume we have a valid category id
- \$sql = 'SELECT {$fpif}, {$fpmf} FROM ' . \$xoopsDB->prefix('{$moduleDirname}_{$tableName}') . ' WHERE {$fpif} = '. \$item_id;
+ \$sql = 'SELECT {$fpmf} FROM ' . \$xoopsDB->prefix('{$moduleDirname}_{$tableName}') . ' WHERE {$fpif} = '. \$item_id;
\$result = \$xoopsDB->query(\$sql); // TODO: error check
\$result_array = \$xoopsDB->fetchArray(\$result);
\$item['name'] = \$result_array['{$fpmf}'];
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -65,7 +65,7 @@
*/
public function getLanguageAdminIndex($language, $tables)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Index ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Index');
$ret .= $this->defines->getDefine($language, 'STATISTICS', "Statistics");
$ret .= $this->defines->getAboveDefines('There are');
foreach (array_keys($tables) as $t)
@@ -84,7 +84,7 @@
*/
public function getLanguageAdminPages($language, $tables)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Files ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Files');
$ret .= $this->defines->getAboveDefines('There aren\'t');
foreach (array_keys($tables) as $t)
{
@@ -127,7 +127,7 @@
*/
public function getLanguageAdminClass($language, $tables)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Classes ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Classes');
//
foreach (array_keys($tables) as $t)
{
@@ -186,7 +186,7 @@
*/
public function getLanguageAdminPermissions($language)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Permissions ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Permissions');
$ret .= $this->defines->getAboveDefines('Permissions');
$ret .= $this->defines->getDefine($language, 'GLOBAL', "Permissions global");
$ret .= $this->defines->getDefine($language, 'GLOBAL_DESC', "Permissions global");
@@ -208,9 +208,9 @@
*/
public function getLanguageAdminFoot($language)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Others ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Others');
$ret .= $this->defines->getDefine($language, 'MAINTAINEDBY', " is maintained by ");
- $ret .= $this->defines->getBelowDefines('---------------- End ----------------');
+ $ret .= $this->defines->getBelowDefines('End');
return $ret;
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -66,9 +66,7 @@
private function getLanguageBlock($module, $language)
{
$tables = $this->getTables();
- $ret = <<<EOT
-// Admin Edit\n
-EOT;
+ $ret = $this->defines->getAboveDefines('Admin Edit');
$ret .= $this->defines->getDefine($language, 'DISPLAY', "How Many Tables to Display");
$ret .= $this->defines->getDefine($language, 'TITLELENGTH', "Title Length");
$ret .= $this->defines->getDefine($language, 'CATTODISPLAY', "Categories to Display");
@@ -77,9 +75,7 @@
{
$tableName = $tables[$t]->getVar('table_name');
$ucfTableName = ucfirst($tableName);
- $ret .= <<<EOT
-// {$ucfTableName}\n
-EOT;
+ $ret .= $this->defines->getAboveDefines($ucfTableName);
$fields = $this->getTableFields($tables[$t]->getVar('table_id'));
foreach (array_keys($fields) as $f)
{
@@ -102,9 +98,7 @@
*/
private function getLanguageFooter()
{
- $ret = <<<EOT
-// ---------------- End ----------------
-EOT;
+ $ret = $this->defines->getBelowDefines('End');
return $ret;
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -100,11 +100,13 @@
}
/*
* @private function geLanguagetMainFooter
- * @param null
+ * @param string $language
*/
- private function geLanguagetMainFooter()
+ private function geLanguagetMainFooter($language)
{
- $ret = $this->defines->getBelowDefines('End');
+ $ret = $this->defines->getAboveDefines('Admin link');
+ $ret .= $this->defines->getDefine($language, 'ADMIN', "Admin");
+ $ret .= $this->defines->getBelowDefines('End');
return $ret;
}
/*
@@ -118,7 +120,7 @@
$language = $this->getLanguage($moduleDirname, 'MA');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->geLanguagetMain($module, $language);
- $content .= $this->geLanguagetMainFooter();
+ $content .= $this->geLanguagetMainFooter($language);
//
$this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -167,16 +167,23 @@
private function getLanguageConfig($language, $table)
{
$ret = $this->defines->getAboveDefines('Config');
- $ret .= $this->defines->getDefine($language, "EDITOR", "Editor");
- $ret .= $this->defines->getDefine($language, "EDITOR_DESC", "Select the Editor to use");
+ if (is_object($table)) {
+ if ( $table->getVar('table_image') != '' )
+ {
+ $ret .= $this->defines->getDefine($language, "EDITOR", "Editor");
+ $ret .= $this->defines->getDefine($language, "EDITOR_DESC", "Select the Editor to use");
+ }
+ }
$ret .= $this->defines->getDefine($language, "KEYWORDS", "Keywords");
$ret .= $this->defines->getDefine($language, "KEYWORDS_DESC", "Insert here the keywords (separate by comma)");
- if ( $table->getVar('table_image') != '' )
- {
- $ret .= $this->defines->getDefine($language, "MAXSIZE", "Max size");
- $ret .= $this->defines->getDefine($language, "MAXSIZE_DESC", "Set a number of max size uploads file in byte");
- $ret .= $this->defines->getDefine($language, "MIMETYPES", "Mime Types");
- $ret .= $this->defines->getDefine($language, "MIMETYPES_DESC", "Set the mime types selected");
+ if (is_object($table)) {
+ if ( $table->getVar('table_image') != '' )
+ {
+ $ret .= $this->defines->getDefine($language, "MAXSIZE", "Max size");
+ $ret .= $this->defines->getDefine($language, "MAXSIZE_DESC", "Set a number of max size uploads file in byte");
+ $ret .= $this->defines->getDefine($language, "MIMETYPES", "Mime Types");
+ $ret .= $this->defines->getDefine($language, "MIMETYPES_DESC", "Set the mime types selected");
+ }
}
$ret .= $this->defines->getDefine($language, "IDPAYPAL", "Paypal ID");
$ret .= $this->defines->getDefine($language, "IDPAYPAL_DESC", "Insert here your PayPal ID for donactions.");
@@ -281,9 +288,11 @@
}
if ( $table->getVar('table_submenu') == 1 ) {
$content .= $this->getLanguageSubmenu($language, $tables);
- }
+ }
$content .= $this->getLanguageBlocks($language, $tables);
- $content .= $this->getLanguageConfig($language, $table);
+ }
+ $content .= $this->getLanguageConfig($language, $table);
+ if (is_object($table)) {
if ( $table->getVar('table_notifications') == 1 )
{
$content .= $this->getLanguageNotifications($language);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/footer.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/footer.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -81,11 +81,13 @@
<br />\n
EOT;
}
- $content .= <<<EOT
+ }
+ $content .= <<<EOT
<{if \$xoops_isadmin}>
<div class="center bold"><a href="<{\$admin}>"><{\$smarty.const.{$language}ADMIN}></a></div><br />
<{/if}>\n
EOT;
+ if (is_object($table)) {
if ( $table->getVar('table_comments') == 1 ) {
$content .= <<<EOT
<div class="pad2 marg2">
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/header.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/header.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -44,10 +44,14 @@
/*
* @public function write
* @param string $module
+ * @param mixed $table
+ * @param array $tables
* @param string $filename
*/
- public function write($module, $filename) {
- $this->setModule($module);
+ public function write($module, $table, $tables, $filename) {
+ $this->setModule($module);
+ $this->setTable($table);
+ $this->setTables($tables);
$this->setFileName($filename);
}
/*
@@ -56,6 +60,8 @@
*/
public function render() {
$module = $this->getModule();
+ $table = $this->getTable();
+ $tables = $this->getTables();
$moduleDirname = $module->getVar('mod_dirname');
$filename = $this->getFileName();
$stuModuleDirname = strtoupper($moduleDirname);
@@ -66,6 +72,21 @@
\$dirname = \$GLOBALS['xoopsModule']->getVar('dirname');
\$pathname = XOOPS_ROOT_PATH. '/modules/'.\$dirname;
include_once \$pathname . '/include/common.php';
+// Get instance of module
+\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();\n
+EOT;
+ if (is_object($table)) {
+ foreach (array_keys($tables) as $t)
+ {
+ $tableName = $tables[$t]->getVar('table_name');
+ $content .= <<<EOT
+// {$tableName}
+\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}');\n
+EOT;
+ }
+ }
+ $content .=<<<EOT
+//
\$myts =& MyTextSanitizer::getInstance();
\$style = {$stuModuleDirname}_URL . '/assets/css/style.css';
if(file_exists(\$style)) { return true; }
@@ -79,8 +100,6 @@
//
xoops_loadLanguage('modinfo', \$dirname);
xoops_loadLanguage('main', \$dirname);
-//
-\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();
EOT;
$this->tdmcfile->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/index.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/index.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -68,7 +68,7 @@
// Define Stylesheet
\$xoTheme->addStylesheet( \$style );
// keywords
-{$moduleDirname}_meta_keywords(xoops_getModuleOption('keywords', \$dirname));
+{$moduleDirname}_meta_keywords(\${$moduleDirname}->getConfig('keywords'));
// description
{$moduleDirname}_meta_description({$language}DESC);
//
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -84,6 +84,23 @@
return $ret;
}
/*
+ * @public function getTopicGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $tableNameTopic
+ * @param string $fieldNameParent
+ * @param string $fieldNameTopic
+ */
+ public function getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNameTopic, $fieldNameParent, $fieldNameTopic) {
+ $ret = <<<EOT
+\t\t// Get Var {$fieldNameParent}
+\t\t\${$rpFieldName} =& \${$tableNameTopic}Handler->get(\${$tableName}_arr[\$i]->getVar('{$fieldNameParent}'));
+\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$rpFieldName}->getVar('{$fieldNameTopic}');\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getUploadImageGetVar
* @param string $lpFieldName
* @param string $rpFieldName
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -79,8 +79,6 @@
\$limit = \${$moduleDirname}->getConfig('userpager');
// Define Stylesheet
\$xoTheme->addStylesheet( \$style );
-// Get Handler
-\${$stlTableName}Handler =& \${$moduleDirname}->getHandler('{$stlTableName}');
//
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
//
@@ -98,6 +96,7 @@
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
+ $fieldParent = $fields[$f]->getVar('field_parent');
// Verify if table_fieldname is not empty
$lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
@@ -121,7 +120,30 @@
$ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
default:
- $ret .= $this->userobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ if( ($fieldParent == 1) && !$table->getVar('table_category') ) {
+ if($fieldElement > 13) {
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
+ $fieldElementName = $fieldElements->getVar('fieldelement_name');
+ $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName));
+ }
+ //
+ $fieldNameParent = $fieldName;
+ //
+ $criteriaFieldsTopic = new CriteriaCompo();
+ $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid));
+ $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic);
+ unset($criteriaFieldsTopic);
+ foreach(array_keys($fieldsTopic) as $ft)
+ {
+ if( $fieldsTopic[$ft]->getVar('field_main') == 1 ) {
+ $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name');
+ }
+ }
+ $ret .= $this->userobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldNameParent, $fieldNameTopic);
+ } else {
+ $ret .= $this->userobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ }
break;
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -339,7 +339,7 @@
'show_func' => "b_{$moduleDirname}_{$tableName}_show",
'edit_func' => "b_{$moduleDirname}_{$tableName}_edit",
'options' => "{$tables[$i]->getVar('table_fieldname')}|5|25|0",
- 'template' => "'{$moduleDirname}_block_{$tableName}.tpl");\n\n
+ 'template' => "'{$moduleDirname}_block_{$tableName}.tpl");\n
EOT;
}
}
@@ -356,11 +356,12...
[truncated message content] |
|
From: <be...@us...> - 2014-07-28 04:36:22
|
Revision: 12731
http://sourceforge.net/p/xoops/svn/12731
Author: beckmi
Date: 2014-07-28 04:36:09 +0000 (Mon, 28 Jul 2014)
Log Message:
-----------
1.02 Beta 1: - added tab for bulk Updates and patches for Core files, required for "bulk Update" to work, located in /extras
Modified Paths:
--------------
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt
XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/install.txt
XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/readme.txt
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/install.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/main.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/modinfo.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php
Added Paths:
-----------
XoopsModules/moduleinstaller/trunk/XOOPS2.56_mod_moduleInstaller_1.01_Beta1_xoops.zip
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/update.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/index.html
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/reset.css
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/style.css
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/index.html
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/logo.png
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/index.html
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/index.html
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/prototype.js
XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/xo-installer.js
XoopsModules/moduleinstaller/trunk/moduleinstaller/extras/
XoopsModules/moduleinstaller/trunk/moduleinstaller/extras/Original Core 2.5.7 files/
XoopsModules/moduleinstaller/trunk/moduleinstaller/extras/Original Core 2.5.7 files/main.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/extras/Original Core 2.5.7 files/modulesadmin.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/extras/main.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/extras/modulesadmin.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/extras/readme.txt
Removed Paths:
-------------
XoopsModules/moduleinstaller/trunk/moduleinstaller/css/
XoopsModules/moduleinstaller/trunk/moduleinstaller/images/
XoopsModules/moduleinstaller/trunk/moduleinstaller/js/
Added: XoopsModules/moduleinstaller/trunk/XOOPS2.56_mod_moduleInstaller_1.01_Beta1_xoops.zip
===================================================================
(Binary files differ)
Index: XoopsModules/moduleinstaller/trunk/XOOPS2.56_mod_moduleInstaller_1.01_Beta1_xoops.zip
===================================================================
--- XoopsModules/moduleinstaller/trunk/XOOPS2.56_mod_moduleInstaller_1.01_Beta1_xoops.zip 2014-07-26 11:34:20 UTC (rev 12730)
+++ XoopsModules/moduleinstaller/trunk/XOOPS2.56_mod_moduleInstaller_1.01_Beta1_xoops.zip 2014-07-28 04:36:09 UTC (rev 12731)
Property changes on: XoopsModules/moduleinstaller/trunk/XOOPS2.56_mod_moduleInstaller_1.01_Beta1_xoops.zip
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php 2014-07-26 11:34:20 UTC (rev 12730)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php 2014-07-28 04:36:09 UTC (rev 12731)
@@ -16,7 +16,7 @@
* @author XOOPS Development Team
* @version $Id $
**/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
@@ -25,4 +25,4 @@
echo $aboutAdmin->addNavigation('about.php');
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php 2014-07-26 11:34:20 UTC (rev 12730)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php 2014-07-28 04:36:09 UTC (rev 12731)
@@ -16,7 +16,7 @@
* @author XOOPS Module Team
* @version $Id $
**/
-$path = dirname(dirname(dirname(dirname(__FILE__))));
+$path = dirname(dirname(dirname(__DIR__)));
include_once $path . '/mainfile.php';
include_once $path . '/include/cp_functions.php';
require_once $path . '/include/cp_header.php';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php 2014-07-26 11:34:20 UTC (rev 12730)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php 2014-07-28 04:36:09 UTC (rev 12731)
@@ -18,7 +18,7 @@
**/
require_once '../../../include/cp_header.php';
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
@@ -26,4 +26,4 @@
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php 2014-07-26 11:34:20 UTC (rev 12730)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php 2014-07-28 04:36:09 UTC (rev 12731)
@@ -14,15 +14,14 @@
* @author DuGris (aka L. JEN) <du...@fr...>
* @version $Id$
**/
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
-
$xoopsOption['checkadmin'] = true;
$xoopsOption['hascommon'] = true;
require_once './../include/common.inc.php';
require_once XOOPS_ROOT_PATH . "/modules/system/admin/modulesadmin/modulesadmin.php";
-defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
+defined('XOOPS_INSTALL') || die('XOOPS Installation wizard die');
if (!@include_once "../../../language/{$wizard->language}/global.php") {
include_once '../../../language/english/global.php';
@@ -33,7 +32,7 @@
require_once '../../../class/xoopsformloader.php';
require_once '../../../class/xoopslists.php';
-//$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/style.css" );
+//$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/assets/css/style.css" );
$pageHasForm = true;
$pageHasHelp = false;
@@ -152,6 +151,5 @@
echo $indexAdmin->renderButton('left', '');
-
include './../include/install_tpl.php';
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php 2014-07-26 11:34:20 UTC (rev 12730)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php 2014-07-28 04:36:09 UTC (rev 12731)
@@ -1,8 +1,8 @@
<?php
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
-$dirname = basename(dirname(dirname(__FILE__)));
+$dirname = basename(dirname(__DIR__));
$module_handler = xoops_gethandler('module');
$module = $module_handler->getByDirname($dirname);
$pathIcon32 = $module->getInfo('icons32');
@@ -17,7 +17,6 @@
$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
++$i;
$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_01;
-// $adminmenu[$i]["link"] = 'admin/page_moduleinstaller.php';
$adminmenu[$i]["link"] = 'admin/install.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/add.png';
++$i;
@@ -25,6 +24,10 @@
$adminmenu[$i]["link"] = 'admin/uninstall.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/delete.png';
++$i;
+$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_03;
+$adminmenu[$i]["link"] = 'admin/update.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/update.png';
+++$i;
$adminmenu[$i]["title"] = _MI_INSTALLER_ADMIN_ABOUT;
$adminmenu[$i]["link"] = 'admin/about.php';
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php 2014-07-26 11:34:20 UTC (rev 12730)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php 2014-07-28 04:36:09 UTC (rev 12731)
@@ -14,13 +14,13 @@
* @author DuGris (aka L. JEN) <du...@fr...>
* @version $Id$
**/
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
xoops_cp_header();
$xoopsOption['checkadmin'] = true;
$xoopsOption['hascommon'] = true;
require_once './../include/common.inc.php';
require_once XOOPS_ROOT_PATH . "/modules/system/admin/modulesadmin/modulesadmin.php";
-defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
+defined('XOOPS_INSTALL') || die('XOOPS Installation wizard die');
if (!@include_once "../../../language/{$wizard->language}/global.php") {
include_once '../../../language/english/global.php';
@@ -31,7 +31,7 @@
require_once '../../../class/xoopsformloader.php';
require_once '../../../class/xoopslists.php';
-//$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/style.css" );
+//$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/assets/css/style.css" );
$pageHasForm = true;
$pageHasHelp = false;
@@ -136,7 +136,6 @@
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('uninstall.php');
-
$indexAdmin->addItemButton(
_AM_INSTALLER_SELECT_ALL,
"javascript:selectAll();",
@@ -151,6 +150,5 @@
echo $indexAdmin->renderButton('left', '');
-
include './../include/install_tpl.php';
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/update.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/update.php (rev 0)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/update.php 2014-07-28 04:36:09 UTC (rev 12731)
@@ -0,0 +1,192 @@
+<?php
+/**
+ * See the enclosed file license.txt for licensing information.
+ * If you did not receive this file, get it at http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package installer
+ * @since 2.3.0
+ * @author Haruki Setoyama <ha...@pl...>
+ * @author Kazumi Ono <web...@my...>
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @author DuGris (aka L. JEN) <du...@fr...>
+ * @version $Id$
+**/
+include_once __DIR__ . '/admin_header.php';
+xoops_cp_header();
+$xoopsOption['checkadmin'] = true;
+$xoopsOption['hascommon'] = true;
+require_once './../include/common.inc.php';
+require_once XOOPS_ROOT_PATH . "/modules/system/admin/modulesadmin/modulesadmin.php";
+defined('XOOPS_INSTALL') || die('XOOPS Installation wizard die');
+
+if (!@include_once "../../../language/{$wizard->language}/global.php") {
+ include_once '../../../language/english/global.php';
+}
+if (!@include_once "../../system/language/{$wizard->language}/admin/modulesadmin.php") {
+ include_once '../../system/language/english/admin/modulesadmin.php';
+}
+require_once '../../../class/xoopsformloader.php';
+require_once '../../../class/xoopslists.php';
+
+//$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/assets/css/style.css" );
+
+$pageHasForm = true;
+$pageHasHelp = false;
+
+/**
+ * @param $dirname
+ */
+
+/*
+function xoops_module_update($dirname) {
+
+//http://localhost/257final/modules/system/admin.php?fct=modulesadmin&op=update&module=mypoints
+
+$url = XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=".$dirname;
+//$ch = curl_init();
+//curl_setopt($ch, CURLOPT_URL,$url);
+//curl_setopt($ch, CURLOPT_RETURNTRANSFER,1); // return into a variable
+//curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+//$result = curl_exec($ch);
+//curl_close($ch);
+
+
+$crl = curl_init();
+curl_setopt($crl, CURLOPT_URL, $url);
+@curl_setopt($crl, CURLOPT_HEADER, 0);
+@curl_setopt($crl, CURLOPT_NOBODY, 1);
+@curl_setopt($crl, CURLOPT_FOLLOWLOCATION, true);
+curl_setopt($crl, CURLOPT_RETURNTRANSFER, 1);
+$res = curl_exec($crl);
+curl_close($crl);
+return $res;
+
+}
+
+*/
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ include_once '../../../class/xoopsblock.php';
+ include_once '../../../kernel/module.php';
+ include_once '../../../include/cp_functions.php';
+ include_once '../../../include/version.php';
+// include_once './../include/modulesadmin.php';
+
+ $config_handler =& xoops_gethandler('config');
+ $xoopsConfig =& $config_handler->getConfigsByCat(XOOPS_CONF);
+
+ $msgs = array();
+ foreach ($_REQUEST['modules'] as $dirname => $updateModule) {
+ if ($updateModule) {
+ $msgs[] =& xoops_module_update($dirname);
+ }
+ }
+
+ $pageHasForm = false;
+
+ if (count($msgs) > 0) {
+ $content = "<div class='x2-note successMsg'>" . UPDATED_MODULES . "</div><ul class='log'>";
+ foreach ($msgs as $msg) {
+ $content .= "<dt>{$msg}</dt>";
+ }
+ $content .= "</ul>";
+ } else {
+ $content = "<div class='x2-note confirmMsg'>" . NO_INSTALLED_MODULES . "</div>";
+ }
+
+ // Flush cache files for cpanel GUIs
+ xoops_load("cpanel", "system");
+ XoopsSystemCpanel::flush();
+
+ //Set active modules in cache folder
+ xoops_setActiveModules();
+} else {
+ if (!isset($GLOBALS['xoopsConfig']['language'])) {
+ $GLOBALS['xoopsConfig']['language'] = $_COOKIE['xo_install_lang'];
+ }
+
+ // Get installed modules
+ $module_handler =& xoops_gethandler('module');
+ $installed_mods =& $module_handler->getObjects();
+ $listed_mods = array();
+ foreach ($installed_mods as $module) {
+ $listed_mods[] = $module->getVar('dirname');
+ }
+
+ include_once '../../../class/xoopslists.php';
+ $dirlist = XoopsLists::getModulesList();
+ $toinstal = 0;
+
+ $javascript = "";
+ $content = "<ul class='log'><li>";
+ $content .= "<table class='module'>\n";
+ //remove System module and itself from the list of modules that can be uninstalled
+// $dirlist = array_diff($dirlist, array('system', 'moduleinstaller'));
+ foreach ($dirlist as $file) {
+ clearstatcache();
+ if (in_array($file, $listed_mods)) {
+ $value = 0;
+ $style = "";
+ if (in_array($file, $wizard->configs['modules'])) {
+ $value = 1;
+ $style = " style='background-color:#E6EFC2;'";
+ }
+
+ $file = trim($file);
+ $module =& $module_handler->create();
+ if (!$module->loadInfo($file, false)) {
+ continue;
+ }
+
+ $form = new XoopsThemeForm('', 'modules', 'index.php', 'post');
+ $moduleYN = new XoopsFormRadioYN('', 'modules['. $module->getInfo('dirname') . ']', $value, _YES, _NO);
+ $moduleYN->setExtra( "" );
+ $form->addElement($moduleYN);
+
+ $content .= "<tr id='" . $file . "'" . $style . ">\n";
+ $content .= " <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $module->getInfo('dirname') . "/" . $module->getInfo('image') . "' alt='" . $module->getInfo('name') . "'/></td>\n";
+
+ $moduleHandlerInDB =& xoops_gethandler('module');
+ $moduleInDB =& $module_handler->getByDirname($module->getInfo('dirname'));
+ // Save current version for use in the update function
+ $prevVersion = round($moduleInDB->getVar('version') / 100, 2);
+
+ $content = round($module->getInfo('version'), 2) != $prevVersion ? $content . " <td ><span style='color: #FF0000; font-weight: bold;'>" : $content . " <td><span>";
+ $content .= " " . $module->getInfo('name') . " " . number_format( round($module->getInfo('version'), 2), 2) . " " . $module->getInfo('module_status') . " (folder: /" . $module->getInfo('dirname') . ")";
+ $content .= " <br />" . $module->getInfo('description');
+ $content .= " </span></td>\n";
+ $content .= " <td class='yesno'>";
+ $content .= $moduleYN->render() ;
+ $content .= " </td></tr>\n";
+ ++$toinstal;
+ }
+ }
+ $content .= "</table>";
+ $content .= "</li></ul><script type='text/javascript'>" . $javascript . "</script>";
+ if ($toinstal == 0) {
+ $pageHasForm = false;
+ $content = "<div class='x2-note confirmMsg'>" . NO_MODULES_FOUND . "</div>";
+ }
+}
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('update.php');
+
+$indexAdmin->addItemButton(
+ _AM_INSTALLER_SELECT_ALL,
+ "javascript:selectAll();",
+ 'button_ok'
+);
+
+$indexAdmin->addItemButton(
+ _AM_INSTALLER_SELECT_NONE,
+ "javascript:unselectAll();",
+ 'prune'
+);
+
+echo $indexAdmin->renderButton('left', '');
+
+include './../include/install_tpl.php';
+include_once __DIR__ . '/admin_footer.php';
Property changes on: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/update.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/index.html
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/index.html (rev 0)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/index.html 2014-07-28 04:36:09 UTC (rev 12731)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/reset.css
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/reset.css (rev 0)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/reset.css 2014-07-28 04:36:09 UTC (rev 12731)
@@ -0,0 +1,35 @@
+@charset "UTF-8";
+/*
+ * Suico theme
+ * In memory of Marcello Brandao
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License 3.0
+ * @package themes
+ * @since 2.5.x
+ * @author Kris <http://www.xoofoo.org/>
+ * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/
+ *
+ * @version $Id
+*/
+
+* { margin: 0; padding: 0; border: 0; outline: none; text-decoration: none; font-family: sans-serif; font-size: 1em; font-weight: normal; font-style: normal; resize:none; }
+
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+ font-weight: inherit;
+ font-style: inherit;
+ font-size: 100%;
+ font-family: inherit;
+ vertical-align: baseline;
+ }
+/* remember to define focus styles! */
+:focus { outline: 0;}
+body { line-height: 1; color: #000; background: #fff;}
+ol, ul { list-style: none; }
+/* tables still need 'cellspacing="0"' in the markup */
+table { border-collapse: separate; border-spacing: 0;}
+caption, th, td { font-weight: normal;}
+blockquote:before, blockquote:after, q:before, q:after { content: "";}
+blockquote, q { quotes: "" "";}
\ No newline at end of file
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/style.css
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/style.css (rev 0)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/css/style.css 2014-07-28 04:36:09 UTC (rev 12731)
@@ -0,0 +1,556 @@
+@charset "UTF-8";
+/* ----- Main layout ----- */
+html { margin: 0; padding: 0; height: 100%;}
+
+
+img {
+ border: none;
+}
+
+/* header */
+
+
+#xo-version img {margin-top: -8px;}
+#xo-support {
+ float: right;
+ margin-right: 10px;
+ padding-top: 25px;
+ font-size: 10pt !important;
+ vertical-align: middle;
+ color: #000;
+}
+
+
+/* ----- Wizard layout ----- */
+#wizard {
+ margin: 0 auto;
+ padding: .5em;
+ text-align: left;
+ background: #f3f3f3 url(../img/wizard_bg.png) no-repeat 0 90px;
+ border-top: 1px solid #e3e3e3;
+ -webkit-border-bottom-right-radius: 8px;
+ -webkit-border-bottom-left-radius: 8px;
+ -moz-border-radius-bottomright: 8px;
+ -moz-border-radius-bottomleft: 8px;
+ border-bottom-right-radius: 8px;
+ border-bottom-left-radius: 8px;
+ border-bottom: 2px solid #ccc;
+ border-right: 2px solid #ccc;
+ border-left: 2px solid #ccc;
+}
+#pageslist {
+ float: left;
+ width: 250px;
+ margin: 10px 0 0 0;
+ padding: .5em;
+ border-right: 1px solid #e4e4e4;
+ list-style-type: none;
+ min-height: 350px;
+
+}
+.page {
+ min-height: 350px;
+ margin: 5px 0 0 260px;
+ padding: .5em;
+ background-color : transparent;
+}
+* html .page { height: 350px; }
+
+h1 {
+ margin: 0;
+ padding: 0;
+ color: #fff;
+ font-family: "Lucida Grande", "Trebuchet MS", sans-serif;
+ font-size: 1.5em;
+}
+
+#header {
+ height: 40px;
+ margin: 0;
+ padding: 0;
+ color: #fff;
+ font-family: "Lucida Grande", "Trebuchet MS", sans-serif;
+ font-size: 1.5em;
+}
+
+
+#title {
+ margin: 5px 11px;
+ width: auto;
+ background: url(../img/dark-navcp.png) repeat-x;
+ height: 40px;
+ padding: 0.1em 1em 0 1em;
+ text-shadow: 1px 1px 2px #ccc;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ border-radius: 8px;
+}
+#step {float: right; margin: 5px;}
+#step2 {float: left; margin: 5px;}
+
+ul, ol { margin:0; padding:0 20px;}
+
+/* ----- Styling ----- */
+
+#pageslist li {
+ padding-left: 15px;
+ padding-top: 1px;
+ padding-bottom: 2px;
+ background: url(../img/bullet.png) no-repeat left center;
+}
+#pageslist li.current {
+ background-image: url(../img/bullet-current.png);
+ background-color: #E9FF8F;
+ filter: alpha(opacity=60);
+ -moz-opacity: 0.6;
+ -webkit-opacity: 0.6;
+ -khtml-opacity: 0.6;
+ opacity: 0.6;
+ margin-bottom: 2px;
+}
+#pageslist li.disabled {
+ background-image: url(../img/bullet-disabled.png);
+}
+
+
+#buttons {
+ clear: both;
+ text-align: right;
+ padding: .5em;
+}
+
+form { margin: 0;}
+select#support { border-color: #ccc;}
+h1, h2 { font-family: "Lucida Grande", "Trebuchet MS", sans-serif; text-shadow: 1px 1px 2px #ccc;}
+h2 {
+ margin-top: 0;
+ border-bottom: 1px solid #ccc;
+ padding-left: .5em;
+ text-align: left;
+}
+h3 {
+ font-size: 1.1em;
+ font-weight: bold;
+ margin: 1em .5em .5em;
+}
+p { margin: .5em;}
+
+a {
+ text-decoration: none;
+ color: #666;
+ font-weight: bold;
+ background-color: transparent;
+}
+
+a:hover {
+ text-decoration: none;
+ color: #ff9966;
+ font-weight: bold;
+ background-color: transparent;
+}
+
+table {
+ width: 99%;
+ border-spacing: 0;
+ border-collapse: collapse;
+ margin-bottom: 1em;
+ filter: alpha(opacity=80);
+ -moz-opacity: 0.8;
+ -webkit-opacity: 0.8;
+ -khtml-opacity: 0.8;
+ opacity: 0.8;
+}
+
+caption, .caption {
+ background: #fff url(../img/table-caption-grey.png) repeat-x;
+ padding: 2px .25em;
+ color: #000;
+ font-size: 1.1em;
+ font-weight: bold;
+ font-variant: small-caps;
+ text-align: center;
+}
+
+table thead th { background-color: #f4f4f4;}
+
+
+td, th {
+ padding: 2px .25em;
+ background-color: #fcfcfc;
+ border: 1px solid #efefef;
+}
+
+fieldset {
+ margin: .5em;
+ padding: 1em;
+ border: 1px solid #333;
+ color: #000;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ -khtml-border-radius: 6px;
+ border-radius: 6px;
+}
+legend {
+ margin: 0;
+ padding: 0 10px;
+ font-size: 1.1em;
+ font-weight: bold;
+ text-shadow: 1px 1px 2px #ccc;
+}
+
+.xolabel {
+ clear: both;
+ display: block;
+ padding: .5em 0;
+}
+
+#xolabel.center {
+ clear: both;
+ text-align: center;
+ display: block;
+ padding: .5em 0;
+}
+
+#help_button { float: right; cursor:help; }
+
+.xoform-help {
+ display: none;
+ margin: 5px;
+ padding: 5px;
+ color: #333;
+ list-style-type: none;
+ background-color: #F4FAFF;
+ border: 1px solid #E4EAEF;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ border-radius: 8px;
+}
+body.show-help .xoform-help { display: block;}
+
+
+#langselect.page { text-align: center; }
+
+/*================================================*/
+ul.diags1 {
+ overflow: auto;
+ width: 60%;
+ padding: 5px;
+ margin: 0;
+ border: 1px solid #d0d0d0;
+ list-style-type: none;
+ border-radius: 8px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ background-color: #FBE3E4;
+}
+/*================================================*/
+
+ul.diags, ul.log {
+/* height: 310px;*/
+ overflow: auto;
+ padding: 5px;
+ margin: 0;
+ border: 1px solid #d0d0d0;
+ list-style-type: none;
+ border-radius: 8px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ -khtml-border-radius: 8px;
+}
+
+/*ul.log {
+ height: 280px;
+}*/
+ul.diags li, ul.log li {
+ color: #000;
+ padding-left: 20px;
+}
+ul.diags li.success, ul.log li.success { background-image: url(../img/yes.png); }
+ul.diags li.failure, ul.log li.failure {
+ background-image: url(../img/no.png);
+ font-weight: bold;
+ color: #f66;
+}
+
+.module {
+ background-color: #fff;
+}
+
+.module td {
+ margin: 0;
+ padding: 2px;
+ background-color: transparent;
+}
+
+.module td.img {
+ width: 100px;
+}
+
+.module td.yesno {
+ width: 100px;
+}
+
+/* Xoops french installer */
+
+/* ===== messages ===== */
+.pathmessage {
+ position: absolute;
+ float: right;
+ margin-left: 5px;
+ width: 220px;
+}
+.error, .warning, .failure {
+ background-image: url(../img/no.png);
+ background-repeat: no-repeat;
+ padding-left: 20px;
+}
+.success {
+ background-image: url(../img/yes.png);
+ background-repeat: no-repeat;
+ padding-left: 20px;
+}
+.warning { color:#ff0000; background-color: transparent;}
+
+.errorMsg, .confirmMsg, .resultMsg, .successMsg {
+ margin: 5px 2px;
+ padding: 5px;
+ border: 1px solid #ccc;
+}
+.confirmMsg {
+ background-color: #FFF6BF;
+ color: #817134;
+ border: 1px solid #ccc;
+ list-style-type: none;
+ border-radius: 8px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ -khtml-border-radius: 8px;
+}
+.resultMsg, .successMsg {
+ background-color: #E6EFC2;
+ color: #529214;
+ border-color: #C6D880;
+ border-radius: 8px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ -khtml-border-radius: 8px;
+}
+.errorMsg a {background-color: transparent; color: #D12F19;}
+.confirmMsg a {background-color: transparent; color: #817134;}
+.successMsg a {background-color: transparent; color: #529214;}
+.errorMsg {
+ background-color: #FBE3E4;
+ background-repeat: no-repeat;
+ background-position: 10px;
+ color: #D12F19;
+ border-color: #FBC2C4;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ border-radius: 8px;
+}
+
+.directory, .files {
+ padding-left: 20px;
+ font-weight: bold;
+ font-style: italic;
+}
+.directory {
+ background-image: url(../img/folder.png);
+ background-repeat: no-repeat;
+ background-position: left;
+}
+.files {
+ background-image: url(../img/document.png);
+ background-repeat: no-repeat;
+ background-position: left;
+}
+
+#screenshot {
+ text-align: center;
+}
+#screenshot img {
+ max-width: 500px;
+ margin-top: 5px;
+}
+/* Form element */
+input[type=submit],input[type=reset],input[type=button],.xo-formbuttons,.formButton,button
+ {
+ margin: 2px 5px 2px 5px;
+ background-color: #D3D2D6;
+ padding: 4px 8px;
+ color: #405A80;
+ font-size: 1em;
+ font-weight: bold;
+ border: 1px solid #ccc;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset;
+ -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset;
+ -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset;
+ -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset;
+ cursor: pointer;
+}
+
+input[type=submit]:hover,input[type=reset]:hover,input[type=button]:hover,.xo-formbuttons:hover,.formButton:hover,button:hover
+ {
+ background-color: #E6EBFF;
+ padding: 4px 8px;
+ color: inherit;
+ cursor: pointer;
+}
+
+input[type=text],input[type=password],input[type=checkbox],input[type=file],textarea
+ {
+ border: 1px solid #ccc;
+ margin: 2px 5px 2px 0;
+ padding: 2px;
+ background-color: #f7f7f7;
+ padding-left: .2em;
+ color: inherit;
+ border: #ccc solid 1px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ -khtml-border-radius: 5px;
+ border-radius: 5px;
+
+}
+
+input[type=text],input[type=password],input[type=file] {
+ width: 60%;
+ margin-bottom: .25em;
+ background: #f7f7f7 url(../img/form-input.png) no-repeat left top;
+ padding: 1px .25em;
+ border-bottom: 1px solid #aaa;
+ border-right: 1px solid #aaa;
+}
+
+input[type=text]:hover,input[type=password]:hover,input[type=file]:hover,input[type=checkbox]:hover,textarea:hover
+ {
+ background-color: #EFEFEF;
+ color: inherit;
+ border: 1px solid #E9CB38;
+}
+
+input[type=text]:focus,input[type=password]:focus,input[type=file]:focus,input[type=checkbox]:focus,textarea:focus
+ {
+ background-color: #F4FAFF;
+ color: #333;
+ border: #139EE8 solid 1px;
+ outline: 1px solid #139EE8;
+ -moz-outline-radius: 5px;
+ -webkit-outline-radius: 5px;
+ -khtml-outline-radius: 5px;
+ border-outline: 5px;
+}
+
+input[type=checkbox],input[type=radio] {
+ margin: 3px;
+ padding: 2px;
+}
+
+select {
+ width: 200px;
+ border-right: #000 1px solid;
+ border-top: #000 1px solid;
+ background-color: #f7f7f7;
+ font: 8pt verdana, arial, helvetica;
+ border-left: #000 1px solid;
+ color: #000;
+ border-bottom: #000 1px solid;
+ filter: alpha(opacity=80);
+ -moz-opacity: 0.8;
+ -webkit-opacity: 0.8;
+ -khtml-opacity: 0.8;
+ opacity: 0.8;
+}
+select[name=lang] {
+ min-width: 10em
+}
+.option {
+ padding-left: 27px;
+ font-size: 1.1em;
+ margin: 2px 0;
+}
+
+textarea {
+ width: 95%;
+}
+
+/* Password streng */
+#password {
+ position: relative;
+ min-height: 120px;
+}
+#passwordinput {
+ position : absolute;
+ width: 100%;
+}
+#passwordmetter {
+ position : absolute;
+ right: -7px;
+ top: -17px;
+ width: 200px;
+ padding: 0 5px 5px;
+ border : 1px solid #555;
+ background: none;
+}
+#passwordmetter label, #passwordgenerator, #passwordgenerator input{
+ text-align: center;
+}
+#passwordDescription {
+ text-align: center;
+ position: relative;
+ top: 2px;
+/* left: 5px;*/
+}
+
+#passwordStrength {
+ text-align: center;
+ height: 20px;
+ display: block;
+ margin-bottom: .25em;
+ font-weight: bold;
+}
+
+.strength0 { width: auto; background: #ccc; }
+.strength1 { width: auto; background: #ccc; }
+.strength2 { width: auto; background: #f00; }
+.strength3 { width: auto; background: #ff5f5f; }
+.strength4 { width: auto; background: #56e500; }
+.strength5 { width: auto; background: #4dcd00; }
+.strength6 { width: auto; background: #399800; }
+.strength0 span { color: #000; }
+.strength1 span { color: #000; }
+.strength2 span { color: #fff; }
+.strength3 span { color: #fff; }
+.strength4 span { color: #000; }
+.strength5 span { color: #000; }
+.strength6 span { color: #fff; }
+
+/*==================== logger ============================*/
+#xo-logger-tabs {
+ margin: 5px;
+ padding-top: 10px;
+ font-size: 95%;
+}
+
+#xo-logger-tabs a {
+ text-decoration: none;
+ color: #f7f7f7;
+ font-weight: bold;
+ background-color: transparent;
+}
+
+#xo-logger-tabs a:hover {
+ text-decoration: none;
+ color: #FF0000;
+ font-weight: bold;
+ background-color: transparent;
+}
+.noininstall {display: none;}
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/index.html
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/index.html (rev 0)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/index.html 2014-07-28 04:36:09 UTC (rev 12731)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/logo.png
===================================================================
(Binary files differ)
Index: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/logo.png
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/logo.png 2014-07-26 11:34:20 UTC (rev 12730)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/logo.png 2014-07-28 04:36:09 UTC (rev 12731)
Property changes on: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/images/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/index.html
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/index.html (rev 0)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/index.html 2014-07-28 04:36:09 UTC (rev 12731)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/index.html
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/index.html (rev 0)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/index.html 2014-07-28 04:36:09 UTC (rev 12731)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/prototype.js
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/prototype.js (rev 0)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/assets/js/prototype.js 2014-07-28 04:36:09 UTC (rev 12731)
@@ -0,0 +1,7036 @@
+/* Prototype JavaScript framework, version 1.7.1
+ * (c) 2005-2010 Sam Stephenson
+ *
+ * Prototype is freely distributable under the terms of an MIT-style license.
+ * For details, see the Prototype web site: http://www.prototypejs.org/
+ *
+ *--------------------------------------------------------------------------*/
+
+var Prototype = {
+
+ Version: '1.7.1',
+
+ Browser: (function(){
+ var ua = navigator.userAgent;
+ var isOpera = Object.prototype.toString.call(window.opera) == '[object Opera]';
+ return {
+ IE: !!window.attachEvent && !isOpera,
+ Opera: isOpera,
+ WebKit: ua.indexOf('AppleWebKit/') > -1,
+ Gecko: ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1,
+ MobileSafari: /Apple.*Mobile/.test(ua)
+ }
+ })(),
+
+ BrowserFeatures: {
+ XPath: !!document.evaluate,
+
+ SelectorsAPI: !!document.querySelector,
+
+ ElementExtensions: (function() {
+ var constructor = window.Element || window.HTMLElement;
+ return !!(constructor && constructor.prototype);
+ })(),
+ SpecificElementExtensions: (function() {
+ if (typeof window.HTMLDivElement !== 'undefined')
+ return true;
+
+ var div = document.createElement('div'),
+ form = document.createElement('form'),
+ isSupported = false;
+
+ if (div['__proto__'] && (div['__proto__'] !== form['__proto__'])) {
+ isSupported = true;
+ }
+
+ div = form = null;
+
+ return isSupported;
+ })()
+ },
+
+ ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script\\s*>',
+ JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
+
+ emptyFunction: function() { },
+
+ K: function(x) { return x }
+};
+
+if (Prototype.Browser.MobileSafari)
+ Prototype.BrowserFeatures.SpecificElementExtensions = false;
+/* Based on Alex Arnell's inheritance implementation. */
+
+var Class = (function() {
+
+ var IS_DONTENUM_BUGGY = (function(){
+ for (var p in { toString: 1 }) {
+ if (p === 'toString') return false;
+ }
+ return true;
+ })();
+
+ function subclass() {};
+ function create() {
+ var parent = null, properties = $A(arguments);
+ if (Object.isFunction(properties[0]))
+ parent = properties.shift();
+
+ function klass() {
+ this.initialize.apply(this, arguments);
+ }
+
+ Object.extend(klass, Class.Methods);
+ klass.superclass = parent;
+ klass.subclasses = [];
+
+ if (parent) {
+ subclass.prototype = parent.prototype;
+ klass.prototype = new subclass;
+ parent.subclasses.push(klass);
+ }
+
+ for (var i = 0, length = properties.length; i < length; i++)
+ klass.addMethods(properties[i]);
+
+ if (!klass.prototype.initialize)
+ klass.prototype.initialize = Prototype.emptyFunction;
+
+ klass.prototype.constructor = klass;
+ return klass;
+ }
+
+ function addMethods(source) {
+ var ancestor = this.superclass && this.superclass.prototype,
+ properties = Object.keys(source);
+
+ if (IS_DONTENUM_BUGGY) {
+ if (source.toString != Object.prototype.toString)
+ properties.push("toString");
+ if (source.valueOf != Object.prototype.valueOf)
+ properties.push("valueOf");
+ }
+
+ for (var i = 0, length = properties.length; i < length; i++) {
+ var property = properties[i], value = source[property];
+ if (ancestor && Object.isFunction(value) &&
+ value.argumentNames()[0] == "$super") {
+ var method = value;
+ value = (function(m) {
+ return function() { return ancestor[m].apply(this, arguments); };
+ })(property).wrap(method);
+
+ value.valueOf = (function(method) {
+ return function() { return method.valueOf.call(method); };
+ })(method);
+
+ value.toString = (function(method) {
+ return function() { return method.toString.call(method); };
+ })(method);
+ }
+ this.prototype[property] = value;
+ }
+
+ return this;
+ }
+
+ return {
+ create: create,
+ Methods: {
+ addMethods: addMethods
+ }
+ };
+})();
+(function() {
+
+ var _toString = Object.prototype.toString,
+ _hasOwnProperty = Object.prototype.hasOwnProperty,
+ NULL_TYPE = 'Null',
+ UNDEFINED_TYPE = 'Undefined',
+ BOOLEAN_TYPE = 'Boolean',
+ NUMBER_TYPE = 'Number',
+ STRING_TYPE = 'String',
+ OBJECT_TYPE = 'Object',
+ FUNCTION_CLASS = '[object Function]',
+ BOOLEAN_CLASS = '[object Boolean]',
+ NUMBER_CLASS = '[object Number]',
+ STRING_CLASS = '[object String]',
+ ARRAY_CLASS = '[object Array]',
+ DATE_CLASS = '[object Date]',
+ NATIVE_JSON_STRINGIFY_SUPPORT = window.JSON &&
+ typeof JSON.stringify === 'function' &&
+ JSON.stringify(0) === '0' &&
+ typeof JSON.stringify(Prototype.K) === 'undefined';
+
+
+
+ var DONT_ENUMS = ['toString', 'toLocaleString', 'valueOf',
+ 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'constructor'];
+
+ var IS_DONTENUM_BUGGY = (function(){
+ for (var p in { toString: 1 }) {
+ if (p === 'toString') return false;
+ }
+ return true;
+ })();
+
+ function Type(o) {
+ switch(o) {
+ case null: return NULL_TYPE;
+ case (void 0): return UNDEFINED_TYPE;
+ }
+ var type = typeof o;
+ switch(type) {
+ case 'boolean': return BOOLEAN_TYPE;
+ case 'number': return NUMBER_TYPE;
+ case 'string': return STRING_TYPE;
+ }
+ return OBJECT_TYPE;
+ }
+
+ function extend(destination, source) {
+ for (var property in source)
+ destination[property] = source[property];
+ return destination;
+ }
+
+ function inspect(object) {
+ try {
+ if (isUndefined(object)) return 'undefined';
+ if (object === null) return 'null';
+ return object.inspect ? object.inspect() : String(object);
+ } catch (e) {
+ if (e instanceof RangeError) return '...';
+ throw e;
+ }
+ }
+
+ function toJSON(value) {
+ return Str('', { '': value }, []);
+ }
+
+ function Str(key, holder, stack) {
+ var value = holder[key];
+ if (Type(value) === OBJECT_TYPE && typeof value.toJSON === 'function') {
+ value = value.toJSON(key);
+ }
+
+ var _class = _toString.call(value);
+
+ switch (_class) {
+ case NUMBER_CLASS:
+ case BOOLEAN_CLASS:
+ case STRING_CLASS:
+ value = value.valueOf();
+ }
+
+ switch (value) {
+ case null: return 'null';
+ case true: return 'true';
+ case false: return 'false';
+ }
+
+ var type = typeof value;
+ switch (type) {
+ case 'string':
+ return value.inspect(true);
+ case 'number':
+ return isFinite(value) ? String(value) : 'null';
+ case 'object':
+
+ for (var i = 0, length = stack.length; i < length; i++) {
+ if (stack[i] === value) {
+ throw new TypeError("Cyclic reference to '" + value + "' in object");
+ }
+ }
+ stack.push(value);
+
+ var partial = [];
+ if (_class === ARRAY_CLASS) {
+ for (var i = 0, length = value.length; i < length; i++) {
+ var str = Str(i, value, stack);
+ partial.push(typeof str === 'undefined' ? 'null' : str);
+ }
+ partial = '[' + partial.join(',') + ']';
+ } else {
+ var keys = Object.keys(value);
+ for (var i = 0, length = keys.length; i < length; i++) {
+ var key = keys[i], str = Str(key, value, stack);
+ if (typeof str !== "undefined") {
+ partial.push(key.inspect(true)+ ':' + str);
+ }
+ }
+ partial = '{' + partial.join(',') + '}';
+ }
+ stack.pop();
+ return partial;
+ }
+ }
+
+ function stringify(object) {
+ return JSON.stringify(object);
+ }
+
+ function toQueryString(object) {
+ return $H(object).toQueryString();
+ }
+
+ function toHTML(object) {
+ return object && object.toHTML ? object.toHTML() : String.interpret(object);
+ }
+
+ function keys(object) {
+ if (Type(object) !== OBJECT_TYPE) { throw new TypeError(); }
+ var results = [];
+ for (var property in object) {
+ if (_hasOwnProperty.call(object, property))
+ results.push(property);
+ }
+
+ if (IS_DONTENUM_BUGGY) {
+ for (var i = 0; property = DONT_ENUMS[i]; i++) {
+ if (_hasOwnProperty.call(object, property))
+ results.push(property);
+ }
+ }
+
+ return results;
+ }
+
+ function values(object) {
+ var results = [];
+ for (var property in object)
+ results.push(object[property]);
+ return results;
+ }
+
+ function clone(object) {
+ return extend({ }, object);
+ }
+
+ function isElement(object) {
+ return !!(object && object.nodeType == 1);
+ }
+
+ function isArray(object) {
+ return _toString.call(object) === ARRAY_CLASS;
+ }
+
+ var hasNativeIsArray = (typeof Array.isArray == 'function')
+ && Array.isArray([]) && !Array.isArray({});
+
+ if (hasNativeIsArray) {
+ isArray = Array.isArray;
+ }
+
+ function isHash(object) {
+ return object instanceof Hash;
+ }
+
+ function isFunction(object) {
+ return _toString.call(object) === FUNCTION_CLASS;
+ }
+
+ function isString(object) {
+ return _toString.call(object) === STRING_CLASS;
+ }
+
+ function isNumber(object) {
+ return _toString.call(object) === NUMBER_CLASS;
+ }
+
+ function isDate(object) {
+ return _toString.call(object) === DATE_CLASS;
+ }
+
+ function isUndefined(object) {
+ return typeof object === "undefined";
+ }
+
+ extend(Object, {
+ extend: extend,
+ inspect: inspect,
+ toJSON: NATIVE_JSON_STRINGIFY_SUPPORT ? stringify : toJSON,
+ toQueryString: toQueryString,
+ toHTML: toHTML,
+ keys: Object.keys || keys,
+ values: values,
+ clone: clone,
+ isElement: isElement,
+ isArray: isArray,
+ isHash: isHash,
+ isFunction: isFunction,
+ isString: isString,
+ isNumber: isNumber,
+ isDate: isDate,
+ isUndefined: isUndefined
+ });
+})();
+Object.extend(Function.prototype, (function() {
+ var slice = Array.prototype.slice;
+
+ function update(array, args) {
+ var arrayLength = array.length, length = args.length;
+ while (length--) array[arrayLength + length] = args[length];
+ return array;
+ }
+
+ function merge(array, args) {
+ array = slice.call(array, 0);
+ return update(array, args);
+ }
+
+ function argumentNames() {
+ var names = this.toString().match(/^[\s\(]*function[^(]*\(([^)]*)\)/)[1]
+ .replace(/\/\/.*?[\r\n]|\/\*(?:.|[\r\n])*?\*\//g, '')
+ .replace(/\s+/g, '').split(',');
+ return names.length == 1 && !names[0] ? [] : names;
+ }
+
+
+ function bind(context) {
+ if (arguments.length < 2 && Object.isUndefined(arguments[0]))
+ return this;
+
+ if (!Object.isFunction(this))
+ throw new TypeError("The object is not callable.");
+
+ var nop = function() {};
+ var __method = this, args = slice.call(arguments, 1);
+
+ var bound = function() {
+ var a = merge(args, arguments), c = context;
+ var c = this instanceof bound ? this : context;
+ return __method.apply(c, a);
+ };
+
+ nop.prototype = this.prototype;
+ bound.prototype = new nop();
+
+ return bound;
+ }
+
+ function bindAsEventListener(context) {
+ var __method = this, args = slice.call(arguments, 1);
+ return function(event) {
+ var a = update([event || window.event], args);
+ return __method.apply(context, a);
+ }
+ }
+
+ function curry() {
+ if (!arguments.length) return this;
+ var __method = this, args = slice.call(arguments, 0);
+ return function() {
+ var a = merge(args, arguments);
+ return __method.apply(this, a);
+ }
+ }
+
+ function delay(timeout) {
+ var __method = this, args = slice.call(arguments, 1);
+ timeout = timeout * 1000;
+ return window.setTimeout(function() {
+ return __method.apply(__method, args);
+ }, timeout);
+ }
+
+ function defer() {
+ var args = update([0.01], arguments);
+ return this.delay.apply(this, args);
+ }
+
+ function wrap(wrapper) {
+ var __method = this;
+ return function() {
+ var a = update([__method.bind(this)], arguments);
+ return wrapper.apply(this, a);
+ }
+ }
+
+ function methodize() {
+ if (this._methodized) return this._methodized;
+ var __method = this;
+ return this._methodized = function() {
+ var a = update([this], arguments);
+ return __method.apply(null, a);
+ };
+ }
+
+ var extensions = {
+ argumentNames: argumentNames,
+ bindAsEventListener: bindAsEventListener,
+ curry: curry,
+ delay: delay,
+ defer: defer,
+ wrap: wrap,
+ methodize: methodize
+ };
+
+ if (!Function.prototype.bind)
+ extensions.bind = bind;
+
+ return extensions;
+})());
+
+
+
+(function(proto) {
+
+
+ function toISOString() {
+ return this.getUTCFullYear() + '-' +
+ (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+ this.getUTCDate().toPaddedString(2) + 'T' +
+ this.getUTCHours().toPaddedString(2) + ':' +
+ this.getUTCMinutes().toPaddedString(2) + ':' +
+ this.getUTCSeconds().toPaddedString(2) + 'Z';
+ }
+
+
+ function toJSON() {
+ return this.toISOString();
+ }
+
+ if (!proto.toISOString) proto.toISOString = toISOString;
+ if (!proto.toJSON) proto.toJSON = toJSON;
+
+})(Date.prototype);
+
+
+RegExp.prototype.match = RegExp.prototype.test;
+
+RegExp.escape = function(str) {
+ return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+};
+var PeriodicalExecuter = Class.create({
+ initialize: function(callback, frequency) {
+ this.callback = callback;
+ this.frequency = frequency;
+ this.currentlyExecuting = false;
+
+ this.registerCallback();
+ },
+
+ registerCallback: function() {
+ this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+ },
+
+ execute: function() {
+ this.callback(this);
+ },
+
+ stop: function() {
+ if (!this.timer) return;
+ clearInterval(this.timer);
+ this.timer = null;
+ },
+
+ onTimerEvent: function() {
+ if (!this.currentlyExecuting) {
+ try {
+ this.currentlyExecuting = true;
+ this.execute();
+ this.currentlyExecuting = false;
+ } catch(e) {
+ this.currentlyExecuting = false;
+ throw e;
+ }
+ }
+ }
+});
+Object.extend(String, {
+ interpret: function(value) {
+ return value == null ? '' : String(value);
+ },
+ specialChar: {
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '\\': '\\\\'
+ }
+});
+
+Object.extend(String.prototype, (function() {
+ var NATIVE_JSON_PARSE_SUPPORT = window.JSON &&
+ typeof JSON.parse === 'function' &&
+ JSON.parse('{"test": true}').test;
+
+ function prepareReplacement(replacement) {
+ if (Object.isFunction(replacement)) return replacement;
+ var template = new Template(replacement);
+ return function(match) { return template.evaluate(match) };
+ }
+
+ function gsub(pattern, replacement) {
+ var result = '', source = this, match;
+ replacement = prepareReplacement(replacement);
+
+ if (Object.isString(pattern))
+ pattern = RegExp.escape(pattern);
+
+ if (!(pattern.length || pattern.source)) {
+ replacement = replacement('');
+ return replacement + source.split('').join(replacement) + replacement;
+ }
+
+ while (source.length > 0) {
+ if (match = source.match(pattern)) {
+ result += source.slice(0, match.index);
+ result += String.interpret(replacement(match));
+ source = source.slice(match.index + match[0].length);
+ } else {
+ result += source, source = '';
+ }
+ }
+ return result;
+ }
+
+ function sub(pattern, replacement, count) {
+ replacement = prepareReplacement(replacement);
+ count = Object.isUndefined(count) ? 1 : count;
+
+ return this.gsub(pattern, function(match) {
+ if (--count < 0) return match[0];
+ return replacement(match);
+ });
+ }
+
+ function scan(pattern, iterator) {
+ this.gsub(pattern, iterator);
+ return String(this);
+ }
+
+ function truncate(length, truncation) {
+ length = length || 30;
+ truncation = Object.isUndefined(truncation) ? '...' : truncation;
+ return this.length > length ?
+ this.slice(0, length - truncation.length) + truncation : String(this);
+ }
+
+ function strip() {
+ return this.replace(/^\s+/, '').replace(/\s+$/, '');
+ }
+
+ function stripTags() {
+ return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?>|<\/\w+>/gi, '');
+ }
+
+ function stripScripts() {
+ return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+ }
+
+ function extractScripts() {
+ var matchAll = new RegExp(Prototype.ScriptFragment, 'img'),
+ matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+ return (this.match(matchAll) || []).map(function(scriptTag) {
+ return (scriptTag.match(matchOne) || ['', ''])[1];
+ });
+ }
+
+ function evalScripts() {
+ return this.extractScripts().map(function(script) { return eval(script); });
+ }
+
+ function escapeHTML() {
+ return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
+ }
+
+ function unescapeHTML() {
+ return this.stripTags().replace(/</g,'<').replace(/>/g,'>').replace(/&/g,'&');
+ }
+
+
+ function toQueryParams(separator) {
+ var match = this.strip().match(/([^?#]*)(#.*)?$/);
+ if (!match) return { };
+
+ return match[1].split(separator || '&').inject({ }, function(hash, pair) {
+ if ((pair = pair.split('='))[0]) {
+ var key = decodeURIComponent(pair.shift()),
+ value = pair.length > 1 ? pair.join('=') : pair[0];
+
+ if (value != undefined) value = decodeURIComponent(value);
+
+ if (key in hash) {
+ if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
+ hash[key].push(value);
+ }
+ else hash[key] = value;
+ }
+ return hash;
+ });
+ }
+
+ function toArray() {
+ return this.split('');
+ }
+
+ function succ() {
+ return this.slice(0, this.length - 1) +
+ String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+ }
+
+ function times(count) {
+ return count < 1 ? '' : new Array(count + 1).join(this);
+ }
+
+ function camelize() {
+ return this.replace(/-+(.)?/g, function(match, chr) {
+ return chr ? chr.toUpperCase() : '';
+ });
+ }
+
+ function capitalize() {
+ return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+ }
+
+ function underscore() {
+ return this.replace(/::/g, '/')
+ .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
+ .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+ .replace(/-/g, '_')
+ .toLowerCase();
+ }
+
+ function dasherize() {
+ return this.replace(/_/g, '-');
+ }
+
+ function inspect(useDoubleQuotes) {
+ var escapedString = this.replace(/[\x00-\x1f\\]/g, function(character) {
+ if (character in String.specialChar) {
+ return String.specialChar[character];
+ }
+ return '\\u00' + character.charCodeAt().toPaddedString(2, 16);
+ });
+ if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
+ return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+ }
+
+ function unfilterJSON(filter) {
+ return this.replace(filter || Prototype.JSONFilter, '$1');
+ }
+
+ function isJSON() {
+ var str = this;
+ if (str.blank()) return false;
+ str = str.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@');
+ str = str.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']');
+ str = str.replace(/(?:^|:|,)(?:\s*\[)+/g, '');
+ return (/^[\],:{...
[truncated message content] |
|
From: <be...@us...> - 2014-07-26 11:34:28
|
Revision: 12730
http://sourceforge.net/p/xoops/svn/12730
Author: beckmi
Date: 2014-07-26 11:34:20 +0000 (Sat, 26 Jul 2014)
Log Message:
-----------
Updating changelog
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-07-26 11:07:10 UTC (rev 12729)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-07-26 11:34:20 UTC (rev 12730)
@@ -7,6 +7,7 @@
- updating some copyright notices
- Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith)
- fix for Update setting Template import date to 0 (timgno/mamba)
+- adding Adding language constants for Protector's Prefix Manager (slider84/mamba)
===============================
2014-06-20: Version 2.5.7 Final (Patch)
|
|
From: <be...@us...> - 2014-07-26 11:07:14
|
Revision: 12729
http://sourceforge.net/p/xoops/svn/12729
Author: beckmi
Date: 2014-07-26 11:07:10 +0000 (Sat, 26 Jul 2014)
Log Message:
-----------
Adding language constants for Prefix Manager
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/language/english/admin.php
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2014-07-25 19:37:50 UTC (rev 12728)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2014-07-26 11:07:10 UTC (rev 12729)
@@ -200,11 +200,11 @@
<h3>"._AM_H3_PREFIXMAN."</h3>
<table class='outer' width='95%'>
<tr>
- <th>PREFIX</th>
- <th>TABLES</th>
- <th>UPDATED</th>
- <th>COPY</th>
- <th>ACTIONS</th>
+ <th>"._AM_PROTECTOR_PREFIX."</th>
+ <th>"._AM_PROTECTOR_TABLES."</th>
+ <th>"._AM_PROTECTOR_UPDATED."</th>
+ <th>"._AM_PROTECTOR_COPY."</th>
+ <th>"._AM_PROTECTOR_ACTIONS."</th>
</tr>
" ;
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/language/english/admin.php 2014-07-25 19:37:50 UTC (rev 12728)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/language/english/admin.php 2014-07-26 11:07:10 UTC (rev 12729)
@@ -48,3 +48,9 @@
define('_AM_ADV_CHECKISOCOM',"Isolated Comments");
//XOOPS 2.5.4
define('_AM_ADV_REGISTERGLOBALS2',"and place in it the line below:");
+//XOOPS 2.5.8
+define('_AM_PROTECTOR_PREFIX',"Prefix");
+define('_AM_PROTECTOR_TABLES',"Tables");
+define('_AM_PROTECTOR_UPDATED',"Updated");
+define('_AM_PROTECTOR_COPY',"Copy");
+define('_AM_PROTECTOR_ACTIONS',"Actions");
|
|
From: <luc...@us...> - 2014-07-25 19:37:54
|
Revision: 12728
http://sourceforge.net/p/xoops/svn/12728
Author: luciorota
Date: 2014-07-25 19:37:50 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
XoopsRequest::getArray($name, $default = array(), $hash = 'default')
If $name is not an array but it should be, method converts $name in an array.
This change is important when a select box contain only 1 option (eg: XoopsFormCheckBox)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsrequest.php
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsrequest.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsrequest.php 2014-07-25 17:48:46 UTC (rev 12727)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsrequest.php 2014-07-25 19:37:50 UTC (rev 12728)
@@ -429,6 +429,11 @@
$var = trim($var);
}
+ // convert $var in array if $type is ARRAY
+ if (strtoupper($type)) == 'ARRAY' && !is_array($var)) {
+ $var = array($var);
+ }
+
// Now we handle input filtering
if ($mask & 2) {
// If the allow raw flag is set, do not modify the variable
|
|
From: <luc...@us...> - 2014-07-25 17:48:54
|
Revision: 12727
http://sourceforge.net/p/xoops/svn/12727
Author: luciorota
Date: 2014-07-25 17:48:46 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/wfdownloads/
XoopsModules/wfdownloads/trunk/wfdownloads/admin/
XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/swishe.php
XoopsModules/wfdownloads/trunk/wfdownloads/assets/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/css/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/css/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/css/module.css
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/VeraBd.ttf
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/brokenimg.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/category/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/category/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/category/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/category/thumbs/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/category/thumbs/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/category/thumbs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/down.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/approve.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/arrow.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/close12.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/delete.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/disabled.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/down.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/download.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/download1.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/download2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/download3.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/download4.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/downloads.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/downloads02.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/downloads03.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/edit.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/forum.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/ignore.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/ignore.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/link.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/newred.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/off.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/on.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/open12.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/pop.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/rate0.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/rate1.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/rate2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/rate3.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/rate4.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/rate5.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/reviews.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/rss.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/statistics.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/update.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon/world_link.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon32/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon32/database_go.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon32/editcopy.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/icon32/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/loadingAnimation.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/logo-en.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/module_logo.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/module_logo_blank.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/screenshots/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/screenshots/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/screenshots/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/screenshots/thumbs/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/screenshots/thumbs/blank.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/screenshots/thumbs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/size2.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/images/up.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/magnific/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/magnific/jquery.magnific-popup.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/magnific/magnific-popup.css
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/README.md
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/DO NOT CHANGE THESE FILES. USE -src- FOLDER.txt
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/background.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/bigplay.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/bigplay.svg
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/controls-ted.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/controls-wmp-bg.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/controls-wmp.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/controls.png
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/controls.svg
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/flashmediaelement-cdn.swf
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/flashmediaelement.swf
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/loading.gif
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/mediaelement-and-player.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/mediaelement.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/mediaelementplayer.min.css
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/mediaelementplayer.min.js
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/mejs-skins.css
XoopsModules/wfdownloads/trunk/wfdownloads/assets/js/mediaelement/build/silverlightmediaelement.xap
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/
XoopsModules/wfdownloads/trunk/wfdownloads/class/breadcrumb.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/img_uploader.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/class/ip_log.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/multicolumnsthemeform.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/rating.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/report.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/request.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/session.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/tree.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_delete.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_edit.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_new.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_post.php
XoopsModules/wfdownloads/trunk/wfdownloads/comment_reply.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/credits.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/history.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/docs/install.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/license.txt
XoopsModules/wfdownloads/trunk/wfdownloads/docs/readme.txt
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/header.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/
XoopsModules/wfdownloads/trunk/wfdownloads/include/comment_functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/constants.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/include/notification.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/oninstall.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/onuninstall.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/onupdate.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/blocks.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/directorychecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/filechecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help3.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help4.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help5.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/help6.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/install.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/help/tips_tricks.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/category_filemodified_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/category_filesubmit_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/category_newfile_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/file_approve_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/file_filemodified_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/filebroken_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/global_filebroken_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/global_filemodified_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/global_filemodify_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/global_filesubmit_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/global_newcategory_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/global_newfile_notify.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/mail_template/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/notification_update.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/sql/
XoopsModules/wfdownloads/trunk/wfdownloads/sql/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/sql/mysql.sql
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_categorieslist.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_downloadslist.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_ip_logslist.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_mimetypeslist.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_mirrorslist.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_permissions.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_ratingslist.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_reportsmodificationslist.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_am_reviewslist.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/wfdownloads_mb_new.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/wfdownloads_mb_top.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/blocks/wfdownloads_mb_top_by_cat.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_brokenfile.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_co_breadcrumb.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_co_letterschoice.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_disclaimer.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_footer.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_header.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_index.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_mirrors.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_newlistindex.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_ratefile.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_reviews.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_submit.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_topten.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/uploads/
XoopsModules/wfdownloads/trunk/wfdownloads/uploads/index.html
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/about.php 2014-07-25 17:48:46 UTC (rev 12727)
@@ -0,0 +1,30 @@
+<?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.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_footer.php 2014-07-25 17:48:46 UTC (rev 12727)
@@ -0,0 +1,28 @@
+<?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.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+echo "<div class='adminfooter'>\n";
+echo " <div style='text-align: center;'>\n";
+echo " <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n";
+echo " </div>\n";
+echo "" . _AM_MODULEADMIN_ADMIN_FOOTER . "\n";
+echo "</div>";
+
+xoops_cp_footer();
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php 2014-07-25 17:48:46 UTC (rev 12727)
@@ -0,0 +1,40 @@
+<?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.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+// Include xoops admin header
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+
+$pathIcon16 = XOOPS_URL . '/' . $wfdownloads->getModule()->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $wfdownloads->getModule()->getInfo('icons32');
+$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $wfdownloads->getModule()->getInfo('dirmoduleadmin');
+require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
+
+// Load language files
+xoops_loadLanguage('admin', $wfdownloads->getModule()->dirname());
+xoops_loadLanguage('modinfo', $wfdownloads->getModule()->dirname());
+xoops_loadLanguage('main', $wfdownloads->getModule()->dirname());
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH . '/class/template.php');
+ $xoopsTpl = new XoopsTpl();
+}
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/categories.php 2014-07-25 17:48:46 UTC (rev 12727)
@@ -0,0 +1,287 @@
+<?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.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
+
+// Check directories
+if (!is_dir($wfdownloads->getConfig('uploaddir'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_UPLOADDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_MAINIMAGEDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('screenshots'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_SCREENSHOTSDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_CATIMAGEDIRNOTEXISTS);
+ exit();
+}
+
+$op = WfdownloadsRequest::getString('op', 'categories.list');
+switch ($op) {
+ case "category.move":
+ case "move":
+ $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
+ if ($ok == false) {
+ $cid = WfdownloadsRequest::getInt('cid', 0);
+
+ wfdownloads_xoops_cp_header();
+
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ $sform = new XoopsThemeForm(_AM_WFDOWNLOADS_CCATEGORY_MOVE, "move", xoops_getenv('PHP_SELF'));
+
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
+ $mytree = new XoopsObjectTree($categoryObjs, "cid", "pid");
+ $sform->addElement(new XoopsFormLabel(_AM_WFDOWNLOADS_BMODIFY, $mytree->makeSelBox('target', 'title')));
+ $create_tray = new XoopsFormElementTray('', '');
+ $create_tray -> addElement(new XoopsFormHidden('source', $cid));
+ $create_tray -> addElement(new XoopsFormHidden('ok', true));
+ $create_tray -> addElement(new XoopsFormHidden('op', 'category.move'));
+ $butt_save = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BMOVE, 'submit');
+ $butt_save -> setExtra('');
+ $create_tray -> addElement($butt_save);
+ $butt_cancel = new XoopsFormButton('', '', _AM_WFDOWNLOADS_BCANCEL, 'submit');
+ $butt_cancel -> setExtra('');
+ $create_tray -> addElement($butt_cancel);
+ $sform -> addElement($create_tray);
+ $sform -> display();
+ xoops_cp_footer();
+ } else {
+ $source = WfdownloadsRequest::getInt('source', 0, 'POST');
+ $target = WfdownloadsRequest::getInt('target', 0, 'POST');
+ if ($target == $source) {
+ redirect_header($currentFile . "?op=category.move&ok=0&cid={$source}", 5, _AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILED);
+ }
+ if (!$target) {
+ redirect_header($currentFile . "?op=category.move&ok=0&cid={$source}", 5, _AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILEDT);
+ }
+ $result = $wfdownloads->getHandler('download')->updateAll("cid", $target, new Criteria("cid", $source), true);
+ if (!$result) {
+ $error = _AM_WFDOWNLOADS_DBERROR;
+ trigger_error($error, E_USER_ERROR);
+ }
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_CCATEGORY_MODIFY_MOVED);
+ exit();
+ }
+ break;
+
+ case "category.save" :
+ case "addCat" :
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $pid = WfdownloadsRequest::getInt('pid', 0, 'POST');
+ $weight = (isset($_POST["weight"]) && $_POST["weight"] > 0) ? (int) $_POST["weight"] : 0;
+ $down_groups = isset($_POST['groups']) ? $_POST['groups'] : array();
+ $up_groups = isset($_POST['up_groups']) ? $_POST['up_groups'] : array();
+ $spotlighthis = (isset($_POST["lid"])) ? (int) $_POST["lid"] : 0;
+ $spotlighttop = (isset($_POST["spotlighttop"]) && ($_POST["spotlighttop"] == 1)) ? 1 : 0;
+
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ $allowedMimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
+ $maxFileSize = $wfdownloads->getConfig('maxfilesize');
+ $maxImgWidth = $wfdownloads->getConfig('maximgwidth');
+ $maxImgHeight = $wfdownloads->getConfig('maximgheight');
+ $uploadDirectory = XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage');
+ $uploader = new XoopsMediaUploader($uploadDirectory, $allowedMimetypes, $maxFileSize, $maxImgWidth, $maxImgHeight);
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $uploader->setTargetFileName('wfdownloads_' . uniqid(time()) . '--' . strtolower($_FILES['uploadfile']['name']));
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $imgurl = $uploader->getSavedFileName();
+ }
+ } else {
+ $imgurl = (isset($_POST["imgurl"]) && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
+ }
+
+ if (!$cid) {
+ $categoryObj = $wfdownloads->getHandler('category')->create();
+ } else {
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $childcats = $wfdownloads->getHandler('category')->getChildCats($categoryObj);
+ if ($pid == $cid || in_array($pid, array_keys($childcats))) {
+ $categoryObj->setErrors(_AM_WFDOWNLOADS_CCATEGORY_CHILDASPARENT);
+ }
+ }
+
+ $categoryObj->setVar('title', $_POST["title"]);
+ $categoryObj->setVar('pid', $pid);
+ $categoryObj->setVar('weight', $weight);
+ $categoryObj->setVar('imgurl', $imgurl);
+ $categoryObj->setVar('description', $_POST["description"]);
+ $categoryObj->setVar('summary', $_POST["summary"]);
+ $categoryObj->setVar('dohtml', isset($_POST['dohtml']));
+ $categoryObj->setVar('dosmiley', isset($_POST['dosmiley']));
+ $categoryObj->setVar('doxcode', isset($_POST['doxcode']));
+ $categoryObj->setVar('doimage', isset($_POST['doimage']));
+ $categoryObj->setVar('dobr', isset($_POST['dobr']));
+// Formulize module support (2006/05/04) jpc - start
+ if (wfdownloads_checkModule('formulize')) {
+ $formulize_fid = (isset($_POST["formulize_fid"])) ? (int) $_POST["formulize_fid"] : 0;
+ $categoryObj->setVar('formulize_fid', $formulize_fid);
+ }
+// Formulize module support (2006/05/04) jpc - end
+ $categoryObj->setVar('spotlighthis', $spotlighthis);
+ $categoryObj->setVar('spotlighttop', $spotlighttop);
+
+ if (!$wfdownloads->getHandler('category')->insert($categoryObj)) {
+ echo $categoryObj->getHtmlErrors();
+ }
+ if (!$cid) {
+ if ($cid == 0) {
+ $newid = (int) $categoryObj->getVar('cid');
+ }
+ wfdownloads_savePermissions($down_groups, $newid, 'WFDownCatPerm');
+ wfdownloads_savePermissions($up_groups, $newid, 'WFUpCatPerm');
+ // Notify of new category
+ $tags = array();
+ $tags['CATEGORY_NAME'] = $_POST['title'];
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $newid;
+ $notification_handler = & xoops_gethandler('notification');
+ $notification_handler -> triggerEvent('global', 0, 'new_category', $tags);
+ $database_mess = _AM_WFDOWNLOADS_CCATEGORY_CREATED;
+ } else {
+ $database_mess = _AM_WFDOWNLOADS_CCATEGORY_MODIFIED;
+ wfdownloads_savePermissions($down_groups, $cid, 'WFDownCatPerm');
+ wfdownloads_savePermissions($up_groups, $cid, 'WFUpCatPerm');
+ }
+ redirect_header($currentFile, 1, $database_mess);
+ break;
+
+ case "category.delete" :
+ case "del" :
+ $cid = WfdownloadsRequest::getInt('cid', 0);
+ $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
+ $categoryObjs = $wfdownloads->getHandler('category')->getObjects();
+ $mytree = new XoopsObjectTree($categoryObjs, "cid", "pid");
+ if ($ok == true) {
+ // get all subcategories under the specified category
+ $arr = $mytree -> getAllChild($cid);
+ foreach ($arr as $child) {
+ // get all category ids
+ $cids[] = $child->getVar('cid');
+ }
+ $cids[] = $cid;
+
+ $criteria = new Criteria("cid", "(" . implode(',', $cids) . ")", "IN");
+
+ //get list of downloads in these subcategories
+ $downloads = $wfdownloads->getHandler('download')->getList($criteria);
+
+ $download_criteria = new Criteria("lid", "(" . implode(',', array_keys($downloads)) . ")", "IN");
+
+ // now for each download, delete the text data and vote data associated with the download
+ $wfdownloads->getHandler('rating')->deleteAll($download_criteria);
+ $wfdownloads->getHandler('report')->deleteAll($download_criteria);
+ $wfdownloads->getHandler('download')->deleteAll($download_criteria);
+ foreach (array_keys($downloads) as $lid) {
+ xoops_comment_delete($wfdownloads->getModule()->mid(), (int) $lid);
+ }
+
+ // all downloads for each category is deleted, now delete the category data
+ $wfdownloads->getHandler('category')->deleteAll($criteria);
+ $error = _AM_WFDOWNLOADS_DBERROR;
+
+ foreach ($cids as $cid) {
+ xoops_groupperm_deletebymoditem ($wfdownloads->getModule()->mid(), 'WFDownCatPerm', $cid);
+ xoops_groupperm_deletebymoditem ($wfdownloads->getModule() -> mid(), 'WFUpCatPerm', $cid);
+ }
+
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_CCATEGORY_DELETED);
+ exit();
+ } else {
+ wfdownloads_xoops_cp_header();
+ xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), $currentFile, _AM_WFDOWNLOADS_CCATEGORY_AREUSURE);
+ xoops_cp_footer();
+ }
+ break;
+
+ case "category.add" :
+ case "category.edit" :
+ case "modCat":
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFDOWNLOADS_MENU_CATEGORIES, "{$currentFile}?op=categories.list", 'list');
+ echo $adminMenu->renderButton();
+
+ if (isset($_REQUEST['cid'])) {
+ $categoryObj = $wfdownloads->getHandler('category')->get($_REQUEST['cid']);
+ } else {
+ $categoryObj = $wfdownloads->getHandler('category')->create();
+ }
+ $form = $categoryObj->getForm();
+ $form -> display();
+
+ include 'admin_footer.php';
+ break;
+
+ case 'categories.list' :
+ case 'main' :
+ default :
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_AM_WFDOWNLOADS_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
+ echo $adminMenu->renderButton();
+
+ $totalCategories = wfdownloads_categoriesCount();
+ if ($totalCategories > 0) {
+ $sorted_categories = wfdownloads_sortCategories();
+ $GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
+ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_categorieslist.tpl");
+ } else {
+ redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
+ }
+ include 'admin_footer.php';
+ break;
+
+ case 'categories.reorder' :
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+
+ if (isset($_POST['new_weights']) && count($_POST['new_weights']) > 0) {
+ $new_weights = $_POST['new_weights'];
+ $ids = array();
+ foreach ($new_weights as $cid => $new_weight) {
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $categoryObj->setVar('weight', $new_weight);
+ if (!$wfdownloads->getHandler('category')->insert($categoryObj)) {
+ redirect_header($currentFile, 3, $categoryObj->getErrors());
+ }
+ unset($categoryObj);
+ }
+ redirect_header($currentFile, 1, _AM_WFDOWNLOADS_CATEGORIES_REORDERED);
+ exit();
+ }
+ break;
+}
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php 2014-07-25 17:48:46 UTC (rev 12727)
@@ -0,0 +1,183 @@
+<?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.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
+
+if (@$_POST['op'] == 'submit') {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+
+ $cloneDirname = $_POST['clonedirname'];
+
+ // Check if name is valid
+ if (empty($cloneDirname) || preg_match('/[^a-zA-Z0-9\_\-]/', $cloneDirname)) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_INVALIDNAME, $cloneDirname));
+ exit();
+ }
+ // Check wether the cloned module exists or not
+ if ($cloneDirname && is_dir(XOOPS_ROOT_PATH . '/modules/' . $cloneDirname)) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_EXISTS, $cloneDirname));
+ }
+ // Check dirname length for template file name length issues (template file name cannot be longer than 50 chars)
+ if (strlen($cloneDirname) > 18) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_TOOLONG, $cloneDirname));
+ }
+
+ $patterns = array(
+ strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
+ strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
+ ucfirst(strtolower(WFDOWNLOADS_DIRNAME)) => ucfirst(strtolower($cloneDirname))
+ );
+
+ $patKeys = array_keys($patterns);
+ $patValues = array_values($patterns);
+ wfdownloads_cloneFileDir(WFDOWNLOADS_ROOT_PATH);
+ $logocreated = wfdownloads_createLogo(strtolower($cloneDirname));
+
+ $message = "";
+ if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($cloneDirname))) {
+ $message .= sprintf(
+ _AM_WFDOWNLOADS_CLONE_CONGRAT,
+ "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=installlist'>" . ucfirst(strtolower($cloneDirname)) . "</a>"
+ ) . "<br />\n";
+ if (!$logocreated) {
+ $message .= _AM_WFDOWNLOADS_CLONE_IMAGEFAIL;
+ }
+ } else {
+ $message .= _AM_WFDOWNLOADS_CLONE_FAIL;
+ }
+
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+ echo $message;
+ include 'admin_footer.php';
+ exit();
+
+} else {
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ $form = new XoopsThemeForm(sprintf(
+ _AM_WFDOWNLOADS_CLONE_TITLE,
+ $wfdownloads->getModule()->getVar('name', 'E')
+ ), 'clone', $currentFile, 'post', true);
+ $cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 18, 18, '');
+ $cloneDirname_text->setDescription(_AM_WFDOWNLOADS_CLONE_NAME_DSC);
+ $form->addElement($cloneDirname_text, true);
+ $form->addElement(new XoopsFormHidden('op', 'submit'));
+ $form->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
+ $form->display();
+ include 'admin_footer.php';
+ exit();
+}
+
+// recursive clonning script
+/**
+ * @param $path
+ */
+function wfdownloads_cloneFileDir($path)
+{
+ global $patKeys;
+ global $patValues;
+
+ $newPath = str_replace($patKeys[0], $patValues[0], $path);
+
+ if (is_dir($path)) {
+ // create new dir
+ mkdir($newPath);
+ // check all files in dir, and process it
+ if ($handle = opendir($path)) {
+ while ($file = readdir($handle)) {
+ if ($file != '.' && $file != '..' && $file != '.svn') {
+ wfdownloads_cloneFileDir("{$path}/{$file}");
+ }
+ }
+ closedir($handle);
+ }
+ } else {
+ if (preg_match('/(.jpg|.gif|.png|.zip|.ttf)$/i', $path)) {
+ // image
+ copy($path, $newPath);
+ } else {
+ // file, read it
+ $content = file_get_contents($path);
+ $content = str_replace($patKeys, $patValues, $content);
+ file_put_contents($newPath, $content);
+ }
+ }
+}
+
+/**
+ * @param $dirname
+ *
+ * @return bool
+ */
+function wfdownloads_createLogo($dirname)
+{
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
+ // Check extension/functions
+ if (!extension_loaded("gd")) {
+ return false;
+ } else {
+ $required_functions = array(
+ "imagecreatetruecolor",
+ "imagecolorallocate",
+ "imagefilledrectangle",
+ "imagejpeg",
+ "imagedestroy",
+ "imageftbbox"
+ );
+ foreach ($required_functions as $func) {
+ if (!function_exists($func)) {
+ return false;
+ }
+ }
+ }
+ // Check original image/font
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo_blank.png")) {
+ return false;
+ }
+ if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/assets/images/VeraBd.ttf")) {
+ return false;
+ }
+ // Create image
+ $imageModule = imagecreatefrompng($imageBase);
+ // Erase old text
+ $greyColor = imagecolorallocate($imageModule, 237, 237, 237);
+ imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
+ // Write text
+ $textColor = imagecolorallocate($imageModule, 0, 0, 0);
+ $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
+ imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $textColor, $font, ucfirst($dirname), array());
+ // Set transparency color
+ $whiteColor = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
+ imagefill($imageModule, 0, 0, $whiteColor);
+ imagecolortransparent($imageModule, $whiteColor);
+ // Save new image
+ imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png");
+ imagedestroy($imageModule);
+
+ return true;
+}
Added: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2014-07-25 17:48:46 UTC (rev 12727)
@@ -0,0 +1,989 @@
+<?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.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
+
+// Check directories
+if (!is_dir($wfdownloads->getConfig('uploaddir'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_UPLOADDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_MAINIMAGEDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('screenshots'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_SCREENSHOTSDIRNOTEXISTS);
+ exit();
+}
+if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage'))) {
+ redirect_header('index.php', 4, _AM_WFDOWNLOADS_ERROR_CATIMAGEDIRNOTEXISTS);
+ exit();
+}
+
+$op = WfdownloadsRequest::getString('op', 'downloads.list');
+switch ($op) {
+ case "download.edit" :
+ case "download.add" :
+ case "Download" :
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+
+ $adminMenu = new ModuleAdmin();
+ $adminMenu->addItemButton(_MI_WFDOWNLOADS_MENU_DOWNLOADS, "{$currentFile}?op=downloads.list", 'list');
+ echo $adminMenu->renderButton();
+
+ $lid = WfdownloadsRequest::getInt('lid', 0);
+
+ $categoriesCount = $wfdownloads->getHandler('category')->getCount();
+ if ($categoriesCount) {
+ // Allowed mimetypes list
+ echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_FILE_ALLOWEDAMIME . "</legend>\n";
+ echo "<div style='padding: 8px;'>\n";
+ $criteria = new Criteria("mime_admin", true);
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
+ $allowMimetypes = implode(' | ', $mimetypes);
+ echo $allowMimetypes;
+ echo "</div>\n";
+ echo "</fieldset><br />\n";
+
+ if ($lid) {
+ // edit download
+ if (!$downloadObj = $wfdownloads->getHandler('download')->get($lid)) {
+ redirect_header($currentFile, 4, _AM_WFDOWNLOADS_DOWN_ERROR_FILENOTFOUND);
+ exit();
+ }
+ $cid = $downloadObj->getVar('cid');
+ if (!$categoryObj = $wfdownloads->getHandler('category')->get($cid)) {
+ redirect_header($currentFile, 4, _AM_WFDOWNLOADS_DOWN_ERROR_CATEGORYNOTFOUND);
+ exit();
+ }
+ $title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_EDIT);
+ $title12 = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FFS_1STEP);
+ $title22 = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FFS_EDITDOWNLOADTITLE);
+ } else {
+ // create download
+ $downloadObj = $wfdownloads->getHandler('download')->create();
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $categoryObj = $wfdownloads->getHandler('category')->get($cid);
+ $downloadObj->setVar('cid', $cid);
+ $title = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FILE_CREATE);
+ $title12 = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FFS_1STEP);
+ $title22 = preg_replace("/{category}/", $categoryObj->getVar('title'), _AM_WFDOWNLOADS_FFS_DOWNLOADTITLE);
+ }
+
+// Formulize module support (2006/05/04) jpc - start
+ if (!wfdownloads_checkModule('formulize')) {
+ // one step form: 1st step
+ $sform = $downloadObj->getAdminForm($title);
+ } elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category']))) {
+ // two steps form: 2nd step
+ $fid = $categoryObj->getVar('formulize_fid');
+ $customArray = array();
+ if ($fid) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $customArray['fid'] = $fid;
+ $customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues( // is a Formulize function
+ $downloadObj->getVar('formulize_idreq'),
+ $customArray['formulize_mgr'],
+ $customArray['groups'],
+ $fid,
+ null,
+ null,
+ null,
+ null,
+ null
+ );
+ $customArray['entry'] = $downloadObj->getVar('formulize_idreq');
+ $customArray['go_back'] = "";
+ $customArray['parentLinks'] = "";
+ if (wfdownloads_checkModule('formulize') < 300) {
+ $owner = getEntryOwner($customArray['entry']); // is a Formulize function
+ } else {
+ $owner = getEntryOwner($customArray['entry'], $fid); // is a Formulize function
+ }
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ $customArray['owner_groups'] = $ownerGroups;
+ }
+ $sform = $downloadObj->getAdminForm($title22, $customArray);
+ } else {
+ // two steps form: 1st step
+ $sform = $downloadObj->getCategoryForm($title12);
+ }
+// Formulize module support (2006/05/04) jpc - end
+ $sform->display();
+ } else {
+ redirect_header('categories.php', 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
+ exit();
+ }
+
+ // Vote data list/manager
+ if ($lid) {
+ $votes_count = $wfdownloads->getHandler('rating')->getCount();
+
+ $registeredCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $registeredCriteria->add(new Criteria('ratinguser', 0, '>'));
+ $votesreg = $wfdownloads->getHandler('rating')->getCount($registeredCriteria);
+ $registeredCriteria->setSort('ratingtimestamp');
+ $registeredCriteria->setOrder('DESC');
+ $regvotes = $wfdownloads->getHandler('rating')->getObjects($registeredCriteria);
+
+ $anonymousCriteria = new CriteriaCompo(new Criteria('lid', $lid));
+ $anonymousCriteria->add(new Criteria('ratinguser', 0, '='));
+ $votesanon = $wfdownloads->getHandler('rating')->getCount($anonymousCriteria);
+ $anonymousCriteria->setSort('ratingtimestamp');
+ $anonymousCriteria->setOrder('DESC');
+
+ echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_VOTE_RATINGINFOMATION . "</legend>\n";
+ echo "<div style='padding: 8px;'><b>" . _AM_WFDOWNLOADS_VOTE_TOTALVOTES . "</b>{$votes_count}<br /><br />\n";
+
+ printf(_AM_WFDOWNLOADS_VOTE_REGUSERVOTES, $votesreg);
+
+ echo "<br />";
+
+ printf(_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES, $votesanon);
+
+ echo "
+ </div>\n
+ <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
+ <tr>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_USER . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_IP . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_RATING . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_USERAVG . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_TOTALRATE . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_DATE . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_MINDEX_ACTION . "</td>\n
+ </tr>\n
+ ";
+
+ if ($votesreg == 0) {
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOREGVOTES . "</b></td></tr>";
+ } else {
+ foreach (array_keys($regvotes) as $i) {
+ $uids[] = $regvotes[$i]->getVar('ratinguser');
+ }
+
+ $criteria = new Criteria("ratinguser", "(" . implode(',', $uids) . ")", "IN");
+ $criteria->setGroupby("ratinguser");
+ $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+
+ foreach (array_keys($regvotes) as $i) {
+ $formatted_date = XoopsLocal::formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), 'l');
+ $userAvgRating = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
+ 'ratinguser'
+ )]["avg"] : 0;
+ $userVotes = isset($userRatings[$regvotes[$i]->getVar('ratinguser')]) ? $userRatings[$regvotes[$i]->getVar(
+ 'ratinguser'
+ )]["count"] : 0;
+ $ratingUserName = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
+
+ echo "
+ <tr><td class='head'>$ratingUserName</td>\n
+ <td class='even'>" . $regvotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $regvotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>$userAvgRating</th>\n
+ <td class='even'>$userVotes</th>\n
+ <td class='even'>$formatted_date</th>\n
+ <td class='even'>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>"
+ . $imagearray['deleteimg'] . "</a>\n
+ </th></tr>\n
+ ";
+ }
+ }
+ echo "
+ </table>\n
+ <br />\n
+ <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
+ <tr>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_USER . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_IP . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_RATING . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_USERAVG . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_TOTALRATE . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_VOTE_DATE . "</td>\n
+ <th>" . _AM_WFDOWNLOADS_MINDEX_ACTION . "</td>\n
+ </tr>\n
+ ";
+ if ($votesanon == 0) {
+ echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOUNREGVOTES . "</b></td></tr>";
+ } else {
+ $criteria = new Criteria('ratinguser', 0);
+ $userRatings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $anonymousVotes = $wfdownloads->getHandler('rating')->getObjects($anonymousCriteria);
+
+ foreach (array_keys($anonymousVotes) as $i) {
+ $formatted_date = XoopsLocal::formatTimestamp($anonymousVotes[$i]->getVar('ratingtimestamp'), 'l');
+ $userAvgRating = isset($userRatings['avg']) ? $userRatings["avg"] : 0;
+ $userVotes = isset($userRatings['count']) ? $userRatings["count"] : 0;
+
+ $ratingUserName = $GLOBALS['xoopsConfig']['anonymous'];
+
+ echo "
+ <tr><td class='head'>$ratingUserName</td>\n
+ <td class='even'>" . $anonymousVotes[$i]->getVar('ratinghostname') . "</th>\n
+ <td class='even'>" . $anonymousVotes[$i]->getVar('rating') . "</th>\n
+ <td class='even'>$userAvgRating</th>\n
+ <td class='even'>$userVotes</th>\n
+ <td class='even'>$formatted_date</th>\n
+ <td class='even'>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonymousVotes[$i]->getVar('ratingid') . "'>"
+ . $imagearray['deleteimg'] . "</a>\n
+ </th></tr>\n
+ ";
+ }
+ }
+ echo "</table>\n";
+ echo "</fieldset>\n";
+ }
+ include 'admin_footer.php';
+ break;
+
+ case "download.save" :
+ case "addDownload" :
+ $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $status = WfdownloadsRequest::getInt('status', _WFDOWNLOADS_STATUS_UPDATED, 'POST');
+
+ if ...
[truncated message content] |
|
From: <luc...@us...> - 2014-07-25 17:45:52
|
Revision: 12726
http://sourceforge.net/p/xoops/svn/12726
Author: luciorota
Date: 2014-07-25 17:45:37 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
fix folder error,
it is possible that I am becoming stupid?
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/admin/
XoopsModules/wfdownloads/trunk/assets/
XoopsModules/wfdownloads/trunk/blocks/
XoopsModules/wfdownloads/trunk/brokenfile.php
XoopsModules/wfdownloads/trunk/class/
XoopsModules/wfdownloads/trunk/comment_delete.php
XoopsModules/wfdownloads/trunk/comment_edit.php
XoopsModules/wfdownloads/trunk/comment_new.php
XoopsModules/wfdownloads/trunk/comment_post.php
XoopsModules/wfdownloads/trunk/comment_reply.php
XoopsModules/wfdownloads/trunk/docs/
XoopsModules/wfdownloads/trunk/footer.php
XoopsModules/wfdownloads/trunk/header.php
XoopsModules/wfdownloads/trunk/include/
XoopsModules/wfdownloads/trunk/index.html
XoopsModules/wfdownloads/trunk/index.php
XoopsModules/wfdownloads/trunk/language/
XoopsModules/wfdownloads/trunk/mirror.php
XoopsModules/wfdownloads/trunk/newlist.php
XoopsModules/wfdownloads/trunk/notification_update.php
XoopsModules/wfdownloads/trunk/ratefile.php
XoopsModules/wfdownloads/trunk/review.php
XoopsModules/wfdownloads/trunk/rss.php
XoopsModules/wfdownloads/trunk/singlefile.php
XoopsModules/wfdownloads/trunk/sql/
XoopsModules/wfdownloads/trunk/submit.php
XoopsModules/wfdownloads/trunk/templates/
XoopsModules/wfdownloads/trunk/topten.php
XoopsModules/wfdownloads/trunk/uploads/
XoopsModules/wfdownloads/trunk/viewcat.php
XoopsModules/wfdownloads/trunk/visit.php
XoopsModules/wfdownloads/trunk/xoops_version.php
Deleted: XoopsModules/wfdownloads/trunk/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/brokenfile.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/brokenfile.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,195 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = basename(__FILE__);
-include 'header.php';
-
-$lid = WfdownloadsRequest::getInt('lid', 0);
-$downloadObj = $wfdownloads->getHandler('download')->get($lid);
-if (empty($downloadObj)) {
- redirect_header('index.php', 3, _CO_WFDOWNLOADS_ERROR_NODOWNLOAD);
-}
-$cid = WfdownloadsRequest::getInt('cid', $downloadObj->getVar('cid'));
-$categoryObj = $wfdownloads->getHandler('category')->get($cid);
-if (empty($categoryObj)) {
- redirect_header('index.php', 3, _CO_WFDOWNLOADS_ERROR_NOCATEGORY);
-}
-
-// Download not published, expired or taken offline - redirect
-if (
- $downloadObj->getVar('published') == 0 ||
- $downloadObj->getVar('published') > time() ||
- $downloadObj->getVar('offline') == true ||
- ($downloadObj->getVar('expired') == true && $downloadObj->getVar('expired') < time()) ||
- $downloadObj->getVar('status') == _WFDOWNLOADS_STATUS_WAITING) {
- redirect_header('index.php', 3, _MD_WFDOWNLOADS_NODOWNLOAD);
-}
-
-// Check permissions
-if ($wfdownloads->getConfig('enable_brokenreports') == false && !wfdownloads_userIsAdmin()) {
- redirect_header('index.php', 3, _NOPERM);
-}
-
-// Breadcrumb
-include_once XOOPS_ROOT_PATH . "/class/tree.php";
-$categoriesTree = new XoopsObjectTree($wfdownloads->getHandler('category')->getObjects(), 'cid', 'pid');
-$breadcrumb = new WfdownloadsBreadcrumb();
-$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
-foreach (array_reverse($categoriesTree->getAllParent($cid)) as $parentCategory) {
- $breadcrumb->addLink($parentCategory->getVar('title'), "viewcat.php?cid=" . $parentCategory->getVar('cid'));
-}
-$breadcrumb->addLink($categoryObj->getVar('title'), "viewcat.php?cid={$cid}");
-$breadcrumb->addLink($downloadObj->getVar('title'), "singlefile.php?lid={$lid}");
-
-
-$op = WfdownloadsRequest::getString('op', 'report.add');
-switch ($op) {
- case "report.add" :
- default :
- // Get report sender 'uid'
- $senderUid = is_object($xoopsUser) ? (int) $xoopsUser->getVar('uid') : 0;
- $senderIp = getenv('REMOTE_ADDR');
-
- if (!empty($_POST['submit'])) {
- // Check if REG user is trying to report twice
- $criteria = new Criteria('lid', $lid);
- $reportsCount = $wfdownloads->getHandler('report')->getCount($criteria);
- if ($reportsCount > 0) {
- redirect_header('index.php', 2, _MD_WFDOWNLOADS_ALREADYREPORTED);
- } else {
- $reportObj = $wfdownloads->getHandler('report')->create();
- $reportObj->setVar('lid', $lid);
- $reportObj->setVar('sender', $senderUid);
- $reportObj->setVar('ip', $senderIp);
- $reportObj->setVar('date', time());
- $reportObj->setVar('confirmed', 0);
- $reportObj->setVar('acknowledged', 0);
- if ($wfdownloads->getHandler('report')->insert($reportObj)) {
- // All is well
- // Send notification
- $tags = array();
- $tags['BROKENREPORTS_URL'] = WFDOWNLOADS_URL . '/admin/reportsmodifications.php?op=reports.modifications.list';
- $notification_handler->triggerEvent('global', 0, 'file_broken', $tags);
-
- // Send email to the owner of the download stating that it is broken
- $user = $member_handler->getUser($downloadObj->getVar('submitter'));
- $subdate = formatTimestamp($downloadObj->getVar('published'), $wfdownloads->getConfig('dateformat'));
- $cid = $downloadObj->getVar('cid');
- $title = $downloadObj->getVar('title');
- $subject = _MD_WFDOWNLOADS_BROKENREPORTED;
-
- $xoopsMailer = & getMailer();
- $xoopsMailer->useMail();
- $template_dir = WFDOWNLOADS_ROOT_PATH . "/language/" . $xoopsConfig['language'] . "/mail_template";
-
- $xoopsMailer->setTemplateDir($template_dir);
- $xoopsMailer->setTemplate('filebroken_notify.tpl');
- $xoopsMailer->setToEmails($user->email());
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
- $xoopsMailer->assign("X_UNAME", $user->uname());
- $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
- $xoopsMailer->assign("X_ADMINMAIL", $xoopsConfig['adminmail']);
- $xoopsMailer->assign('X_SITEURL', XOOPS_URL . '/');
- $xoopsMailer->assign("X_TITLE", $title);
- $xoopsMailer->assign("X_SUB_DATE", $subdate);
- $xoopsMailer->assign('X_DOWNLOAD', WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}");
- $xoopsMailer->setSubject($subject);
- $xoopsMailer->send();
- redirect_header('index.php', 2, _MD_WFDOWNLOADS_BROKENREPORTED);
- exit();
- } else {
- echo $reportObj->getHtmlErrors();
- }
- }
- } else {
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_brokenfile.tpl";
- include XOOPS_ROOT_PATH . '/header.php';
-
- // Begin Main page Heading etc
- $catarray['imageheader'] = wfdownloads_headerImage();
- $xoopsTpl->assign('catarray', $catarray);
-
- $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript(WFDOWNLOADS_URL . '/assets/js/magnific/jquery.magnific-popup.min.js');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/js/magnific/magnific-popup.css');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/css/module.css');
-
- $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-
- // Breadcrumb
- $breadcrumb->addLink(_MD_WFDOWNLOADS_REPORTBROKEN, '');
- $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
-
- // Generate form
- include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $sform = new XoopsThemeForm(_MD_WFDOWNLOADS_RATETHISFILE, 'reportform', xoops_getenv('PHP_SELF'));
- $sform->addElement(new XoopsFormHidden('lid', $lid));
- $sform->addElement(new XoopsFormHidden('cid', $cid));
- $sform->addElement(new XoopsFormHidden('uid', $senderUid));
- $button_tray = new XoopsFormElementTray('', '');
- $submit_button = new XoopsFormButton('', 'submit', _MD_WFDOWNLOADS_SUBMITBROKEN, 'submit');
- $button_tray->addElement($submit_button);
- $cancel_button = new XoopsFormButton('', '', _CANCEL, 'button');
- $cancel_button->setExtra('');
- $button_tray->addElement($cancel_button);
- $sform->addElement($button_tray);
- $xoopsTpl->assign('reportform', $sform->render());
- $xoopsTpl->assign(
- 'download',
- array('lid' => $lid, 'cid' => $cid, 'title' => $downloadObj->getVar('title'), 'description' => $downloadObj->getVar('description'))
- );
-
- $criteria = new Criteria('lid', $lid);
- $reportObjs = $wfdownloads->getHandler('report')->getObjects($criteria);
-
- if (count($reportObjs) > 0) {
- $reportObj = $reportObjs[0];
-
- $broken['title'] = trim($downloadObj->getVar('title'));
- $broken['id'] = $reportObj->getVar('reportid');
- $broken['reporter'] = XoopsUserUtility::getUnameFromId((int) $reportObj->getVar('sender'));
- $broken['date'] = formatTimestamp($reportObj->getVar('published'), $wfdownloads->getConfig('dateformat'));
- $broken['acknowledged'] = ($reportObj->getVar('acknowledged') == 1) ? _YES : _NO;
- $broken['confirmed'] = ($reportObj->getVar('confirmed') == 1) ? _YES : _NO;
-
- $xoopsTpl->assign('brokenreportexists', true);
- $xoopsTpl->assign('broken', $broken);
- $xoopsTpl->assign('brokenreport', true); // this definition is not removed for backward compatibility issues
- } else {
- // file info
- $down['title'] = trim($downloadObj->getVar('title'));
- $down['homepage'] = $myts->makeClickable(formatURL(trim($downloadObj->getVar('homepage'))));
- $time = ($downloadObj->getVar('updated') != false) ? $downloadObj->getVar('updated') : $downloadObj->getVar('published');
- $down['updated'] = formatTimestamp($time, $wfdownloads->getConfig('dateformat'));
- $is_updated = ($downloadObj->getVar('updated') != false) ? _MD_WFDOWNLOADS_UPDATEDON : _MD_WFDOWNLOADS_SUBMITDATE;
- $down['publisher'] = XoopsUserUtility::getUnameFromId((int) $downloadObj->getVar('submitter'));
-
- $xoopsTpl->assign('brokenreportexists', false);
- $xoopsTpl->assign('file_id', $lid);
- $xoopsTpl->assign('lang_subdate', $is_updated);
- $xoopsTpl->assign('is_updated', $downloadObj->getVar('updated'));
- $xoopsTpl->assign('lid', $lid);
- $xoopsTpl->assign('down', $down);
- }
- include 'footer.php';
- }
- break;
-}
Deleted: XoopsModules/wfdownloads/trunk/comment_delete.php
===================================================================
--- XoopsModules/wfdownloads/trunk/comment_delete.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/comment_delete.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,22 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-include '../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_delete.php';
Deleted: XoopsModules/wfdownloads/trunk/comment_edit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/comment_edit.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/comment_edit.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,22 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-include '../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_edit.php';
Deleted: XoopsModules/wfdownloads/trunk/comment_new.php
===================================================================
--- XoopsModules/wfdownloads/trunk/comment_new.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/comment_new.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,30 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = basename(__FILE__);
-include 'header.php';
-
-$com_itemid = WfdownloadsRequest::getInt('com_itemid', 0);
-if ($com_itemid > 0) {
- // Get file title
- $download = $wfdownloads->getHandler('download')->get($com_itemid);
- $com_replytitle = $download->getVar('title');
- include XOOPS_ROOT_PATH . '/include/comment_new.php';
-}
Deleted: XoopsModules/wfdownloads/trunk/comment_post.php
===================================================================
--- XoopsModules/wfdownloads/trunk/comment_post.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/comment_post.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,22 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-include '../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_post.php';
Deleted: XoopsModules/wfdownloads/trunk/comment_reply.php
===================================================================
--- XoopsModules/wfdownloads/trunk/comment_reply.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/comment_reply.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,22 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-include '../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_reply.php';
Deleted: XoopsModules/wfdownloads/trunk/footer.php
===================================================================
--- XoopsModules/wfdownloads/trunk/footer.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/footer.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,32 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-// Module info/menu
-$moduleInfo = $wfdownloads->getModule()->getInfo();
-//$xoopsTpl->assign('wfdownloadModuleInfo', $moduleInfo); // huge array but useful?
-$xoopsTpl->assign('wfdownloadModuleInfoSub', $moduleInfo['sub']);
-// Module admin
-$xoopsTpl->assign("isAdmin", $wfdownloads_isAdmin);
-$xoopsTpl->assign("wfdownloads_adminpage", "<a href='" . WFDOWNLOADS_URL . "/admin/index.php'>" . _MD_WFDOWNLOADS_ADMIN_PAGE . "</a>");
-// Extra info
-$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/'); // this definition is not removed for backward compatibility issues
-$xoopsTpl->assign("ref_smartfactory","WFDownloads is developed by The SmartFactory (http://www.smartfactory.ca), a division of InBox Solutions (http://www.inboxsolutions.net)");
-
-include_once XOOPS_ROOT_PATH . '/footer.php';
Deleted: XoopsModules/wfdownloads/trunk/header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/header.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/header.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,26 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-include_once dirname(dirname(dirname(__FILE__))) . '/mainfile.php';
-include_once dirname(__FILE__) . '/include/common.php';
-
-// uncomment the below line only if you are using Protector 3.x module
-// and you trust your users when uploading files, it is recommended to not allow anonymous uploads if you do so!!
-//define('PROTECTOR_SKIP_FILESCHECKER', true);
Deleted: XoopsModules/wfdownloads/trunk/index.html
===================================================================
--- XoopsModules/wfdownloads/trunk/index.html 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/index.html 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1 +0,0 @@
-<script>history.go(-1);</script>
\ No newline at end of file
Deleted: XoopsModules/wfdownloads/trunk/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/index.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/index.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,305 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = pathinfo(__FILE__, PATHINFO_BASENAME);
-include 'header.php';
-
-// Check directories
-if (!is_dir($wfdownloads->getConfig('uploaddir'))) {
- redirect_header(XOOPS_URL, 4, _MD_WFDOWNLOADS_ERROR_UPLOADDIRNOTEXISTS);
- exit();
-}
-if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('mainimagedir'))) {
- redirect_header(XOOPS_URL, 4, _MD_WFDOWNLOADS_ERROR_MAINIMAGEDIRNOTEXISTS);
- exit();
-}
-if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('screenshots'))) {
- redirect_header(XOOPS_URL, 4, _MD_WFDOWNLOADS_ERROR_SCREENSHOTSDIRNOTEXISTS);
- exit();
-}
-if (!is_dir(XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage'))) {
- redirect_header(XOOPS_URL, 4, _MD_WFDOWNLOADS_ERROR_CATIMAGEDIRNOTEXISTS);
- exit();
-}
-
-$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
-
-// Check if submission is allowed
-$isSubmissionAllowed = false;
-if (is_object($xoopsUser)
- && ($wfdownloads->getConfig('submissions') == _WFDOWNLOADS_SUBMISSIONS_DOWNLOAD
- || $wfdownloads->getConfig('submissions') == _WFDOWNLOADS_SUBMISSIONS_BOTH)
-) {
- // if user is a registered user
- $groups = $xoopsUser->getGroups();
- if (count(array_intersect($wfdownloads->getConfig('submitarts'), $groups)) > 0) {
- $isSubmissionAllowed = true;
- }
-} else {
- // if user is anonymous
- if ($wfdownloads->getConfig('anonpost') == _WFDOWNLOADS_ANONPOST_DOWNLOAD || $wfdownloads->getConfig('anonpost') == _WFDOWNLOADS_ANONPOST_BOTH) {
- $isSubmissionAllowed = true;
- }
-}
-
-// Get download/upload permissions
-$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
-$allowedUpCategoriesIds = $gperm_handler->getItemIds('WFUpCatPerm', $groups, $wfdownloads->getModule()->mid());
-
-$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_index.tpl";
-include XOOPS_ROOT_PATH . '/header.php';
-
-$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
-$xoTheme->addScript(WFDOWNLOADS_URL . '/assets/js/magnific/jquery.magnific-popup.min.js');
-$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/js/magnific/magnific-popup.css');
-$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/css/module.css');
-
-$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-
-// Breadcrumb
-$breadcrumb = new WfdownloadsBreadcrumb();
-$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
-
-$xoopsTpl->assign('module_home', wfdownloads_module_home(false)); // this definition is not removed for backward compatibility issues
-$xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
-
-$cat_criteria = new CriteriaCompo();
-$cat_criteria->setSort('weight ASC, title');
-$categories = $wfdownloads->getHandler('category')->getObjects($cat_criteria);
-unset($cat_criteria);
-
-$categoriesTree = new XoopsObjectTree($categories, "cid", "pid");
-
-// Generate content header
-$sql = "SELECT * FROM " . $xoopsDB->prefix('wfdownloads_indexpage') . " ";
-$head_arr = $xoopsDB->fetchArray($xoopsDB->query($sql));
-$catarray['imageheader'] = wfdownloads_headerImage();
-$catarray['indexheaderalign'] = $head_arr['indexheaderalign'];
-$catarray['indexfooteralign'] = $head_arr['indexfooteralign'];
-$html = ($head_arr['nohtml']) ? 1 : 0;
-$smiley = ($head_arr['nosmiley']) ? 1 : 0;
-$xcodes = ($head_arr['noxcodes']) ? 1 : 0;
-$images = ($head_arr['noimages']) ? 1 : 0;
-$breaks = ($head_arr['nobreak']) ? 1 : 0;
-$catarray['indexheader'] = $myts->displayTarea($head_arr['indexheader'], $html, $smiley, $xcodes, $images, $breaks);
-$catarray['indexfooter'] = $myts->displayTarea($head_arr['indexfooter'], $html, $smiley, $xcodes, $images, $breaks);
-$catarray['letters'] = wfdownloads_lettersChoice();
-$catarray['toolbar'] = wfdownloads_toolbar();
-$xoopsTpl->assign('catarray', $catarray);
-
-// Begin Main page download info
-$chcount = 0;
-$countin = 0;
-
-$listings = wfdownloads_getTotalDownloads($allowedDownCategoriesIds);
-
-// Get total amount of categories
-$total_cat = count($allowedDownCategoriesIds);
-// Get all main categories
-$mainCategories = $categoriesTree->getFirstChild(0);
-$count = 0;
-
-// Comparison functions for uasort()
-/**
- * @param $category_a
- * @param $category_b
- *
- * @return int
- */
-function categoriesCompareCid($category_a, $category_b)
-{
- if ($category_a->getVar('cid') == $category_b->getVar('cid')) {
- return 0;
- }
-
- return ($category_a->getVar('cid') < $category_b->getVar('cid')) ? -1 : 1;
-}
-
-/**
- * @param $category_a
- * @param $category_b
- *
- * @return int
- */
-function categoriesCompareTitle($category_a, $category_b)
-{
- if ($category_a->getVar('title') == $category_b->getVar('title')) {
- return 0;
- }
-
- return ($category_a->getVar('title') < $category_b->getVar('title')) ? -1 : 1;
-}
-
-/**
- * @param $category_a
- * @param $category_b
- *
- * @return int
- */
-function categoriesCompareWeight($category_a, $category_b)
-{
- if ($category_a->getVar('weight') == $category_b->getVar('weight')) {
- return 0;
- }
-
- return ($category_a->getVar('weight') < $category_b->getVar('weight')) ? -1 : 1;
-}
-
-// Foreach main category
-foreach (array_keys($mainCategories) as $i) {
- if (in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds)) {
- // Get this category image
- // Get this category subcategories
- $allSubcategories = $categoriesTree->getAllChild($mainCategories[$i]->getVar('cid'));
-
- // Sort subcategories by: cid or title or weight
- switch ($wfdownloads->getConfig('subcatssortby')) {
- case 'cid' :
- uasort($allSubcategories, 'categoriesCompareCid');
- break;
- case 'title' :
- uasort($allSubcategories, 'categoriesCompareTitle');
- break;
- case 'weight' :
- default :
- uasort($allSubcategories, 'categoriesCompareWeight');
- break;
- }
-
- // Get this category indicator image
- $publishdate = isset($listings['published'][$mainCategories[$i]->getVar('cid')]) ? $listings['published'][$mainCategories[$i]->getVar('cid')]
- : 0;
- if (count($allSubcategories) > 0) {
- // Foreach subcategory
- foreach (array_keys($allSubcategories) as $k) {
- if (in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
- $publishdate = (isset($listings['published'][$allSubcategories[$k]->getVar('cid')]) &&
- $listings['published'][$allSubcategories[$k]->getVar('cid')] > $publishdate)
- ? $listings['published'][$allSubcategories[$k]->getVar('cid')] : $publishdate;
- }
- }
- }
- $isNewImage = wfdownloads_isNewImage($publishdate);
- if (($mainCategories[$i]->getVar('imgurl') != "")
- && is_file(
- XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage') . '/' . $mainCategories[$i]->getVar('imgurl')
- )
- ) {
- if ($wfdownloads->getConfig('usethumbs') && function_exists('gd_info')) {
- $imageURL = wfdownloads_createThumb(
- $mainCategories[$i]->getVar('imgurl'),
- $wfdownloads->getConfig('catimage'),
- "thumbs",
- $wfdownloads->getConfig('cat_imgwidth'),
- $wfdownloads->getConfig('cat_imgheight'),
- $wfdownloads->getConfig('imagequality'),
- $wfdownloads->getConfig('updatethumbs'),
- $wfdownloads->getConfig('keepaspect')
- );
- } else {
- $imageURL = XOOPS_URL . '/' . $wfdownloads->getConfig('catimage') . '/' . $mainCategories[$i]->getVar('imgurl');
- }
- } else {
- $imageURL = $isNewImage['image'];
- }
-
- // Get this category subcategories id and title
- $subcategories = array();
- ++$count;
- $download_count = isset($listings['count'][$mainCategories[$i]->getVar('cid')]) ? $listings['count'][$mainCategories[$i]->getVar('cid')] : 0;
- // modified July 5 2006 by Freeform Solutions (jwe)
- // make download count recursive, to include all sub categories that the user has permission to view
- //$allSubcategories = $categoriesTree->getAllChild($mainCategories[$i]->getVar('cid'));
- if (count($allSubcategories) > 0) {
- foreach (array_keys($allSubcategories) as $k) {
- if (in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds)) {
- $download_count += isset($listings['count'][$allSubcategories[$k]->getVar('cid')])
- ? $listings['count'][$allSubcategories[$k]->getVar('cid')] : 0;
- if ($wfdownloads->getConfig('subcats') == 1 && $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
- // if we are collecting subcat info for displaying, and this subcat is a first level child...
- $subcategories[] = array(
- 'id' => $allSubcategories[$k]->getVar('cid'), // this definition is not removed for backward compatibility issues
- 'cid' => $allSubcategories[$k]->getVar('cid'),
- 'allowed_download' => in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds),
- 'allowed_upload' => ($isSubmissionAllowed && in_array($allSubcategories[$k]->getVar('cid'), $allowedUpCategoriesIds)),
- 'title' => $allSubcategories[$k]->getVar('title')
- );
- }
- }
- }
- }
-
- if ($wfdownloads->getConfig('subcats') != true) {
- unset($subcategories);
- $xoopsTpl->append(
- 'categories',
- array(
- 'image' => $imageURL, // this definition is not removed for backward compatibility issues
- 'image_URL' => $imageURL,
- 'days' => $isNewImage['days'],
- 'id' => (int) $mainCategories[$i]->getVar('cid'), // this definition is not removed for backward compatibility issues
- 'cid' => (int) $mainCategories[$i]->getVar('cid'),
- 'allowed_download' => in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds),
- 'allowed_upload' => ($isSubmissionAllowed && in_array($mainCategories[$i]->getVar('cid'), $allowedUpCategoriesIds)),
- 'title' => $mainCategories[$i]->getVar('title'),
- 'summary' => $mainCategories[$i]->getVar('summary'),
- 'totaldownloads' => (int) $download_count, // this definition is not removed for backward compatibility issues
- 'downloads_count' => (int) $download_count,
- 'count' => (int) $count,
- 'alttext' => $isNewImage['alttext']
- )
- );
- } else {
- $xoopsTpl->append(
- 'categories',
- array(
- 'image' => $imageURL, // this definition is not removed for backward compatibility issues
- 'image_URL' => $imageURL,
- 'days' => $isNewImage['days'],
- 'id' => (int) $mainCategories[$i]->getVar('cid'), // this definition is not removed for backward compatibility issues
- 'cid' => (int) $mainCategories[$i]->getVar('cid'),
- 'allowed_download' => in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds),
- 'allowed_upload' => ($isSubmissionAllowed && in_array($mainCategories[$i]->getVar('cid'), $allowedUpCategoriesIds)),
- 'title' => $mainCategories[$i]->getVar('title'),
- 'summary' => $mainCategories[$i]->getVar('summary'),
- 'subcategories' => $subcategories,
- 'totaldownloads' => (int) $download_count, // this definition is not removed for backward compatibility issues
- 'downloads_count' => (int) $download_count,
- 'count' => (int) $count,
- 'alttext' => $isNewImage['alttext']
- )
- );
- }
- }
-}
-$lang_ThereAre = $count != 1 ? _MD_WFDOWNLOADS_THEREARE : _MD_WFDOWNLOADS_THEREIS;
-
-$xoopsTpl->assign('lang_thereare', sprintf($lang_ThereAre, $count, array_sum($listings['count'])));
-
-if ($wfdownloads->getConfig('enablerss') == true) {
- $rsslink_URL = WFDOWNLOADS_URL . "/rss.php";
- $xoopsTpl->assign('full_rssfeed_URL', $rsslink_URL);
- $rsslink = "<a href='" . $rsslink_URL . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "'>";
- $rsslink.= "<img src='" . WFDOWNLOADS_URL . "/assets/images/icon/rss.gif' border='0' alt='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "'>";
- $rsslink.= "</a>";
- $xoopsTpl->assign('full_rssfeed_link', $rsslink); // this definition is not removed for backward compatibility issues
-}
-
-include 'footer.php';
Deleted: XoopsModules/wfdownloads/trunk/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/mirror.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/mirror.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,258 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = basename(__FILE__);
-include 'header.php';
-
-$lid = WfdownloadsRequest::getInt('lid', 0);
-$downloadObj = $wfdownloads->getHandler('download')->get($lid);
-if (empty($downloadObj)) {
- redirect_header('index.php', 3, _CO_WFDOWNLOADS_ERROR_NODOWNLOAD);
-}
-$cid = WfdownloadsRequest::getInt('cid', $downloadObj->getVar('cid'));
-$categoryObj = $wfdownloads->getHandler('category')->get($cid);
-if (empty($categoryObj)) {
- redirect_header('index.php', 3, _CO_WFDOWNLOADS_ERROR_NOCATEGORY);
-}
-
-// Download not published, expired or taken offline - redirect
-if (
- $downloadObj->getVar('published') == 0 ||
- $downloadObj->getVar('published') > time() ||
- $downloadObj->getVar('offline') == true ||
- ($downloadObj->getVar('expired') != 0 && $downloadObj->getVar('expired') < time()) ||
- $downloadObj->getVar('status') == _WFDOWNLOADS_STATUS_WAITING) {
- redirect_header('index.php', 3, _MD_WFDOWNLOADS_NODOWNLOAD);
-}
-
-// Check permissions
-if ($wfdownloads->getConfig('enable_mirrors') == false && !wfdownloads_userIsAdmin()) {
- redirect_header('index.php', 3, _NOPERM);
-}
-$userGroups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
-if (!$gperm_handler->checkRight('WFDownCatPerm', $cid, $userGroups, $wfdownloads->getModule()->mid())) {
- redirect_header('index.php', 3, _NOPERM);
-}
-
-// Breadcrumb
-include_once XOOPS_ROOT_PATH . "/class/tree.php";
-$categoriesTree = new XoopsObjectTree($wfdownloads->getHandler('category')->getObjects(), 'cid', 'pid');
-$breadcrumb = new WfdownloadsBreadcrumb();
-$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
-foreach (array_reverse($categoriesTree->getAllParent($cid)) as $parentCategory) {
- $breadcrumb->addLink($parentCategory->getVar('title'), "viewcat.php?cid=" . $parentCategory->getVar('cid'));
-}
-$breadcrumb->addLink($categoryObj->getVar('title'), "viewcat.php?cid={$cid}");
-$breadcrumb->addLink($downloadObj->getVar('title'), "singlefile.php?lid={$lid}");
-
-$op = WfdownloadsRequest::getString('op', 'mirror.add');
-switch ($op) {
- case "mirrors.list" :
- case "list" : // this case is not removed for backward compatibility issues
- $start = WfdownloadsRequest::getInt('start', 0);
-
- $xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_mirrors.tpl";
- include XOOPS_ROOT_PATH . '/header.php';
-
- $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript(WFDOWNLOADS_URL . '/assets/js/magnific/jquery.magnific-popup.min.js');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/js/magnific/magnific-popup.css');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/css/module.css');
-
- $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-
- // Generate content header
- $sql = "SELECT * FROM " . $xoopsDB->prefix('wfdownloads_indexpage') . " ";
- $head_arr = $xoopsDB->fetchArray($xoopsDB->query($sql));
- $catarray['imageheader'] = wfdownloads_headerImage();
- $xoopsTpl->assign('catarray', $catarray);
- $xoopsTpl->assign('category_path', $wfdownloads->getHandler('category')->getNicePath($cid));
- $xoopsTpl->assign('category_id', $cid);
-
- // Breadcrumb
- $breadcrumb->addLink(_CO_WFDOWNLOADS_MIRRORS_LIST, '');
- $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
-
- // Count mirrors
- $criteria = new CriteriaCompo(new Criteria("lid", $lid));
- $criteria->add(new Criteria("submit", 1)); // true
- $mirrorsCount = $wfdownloads->getHandler('mirror')->getCount($criteria);
-
- // Get mirrors
- $criteria->setSort('date');
- $criteria->setLimit(5);
- $criteria->setStart($start);
- $mirrorObjs = $wfdownloads->getHandler('mirror')->getObjects($criteria);
-
- $download_array = $downloadObj->toArray();
- $xoopsTpl->assign('down_arr', $download_array);
-
- $add_mirror = false;
- if (!is_object($xoopsUser)
- && ($wfdownloads->getConfig('anonpost') == _WFDOWNLOADS_ANONPOST_MIRROR
- || $wfdownloads->getConfig('anonpost') == _WFDOWNLOADS_ANONPOST_BOTH)
- && ($wfdownloads->getConfig('submissions') == _WFDOWNLOADS_SUBMISSIONS_MIRROR
- || $wfdownloads->getConfig('submissions') == _WFDOWNLOADS_SUBMISSIONS_BOTH)
- ) {
- $add_mirror = true;
- } elseif (is_object($xoopsUser)
- && ($wfdownloads->getConfig('submissions') == _WFDOWNLOADS_SUBMISSIONS_MIRROR
- || $wfdownloads->getConfig('submissions') == _WFDOWNLOADS_SUBMISSIONS_BOTH
- || $xoopsUser->isAdmin())
- ) {
- $add_mirror = true;
- }
-
- foreach ($mirrorObjs as $mirrorObj) {
- $mirror_array = $mirrorObj->toArray();
- if ($wfdownloads->getConfig('enable_onlinechk') == 1) {
- $serverURL = str_replace('http://', '', trim($mirror_array['homeurl']));
- $mirror_array['isonline'] = wfdownloads_mirrorOnline($serverURL);
- } else {
- $mirror_array['isonline'] = 2;
- }
- $mirror_array['add_mirror'] = $add_mirror;
- $mirror_array['date'] = formatTimestamp($mirror_array['date'], $wfdownloads->getConfig('dateformat'));
- $mirror_array['submitter'] = XoopsUserUtility::getUnameFromId($mirror_array['uid']);
- $xoopsTpl->append('down_mirror', $mirror_array);
- }
- $xoopsTpl->assign('lang_mirror_found', sprintf(_MD_WFDOWNLOADS_MIRROR_TOTAL, $mirrorsCount));
-
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($mirrorsCount, 5, $start, 'start', "op=mirrors.list&cid={$cid}&lid={$lid}", 1);
- $navbar['navbar'] = $pagenav->renderNav();
- $xoopsTpl->assign('navbar', $navbar);
-
- $xoopsTpl->assign('categoryPath', $pathstring . " > " . $download_array['title']);
- $xoopsTpl->assign('module_home', wfdownloads_module_home(true));
-
- include 'footer.php';
- break;
-
- case "mirror.add" :
- default :
- // Check if ANONYMOUS user can post mirrors
- if (!is_object($xoopsUser)
- && ($wfdownloads->getConfig('anonpost') == _WFDOWNLOADS_ANONPOST_NONE
- || $wfdownloads->getConfig('anonpost') == _WFDOWNLOADS_ANONPOST_DOWNLOAD)
- ) {
- redirect_header(XOOPS_URL . '/user.php', 1, _MD_WFDOWNLOADS_MUSTREGFIRST);
- exit();
- }
- // Check if user can submit mirrors
- if (is_object($xoopsUser)
- && ($wfdownloads->getConfig('submissions') == _WFDOWNLOADS_SUBMISSIONS_NONE
- || $wfdownloads->getConfig('submissions') == _WFDOWNLOADS_SUBMISSIONS_DOWNLOAD)
- && !$xoopsUser->isAdmin()
- ) {
- redirect_header('index.php', 1, _MD_WFDOWNLOADS_MIRROR_NOTALLOWESTOSUBMIT);
- exit();
- }
-
- // Get mirror poster 'uid'
- $mirroruserUid = is_object($xoopsUser) ? (int) $xoopsUser->getVar('uid') : 0;
-
- if (!empty($_POST['submit'])) {
- $mirrorObj = $wfdownloads->getHandler('mirror')->create();
- $mirrorObj->setVar('title', trim($_POST['title']));
- $mirrorObj->setVar('homeurl', formatURL(trim($_POST['homeurl'])));
- $mirrorObj->setVar('location', trim($_POST['location']));
- $mirrorObj->setVar('continent', trim($_POST['continent']));
- $mirrorObj->setVar('downurl', trim($_POST['downurl']));
- $mirrorObj->setVar('lid', (int) $_POST['lid']);
- $mirrorObj->setVar('uid', $mirroruserUid);
- $mirrorObj->setVar('date', time());
- if (($wfdownloads->getConfig('autoapprove') == _WFDOWNLOADS_AUTOAPPROVE_NONE
- || $wfdownloads->getConfig('autoapprove') == _WFDOWNLOADS_AUTOAPPROVE_DOWNLOAD)
- && !$wfdownloads_isAdmin
- ) {
- $approve = false;
- } else {
- $approve = true;
- }
- $submit = ($approve) ? true : false;
- $mirrorObj->setVar('submit', $submit);
-
- if (!$wfdownloads->getHandler('mirror')->insert($mirrorObj)) {
- redirect_header('index.php', 3, _MD_WFDOWNLOADS_ERROR_CREATEMIRROR);
- } else {
- $database_mess = ($approve) ? _MD_WFDOWNLOADS_ISAPPROVED : _MD_WFDOWNLOADS_ISNOTAPPROVED;
- redirect_header('index.php', 2, $database_mess);
- }
- } else {
- include XOOPS_ROOT_PATH . '/header.php';
-
- $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript(WFDOWNLOADS_URL . '/assets/js/magnific/jquery.magnific-popup.min.js');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/js/magnific/magnific-popup.css');
- $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/css/module.css');
-
- $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-
- // Breadcrumb
- $breadcrumb->addLink(_MD_WFDOWNLOADS_ADDMIRROR, '');
- echo $breadcrumb->render();
-
- echo "<div align='center'>" . wfdownloads_headerImage() . "</div><br />\n";
- echo "<div>" . _MD_WFDOWNLOADS_MIRROR_SNEWMNAMEDESC . "</div>\n";
-
- // Generate form
- include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $sform = new XoopsThemeForm(_MD_WFDOWNLOADS_MIRROR_SUBMITMIRROR, 'mirrorform', xoops_getenv('PHP_SELF'));
- $title_text = new XoopsFormText(_MD_WFDOWNLOADS_MIRROR_HOMEURLTITLE, 'title', 50, 255);
- $title_text->setDescription(_MD_WFDOWNLOADS_MIRROR_HOMEURLTITLE_DESC);
- $sform->addElement($title_text, true);
- $homeurl_text = new XoopsFormText(_MD_WFDOWNLOADS_MIRROR_HOMEURL, 'homeurl', 50, 255);
- $homeurl_text->setDescription(_MD_WFDOWNLOADS_MIRROR_HOMEURL_DESC);
- $sform->addElement($homeurl_text, true);
- $location_text = new XoopsFormText(_MD_WFDOWNLOADS_MIRROR_LOCATION, 'location', 50, 255);
- $location_text->setDescription(_MD_WFDOWNLOADS_MIRROR_LOCATION_DESC);
- $sform->addElement($location_text, true);
- $continent_select = new XoopsFormSelect(_MD_WFDOWNLOADS_MIRROR_CONTINENT, 'continent');
- $continent_select->addOptionArray(
- array(
- _MD_WFDOWNLOADS_CONT1 => _MD_WFDOWNLOADS_CONT1,
- _MD_WFDOWNLOADS_CONT2 => _MD_WFDOWNLOADS_CONT2,
- _MD_WFDOWNLOADS_CONT3 => _MD_WFDOWNLOADS_CONT3,
- _MD_WFDOWNLOADS_CONT4 => _MD_WFDOWNLOADS_CONT4,
- _MD_WFDOWNLOADS_CONT5 => _MD_WFDOWNLOADS_CONT5,
- _MD_WFDOWNLOADS_CONT6 => _MD_WFDOWNLOADS_CONT6,
- _MD_WFDOWNLOADS_CONT7 => _MD_WFDOWNLOADS_CONT7
- )
- );
- $sform->addElement($continent_select);
- $downurl_text = new XoopsFormText(_MD_WFDOWNLOADS_MIRROR_DOWNURL, 'downurl', 50, 255);
- $downurl_text->setDescription(_MD_WFDOWNLOADS_MIRROR_DOWNURL_DESC);
- $sform->addElement($downurl_text, true);
- $sform->addElement(new XoopsFormHidden('lid', $lid));
- $sform->addElement(new XoopsFormHidden('cid', $cid));
- $sform->addElement(new XoopsFormHidden('uid', $mirroruserUid));
- $button_tray = new XoopsFormElementTray('', '');
- $submit_button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
- $button_tray->addElement($submit_button);
- $cancel_button = new XoopsFormButton('', '', _CANCEL, 'button');
- $cancel_button->setExtra('');
- $button_tray->addElement($cancel_button);
- $sform->addElement($button_tray);
- $sform->display();
- include 'footer.php';
- }
- break;
-}
Deleted: XoopsModules/wfdownloads/trunk/newlist.php
===================================================================
--- XoopsModules/wfdownloads/trunk/newlist.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/newlist.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,108 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = basename(__FILE__);
-include 'header.php';
-
-$xoopsOption['template_main'] = "{$wfdownloads->getModule()->dirname()}_newlistindex.tpl";
-include XOOPS_ROOT_PATH . '/header.php';
-
-$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
-$xoTheme->addScript(WFDOWNLOADS_URL . '/assets/js/magnific/jquery.magnific-popup.min.js');
-$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/js/magnific/magnific-popup.css');
-$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/assets/css/module.css');
-
-$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-
-$groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
-
-$catArray['imageheader'] = wfdownloads_headerImage();
-$catArray['letters'] = wfdownloads_lettersChoice();
-$catArray['toolbar'] = wfdownloads_toolbar();
-$xoopsTpl->assign('catarray', $catArray);
-
-// Breadcrumb
-$breadcrumb = new WfdownloadsBreadcrumb();
-$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
-
-// Get number of downloads...
-$allowedCategories = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $wfdownloads->getModule()->mid());
-// ... in the last week
-$"-1 week"); //$ - 3600*24*7; //@TODO: Change to strtotime (TODAY-1week);
-$criteria = new Criteria('published', $oneWeekAgo, ">=");
-$allWeekDownloads = $wfdownloads->getHandler('download')->getActiveCount($criteria);
-// ... in the last month
-$"-1 month"); //$one_month_ago = time() - 3600*24*7; //@TODO: Change to strtotime (TODAY-1month);
-$criteria = new Criteria('published', $oneMonthAgo, ">=");
-$allMonthDownloads = $wfdownloads->getHandler('download')->getActiveCount($criteria);
-$xoopsTpl->assign('allweekdownloads', $allWeekDownloads);
-$xoopsTpl->assign('allmonthdownloads', $allMonthDownloads);
-
-// Get latest downloads
-$criteria = new CriteriaCompo(new Criteria("offline", 0));
-if (isset($_GET['newdownloadshowdays'])) {
- $days = (int) $_GET['newdownloadshowdays'];
- $days_limit = array(7, 14, 30);
- if (in_array($days, $days_limit)) {
- $xoopsTpl->assign('newdownloadshowdays', $days);
- $downloadshowdays = time() - (3600 * 24 * $days);
- $criteria->add(new Criteria('published', $downloadshowdays, '>='), 'AND');
- }
-}
-$criteria->setSort('published');
-$criteria->setOrder('DESC');
-$criteria->setLimit($wfdownloads->getConfig('perpage'));
-$criteria->setStart(0);
-$downloadObjs = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
-foreach ($downloadObjs as $downloadObj) {
- $downloadInfo = $downloadObj->getDownloadInfo();
- $xoopsTpl->assign('lang_dltimes', sprintf(_MD_WFDOWNLOADS_DLTIMES, $downloadInfo['hits']));
- $xoopsTpl->assign('lang_subdate', $downloadInfo['is_updated']);
- $xoopsTpl->append('file', $downloadInfo);
- $xoopsTpl->append('downloads', $downloadInfo); // this definition is not removed for backward compatibility issues
-}
-
-// Screenshots display
-$xoopsTpl->assign('show_screenshot', false);
-if ($wfdownloads->getConfig('screenshot') == 1) {
- $xoopsTpl->assign('shots_dir', $wfdownloads->getConfig('screenshots'));
- $xoopsTpl->assign('shotwidth', $wfdownloads->getConfig('shotwidth'));
- $xoopsTpl->assign('shotheight', $wfdownloads->getConfig('shotheight'));
- $xoopsTpl->assign('show_screenshot', true);
- $xoopsTpl->assign('viewcat', true);
-}
-if (isset($days)) {
- $which_new_downloads = " > " . sprintf(_MD_WFDOWNLOADS_NEWDOWNLOADS_INTHELAST, (int) $days);
- $xoopsTpl->assign(
- 'categoryPath',
- '<a href="' . WFDOWNLOADS_URL . '/newlist.php">' . _MD_WFDOWNLOADS_NEWDOWNLOADS . '</a>' . $which_new_downloads
- );
- $breadcrumb->addLink(_MD_WFDOWNLOADS_LATESTLIST, $currentFile);
- $breadcrumb->addLink(sprintf(_MD_WFDOWNLOADS_NEWDOWNLOADS_INTHELAST, (int) $days), '');
-} else {
- $xoopsTpl->assign('categoryPath', _MD_WFDOWNLOADS_NEWDOWNLOADS);
- $breadcrumb->addLink(_MD_WFDOWNLOADS_LATESTLIST, '');
-}
-
-// Breadcrumb
-$xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
-
-$xoopsTpl->assign('module_home', wfdownloads_module_home(true));
-include 'footer.php';
Deleted: XoopsModules/wfdownloads/trunk/notification_update.php
===================================================================
--- XoopsModules/wfdownloads/trunk/notification_update.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/notification_update.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,22 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-include '../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/notification_update.php';
Deleted: XoopsModules/wfdownloads/trunk/ratefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/ratefile.php 2014-07-25 17:27:29 UTC (rev 12725)
+++ XoopsModules/wfdownloads/trunk/ratefile.php 2014-07-25 17:45:37 UTC (rev 12726)
@@ -1,176 +0,0 @@
-<?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.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = basename(__FILE__);
-include 'header.php';
-
-$lid = WfdownloadsRequest::getInt('lid', 0);
-$downloadObj = $wfdownloads->getHandler('download')->get($lid);
-if (empty($downloadObj)) {
- redirect_header('index.php', 3, _CO_WFDOWNLOADS_ERROR_NODOWNLOAD);
-}
-$cid = WfdownloadsRequest::getInt('cid', $downloadObj->getVar('cid'));
-$categoryObj = $wfdownloads->getHandler('category')->get($cid);
-if (empty($categoryObj)) {
- redirect_header('index.php', 3, _CO_WFDOWNLOADS_ERROR_NOCATEGORY);
-}
-
-// Download not published, expired or taken offline - redirect
-if (
- $downloadObj->getVar('published') == false ||
- $downloadObj->getVar('published') > time() ||
- $downloadObj->getVar('offline') == true ||
- ($downloadObj->getVar('expired') != 0 && $downloadObj->getVar('expired') < time())) {
- redirect_header("index.php", 3, _MD_WFDOWNLOADS_NODOWNLOAD);
-}
-
-// Check permissions
-if ($wfdownloads->getConfig('enable_ratings') == false && !wfdownloads_userIsAdmin()) {
- redirect_header('index.php', 3, _NOPERM);
-}
-// Breadcrumb
-include_once XOOPS_ROOT_PATH . "/class/tree.php";
-$categoriesTree = new XoopsObjectTree($wfdownloads->getHandler('category')->getObjects(), 'cid', 'pid');
-$breadcrumb = new WfdownloadsBreadcrumb();
-$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
-foreach (array_reverse($categoriesTree->getAllParent($cid)) as $parentCategory) {
- $breadcrumb->addLink($parentCategory->getVar('title'), "viewcat.php?cid=" . $parentCategory->getVar('cid'));
-}
-$breadcrumb->addLink($categoryObj->getVar('title'), "viewcat.php?cid={$cid}");
-$breadcrumb->addLink($downloadObj->getVar('title'), "singlefile.php?lid={$lid}");
-
-$op = WfdownloadsRequest::getString('op', 'vote.add');
-switch ($op) {
- case "vote.add" :
- default :
- // Get vote poster 'uid'
- $ratinguserUid = is_object($xoopsUser) ? (int) $xoopsUser->getVar('uid') : 0;
- $ratinguserIp = getenv("REMOTE_ADDR");
-
- if (!empty($_POST['submit'])) {
- $rating = WfdownloadsRequest::getString('rating', '--', 'POST');
-
- // Check if Rating is Null
- if ($rating == '--') {
- redirect_header("?cid={$cid}&lid={$lid}", 4, _MD_WFDOWNLOADS_NORAT...
[truncated message content] |
|
From: <luc...@us...> - 2014-07-25 17:27:44
|
Revision: 12725
http://sourceforge.net/p/xoops/svn/12725
Author: luciorota
Date: 2014-07-25 17:27:29 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
code clean up
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/about.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_footer.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/cat.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/task.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/assets/css/module.css
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/assets/css/style.css
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/request.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/session.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xnewsletter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/readme.txt
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/constants.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/html2text/epl-v10.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/html2text/html2text.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/install.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/module.css
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/search.inc.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/blocks.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/common.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help2.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/main.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/templates/xoops.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/sample1col.csv
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/sample4col.csv
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/print.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/sql/mysql.sql
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_day.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_recent.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_day.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_random.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_letter_block_recent.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xNewsletter_subscrinfo_block.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_common_breadcrumb.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index_list_letters.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_letters.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_list_subscrs.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_letter_preview.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_print.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_protocol.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_subscription_result.tpl
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/about.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/about.php 2014-07-25 17:13:08 UTC (rev 12724)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/about.php 2014-07-25 17:27:29 UTC (rev 12725)
@@ -19,7 +19,7 @@
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
* @license GPL 2.0
- * @package xNewsletter
+ * @package xnewsletter
* @author Goffy ( web...@we... )
*
* Version : $Id $
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-07-25 17:13:08 UTC (rev 12724)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-07-25 17:27:29 UTC (rev 12725)
@@ -19,48 +19,45 @@
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
* @license GPL 2.0
- * @package xNewsletter
+ * @package xnewsletter
* @author Goffy ( web...@we... )
*
* Version : $Id $
* ****************************************************************************
*/
+$currentFile = basename(__FILE__);
include "admin_header.php";
xoops_cp_header();
-//global $indexAdmin;
// We recovered the value of the argument op in the URL$
-$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
-$save_and_check = xNewsletter_CleanVars($_REQUEST, 'save_and_check', 'none', 'string');
-$accounts_id = xNewsletter_CleanVars($_REQUEST, 'accounts_id', 0, 'int');
-$post = xNewsletter_CleanVars($_REQUEST, 'post', '', 'string');
+$op = xnewsletterRequest::getString('op', 'list');
+$save_and_check = xnewsletterRequest::getString('save_and_check', 'none');
+$accounts_id = xnewsletterRequest::getInt('accounts_id', 0);
+$post = xnewsletterRequest::getString('post', '');
if ($post == "" && $op == "save_accounts" && $save_and_check =="none" ) $op = "edit_account";
switch ($op) {
case "check_account" :
- $img_ok = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ";
- $img_failed = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ";
-
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
-
+ //
if ($accounts_id == 0) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
} else {
- $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
}
$mailhost = $accountObj->getVar("accounts_server_in");
$port = $accountObj->getVar("accounts_port_in");
switch ($accountObj->getVar("accounts_type")) {
- case _AM_ACCOUNTS_TYPE_VAL_POP3:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3:
$service = "pop3";
break;
- case _AM_ACCOUNTS_TYPE_VAL_SMTP:
- case _AM_ACCOUNTS_TYPE_VAL_GMAIL:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL:
$service = "imap";
break;
case "default":
@@ -89,27 +86,27 @@
$mbox = @imap_open("{" . $command . "}", $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
if ($mbox === false) {
echo "<tr>";
- echo "<td class='center width5'>" . $img_failed . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_FAILED . "</td>";
echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
echo "<td class='left'>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
echo "<td class='left'></td>";
echo "</tr>";
- $folders = imap_listmailbox($mbox, "{".$command."}", "*");
+ $folders = imap_listmailbox($mbox, "{" . $command . "}", "*");
if ($folders == false) {
echo "<tr>";
- echo "<td class='center width5'>" . $img_failed . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_FAILED . "</td>";
echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
echo "<td class='left'>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
echo "<td class='left'>";
if (is_array($folders)) {
@@ -123,7 +120,7 @@
if ("{" . $command . "}" . $accounts_hardbox == $val) {
$accounts_hardbox_ok = 1;
} else {
- @imap_createmailbox($mbox, imap_utf7_encode('{' .$command . '}' . $accounts_hardbox));
+ @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
$foldercreated = 1;
}
if ("{" . $command . "}" . $accounts_softbox == $val) {
@@ -147,36 +144,36 @@
echo "<tr>";
if ($accountObj->getVar("accounts_use_bmh") == '1') {
if ($accounts_inbox_ok == 1 && $accounts_hardbox_ok == 1 && $accounts_softbox_ok == 1) {
- echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
} else {
- echo "<td class='center width5'>" . $img_failed . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_FAILED . "</td>";
}
echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH . "</td>";
echo "<td class='left'>";
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_INBOX . " ";
if ($accounts_inbox_ok == 1) {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX . " ";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
if ($accounts_hardbox_ok == 1) {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX . " ";
if ($accounts_softbox_ok == 1) {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
echo "</td>";
} else {
- echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED . "</td>";
echo "<td class='center'></td>";
}
@@ -189,64 +186,64 @@
case "list":
default:
- echo $indexAdmin->addNavigation('accounts.php') ;
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
+ echo $indexAdmin->addNavigation($currentFile) ;
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, '?op=new_account', 'add');
echo $indexAdmin->renderButton();
-
- $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
- $criteria = new CriteriaCompo();
- $criteria->setSort("accounts_id ASC, accounts_type");
- $criteria->setOrder("ASC");
- $numrows = $xnewsletter->getHandler('xNewsletter_accounts')->getCount();
- $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($criteria);
- if ($numrows > $limit) {
+ //
+ $limit = $xnewsletter->getConfig('adminperpage');
+ $accountsCriteria = new CriteriaCompo();
+ $accountsCriteria->setSort("accounts_id ASC, accounts_type");
+ $accountsCriteria->setOrder("ASC");
+ $accountsCount = $xnewsletter->getHandler('accounts')->getCount();
+ $start = xnewsletterRequest::getInt('start', 0);
+ $accountsCriteria->setStart($start);
+ $accountsCriteria->setLimit($limit);
+ $accountsObjs = $xnewsletter->getHandler('accounts')->getAll($accountsCriteria);
+ if ($accountsCount > $limit) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
+ $pagenav = new XoopsPageNav($accountsCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
// View Table
- if ($numrows > 0) {
+ if ($accountsCount > 0) {
echo "<table class='outer width100' cellspacing='1'>
<tr>
- <th class='center width2'>" ._AM_XNEWSLETTER_ACCOUNTS_ID . "</th>
+ <th class='center width2'>" . _AM_XNEWSLETTER_ACCOUNTS_ID . "</th>
<th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_TYPE . "</th>
<th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_NAME . "</th>
<th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURNAME . "</th>
<th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURMAIL . "</th>
<th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_DEFAULT . "</th>
- <th class='center width10'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
+ <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION . "</th>
</tr>";
$class = "odd";
- foreach (array_keys($accounts_arr) as $i) {
- echo "<tr class='" . $class . "'>";
+ foreach ($accountsObjs as $accounts_id => $accountsObj) {
+ echo "<tr class='".$class."'>";
$class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $i . "</td>";
+ echo "<td class='center'>" . $accounts_id . "</td>";
$arr_accounts_type=array(
- _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL=>_AM_ACCOUNTS_TYPE_PHPMAIL,
- _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL=>_AM_ACCOUNTS_TYPE_PHPSENDMAIL,
- _AM_ACCOUNTS_TYPE_VAL_POP3=>_AM_ACCOUNTS_TYPE_POP3,
- _AM_ACCOUNTS_TYPE_VAL_SMTP=>_AM_ACCOUNTS_TYPE_SMTP,
- _AM_ACCOUNTS_TYPE_VAL_GMAIL=>_AM_ACCOUNTS_TYPE_GMAIL);
- echo "<td class='center'>" . $arr_accounts_type[$accounts_arr[$i]->getVar("accounts_type")] . "</td>";
- echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_name") . "</td>";
- echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_yourname") . "</td>";
- echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_yourmail") . "</td>";
- $verif_accounts_default = ($accounts_arr[$i]->getVar("accounts_default") == 1) ? _YES : _NO;
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPMAIL,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPSENDMAIL,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3 => _AM_XNEWSLETTER_ACCOUNTS_TYPE_POP3,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP => _AM_XNEWSLETTER_ACCOUNTS_TYPE_SMTP,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL => _AM_XNEWSLETTER_ACCOUNTS_TYPE_GMAIL);
+ echo "<td class='center'>" . $arr_accounts_type[$accountsObj->getVar("accounts_type")] . "</td>";
+ echo "<td class='center'>" . $accountsObj->getVar("accounts_name") . "</td>";
+ echo "<td class='center'>" . $accountsObj->getVar("accounts_yourname") . "</td>";
+ echo "<td class='center'>" . $accountsObj->getVar("accounts_yourmail") . "</td>";
+ $verif_accounts_default = ($accountsObj->getVar("accounts_default") == 1) ? _YES : _NO;
echo "<td class='center'>" . $verif_accounts_default . "</td>";
echo "<td class='center width5'>";
- echo " <a href='accounts.php?op=edit_account&accounts_id=" . $i . "'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
- echo " <a href='accounts.php?op=delete_account&accounts_id=" . $i . "'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>";
- if ($accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
- echo " <a href='accounts.php?op=check_account&accounts_id=" . $i . "'><img src=".XNEWSLETTER_ICONS_URL."/xn_check.png alt='"._AM_ACCOUNTS_TYPE_CHECK."' title='"._AM_ACCOUNTS_TYPE_CHECK."' /></a>";
+ echo " <a href='?op=edit_account&accounts_id=" . $accounts_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='"._EDIT . "' /></a>";
+ echo " <a href='?op=delete_account&accounts_id=" . $accounts_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
+ if ($accountsObj->getVar("accounts_type") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accountsObj->getVar("accounts_type") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
+ echo " <a href='?op=check_account&accounts_id=". $accounts_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_check.png alt='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' title='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' /></a>";
}
echo "</td>";
echo "</tr>";
@@ -256,21 +253,21 @@
} else {
echo "<table class='outer width100' cellspacing='1'>
<tr>
- <th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_TYPE."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_NAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURNAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURMAIL."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_USERNAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PASSWORD."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SERVER_IN."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PORT_IN."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_IN."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SERVER_OUT."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PORT_OUT."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_OUT."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
- <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
+ <th class='center width2'>" . _AM_XNEWSLETTER_ACCOUNTS_ID . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_TYPE . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_NAME . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURNAME . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURMAIL . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_USERNAME . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_PASSWORD . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_SERVER_IN . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_PORT_IN . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_IN . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_SERVER_OUT . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_PORT_OUT . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_OUT . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_DEFAULT . "</th>
+ <th class='center width10'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
</tr>";
echo "</table><br /><br />";
}
@@ -278,34 +275,35 @@
break;
case "new_account":
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
- $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->create();
- $accountObj = xNewsletter_setPost($accountObj, $_POST);
+ //
+ $accountObj = $xnewsletter->getHandler('accounts')->create();
+ $accountObj = xnewsletter_setPost($accountObj, $_POST);
$form = $accountObj->getForm();
$form->display();
break;
case "save_accounts":
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
$_POST['accounts_id'] = $accounts_id;
- $accountObj = xNewsletter_setPost($accountObj, $_POST);
+ $accountObj = xnewsletter_setPost($accountObj, $_POST);
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria("accounts_default", 1));
- $count_accounts_default = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($criteria);
+ $accountsCriteria = new CriteriaCompo();
+ $accountsCriteria->add(new Criteria("accounts_default", 1));
+ $count_accounts_default = $xnewsletter->getHandler('accounts')->getCount($accountsCriteria);
if ($count_accounts_default > 0) {
if ($accountObj->getVar("accounts_default") == 1) {
global $xoopsDB;
$verif_accounts_default = "1";
//reset old accounts_default
- $sql = "UPDATE `{$xoopsDB->prefix("mod_xnewsletter_accounts")}` SET `accounts_default` = '0'";
- $result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
+ $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_accounts")}` SET `accounts_default` = '0'";
+ if(!$result = $xoopsDB->query($sql)) die ("MySQL-Error: " . mysql_error());
} else {
$verif_accounts_default = "0";
}
@@ -313,12 +311,12 @@
$verif_accounts_default = "1";
}
$accountObj->setVar("accounts_default", $verif_accounts_default);
- if ($accountObj->getVar("accounts_yourmail") != "" && $accountObj->getVar("accounts_yourmail") != _AM_ACCOUNTS_TYPE_YOUREMAIL ) {
- if ($xnewsletter->getHandler('xNewsletter_accounts')->insert($accountObj)) {
+ if ($accountObj->getVar("accounts_yourmail") != "" && $accountObj->getVar("accounts_yourmail") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_YOUREMAIL ) {
+ if ($xnewsletter->getHandler('accounts')->insert($accountObj)) {
if ($save_and_check == 'none') {
- redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ redirect_header("?op=list", 2, _AM_XNEWSLETTER_FORMOK);
} else {
- redirect_header("accounts.php?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 2, _AM_XNEWSLETTER_FORMOK);
+ redirect_header("?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 2, _AM_XNEWSLETTER_FORMOK);
}
}
} else {
@@ -331,31 +329,32 @@
break;
case "edit_account":
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, '?op=new_account', 'add');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
- $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ //
+ $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
if (!empty($_POST)) {
- xNewsletter_setPost($accountObj, $_POST);
+ xnewsletter_setPost($accountObj, $_POST);
}
$form = $accountObj->getForm();
$form->display();
break;
case "delete_account":
- $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
+ $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
+ if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if ($xnewsletter->getHandler('xNewsletter_accounts')->delete($accountObj)) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_FORMDELOK);
+ if ($xnewsletter->getHandler('accounts')->delete($accountObj)) {
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
echo $accountObj->getHtmlErrors();
}
} else {
- xoops_confirm(array("ok" => 1, "accounts_id" => $accounts_id, "op" => "delete_account"), "accounts.php", sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar("accounts_name")));
+ xoops_confirm(array("ok" => true, "accounts_id" => $accounts_id, "op" => "delete_account"), $currentFile, sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar("accounts_name")));
}
break;
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_footer.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_footer.php 2014-07-25 17:13:08 UTC (rev 12724)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_footer.php 2014-07-25 17:27:29 UTC (rev 12725)
@@ -19,7 +19,7 @@
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
* @license GPL 2.0
- * @package xNewsletter
+ * @package xnewsletter
* @author Goffy ( web...@we... )
*
* Version : $Id $
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_header.php 2014-07-25 17:13:08 UTC (rev 12724)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_header.php 2014-07-25 17:27:29 UTC (rev 12725)
@@ -19,7 +19,7 @@
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
* @license GPL 2.0
- * @package xNewsletter
+ * @package xnewsletter
* @author Goffy ( web...@we... )
*
* Version : $Id $
@@ -31,34 +31,28 @@
// Include xoops admin header
include_once XOOPS_ROOT_PATH . "/include/cp_functions.php";
-/*
+
$pathIcon16 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons16');
$pathIcon32 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons32');
$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $xnewsletter->getModule()->getInfo('dirmoduleadmin');
require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
-*/
-//$dirname = basename(dirname(dirname(__FILE__)));
-
-//include_once XOOPS_ROOT_PATH . "/modules/" . $xnewsletter->getModule()->dirname() . "/include/functions.php";
-//include_once XOOPS_ROOT_PATH . "/modules/" . $xnewsletter->getModule()->dirname() . "/include/config.php";
-
-//$module_handler =& xoops_gethandler('module');
-$xoopsModule = $xnewsletter->getModule();
-
//Load languages
xoops_loadLanguage('admin', $xnewsletter->getModule()->dirname());
xoops_loadLanguage('modinfo', $xnewsletter->getModule()->dirname());
xoops_loadLanguage('main', $xnewsletter->getModule()->dirname());
-if (!xNewsletter_checkModuleAdmin()) {
+define('XNEWSLETTER_IMG_OK', "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ");
+define('XNEWSLETTER_IMG_FAILED', "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ");
+
+if (!xnewsletter_checkModuleAdmin()) {
xoops_cp_header();
echo xoops_error(_AM_XNEWSLETTER_NOFRAMEWORKS);
xoops_cp_footer();
exit();
}
-//$pathIcon = XOOPS_URL . "/modules/" . $dirname . "/images/icons";
+//$pathIcon = XOOPS_URL . "/modules/" . $dirname . "/assets/images/icons";
$indexAdmin = new ModuleAdmin();
$myts = MyTextSanitizer::getInstance();
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/attachment.php 2014-07-25 17:13:08 UTC (rev 12724)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/attachment.php 2014-07-25 17:27:29 UTC (rev 12725)
@@ -19,78 +19,80 @@
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
* @license GNU General Public License 2.0
- * @package xNewsletter
+ * @package xnewsletter
* @author Goffy ( web...@we... )
*
* Version : $Id $
* ****************************************************************************
*/
+$currentFile = basename(__FILE__);
include "admin_header.php";
xoops_cp_header();
-//global $pathIcon, $indexAdmin;
// We recovered the value of the argument op in the URL$
-$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
-$attachment_id = xNewsletter_CleanVars($_REQUEST, 'attachment_id', 0, 'int');
+$op = xnewsletterRequest::getString('op', 'list');
+$attachment_id = xnewsletterRequest::getInt('attachment_id', 0);
switch ($op) {
case "list" :
default :
- echo $indexAdmin->addNavigation('attachment.php');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWATTACHMENT, 'attachment.php?op=new_attachment', 'add');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWATTACHMENT, '?op=new_attachment', 'add');
echo $indexAdmin->renderButton();
- $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
- $criteria = new CriteriaCompo();
- $criteria->setSort("attachment_letter_id DESC, attachment_id");
- $criteria->setOrder("DESC");
- $numrows = $xnewsletter->getHandler('xNewsletter_attachment')->getCount();
- $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $attachment_arr = $xnewsletter->getHandler('xNewsletter_attachment')->getall($criteria);
- if ($numrows > $limit) {
+ //
+ $limit = $xnewsletter->getConfig('adminperpage');
+ $attachmentCriteria = new CriteriaCompo();
+ $attachmentCriteria->setSort("attachment_letter_id DESC, attachment_id");
+ $attachmentCriteria->setOrder("DESC");
+ $attachmentsCount = $xnewsletter->getHandler('attachment')->getCount();
+ $start = xnewsletterRequest::getInt('start', 0);
+ $attachmentCriteria->setStart($start);
+ $attachmentCriteria->setLimit($limit);
+ $attachmentObjs = $xnewsletter->getHandler('attachment')->getAll($attachmentCriteria);
+ if ($attachmentsCount > $limit) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
+ $pagenav = new XoopsPageNav($attachmentsCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
// View Table
- if ($numrows>0) {
+ if ($attachmentsCount>0) {
echo "
<table class='outer width100' cellspacing='1'>
<tr>
- <th class='center width2'>"._AM_XNEWSLETTER_ATTACHMENT_ID."</th>
- <th class='center'>"._AM_XNEWSLETTER_ATTACHMENT_LETTER_ID."</th>
- <th class='center'>"._AM_XNEWSLETTER_ATTACHMENT_NAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ATTACHMENT_TYPE."</th>
- <th class='center'>"._AM_XNEWSLETTER_ATTACHMENT_SUBMITTER."</th>
- <th class='center'>"._AM_XNEWSLETTER_ATTACHMENT_CREATED."</th>
- <th class='center width5'>"._AM_XNEWSLETTER_FORMACTION."</th>
+ <th class='center width2'>" . _AM_XNEWSLETTER_ATTACHMENT_ID . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_LETTER_ID . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_NAME . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_TYPE . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_SUBMITTER . "</th>
+ <th class='center'>" . _AM_XNEWSLETTER_ATTACHMENT_CREATED . "</th>
+ <th class='center width5'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
</tr>
";
$class = "odd";
- foreach (array_keys($attachment_arr) as $i) {
+ foreach ($attachmentObjs as $attachment_id => $attachmentObj) {
echo "<tr class='" . $class . "'>";
$class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>".$i."</td>";
+ echo "<td class='center'>" . $attachment_id . "</td>";
- $letter =& $xnewsletter->getHandler('xNewsletter_letter')->get($attachment_arr[$i]->getVar("attachment_letter_id"));
+ $letter =& $xnewsletter->getHandler('letter')->get($attachmentObj->getVar("attachment_letter_id"));
$title_letter = $letter->getVar("letter_title");
echo "<td class='center'>" . $title_letter . "</td>";
- echo "<td class='center'>" . $attachment_arr[$i]->getVar("attachment_name") . "</td>";
- echo "<td class='center'>" .$attachment_arr[$i]->getVar("attachment_type")."</td>";
- echo "<td class='center'>" . XoopsUser::getUnameFromId($attachment_arr[$i]->getVar("attachment_submitter"), "S") . "</td>";
- echo "<td class='center'>" . formatTimeStamp($attachment_arr[$i]->getVar("attachment_created"), "S") . "</td>";
+ echo "<td class='center'>" . $attachmentObj->getVar("attachment_name") . "</td>";
+ echo "<td class='center'>" . $attachmentObj->getVar("attachment_type") . "</td>";
+ echo "<td class='center'>" . XoopsUser::getUnameFromId($attachmentObj->getVar("attachment_submitter"), "S") . "</td>";
+ echo "<td class='center'>" . formatTimeStamp($attachmentObj->getVar("attachment_created"), "S") . "</td>";
echo "
<td class='center width5' nowrap='nowrap'>
- <a href='attachment.php?op=edit_attachment&attachment_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
- <a href='attachment.php?op=delete_attachment&attachment_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>
+ <a href='?op=edit_attachment&attachment_id=" . $attachment_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
+
+ <a href='?op=delete_attachment&attachment_id=" . $attachment_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>
</td>
";
echo "</tr>";
@@ -115,64 +117,60 @@
break;
case "new_attachment" :
- echo $indexAdmin->addNavigation("attachment.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ATTACHMENTLIST, 'attachment.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ATTACHMENTLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
-
- $obj =& $xnewsletter->getHandler('xNewsletter_attachment')->create();
- $form = $obj->getForm();
+ //
+ $attachmentObj = $xnewsletter->getHandler('attachment')->create();
+ $form = $attachmentObj->getForm();
$form->display();
break;
case "save_attachment" :
if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header("attachment.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $obj =& $xnewsletter->getHandler('xNewsletter_attachment')->get($attachment_id);
- //Form attachment_letter_id
- $obj->setVar("attachment_letter_id", xNewsletter_CleanVars($_REQUEST, "attachment_letter_id", 0, "int"));
- //Form attachment_name
- $obj->setVar("attachment_name", xNewsletter_CleanVars($_REQUEST, "attachment_name", "", "string"));
- //Form attachment_type
- $obj->setVar("attachment_type", xNewsletter_CleanVars($_REQUEST, "attachment_type", 0, "int"));
- //Form attachment_submitter
- $obj->setVar("attachment_submitter", xNewsletter_CleanVars($_REQUEST, "attachment_submitter", 0, "int"));
- //Form attachment_created
- $obj->setVar("attachment_created", xNewsletter_CleanVars($_REQUEST, "attachment_created", time(), "int"));
+ $attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
+ $attachmentObj->setVar("attachment_letter_id", xnewsletterRequest::getInt('attachment_letter_id', 0));
+ $attachmentObj->setVar("attachment_name", xnewsletterRequest::getString('attachment_name', ''));
+ $attachmentObj->setVar("attachment_type", xnewsletterRequest::getInt('attachment_type', 0));
+ $attachmentObj->setVar("attachment_submitter", xnewsletterRequest::getInt('attachment_submitter', 0));
+ $attachmentObj->setVar("attachment_created", xnewsletterRequest::getInt('attachment_created', time()));
- if ($xnewsletter->getHandler('xNewsletter_attachment')->insert($obj)) {
- redirect_header("attachment.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ if ($xnewsletter->getHandler('attachment')->insert($attachmentObj)) {
+ redirect_header("?op=list", 2, _AM_XNEWSLETTER_FORMOK);
}
- echo $obj->getHtmlErrors();
- $form =& $obj->getForm();
+ echo $attachmentObj->getHtmlErrors();
+ $form = $attachmentObj->getForm();
$form->display();
break;
case "edit_attachment" :
- echo $indexAdmin->addNavigation("attachment.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWATTACHMENT, 'attachment.php?op=new_attachment', 'add');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ATTACHMENTLIST, 'attachment.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWATTACHMENT, '?op=new_attachment', 'add');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ATTACHMENTLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj = $xnewsletter->getHandler('xNewsletter_attachment')->get($attachment_id);
- $form = $obj->getForm();
+ //
+ $attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
+ $form = $attachmentObj->getForm();
$form->display();
break;
case "delete_attachment" :
- $obj =& $xnewsletter->getHandler('xNewsletter_attachment')->get($attachment_id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ $attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
+ if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header("attachment.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if ($xnewsletter->getHandler('xNewsletter_attachment')->delete($obj)) {
- redirect_header("attachment.php", 3, _AM_XNEWSLETTER_FORMDELOK);
+ if ($xnewsletter->getHandler('attachment')->delete($attachmentObj)) {
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
- echo $obj->getHtmlErrors();
+ echo $attachmentObj->getHtmlErrors();
}
} else {
- xoops_confirm(array("ok" => 1, "attachment_id" => $attachment_id, "op" => "delete_attachment"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $obj->getVar("attachment_letter_id")));
+ xoops_confirm(array("ok" => true, "attachment_id" => $attachment_id, "op" => "delete_attachment"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $attachmentObj->getVar("attachment_letter_id")));
}
break;
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh.php 2014-07-25 17:13:08 UTC (rev 12724)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh.php 2014-07-25 17:27:29 UTC (rev 12725)
@@ -19,137 +19,132 @@
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
* @license GNU General Public License 2.0
- * @package xNewsletter
+ * @package xnewsletter
* @author Goffy ( web...@we... )
*
* Version : $Id $
* ****************************************************************************
*/
+$currentFile = basename(__FILE__);
include "admin_header.php";
xoops_cp_header();
-//global $indexAdmin;
// We recovered the value of the argument op in the URL$
-$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
-$bmh_id = xNewsletter_CleanVars($_REQUEST, 'bmh_id', 0, 'int');
-$bmh_measure = xNewsletter_CleanVars($_REQUEST, 'bmh_measure', 0, 'int');
-$filter = xNewsletter_CleanVars($_REQUEST, 'bmh_measure_filter', _AM_XNEWSLETTER_BMH_MEASURE_VAL_ALL, 'int');
+$op = xnewsletterRequest::getString('op', 'list');
+$bmh_id = xnewsletterRequest::getInt('bmh_id', 0);
+$bmh_measure = xnewsletterRequest::getInt('bmh_measure', 0);
+$filter = xnewsletterRequest::getInt('bmh_measure_filter', _AM_XNEWSLETTER_BMH_MEASURE_VAL_ALL);
-switch ($op)
-{
-case "bmh_delsubscr":
+switch ($op) {
+ case "bmh_delsubscr":
+ if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ $count_err = 0;
- if ( (isset($_POST["ok"]) && $_POST["ok"] == 1) ) {
- $count_err = 0;
+ $bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
+ $bmh_email = $bmhObj->getVar("bmh_email");
- $obj_bmh =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
- $bmh_email = $obj_bmh->getVar("bmh_email");
+ $sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("xnewsletter_subscr") . " WHERE (";
+ $sql .= "subscr_email='" . $bmh_email . "'";
+ $sql .= ") LIMIT 1;";
+ if ( $user = $xoopsDB->query($sql) ) {
+ $row_user = $xoopsDB->fetchRow($user);
+ $subscr_id = intval($row_user[0]);
+ }
+ if ($subscr_id == 0) {
+ //set bmh_measure for all entries in bmh with this email
+ $sql_upd_measure = "UPDATE " . $xoopsDB->prefix("xnewsletter_bmh") . " SET `bmh_measure` = '" . _AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
+ $sql_upd_measure .=" WHERE ((`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_email` ='" . $bmh_email . "') AND (`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_measure` ='0'))";
+ $xoopsDB->query($sql_upd_measure);
+ redirect_header("?op=list", 5, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
+ }
+ $subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
- $sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("mod_xnewsletter_subscr") . " WHERE (";
- $sql .= "subscr_email='" . $bmh_email . "'";
- $sql .= ") LIMIT 1;";
- if ( $user = $xoopsDB->query($sql) ) {
- $row_user = $xoopsDB->fetchRow($user);
- $subscr_id = intval($row_user[0]);
- }
- if ($subscr_id == 0) {
- //set bmh_measure for all entries in bmh with this email
- $sql_upd_measure = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_bmh")." SET `bmh_measure` = '"._AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."'";
- $sql_upd_measure .=" WHERE ((`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_measure` ='0'))";
- $xoopsDB->query($sql_upd_measure);
- redirect_header("bmh.php?op=list", 5, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
- }
- $obj_subscr =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
+ // delete subscriber
+ if (!$xnewsletter->getHandler('subscr')->delete($subscrObj,true)) {
+ $actionprot_err = $subscrObj->getHtmlErrors()."<br/><br/><br/>";
+ ++$count_err;
+ }
- // delete subscriber
- if (!$xnewsletter->getHandler('xNewsletter_subscr')->delete($obj_subscr,true)) {
- $actionprot_err = $obj_subscr->getHtmlErrors()."<br/><br/><br/>";
- $count_err++;
- }
+ //delete subscription
+ $catsubscrCriteria = new CriteriaCompo();
+ $catsubscrCriteria->add(new Criteria('catsubscr_subscrid', $subscr_id));
+ $catsubscrsCount = $xnewsletter->getHandler('catsubscr')->getCount($catsubscrCriteria);
+ if ($catsubscrsCount > 0) {
+ $catsubscrObjs = $xnewsletter->getHandler('catsubscr')->getAll($catsubscrCriteria);
+ foreach ($catsubscrObjs as $catsubscr_id => $catsubscrObj) {
+ $catsubscrObj = $xnewsletter->getHandler('catsubscr')->get($catsubscrObj->getVar("catsubscr_id"));
+ $catObj = $xnewsletter->getHandler('cat')->get($catsubscrObj->getVar("catsubscr_catid"));
+ $cat_mailinglist = $catObj->getVar("cat_mailinglist");
- //delete subscription
- $crit_catsubscr = new CriteriaCompo();
- $crit_catsubscr->add(new Criteria('catsubscr_subscrid', $subscr_id));
- $numrows_catsubscr = $xnewsletter->getHandler('xNewsletter_catsubscr')->getCount($crit_catsubscr);
- if ($numrows_catsubscr > 0) {
- $catsubscr_arr = $xnewsletter->getHandler('xNewsletter_catsubscr')->getall($crit_catsubscr);
- foreach (array_keys($catsubscr_arr) as $cat) {
- $obj_catsubscr =& $xnewsletter->getHandler('xNewsletter_catsubscr')->get($catsubscr_arr[$cat]->getVar("catsubscr_id"));
- $obj_cat =& $xnewsletter->getHandler('xNewsletter_cat')->get($catsubscr_arr[$cat]->getVar("catsubscr_catid"));
- $cat_mailinglist = $obj_cat->getVar("cat_mailinglist");
+ if ($xnewsletter->getHandler('catsubscr')->delete($catsubscrObj, true)) {
+ //handle mailinglists
+ if ($cat_mailinglist > 0) {
+ require_once( XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php" );
+ subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
+ }
+ } else {
+ $actionprot_err .= $catsubscrObj->getHtmlErrors();
+ ++$count_err;
+ }
+ }
+ }
- if ($xnewsletter->getHandler('xNewsletter_catsubscr')->delete($obj_catsubscr, true)) {
- //handle mailinglists
- if ($cat_mailinglist > 0) {
- require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
- subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
+ if ($count_err == 0) {
+ redirect_header("?op=handle_bmh&bmh_id=".$bmh_id."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE."&filter=".$filter, 3, _AM_XNEWSLETTER_FORMDELOK);
+ } else {
+ echo $actionprot_err;
}
- } else {
- $actionprot_err .= $obj_catsubscr->getHtmlErrors();
- $count_err++;
- }
- }
- }
-
- if ($count_err == 0) {
- redirect_header("bmh.php?op=handle_bmh&bmh_id=".$bmh_id."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE."&filter=".$filter, 3, _AM_XNEWSLETTER_FORMDELOK);
- } else {
- echo $actionprot_err;
- }
} else {
- xoops_confirm(array("ok" => 1, "bmh_id" => $bmh_id, "op" => "bmh_delsubscr", "filter" => $filter), "bmh.php", sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
+ xoops_confirm(array("ok" => true, "bmh_id" => $bmh_id, "op" => "bmh_delsubscr", "filter" => $filter), $currentFile, sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
}
- break;
+ break;
case "handle_bmh":
- if ($bmh_id == 0) redirect_header("bmh.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
- if ($bmh_measure == 0) redirect_header("bmh.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ if ($bmh_id == 0) redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ if ($bmh_measure == 0) redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
- $obj_bmh =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
+ $bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- if ($obj_bmh->getVar("bmh_measure") == _AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
- redirect_header("bmh.php?op=list&filter=".$filter."'", 3, _AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED);
- }
+ if ($bmhObj->getVar("bmh_measure") == _AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
+ redirect_header("?op=list&filter=".$filter."'", 3, _AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED);
+ }
- $bmh_email = $obj_bmh->getVar("bmh_email");
+ $bmh_email = $bmhObj->getVar("bmh_email");
if ($bmh_measure == _AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
- $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_subscr")."` INNER JOIN `";
- $sql .= $xoopsDB->prefix("mod_xnewsletter_catsubscr")."` ON `subscr_id` = `catsubscr_subscrid` ";
+ $sql = "UPDATE `".$xoopsDB->prefix("xnewsletter_subscr")."` INNER JOIN `";
+ $sql .= $xoopsDB->prefix("xnewsletter_catsubscr")."` ON `subscr_id` = `catsubscr_subscrid` ";
$sql .= "SET `catsubscr_quited` = ".time()." WHERE (((`subscr_email`)='";
$sql .= $bmh_email. "'))";
- $result= $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ if(!$result = $xoopsDB->queryF($sql)) die ("MySQL-Error: " . mysql_error());
}
- //set bmh_measure for all entries in bmh with this email
- $sql_upd = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_bmh")." SET ";
- $sql_upd .="`bmh_measure` = '".$bmh_measure."'";
- $sql_upd .=", `bmh_submitter` = '".$xoopsUser->uid()."'";
- $sql_upd .=", `bmh_created` = '".time()."'";
- $sql_upd .=" WHERE ((`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_measure` ='0'))";
- $result= $xoopsDB->queryF($sql_upd) or die ("MySQL-Error: " . mysql_error());
+ //set bmh_measure for all entries in bmh with this email
+ $sql_upd = "UPDATE ".$xoopsDB->prefix("xnewsletter_bmh")." SET ";
+ $sql_upd .="`bmh_measure` = '".$bmh_meas...
[truncated message content] |
|
From: <luc...@us...> - 2014-07-25 17:13:15
|
Revision: 12724
http://sourceforge.net/p/xoops/svn/12724
Author: luciorota
Date: 2014-07-25 17:13:08 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/admin/menu.php
XoopsModules/wfdownloads/trunk/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/menu.php 2014-07-24 14:54:30 UTC (rev 12723)
+++ XoopsModules/wfdownloads/trunk/admin/menu.php 2014-07-25 17:13:08 UTC (rev 12724)
@@ -31,67 +31,82 @@
$adminmenu = array();
$i=0;
$adminmenu[$i]["title"] = _MI_WFDOWNLOADS_MENU_HOME;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_HOME;
$adminmenu[$i]['link'] = "admin/index.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/home.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_CATEGORIES;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_CATEGORIES;
$adminmenu[$i]['link'] = "admin/categories.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/category.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_DOWNLOADS;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_DOWNLOADS;
$adminmenu[$i]['link'] = "admin/downloads.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/download.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/download.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_REVIEWS;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_REVIEWS;
$adminmenu[$i]['link'] = "admin/reviews.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/translations.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/translations.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_RATINGS;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_RATINGS;
$adminmenu[$i]['link'] = "admin/ratings.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/button_ok.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/button_ok.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_REPORTSMODIFICATIONS;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_REPORTSMODIFICATIONS;
$adminmenu[$i]['link'] = "admin/reportsmodifications.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/alert.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/alert.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_MIRRORS;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_MIRRORS;
$adminmenu[$i]['link'] = "admin/mirrors.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/list.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/list.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_INDEXPAGE;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_INDEXPAGE;
$adminmenu[$i]['link'] = "admin/indexpage.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/index.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/index.png';
/*
// Swish-e support EXPERIMENTAL
if ($wfdownloads->getConfig('enable_swishe') == true) {
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_SWISHE;
+ $adminmenu[$i]['desc'] =
$adminmenu[$i]['link'] = "admin/swishe.php";
- $adminmenu[$i]["icon"] = $pathIcon32 . '/search.png';
+ $adminmenu[$i]['icon'] = $pathIcon32 . '/search.png';
}
// Swish-e support EXPERIMENTAL
*/
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_IMAGES;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_IMAGES;
$adminmenu[$i]['link'] = "admin/images.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/photo.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/photo.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_MIMETYPES;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_MIMETYPES;
$adminmenu[$i]['link'] = "admin/mimetypes.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/type.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/type.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_PERMISSIONS;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_PERMISSIONS;
$adminmenu[$i]['link'] = "admin/permissions.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/permissions.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_IMPORT;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_IMPORT;
$adminmenu[$i]['link'] = "admin/import.php";
-$adminmenu[$i]["icon"] = './assets/images/icon32/database_go.png';
+$adminmenu[$i]['icon'] = './assets/images/icon32/database_go.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_CLONE;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_CLONE;
$adminmenu[$i]['link'] = "admin/clone.php";
-$adminmenu[$i]["icon"] = './assets/images/icon32/editcopy.png';
+$adminmenu[$i]['icon'] = './assets/images/icon32/editcopy.png';
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_ABOUT;
+$adminmenu[$i]['desc'] = _MI_WFDOWNLOADS_MENU_ABOUT;
$adminmenu[$i]['link'] = "admin/about.php";
-$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
+$adminmenu[$i]['icon'] = $pathIcon32 . '/about.png';
Modified: XoopsModules/wfdownloads/trunk/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/language/english/modinfo.php 2014-07-24 14:54:30 UTC (rev 12723)
+++ XoopsModules/wfdownloads/trunk/language/english/modinfo.php 2014-07-25 17:13:08 UTC (rev 12724)
@@ -296,21 +296,37 @@
define('_MI_WFDOWNLOADS_SUBCATSSORTBYWEIGHT', "Category weight");
// Names of admin menu items
define('_MI_WFDOWNLOADS_MENU_HOME', "Home");
+define('_MI_WFDOWNLOADS_MENU_HOME_DESC', "Home");
define('_MI_WFDOWNLOADS_MENU_CATEGORIES', "Categories");
+define('_MI_WFDOWNLOADS_MENU_CATEGORIES_DESC', "Categories");
define('_MI_WFDOWNLOADS_MENU_DOWNLOADS', "Downloads");
+define('_MI_WFDOWNLOADS_MENU_DOWNLOADS_DESC', "Downloads");
define('_MI_WFDOWNLOADS_MENU_REVIEWS', "Reviews");
+define('_MI_WFDOWNLOADS_MENU_REVIEWS_DESC', "Reviews");
define('_MI_WFDOWNLOADS_MENU_MIRRORS', "Mirrors");
+define('_MI_WFDOWNLOADS_MENU_MIRRORS_DESC', "Mirrors");
define('_MI_WFDOWNLOADS_MENU_BROKENS', "Brokens");
+define('_MI_WFDOWNLOADS_MENU_BROKENS_DESC', "Brokens");
define('_MI_WFDOWNLOADS_MENU_REPORTSMODIFICATIONS', "Broken & Modified");
+define('_MI_WFDOWNLOADS_MENU_REPORTSMODIFICATIONS_DESC', "Broken & Modified");
define('_MI_WFDOWNLOADS_MENU_INDEXPAGE', "Index page");
+define('_MI_WFDOWNLOADS_MENU_INDEXPAGE_DESC', "Index page");
define('_MI_WFDOWNLOADS_MENU_SWISHE', "Swish-e config");
+define('_MI_WFDOWNLOADS_MENU_SWISHE_DESC', "Swish-e config");
define('_MI_WFDOWNLOADS_MENU_IMAGES', "Images");
+define('_MI_WFDOWNLOADS_MENU_IMAGES_DESC', "Images");
define('_MI_WFDOWNLOADS_MENU_MIMETYPES', "MIME types");
+define('_MI_WFDOWNLOADS_MENU_MIMETYPES_DESC', "MIME types");
define('_MI_WFDOWNLOADS_MENU_RATINGS', "Ratings & Votes");
+define('_MI_WFDOWNLOADS_MENU_RATINGS_DESC', "Ratings & Votes");
define('_MI_WFDOWNLOADS_MENU_PERMISSIONS', "Permissions");
+define('_MI_WFDOWNLOADS_MENU_PERMISSIONS_DESC', "Permissions");
define('_MI_WFDOWNLOADS_MENU_IMPORT', "Import");
+define('_MI_WFDOWNLOADS_MENU_IMPORT_DESC', "Import");
define('_MI_WFDOWNLOADS_MENU_CLONE', "Clone module");
+define('_MI_WFDOWNLOADS_MENU_CLONE_DESC', "Clone module");
define('_MI_WFDOWNLOADS_MENU_ABOUT', "About");
+define('_MI_WFDOWNLOADS_MENU_ABOUT_DESC', "About");
define('_MI_WFDOWNLOADS_SCREENSHOTSDSC', "Path relative to Xoops root path: \"" . XOOPS_ROOT_PATH . "/\". <br />No trailing slash.");
define('_MI_WFDOWNLOADS_MAINIMGDIRDSC', "Path relative to Xoops root path: \"" . XOOPS_ROOT_PATH . "/\". <br />No trailing slash.");
define('_MI_WFDOWNLOADS_CATEGORYIMGDSC', "Path relative to Xoops root path: \"" . XOOPS_ROOT_PATH . "/\". <br />No trailing slash.");
Modified: XoopsModules/wfdownloads/trunk/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/xoops_version.php 2014-07-24 14:54:30 UTC (rev 12723)
+++ XoopsModules/wfdownloads/trunk/xoops_version.php 2014-07-25 17:13:08 UTC (rev 12724)
@@ -42,10 +42,10 @@
$modversion['onUpdate'] = 'include/onupdate.php';
$modversion['onUninstall'] = 'include/onuninstall.php';
-$modversion['date'] = '2014-07-24';
-$modversion['release_date'] = '2014/07/24';
-$modversion['releasedate'] = '2014-07-24';
-$modversion['status'] = 'RC2';
+$modversion['date'] = '2014-07-25';
+$modversion['release_date'] = '2014/07/25';
+$modversion['releasedate'] = '2014-07-25';
+$modversion['status'] = 'RC3';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
// About
|
|
From: <luc...@us...> - 2014-07-24 14:54:37
|
Revision: 12723
http://sourceforge.net/p/xoops/svn/12723
Author: luciorota
Date: 2014-07-24 14:54:30 +0000 (Thu, 24 Jul 2014)
Log Message:
-----------
RC2
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/admin/categories.php
XoopsModules/wfdownloads/trunk/admin/clone.php
XoopsModules/wfdownloads/trunk/admin/downloads.php
XoopsModules/wfdownloads/trunk/admin/import.php
XoopsModules/wfdownloads/trunk/admin/index.php
XoopsModules/wfdownloads/trunk/admin/menu.php
XoopsModules/wfdownloads/trunk/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/admin/mirrors.php
XoopsModules/wfdownloads/trunk/admin/permissions.php
XoopsModules/wfdownloads/trunk/admin/ratings.php
XoopsModules/wfdownloads/trunk/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/admin/reviews.php
XoopsModules/wfdownloads/trunk/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/class/breadcrumb.php
XoopsModules/wfdownloads/trunk/class/category.php
XoopsModules/wfdownloads/trunk/class/download.php
XoopsModules/wfdownloads/trunk/class/wfdownloads_lists.php
XoopsModules/wfdownloads/trunk/docs/changelog.txt
XoopsModules/wfdownloads/trunk/include/functions.php
XoopsModules/wfdownloads/trunk/include/notification.inc.php
XoopsModules/wfdownloads/trunk/include/search.inc.php
XoopsModules/wfdownloads/trunk/language/english/admin.php
XoopsModules/wfdownloads/trunk/language/english/main.php
XoopsModules/wfdownloads/trunk/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/singlefile.php
XoopsModules/wfdownloads/trunk/submit.php
XoopsModules/wfdownloads/trunk/templates/wfdownloads_singlefile.tpl
XoopsModules/wfdownloads/trunk/topten.php
XoopsModules/wfdownloads/trunk/viewcat.php
XoopsModules/wfdownloads/trunk/xoops_version.php
Added Paths:
-----------
XoopsModules/wfdownloads/trunk/admin/swishe.php
XoopsModules/wfdownloads/trunk/assets/images/module_logo_blank.png
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_categorieslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_downloadslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_ip_logslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_mimetypeslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_mirrorslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_permissions.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_ratingslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_reportsmodificationslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_am_reviewslist.tpl
XoopsModules/wfdownloads/trunk/templates/blocks/wfdownloads_mb_new.tpl
XoopsModules/wfdownloads/trunk/templates/blocks/wfdownloads_mb_top.tpl
XoopsModules/wfdownloads/trunk/templates/blocks/wfdownloads_mb_top_by_cat.tpl
XoopsModules/wfdownloads/trunk/templates/wfdownloads_co_breadcrumb.tpl
XoopsModules/wfdownloads/trunk/templates/wfdownloads_co_letterschoice.tpl
Removed Paths:
-------------
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_categorieslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_downloadslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_ip_logslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_mimetypeslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_mirrorslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_permissions.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_ratingslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_reportsmodificationslist.tpl
XoopsModules/wfdownloads/trunk/templates/admin/wfdownloads_admin_reviewslist.tpl
XoopsModules/wfdownloads/trunk/templates/wfdownloads_common_breadcrumb.tpl
XoopsModules/wfdownloads/trunk/templates/wfdownloads_common_letterschoice.tpl
XoopsModules/wfdownloads/trunk/wfdownloads/
Modified: XoopsModules/wfdownloads/trunk/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/categories.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/categories.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -257,7 +257,7 @@
$sorted_categories = wfdownloads_sortCategories();
$GLOBALS['xoopsTpl']->assign('sorted_categories', $sorted_categories);
$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_categorieslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_categorieslist.tpl");
} else {
redirect_header("{$currentFile}?op=category.add", 1, _AM_WFDOWNLOADS_CCATEGORY_NOEXISTS);
}
Modified: XoopsModules/wfdownloads/trunk/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/clone.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/clone.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -38,6 +38,10 @@
if ($cloneDirname && is_dir(XOOPS_ROOT_PATH . '/modules/' . $cloneDirname)) {
redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_EXISTS, $cloneDirname));
}
+ // Check dirname length for template file name length issues (template file name cannot be longer than 50 chars)
+ if (strlen($cloneDirname) > 18) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_TOOLONG, $cloneDirname));
+ }
$patterns = array(
strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
@@ -79,7 +83,7 @@
_AM_WFDOWNLOADS_CLONE_TITLE,
$wfdownloads->getModule()->getVar('name', 'E')
), 'clone', $currentFile, 'post', true);
- $cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 20, 20, '');
+ $cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 18, 18, '');
$cloneDirname_text->setDescription(_AM_WFDOWNLOADS_CLONE_NAME_DSC);
$form->addElement($cloneDirname_text, true);
$form->addElement(new XoopsFormHidden('op', 'submit'));
@@ -152,7 +156,7 @@
}
}
// Check original image/font
- if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png")) {
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo_blank.png")) {
return false;
}
if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/assets/images/VeraBd.ttf")) {
Modified: XoopsModules/wfdownloads/trunk/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/downloads.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/downloads.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -841,7 +841,7 @@
}
}
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_downloadslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_downloadslist.tpl");
include 'admin_footer.php';
break;
@@ -982,7 +982,7 @@
}
}
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ip_logslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_ip_logslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/trunk/admin/import.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/import.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/import.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -269,27 +269,39 @@
$wfdownloads = WfdownloadsWfdownloads::getInstance();
echo "<br /><span style='font-weight: bold;'>Copying Files</span><br />";
+
// Copy categories images/thumbnails
if (!wfdownloads_copyDir(XOOPS_ROOT_PATH . '/' . $wfdModuleConfig['catimage'], XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('catimage'))) {
return false;
}
echo "Copied categories images and thumbnails<br />";
+
// Copy screenshots images/thumbnails
if (!wfdownloads_copyDir(
XOOPS_ROOT_PATH . '/' . $wfdModuleConfig['screenshots'],
XOOPS_ROOT_PATH . '/' . $wfdownloads->getConfig('screenshots')
- )
- ) {
+ )) {
return false;
}
echo "Copied downloads screenshots and thumbnails<br />";
+
// Copy files
- if (!wfdownloads_copyDir($wfdModuleConfig['uploaddir'], $wfdownloads->getConfig('uploaddir'))) {
- return false;
+ $wfdDownloadObjs = $wfdDownloadsHandler->getObjects();
+ $countCopied = 0;
+ $countNotCopied = 0;
+ foreach($wfdDownloadObjs as $wfdDownloadObj) {
+ if (wfdownloads_copyFile($wfdModuleConfig['uploaddir'] . "/" . $wfdDownloadObj->getVar('filename'), $wfdownloads->getConfig('uploaddir') . "/" . $wfdDownloadObj->getVar('filename'))) {
+ echo "<span style='color:green;'>" . $wfdModuleConfig['uploaddir'] . "/" . $wfdDownloadObj->getVar('filename') . " copied</span><br />";
+ ++$countCopied;
+ } else {
+ echo "<span style='color:red;'>ERROR copying:" . $wfdModuleConfig['uploaddir'] . "/" . $wfdDownloadObj->getVar('filename') . "</span><br />";
+ ++$countNotCopied;
+ }
}
- echo "Copied files<br />";
-
+ echo "Files copied: ". $countCopied;
echo "<br />";
+ echo "Files not copied: ". $countNotCopied;
+ echo "<br />";
echo _AM_WFDOWNLOADS_IMPORT_IMPORTINGDATA;
echo "<br />";
@@ -337,19 +349,36 @@
list($max_ratingid) = $xoopsDB->fetchRow($result);
//Import data into category table
- $sql = "INSERT INTO {$destination['cat']} (";
- $sql .= " `old_cid`, `old_pid`, `title`, `imgurl`, `description`, `total`, `summary`, `spotlighttop`, `spotlighthis`, `dohtml`, `dosmiley`, `doxcode`, `doimage`, `dobr`, `weight`, `formulize_fid`";
- $sql .= " ) SELECT ";
- $sql .= " `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `summary`, `spotlighttop`, `spotlighthis`, `dohtml`, `dosmiley`, `doxcode`, `doimage`, `dobr`, `weight`, `formulize_fid`";
- $sql .= " FROM {$source['cat']}";
+ if (wfdownloads_checkModule('wf' . 'downloads') >= 320) {
+ $sql = "INSERT INTO {$destination['cat']} (";
+ $sql .= " `old_cid`, `old_pid`, `title`, `imgurl`, `description`, `total`, `summary`, `spotlighttop`, `spotlighthis`, `dohtml`, `dosmiley`, `doxcode`, `doimage`, `dobr`, `weight`, `formulize_fid`";
+ $sql .= " ) SELECT ";
+ $sql .= " `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `summary`, `spotlighttop`, `spotlighthis`, `dohtml`, `dosmiley`, `doxcode`, `doimage`, `dobr`, `weight`, `formulize_fid`";
+ $sql .= " FROM {$source['cat']}";
+ } else {
+ $sql = "INSERT INTO {$destination['cat']} (";
+ $sql .= " `old_cid`, `old_pid`, `title`, `imgurl`, `description`, `total`, `summary`, `spotlighttop`, `spotlighthis`, `dohtml`, `dosmiley`, `doxcode`, `doimage`, `dobr`, `weight`";
+ $sql .= " ) SELECT ";
+ $sql .= " `cid`, `pid`, `title`, `imgurl`, `description`, `total`, `summary`, `spotlighttop`, `spotlighthis`, `dohtml`, `dosmiley`, `doxcode`, `doimage`, `dobr`, `weight`";
+ $sql .= " FROM {$source['cat']}";
+ }
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} categories into {$destination['cat']}<br />";
+
//Import data into downloads table
- $sql = "INSERT INTO {$destination['downloads']} (";
- $sql .= " `cid`, `old_lid`, `old_cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `screenshot2`, `screenshot3`, `screenshot4`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `versiontypes`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`, `formulize_idreq`, `screenshots`";
- $sql .= " ) SELECT ";
- $sql .= " 0, `lid`, `cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `screenshot2`, `screenshot3`, `screenshot4`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `versiontypes`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`, `formulize_idreq`, `screenshots`";
- $sql .= " FROM {$source['downloads']}";
+ if (wfdownloads_checkModule('wf' . 'downloads') >= 320) {
+ $sql = "INSERT INTO {$destination['downloads']} (";
+ $sql .= " `cid`, `old_lid`, `old_cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `screenshot2`, `screenshot3`, `screenshot4`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `versiontypes`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`, `formulize_idreq`";
+ $sql .= " ) SELECT ";
+ $sql .= " 0, `lid`, `cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `screenshot2`, `screenshot3`, `screenshot4`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `versiontypes`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`, `formulize_idreq`";
+ $sql .= " FROM {$source['downloads']}";
+ } else {
+ $sql = "INSERT INTO {$destination['downloads']} (";
+ $sql .= " `cid`, `old_lid`, `old_cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`";
+ $sql .= " ) SELECT ";
+ $sql .= " 0, `lid`, `cid`, `title`, `url`, `filename`, `filetype`, `homepage`, `version`, `size`, `platform`, `screenshot`, `submitter`, `publisher`, `status`, `date`, `hits`, `rating`, `votes`, `comments`, `license`, `mirror`, `price`, `paypalemail`, `features`, `requirements`, `homepagetitle`, `forumid`, `limitations`, `dhistory`, `published`, `expired`, `updated`, `offline`, `summary`, `description`, `ipaddress`, `notifypub`";
+ $sql .= " FROM {$source['downloads']}";
+ }
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} downloads into {$destination['downloads']}<br />";
@@ -361,22 +390,33 @@
$sql .= " FROM {$source['mirrors']}";
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} mirrors into {$destination['mirrors']}<br />";
+
//Import data into reviews table
- $sql = "INSERT INTO {$destination['reviews']} (";
- $sql .= " `lid`, `title`, `review`, `submit`, `date`, `uid`, `rate`";
- $sql .= " ) SELECT";
- $sql .= " `lid`, `title`, `review`, `submit`, `date`, `uid`, `rate`";
- $sql .= " FROM {$source['reviews']}";
+ if (wfdownloads_checkModule('wf' . 'downloads') >= 320) {
+ $sql = "INSERT INTO {$destination['reviews']} (";
+ $sql .= " `lid`, `title`, `review`, `submit`, `date`, `uid`, `rate`";
+ $sql .= " ) SELECT";
+ $sql .= " `lid`, `title`, `review`, `submit`, `date`, `uid`, `rate`";
+ $sql .= " FROM {$source['reviews']}";
+ } else {
+ $sql = "INSERT INTO {$destination['reviews']} (";
+ $sql .= " `lid`, `title`, `review`, `submit`, `date`, `uid`";
+ $sql .= " ) SELECT";
+ $sql .= " `lid`, `title`, `review`, `submit`, `date`, `uid`";
+ $sql .= " FROM {$source['reviews']}";
+ }
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} reviews into {$destination['reviews']}<br />";
+
//Import data into brokens table
$sql = "INSERT INTO {$destination['broken']} (";
- $sql .= " `lid`, `sender`, `ip`";
+ $sql .= " `lid`, `sender`, `date`, `ip`";
$sql .= " ) SELECT";
- $sql .= " `lid`, `sender`, `ip`";
+ $sql .= " `lid`, `sender`, `date`, `ip`";
$sql .= " FROM {$source['broken']}";
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} broken reports into {$destination['broken']}<br />";
+
//Import data into votedata table
$sql = "INSERT INTO {$destination['votes']} (";
$sql .= " `lid`, `ratinguser`, `rating`, `ratinghostname`, `ratingtimestamp`";
@@ -385,6 +425,7 @@
$sql .= " FROM {$source['votes']}";
$xoopsDB->query($sql);
echo "Imported {$xoopsDB->getAffectedRows()} votes into {$destination['votes']}<br />";
+
//Import data into mod request table
$sql = "INSERT INTO {$destination['mod']} (";
$sql .= " `lid`, `cid`, `title`, `url`, `homepage`, `version`, `size`, `platform`, `screenshot`, `description`, `modifysubmitter`, `features`, `requirements`, `publisher`, `dhistory`, `summary`)";
@@ -432,10 +473,10 @@
}
//Remove temporary fields
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['cat'] . " DROP `old_pid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_cid`");
- $xoopsDB->query("ALTER TABLE ." . $destination['downloads'] . " DROP `old_lid`");
+ $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " DROP `old_cid`");
+ $xoopsDB->query("ALTER TABLE " . $destination['cat'] . " DROP `old_pid`");
+ $xoopsDB->query("ALTER TABLE " . $destination['downloads'] . " DROP `old_cid`");
+ $xoopsDB->query("ALTER TABLE " . $destination['downloads'] . " DROP `old_lid`");
return null;
}
Modified: XoopsModules/wfdownloads/trunk/admin/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/index.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/index.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -32,6 +32,7 @@
//--------------------------
$categories_count = wfdownloads_categoriesCount();
+$votes_count = $wfdownloads->getHandler('rating')->getCount();
$brokenDownloads_count = $wfdownloads->getHandler('report')->getCount();
$modificationRequests_count = $wfdownloads->getHandler('modification')->getCount();
$newReviews_count = $wfdownloads->getHandler('review')->getCount();
@@ -111,6 +112,29 @@
'green'
);
}
+// Ratings
+if ($wfdownloads->getConfig('enable_ratings') == false) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFDOWNLOADS_MINDEX_DOWNSUMMARY,
+ '<infolabel>' . _AM_WFDOWNLOADS_SVOTES . '</infolabel>',
+ _CO_WFDOWNLOADS_DISABLED,
+ 'red'
+ );
+} elseif ($votes_count > 0) {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFDOWNLOADS_MINDEX_DOWNSUMMARY,
+ '<infolabel><a href="ratings.php">' . _AM_WFDOWNLOADS_SVOTES . '</a></infolabel>',
+ $votes_count,
+ 'green'
+ );
+} else {
+ $indexAdmin->addInfoBoxLine(
+ _AM_WFDOWNLOADS_MINDEX_DOWNSUMMARY,
+ '<infolabel>' . _AM_WFDOWNLOADS_SVOTES . '</infolabel>',
+ $votes_count,
+ 'green'
+ );
+}
// Modifications
if ($modificationRequests_count > 0) {
$indexAdmin->addInfoBoxLine(
Modified: XoopsModules/wfdownloads/trunk/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/menu.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/menu.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -20,11 +20,13 @@
*/
defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
-$pathIcon32 = '../../' . $module->getInfo('icons32');
+//$module_handler = xoops_gethandler('module');
+//$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+$wfdownloads = WfdownloadsWfdownloads::getInstance();
+$pathIcon32 = '../../' . $wfdownloads->getModule()->getInfo('icons32');
-xoops_loadLanguage('modinfo', $module->dirname());
+xoops_loadLanguage('modinfo', $wfdownloads->getModule()->dirname());
$adminmenu = array();
$i=0;
@@ -59,6 +61,16 @@
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_INDEXPAGE;
$adminmenu[$i]['link'] = "admin/indexpage.php";
$adminmenu[$i]["icon"] = $pathIcon32 . '/index.png';
+/*
+// Swish-e support EXPERIMENTAL
+if ($wfdownloads->getConfig('enable_swishe') == true) {
+ ++$i;
+ $adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_SWISHE;
+ $adminmenu[$i]['link'] = "admin/swishe.php";
+ $adminmenu[$i]["icon"] = $pathIcon32 . '/search.png';
+}
+// Swish-e support EXPERIMENTAL
+*/
++$i;
$adminmenu[$i]['title'] = _MI_WFDOWNLOADS_MENU_IMAGES;
$adminmenu[$i]['link'] = "admin/images.php";
Modified: XoopsModules/wfdownloads/trunk/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/mimetypes.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/mimetypes.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -218,7 +218,7 @@
$GLOBALS['xoopsTpl']->assign('allowAdminMimetypes', $allowAdminMimetypes);
$GLOBALS['xoopsTpl']->assign('allowUserMimetypes', $allowUserMimetypes);
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mimetypeslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_mimetypeslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/trunk/admin/mirrors.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/mirrors.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/mirrors.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -190,7 +190,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_mirrorslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_mirrorslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/trunk/admin/permissions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/permissions.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/permissions.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -45,6 +45,6 @@
$GLOBALS['xoopsTpl']->assign('down_cat_form', $down_cat_form->render());
$GLOBALS['xoopsTpl']->assign('up_cat_form', $up_cat_form->render());
-$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_permissions.tpl");
+$GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_permissions.tpl");
include 'admin_footer.php';
Modified: XoopsModules/wfdownloads/trunk/admin/ratings.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/ratings.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/ratings.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -83,7 +83,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_ratingslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_ratingslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/trunk/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/reportsmodifications.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/reportsmodifications.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -404,7 +404,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reportsmodificationslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_reportsmodificationslist.tpl");
include 'admin_footer.php';
break;
Modified: XoopsModules/wfdownloads/trunk/admin/reviews.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/reviews.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/admin/reviews.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -202,7 +202,7 @@
$xoopsTpl->assign('use_reviews', $wfdownloads->getConfig('enable_reviews'));
$xoopsTpl->assign('use_brokenreports', $wfdownloads->getConfig('enable_brokenreports'));
- $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_admin_reviewslist.tpl");
+ $GLOBALS['xoopsTpl']->display("db:{$wfdownloads->getModule()->dirname()}_am_reviewslist.tpl");
include 'admin_footer.php';
break;
Added: XoopsModules/wfdownloads/trunk/admin/swishe.php
===================================================================
--- XoopsModules/wfdownloads/trunk/admin/swishe.php (rev 0)
+++ XoopsModules/wfdownloads/trunk/admin/swishe.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -0,0 +1,78 @@
+<?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.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
+
+if (@$_POST['op'] == 'submit') {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+
+ // Swish-e support EXPERIMENTAL
+ wfdownloads_swishe_config();
+ // Swish-e support EXPERIMENTAL
+
+ include 'admin_footer.php';
+ exit();
+
+} else {
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+
+ // Swish-e support EXPERIMENTAL
+ if (wfdownloads_swishe_check() == true) {
+ echo "OK";
+ } else {
+ echo "NOT OK" . "<br />";
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ $form = new XoopsThemeForm(_AM_WFDOWNLOADS_SWISHE_CONFIG, 'config', $currentFile, 'post', true);
+ $form->addElement(new XoopsFormHidden('op', 'submit'));
+ $form->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
+ $form->display();
+ }
+
+ // Get the location of the document repository (the index files are located in the root)
+ $swisheDocPath = $wfdownloads->getConfig('uploaddir');
+
+ // Get the location of the SWISH-E executable
+ $swisheExePath = $wfdownloads->getConfig('swishe_exe_path');
+
+ // check if _binfilter.sh exists
+ echo "{$swisheDocPath}/_binfilter.sh" . "<br />";
+// IN PROGRESS
+ // check if swish-e.conf exists
+ echo "{$swisheDocPath}/swish-e.conf" . "<br />";
+// IN PROGRESS
+ // check if swish-e exists
+ echo "{$swisheExePath}/swish-e" . "<br />"; // path of swish-e command
+ echo "{$swisheDocPath}/index.swish-e" . "<br />"; // path of swish-e index file
+// IN PROGRESS
+ // Swish-e support EXPERIMENTAL
+
+ include 'admin_footer.php';
+ exit();
+}
Added: XoopsModules/wfdownloads/trunk/assets/images/module_logo_blank.png
===================================================================
(Binary files differ)
Index: XoopsModules/wfdownloads/trunk/assets/images/module_logo_blank.png
===================================================================
--- XoopsModules/wfdownloads/trunk/assets/images/module_logo_blank.png 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/assets/images/module_logo_blank.png 2014-07-24 14:54:30 UTC (rev 12723)
Property changes on: XoopsModules/wfdownloads/trunk/assets/images/module_logo_blank.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsModules/wfdownloads/trunk/blocks/top_by_cat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/blocks/top_by_cat.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/blocks/top_by_cat.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -70,17 +70,17 @@
$block['downloads'][] = $download;
}
- $allsubcats_linked_totop = $wfdownloads->getHandler('category')->getAllSubcatsTopParentCid();
+ $categoriesTopParentByCid = $wfdownloads->getHandler('category')->getAllSubcatsTopParentCid();
+
foreach ($wfdownloads->getHandler('category')->topCategories as $cid) {
$block['topcats'][$cid]['title'] = $wfdownloads->getHandler('category')->allCategories[$cid]->getVar('title');
$block['topcats'][$cid]['cid'] = $cid;
$block['topcats'][$cid]['imgurl'] = $wfdownloads->getHandler('category')->allCategories[$cid]->getVar('imgurl');
}
-//mb foreach ($block['downloads'] as $key => $value) {
foreach ($block['downloads'] as $value) {
- $block['topcats'][$allsubcats_linked_totop[$value['cid']]]['downloads'][] = $value;
+ $block['topcats'][$categoriesTopParentByCid[$value['cid']]]['downloads'][] = $value;
}
return $block;
Modified: XoopsModules/wfdownloads/trunk/class/breadcrumb.php
===================================================================
--- XoopsModules/wfdownloads/trunk/class/breadcrumb.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/class/breadcrumb.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -46,6 +46,8 @@
/**
* Add link to breadcrumb
*
+ * @param string $title
+ * @param string $link
*/
function addLink( $title='', $link='' )
{
@@ -69,7 +71,7 @@
require_once $GLOBALS['xoops']->path('class/template.php');
$breadcrumbTpl = new XoopsTpl();
$breadcrumbTpl->assign('breadcrumb', $this->_bread);
- $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.tpl");
+ $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_co_breadcrumb.tpl");
unset($breadcrumbTpl);
return $html;
Modified: XoopsModules/wfdownloads/trunk/class/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/class/category.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/class/category.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -107,7 +107,7 @@
);
}
// category: weight
- $form->addElement(new XoopsFormText(_AM_WFDOWNLOADS_FCATEGORY_WEIGHT, 'weight', 10, 80, $this->getVar('weight')), false);
+ $form->addElement(new XoopsFormText(_AM_WFDOWNLOADS_FCATEGORY_WEIGHT, 'weight', 11, 11, $this->getVar('weight')), false);
// permission: WFDownCatPerm
$groups = $gperm_handler->getGroupIds('WFDownCatPerm', $this->getVar('cid'), $this->wfdownloads->getModule()->mid());
$groups_down_select = new XoopsFormSelectGroup(_AM_WFDOWNLOADS_FCATEGORY_GROUPPROMPT, "groups", true, $groups, 5, true);
@@ -241,16 +241,16 @@
function getNicePath($cid, $root_filename = "index.php", $item_filename = "viewcat.php?op=")
{
include_once WFDOWNLOADS_ROOT_PATH . '/class/xoopstree.php';
- $mytree = new WfdownloadsXoopsTree($this->table, $this->keyName, 'pid');
- $pathstring = $mytree->getNicePathFromId($cid, $this->identifierName, $item_filename);
+ $mytree = new WfdownloadsXoopsTree($this->table, $this->keyName, 'pid');
+ $pathString = $mytree->getNicePathFromId($cid, $this->identifierName, $item_filename);
/**
* Replacing the " with ">" and deleteing the last ">" at the end
*/
- $pathstring = trim($pathstring);
- $pathstring = str_replace(':', '>', $pathstring);
-// $pathstring = substr($pathstring, 0, strlen($pathstring) - 13); // not needed now with fixed icms core! but required for XOOPS
- return $pathstring;
+ $pathString = trim($pathString);
+ $pathString = str_replace(':', '>', $pathString);
+// $pathString = substr($pathString, 0, strlen($pathString) - 13); // not needed now with fixed icms core! but required for XOOPS
+ return $pathString;
}
/**
@@ -266,7 +266,7 @@
global $xoopsUser;
$gperm_handler = xoops_gethandler('groupperm');
- $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $this->wfdownloads->getModule()->mid());
return $this->getObjects(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'), $id_as_key, $as_object);
@@ -285,7 +285,7 @@
global $xoopsUser;
$gperm_handler = xoops_gethandler('groupperm');
- $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
$allowedDownCategoriesIds = $gperm_handler->getItemIds('WFDownCatPerm', $groups, $this->wfdownloads->getModule()->mid());
return $this->getObjects(new Criteria('cid', '(' . implode(',', $allowedDownCategoriesIds) . ')', 'IN'), $id_as_key, $as_object);
@@ -302,7 +302,7 @@
global $xoopsUser;
$gperm_handler = xoops_gethandler('groupperm');
- $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
$allowedUpCategoriesIds = $gperm_handler->getItemIds('WFUpCatPerm', $groups, $this->wfdownloads->getModule()->mid());
return $this->getObjects(new Criteria('cid', '(' . implode(',', $allowedUpCategoriesIds) . ')', 'IN'), $id_as_key, $as_object);
@@ -315,11 +315,11 @@
*/
function getChildCats($category)
{
- $allcats = $this->getObjects();
+ $categoryObjs = $this->getObjects();
include_once XOOPS_ROOT_PATH . '/class/tree.php';
- $tree = new XoopsObjectTree($allcats, $this->keyName, 'pid');
+ $categoryObjsTree = new XoopsObjectTree($categoryObjs, $this->keyName, 'pid');
- return $tree->getAllChild($category->getVar($this->keyName));
+ return $categoryObjsTree->getAllChild($category->getVar($this->keyName));
}
/**
@@ -332,52 +332,62 @@
}
include_once XOOPS_ROOT_PATH . '/class/tree.php';
- $tree = new XoopsObjectTree($this->allCategories, $this->keyName, 'pid');
- $treeobj = $tree->getTree();
+ $categoryObjsTree = new XoopsObjectTree($this->allCategories, $this->keyName, 'pid');
- /**
- * Let's create an array where key will be cid of the top categories and
- * value will be an array containing all the cid of its subcategories
- * If value = 0, then this topcat does not have any subcats
- */
- $topcatsarray = array();
- foreach ($treeobj[0]['child'] as $topcid) {
- if (!isset($this->topCategories[$topcid])) {
- $this->topCategories[$topcid] = $topcid;
+ $allsubcats_linked_totop = array();
+ foreach ($this->allCategories as $cid => $category) {
+ $parentCategoryObjs = $categoryObjsTree->getAllParent($cid);
+ if (count($parents) == 0) {
+ // is a top category
+ $allsubcats_linked_totop[$cid] = $cid;
+ } else {
+ // is not a top category
+ $topParentCategoryObj = end($parentCategoryObjs);
+ $allsubcats_linked_totop[$cid] = $topParentCategoryObj->getVar($cid);
}
- foreach ($tree->getAllChild($topcid) as /*$key =>*/ $category) {
- $childrenids[] = $category->getVar('cid');
+ unset($parentCategoryObjs);
+ }
+ return $allsubcats_linked_totop;
+/*
+ $categoryObjsTreeNodes = $categoryObjsTree->getTree();
+
+ // Let's create an array where key will be cid of the top categories and
+ // value will be an array containing all the cid of its subcategories
+ // If value = 0, then this topcat does not have any subcats
+ $topCategories = array();
+ foreach ($categoryObjsTreeNodes[0]['child'] as $topCategory_cid) {
+ if (!isset($this->topCategories[$topCategory_cid])) {
+ $this->topCategories[$topCategory_cid] = $topCategory_cid;
}
- $childrenids = isset($childrenids) ? $childrenids : 0;
- $topcatsarray[$topcid] = $childrenids;
- unset($childrenids);
+ foreach ($categoryObjsTree->getAllChild($topCategory_cid) as $key => $childCategory) {
+ $childCategory_cids[] = $childCategory->getVar('cid');
+ }
+ $childCategory_cids = isset($childCategory_cids) ? $childCategory_cids : 0;
+ $topCategories[$topCategory_cid] = $childCategory_cids;
+ unset($childCategory_cids);
}
- /**
- * Now we need to create another array where key will be all subcategories cid and
- * value will be the cid of its top most category
- */
+ // Now we need to create another array where key will be all subcategories cid and
+ // value will be the cid of its top most category
$allsubcats_linked_totop = array();
- foreach ($topcatsarray as $topcatcid => $subcatsarray) {
- if ($subcatsarray == 0) {
- $allsubcats_linked_totop[$topcatcid] = $topcatcid;
+ foreach ($topCategories as $topCategory_cid => $childCategory_cids) {
+ if ($childCategory_cids == 0) {
+ $allsubcats_linked_totop[$topCategory_cid] = $topCategory_cid;
} else {
- foreach ($subcatsarray as $subcatcid) {
- $allsubcats_linked_totop[$subcatcid] = $topcatcid;
+ foreach ($childCategory_cids as $childCategory_cid) {
+ $allsubcats_linked_totop[$childCategory_cid] = $topCategory_cid;
}
}
}
- /**
- * Finally, let's finish by adding to this array, all the top categories which values
- * will be their cid
- */
-// foreach ($this->topCategories as $topcid) {
- foreach ($topcatsarray as $topcid) {
- $allsubcats_linked_totop[$topcid] = $topcid;
+ // Finally, let's finish by adding to this array, all the top categories which values
+ // will be their cid
+ foreach ($topCategories as $topCategory_cid) {
+ $allsubcats_linked_totop[$topCategory_cid] = $topCategory_cid;
}
return $allsubcats_linked_totop;
+*/
}
}
Modified: XoopsModules/wfdownloads/trunk/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/class/download.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/class/download.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -446,7 +446,7 @@
// Return if download has custom fields
$download['has_custom_fields'] = (wfdownloads_checkModule('formulize') && $this->getVar('formulize_idreq'));
-
+
return $download;
}
@@ -1149,6 +1149,8 @@
// Formulize module support (2006/03/06, 2006/03/08) jpc - start
/**
+ * @param $title
+ *
* @return XoopsThemeForm
*/
function getCategoryForm($title)
Modified: XoopsModules/wfdownloads/trunk/class/wfdownloads_lists.php
===================================================================
--- XoopsModules/wfdownloads/trunk/class/wfdownloads_lists.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/class/wfdownloads_lists.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -40,6 +40,15 @@
* Images
* files
* dir
+ *
+ * @param string $path
+ * @param null $value
+ * @param string $selected
+ * @param int $size
+ * @param int $emptyselect
+ * @param int $type
+ * @param string $prefix
+ * @param string $suffix
*/
function __construct($path = "uploads", $value = null, $selected = '', $size = 1, $emptyselect = 0, $type = 0, $prefix = '', $suffix = '')
@@ -78,6 +87,8 @@
/**
* Private to be called by other parts of the class
+ * @param $dirname
+ * @return array
*/
function &getDirListAsArray($dirname)
{
Modified: XoopsModules/wfdownloads/trunk/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/docs/changelog.txt 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/docs/changelog.txt 2014-07-24 14:54:30 UTC (rev 12723)
@@ -1,4 +1,5 @@
-<b><u>=> Version 3.23 Beta (2014-04-27)</u></b>
+<b><u>=> Version 3.23 RC2 (2014-07-24)</u></b>
+- todo: Swish-e files indexing support
- removed obsolete eval() that was used for PHP4 (mamba)
- removed object.php file (mamba)
- 'file_url' is calculated inside download object for better usability (luciorota)
Modified: XoopsModules/wfdownloads/trunk/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/include/functions.php 2014-07-22 12:18:06 UTC (rev 12722)
+++ XoopsModules/wfdownloads/trunk/include/functions.php 2014-07-24 14:54:30 UTC (rev 12723)
@@ -175,6 +175,11 @@
return null;
}
+/**
+ * @param string $path
+ *
+ * @return array
+ */
function wfdownloads_getFiles($path = '.')
{
$files = array();
@@ -343,8 +348,8 @@
if (count($subCategoryObjs) > 0) {
++$level;
foreach ($subCategoryObjs as $subCategoryObj) {
- $pid = $subCategoryObj->getVar('pid');
- $cid = $subCategoryObj->getVar('cid');
+ $pid = $subCategoryObj->getVar('pid');
+ $cid = $subCategoryObj->getVar('cid');
$sorted[] = array('pid' => $pid, 'cid' => $cid, 'level' => $level, 'category' => $subCategoryObj->toArray());
if ($subSorted = wfdownloads_sortCategories($cid, $level)) {
$sorted = array_merge($sorted, $subSorted);
@@ -397,7 +402,7 @@
$letterschoiceTpl = new XoopsTpl();
$letterschoiceTpl->caching = false; // Disable cache
$letterschoiceTpl->assign('alphabet', $alphabet_array);
- $html = $letterschoiceTpl->fetch("db:" . $wfdownloads->getModule()->dirname() . "_common_letterschoice.tpl");
+ $html = $letterschoiceTpl->fetch("db:" . $wfdownloads->getModule()->dirname() . "_co_letterschoice.tpl");
unset($letterschoiceTpl);
return $html;
@@ -1315,7 +1320,7 @@
*
* @return int
*/
-function return_bytes($size_str)
+function wfdownloads_return_bytes($size_str)
{
switch (substr ($size_str, -1))
{
@@ -1366,7 +1371,7 @@
$file_name = $_FILES['userfile']['name'];
//Admin can upload files of any size
if (wfdownloads_userIsAdmin()) {
- $maxFileSize = return_bytes(ini_get('upload_max_filesize'));
+ $maxFileSize = wfdownloads_return_bytes(ini_get('upload_max_filesize'));
} else {
$maxFileSize = $wfdownloads->getConfig('maxfilesize');
}
@@ -1460,15 +1465,18 @@
// IN PROGRESS
// IN PROGRESS
/**
-* @author Jack Mason
-* @website volunteer @ http://www.osipage.com, web access application and bookmarking tool.
-* @copyright Free script, use anywhere as you like, no attribution required
-* @created 2014
-* The script is capable of downloading really large files in PHP. Files greater than 2GB may fail in 32-bit windows or similar system.
-* All incorrect headers have been removed and no nonsense code remains in this script. Should work well.
-* The best and most recommended way to download files with PHP is using xsendfile, learn
-* more here: https://tn123.org/mod_xsendfile/
-*/
+ * @author Jack Mason
+ * @website volunteer @ http://www.osipage.com, web access application and bookmarking tool.
+ * @copyright Free script, use anywhere as you like, no attribution required
+ * @created 2014
+ * The script is capable of downloading really large files in PHP. Files greater than 2GB may fail in 32-bit windows or similar system.
+ * All incorrect headers have been removed and no nonsense code remains in this script. Should work well.
+ * The best and most recommended way to download files with PHP is using xsendfile, learn
+ * more here: https://tn123.org/mod_xsendfile/
+ *
+ * @param $filePath
+ * @param $fileMimetype
+ */
function wfdownloads_largeDownload($filePath, $fileMimetype)
{
/* You may need these ini settings too */
@@ -1694,96 +1702,118 @@
return $truncate;
}
-// IN PROGRESS
-// IN PROGRESS
-// IN PROGRESS
-/*
-php4swish-e 1.1, a web search interface for the swish-e search engine.
-swish-e is a popular open-source search engine that runs on many platforms.
-More information on swish-e is available at swish-e.org.
-This code has been thoroughly tested and is ready for production
- on any UNIX or Linux server that has the swish-e search engine installed.
-You are free to modify this code as you see fit.
-You must specify the path of swish-e ($swish) and
- the location of the search index file ($search_index).
-You will also need to change the default index file served if it is not index.php.
-If you want the meta description information to display completely,
- be sure the <meta description... information is on *one* line for each web page.
-If you wish to allow external search forms to call this script, be sure to set the
- form's action attribute to whatever you name this file.
-Suggestions for enhancements are welcome.
-*/
+
+
+// Swish-e support EXPERIMENTAL
+/**
+ * php4swish-e 1.1, a web search interface for the swish-e search engine.
+ * swish-e is a popular open-source search engine that runs on many platforms.
+ * More information on swish-e is available at swish-e.org.
+ * This code has been thoroughly tested and is ready for production
+ * on any UNIX or Linux server that has the swish-e search engine installed.
+ * You are free to modify this code as you see fit.
+ * You must specify the path of swish-e ($swish) and
+ * the location of the search index file ($swisheIndexFilePath).
+ * You will also need to change the default index file served if it is not index.php.
+ * If you want the meta description information to display completely,
+ * be sure the <meta description... information is on *one* line for each web page.
+ * If you wish to allow external search forms to call this script, be sure to set the
+ * form's action attribute to whatever you name this file.
+ * Suggestions for enhancements are welcome.
+ */
+function wfdownloads_swishe_check()
+{
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
+
+ // Get the location of the document repository (the index files are located in the root)
+ $swisheDocPath = $wfdownloads->getConfig('uploaddir');
+
+ // Get the location of the SWISH-E executable
+ $swisheExePath = $wfdownloads->getConfig('swishe_exe_path');
+
+ // check if _binfilter.sh exists
+ if (!is_file("{$swisheDocPath}/_binfilter.sh")) {
+ return false;
+ }
+
+ // check if swish-e.conf exists
+ if (!is_file("{$swisheDocPath}/swish-e.conf")) {
+ return false;
+ }
+
+ // check if swish-e.exe exists
+ if (!is_file("{$swisheExePath}/swish-e.exe")) {
+ return false;
+ }
+
+ return true;
+}
+
function wfdownloads_swishe_config()
{
$wfdownloads = WfdownloadsWfdownloads::getInstance();
- // Get the path to the repository
- // IN PROGRESS
- // IN PROGRESS
- // IN PROGRESS
- $swisheDocPath = $wfdownloads->getConfig('swishe_doc_path'); // IN PROGRESS WFDOWNLOADS REPOSITORY PATH
+ // Get the location of the document repository (the index files are located in the root)
+ $swisheDocPath = $wfdownloads->getConfig('uploaddir');
// Create _binfilter.sh
- // IN PROGRESS
- // IN PROGRESS
- // IN PROGRESS
- //$file = "{$swisheDocPath}/_binfilter.sh";
- //$fp = fopen($file, 'w') or die("<BR><BR>Unable to open $file");
- //fputs($fp, "strings \"\$1\" - 2>/dev/null\n");
- //fclose($fp);
- //chmod($file, 0755);
+ $file = "{$swisheDocPath}/_binfilter.sh";
+ $fp = fopen($file, 'w') or die("<BR><BR>Unable to open $file");
+ fputs($fp, "strings \"\$1\" - 2>/dev/null\n");
+ fclose($fp);
+ chmod($file, 0755);
+ unset($fp);
// Create swish-e.conf
$file = "{$swisheDocPath}/swish-e.conf";
- $fp = fopen($file, 'w') || die("<BR><BR>Unable to open {$file}");
- $line = "IndexDir {$swisheDocPath}/\n";
- fputs($fp, $line);
- $line = "IndexFile {$swisheDocPath}/index.swish-e\n";
- fputs($fp, $line);
- //$line = "TruncateDocSize 100000\n";
- //fputs($fp,$line);
- $line = "IndexReport 1\n";
- fputs($fp, $line);
- $line = "IndexContents TXT* .dat\n";
- fputs($fp, $line);
- //$line = "FileFilter .dat \"{$swisheDocPath}/_binfilter.sh\" \"'%p'\"\n";
- //fputs($fp,$line);
- $line = "IndexOnly .dat\n";
- fputs($fp, $line);
- $line = "MinWordLimit 3\n";
- fputs($fp, $line);
+ $fp = fopen($file, 'w') or die("<BR><BR>Unable to open {$file}");
+ // IndexDir [directories or files|URL|external program]
+ // IndexDir defines the source of the documents for Swish-e. Swish-e currently supports three file access methods: File system, HTTP (also called spidering), and prog for reading files from an external program.
+ fputs($fp, "IndexDir {$swisheDocPath}/\n");
+ // IndexFile *path*
+ // Index file specifies the location of the generated index file. If not specified, Swish-e will create the file index.swish-e in the current directory.
+ fputs($fp, "IndexFile {$swisheDocPath}/index.swish-e\n");
+ // TruncateDocSize *number of characters*
+ // TruncateDocSize limits the size of a document while indexing documents and/or using filters. This config directive truncates the numbers of read bytes of a document to the specified size. This means: if a document is larger, read only the specified numbers of bytes of the document.
+ //fputs($fp, "TruncateDocSize 100000\n");
+ // IndexReport [0|1|2|3]
+ // This is how detailed you want reporting while indexing. You can specify numbers 0 to 3. 0 is totally silent, 3 is the most verbose. The default is 1.
+ fputs($fp, "IndexReport 1\n");
+ // IndexContents [TXT|HTML|XML|TXT2|HTML2|XML2|TXT*|HTML*|XML*] *file extensions*
+ // The IndexContents directive assigns one of Swish-e's document parsers to a document, based on the its extension. Swish-e currently knows how to parse TXT, HTML, and XML documents.
+ fputs($fp, "IndexContents TXT* .dat\n");
+ // FileFilter *suffix* "filter-prog" ["filter-options"]
+ // This maps file suffix (extension) to a filter program. If filter-prog starts with a directory delimiter (absolute path), Swish-e doesn't use the FilterDir settings, but uses the given filter-prog path directly.
+ //fputs($fp, "FileFilter .dat \"{$swisheDocPath}/_binfilter.sh\" \"'%p'\"\n");
+ // IndexOnly *list of file suffixes*
+ // This directive specifies the allowable file suffixes (extensions) while indexing. The default is to index all files specified in IndexDir.
+ fputs($fp, "IndexOnly .dat\n");
+ // MinWordLimit *integer*
+ // Set the minimum length of an word. Shorter words will not be indexed. The default is 1 (as defined in src/config.h).
+ fputs($fp, "MinWordLimit 3\n");
fclose($fp);
chmod($file, 0755);
-
- // IN PROGRESS
- // IN PROGRESS
- // IN PROGRESS
- print("<SCRIPT LANGUAGE='Javascript'>\r");
- print("location='config_main.php';");
- print("</SCRIPT>");
}
-// IN PROGRESS
-// IN PROGRESS
-// IN PROGRESS
/**
- * @param $search_query
+ * @param $swisheQueryWords
*/
-function wfdownloads_swishe_search($search_query)
+function wfdownloads_swishe_search($swisheQueryWords)
{
$wfdownloads = WfdownloadsWfdownloads::getInstance();
+ $ret = false;
// IN PROGRESS
// IN PROGRESS
// IN PROGRESS
- $search_query = stripslashes($search_query);
- if (((strlen($search_query) > 2) && ($last_query != $search_query)) && ($page == false)) {
+ $swisheQueryWords = stripslashes($swisheQueryWords);
+ if (strlen($swisheQueryWords) > 2) {
//print "<BR>SEARCH!";
- // Get the first word in $search_query and use it for the $summary_query.
+ // Get the first word in $swisheQueryWords and use it for the $summary_query.
// IN PROGRESS
// IN PROGRESS
// IN PROGRESS
- $summary_query = str_replace("\"", " ", $search_query);
+ $summary_query = str_replace("\"", " ", $swisheQueryWords);
$summary_query = trim($summary_query);
$summary_query_e = explode(" ", $summary_query);
$summary_query = trim($summary_query_e[0]);
@@ -1792,42 +1822,32 @@
//print "<BR>SQ: ".$summary_query;
// Get the location of the document repository (the index files are located in the root)
- // IN PROGRESS
- // IN PROGRESS
- // IN PROGRESS
- $swisheDocPath = $wfdownloads->getConfig('swishe_doc_path'); // IN PROGRESS WFDOWNLOADS REPOSITORY PATH
+ $swisheDocPath = $wfdownloads->getConfig('uploaddir');
$swisheDocPath_strlen = strlen($wfdownloads->getConfig('swishe_doc_path'));
// Get the location of the SWISH-E executable
- // IN PROGRESS
- // IN PROGRESS
- // IN PROGRESS
$swisheExePath = $wfdownloads->getConfig('swishe_exe_path');
- // Get the search_limit to limit the search to X number of entries
- // IN PROGRESS
- // IN PROGRESS
- // IN PROGRESS
- $search_limit = $wfdownloads->getConfig('search_limit');
- //print "<BR>Query: ".$search_query;
-
// Get search query
- $search_query = EscapeShellCmd($search_query); // escape potentially malicious shell commands
- $search_query = stripslashes($search_query); // remove backslashes from search query
- $search_query = preg_replace('#("|\')#', '', $search_query); // remove quotes from search query
- $swish = "{$swisheExePath}/swish-e"; // path of swish-e command
- $search_index = "{$swisheDocPath}/index.swish-e"; // path of swish-e index file
- $search_params = "-H1 -m{$search_limit}"; // Additional search parameters
+ $swisheQueryWords = escapeshellcmd($swisheQueryWords); // escape potentially malicious shell commands
+ $swisheQueryWords = stripslashes($swisheQueryWords); // remove backslashes from search query
+ $swisheQueryWords = preg_replace('#("|\')#', '', $swisheQueryWords); // remove quotes from search query
+ $swisheCommand = "{$swisheExePath}/swish-e"; // path of swish-e command
+ $swisheIndexFilePath = "{$swisheDocPath}/index.swish-e"; // path of swish-e index file
+ $swisheSearchParams = ""; // Additional search parameters
+ $swisheSearchParams .= "-H1"; // -H1 : print standard result header (default).
+ if ($wfdownloads->getConfig('swishe_search_limit') != 0) {
+ $swisheSearchParams .= " -m{$wfdownloads->getConfig('swishe_search_limit')}"; // -m *number* (max results)
+ }
// Opens a pipe to swish-e
- $pipe_handler = popen("{$swish} -w {$search_query} -f {$search_index} {$search_params}", "r")
- || die("The search request generated an error...Please try again.");
+ $swishePipeHandler = popen("{$swisheCommand} -w {$swisheQueryWords} -f {$swisheIndexFilePath} {$swisheSearchParams}", "r");
+ if(!$swishePipeHandler) die("The search request generated an error...Please try again.");
+error_log("{$swisheCommand} -w {$swisheQueryWords} -f {$swisheIndexFilePath} {$swisheSearchParams}");
- //print "$swish -w $search_query -f $search_index $search_params<BR>";
-
$line_cnt = 1;
// loop through each line of the pipe result (i.e. swish-e output) to find hit number
- while ($nline = @fgets($pipe_handler, 1024)) {
+ while ($nline = @fgets($swishePipeHandler, 1024)) {
if ($line_cnt == 4) {
$num_line = $nline;
break; // grab the 4th line, which contains the number of hits returned
@@ -1836,12 +1856,13 @@
}
// strip out all but the number of hits
- $num_results = preg_replace('/# Number of hits: /', '', $num_line);
+ //$num_results = preg_replace('/# Number of hits: /', '', $num_line);
//$table_header_flag = false;
//$disp_nff_flag = true;
- while ($line = @fgets($pipe_handler, 4096)) {
+ $ret = array();
+ while ($line = @fgets($swishePipeHandler, 4096)) {
// loop through each line of the pipe result (i.e. swish-e output)
if (preg_match("/^(\d+)\s+(\S+)\s+\"(.*)\"\s+(\d+)/", $line)) {
// Skip commented-out lines and the last line
@@ -1849,60 +1870,24 @@
$line[1] = preg_replace("/[[:blank:]]/", "%%", $line[1]); // replace every space with %% for the phrase in quotation marks
$line = implode('"', $line); // collapse the array into a string
$line = preg_replace("/[[:blank:]]/", "\t", $line); // replace every space with a tab
- list ($rel...
[truncated message content] |
|
From: <be...@us...> - 2014-07-22 12:18:21
|
Revision: 12722
http://sourceforge.net/p/xoops/svn/12722
Author: beckmi
Date: 2014-07-22 12:18:06 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
Updating phpThumb to latest version
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.filters.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.functions.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.gif.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.ico.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php 2014-07-20 20:29:24 UTC (rev 12721)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php 2014-07-22 12:18:06 UTC (rev 12722)
@@ -1,7 +1,8 @@
<?php
//////////////////////////////////////////////////////////////
-/// phpThumb() by James Heinrich <in...@si...> //
-// available at http://phpthumb.sourceforge.net ///
+// phpThumb() by James Heinrich <in...@si...> //
+// available at http://phpthumb.sourceforge.net //
+// and/or https://github.com/JamesHeinrich/phpThumb //
//////////////////////////////////////////////////////////////
/// //
// See: phpthumb.changelog.txt for recent changes //
@@ -13,334 +14,340 @@
ini_set('display_errors', '1');
ini_set('magic_quotes_runtime', '0');
if (ini_get('magic_quotes_runtime')) {
- die('"magic_quotes_runtime" is set in php.ini, cannot run phpThumb with this enabled');
+ die('"magic_quotes_runtime" is set in php.ini, cannot run phpThumb with this enabled');
}
-$starttime = array_sum(explode(' ', microtime()));
+$starttime = array_sum(explode(' ', microtime())); // could be called as microtime(true) for PHP 5.0.0+
// this script relies on the superglobal arrays, fake it here for old PHP versions
if (phpversion() < '4.1.0') {
- $_SERVER = $HTTP_SERVER_VARS;
- $_GET = $HTTP_GET_VARS;
+ $_SERVER = $HTTP_SERVER_VARS;
+ $_GET = $HTTP_GET_VARS;
}
-function SendSaveAsFileHeaderIfNeeded()
-{
- if (headers_sent()) {
- return false;
- }
- global $phpThumb;
- $downloadfilename = phpthumb_functions::SanitizeFilename(@$_GET['sia'] ? $_GET['sia'] : (@$_GET['down'] ? $_GET['down'] : 'phpThumb_generated_thumbnail'.(@$_GET['f'] ? $_GET['f'] : 'jpg')));
- if (@$downloadfilename) {
- $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__);
- header('Content-Disposition: '.(@$_GET['down'] ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
- }
-
- return true;
+function SendSaveAsFileHeaderIfNeeded() {
+ if (headers_sent()) {
+ return false;
+ }
+ global $phpThumb;
+ $downloadfilename = phpthumb_functions::SanitizeFilename(!empty($_GET['sia']) ? $_GET['sia'] : (!empty($_GET['down']) ? $_GET['down'] : 'phpThumb_generated_thumbnail'.(!empty($_GET['f']) ? $_GET['f'] : 'jpg')));
+ if (!empty($downloadfilename)) {
+ $phpThumb->DebugMessage('SendSaveAsFileHeaderIfNeeded() sending header: Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"', __FILE__, __LINE__);
+ header('Content-Disposition: '.(!empty($_GET['down']) ? 'attachment' : 'inline').'; filename="'.$downloadfilename.'"');
+ }
+ return true;
}
-function PasswordStrength($password)
-{
- $strength = 0;
- $strength += strlen(preg_replace('#[^a-z]#', '', $password)) * 0.5; // lowercase characters are weak
- $strength += strlen(preg_replace('#[^A-Z]#', '', $password)) * 0.8; // uppercase characters are somewhat better
- $strength += strlen(preg_replace('#[^0-9]#', '', $password)) * 1.0; // numbers are somewhat better
- $strength += strlen(preg_replace('#[a-zA-Z0-9]#', '', $password)) * 2.0; // other non-alphanumeric characters are best
-
- return $strength;
+function PasswordStrength($password) {
+ $strength = 0;
+ $strength += strlen(preg_replace('#[^a-z]#', '', $password)) * 0.5; // lowercase characters are weak
+ $strength += strlen(preg_replace('#[^A-Z]#', '', $password)) * 0.8; // uppercase characters are somewhat better
+ $strength += strlen(preg_replace('#[^0-9]#', '', $password)) * 1.0; // numbers are somewhat better
+ $strength += strlen(preg_replace('#[a-zA-Z0-9]#', '', $password)) * 2.0; // other non-alphanumeric characters are best
+ return $strength;
}
-function RedirectToCachedFile()
-{
- global $phpThumb, $PHPTHUMB_CONFIG;
+function RedirectToCachedFile() {
+ global $phpThumb;
- $nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename);
- $nice_docroot = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($PHPTHUMB_CONFIG['document_root'], '/\\'));
+ $nice_cachefile = str_replace(DIRECTORY_SEPARATOR, '/', $phpThumb->cache_filename);
+ $nice_docroot = str_replace(DIRECTORY_SEPARATOR, '/', rtrim($phpThumb->config_document_root, '/\\'));
- $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
+ $parsed_url = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
- $nModified = filemtime($phpThumb->cache_filename);
+ $nModified = filemtime($phpThumb->cache_filename);
- if ($phpThumb->config_nooffsitelink_enabled && @$_SERVER['HTTP_REFERER'] && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) {
+ if ($phpThumb->config_nooffsitelink_enabled && !empty($_SERVER['HTTP_REFERER']) && !in_array(@$parsed_url['host'], $phpThumb->config_nooffsitelink_valid_domains)) {
- $phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('Would have used cached (image/'.$phpThumb->thumbnailFormat.') file "'.$phpThumb->cache_filename.'" (Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT), but skipping because $_SERVER[HTTP_REFERER] ('.@$_SERVER['HTTP_REFERER'].') is not in $phpThumb->config_nooffsitelink_valid_domains ('.implode(';', $phpThumb->config_nooffsitelink_valid_domains).')', __FILE__, __LINE__);
- } elseif ($phpThumb->phpThumbDebug) {
+ } elseif ($phpThumb->phpThumbDebug) {
- $phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__);
- $phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__);
- $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__);
- if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) {
- $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
- }
- if (preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
- $phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__);
- } else {
- $phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
- }
+ $phpThumb->DebugTimingMessage('skipped using cached image', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('Would have used cached file, but skipping due to phpThumbDebug', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('* Would have sent headers (1): Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', __FILE__, __LINE__);
+ if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) {
+ $phpThumb->DebugMessage('* Would have sent headers (2): Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]), __FILE__, __LINE__);
+ }
+ if (preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+ $phpThumb->DebugMessage('* Would have sent headers (3): Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])), __FILE__, __LINE__);
+ } else {
+ $phpThumb->DebugMessage('* Would have sent data: readfile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
+ }
- } else {
+ } else {
- if (headers_sent()) {
- $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
- exit;
- }
- SendSaveAsFileHeaderIfNeeded();
+ if (headers_sent()) {
+ $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
+ exit;
+ }
+ SendSaveAsFileHeaderIfNeeded();
- header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT');
- if (@$_SERVER['HTTP_IF_MODIFIED_SINCE'] && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && @$_SERVER['SERVER_PROTOCOL']) {
- header($_SERVER['SERVER_PROTOCOL'].' 304 Not Modified');
- exit;
- }
+ header('Cache-Control: private');
+ header('Pragma: private');
+ header('Expires: '.date(DATE_RFC822, strtotime(' 1 day')));
+ if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) && ($nModified == strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])) && !empty($_SERVER['SERVER_PROTOCOL'])) {
+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', $nModified).' GMT', true, 304);
+ exit;
+ }
+ if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) {
+ header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
+ } elseif (preg_match('#\\.ico$#i', $phpThumb->cache_filename)) {
+ header('Content-Type: image/x-icon');
+ }
+ header('Content-Length: '.filesize($phpThumb->cache_filename));
+ if (empty($phpThumb->config_cache_force_passthru) && preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
+ header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])));
+ } else {
+ @readfile($phpThumb->cache_filename);
+ }
+ exit;
- if ($getimagesize = @GetImageSize($phpThumb->cache_filename)) {
- header('Content-Type: '.phpthumb_functions::ImageTypeToMIMEtype($getimagesize[2]));
- } elseif (preg_match('#\\.ico$#i', $phpThumb->cache_filename)) {
- header('Content-Type: image/x-icon');
- }
- if (!@$PHPTHUMB_CONFIG['cache_force_passthru'] && preg_match('#^'.preg_quote($nice_docroot).'(.*)$#', $nice_cachefile, $matches)) {
- header('Location: '.dirname($matches[1]).'/'.urlencode(basename($matches[1])));
- } else {
- @readfile($phpThumb->cache_filename);
- }
- exit;
+ }
+ return true;
+}
- }
- return true;
-}
// instantiate a new phpThumb() object
ob_start();
-if (!include_once(__DIR__.'/phpthumb.class.php')) {
- ob_end_flush();
- die('failed to include_once("'.realpath(__DIR__.'/phpthumb.class.php').'")');
+if (!include_once(dirname(__FILE__).'/phpthumb.class.php')) {
+ ob_end_flush();
+ die('failed to include_once("'.realpath(dirname(__FILE__).'/phpthumb.class.php').'")');
}
ob_end_clean();
-
$phpThumb = new phpThumb();
$phpThumb->DebugTimingMessage('phpThumb.php start', __FILE__, __LINE__, $starttime);
$phpThumb->SetParameter('config_error_die_on_error', true);
if (!phpthumb_functions::FunctionIsDisabled('set_time_limit')) {
- set_time_limit(60); // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
+ set_time_limit(60); // shouldn't take nearly this long in most cases, but with many filters and/or a slow server...
}
// phpThumbDebug[0] used to be here, but may reveal too much
// info when high_security_mode should be enabled (not set yet)
-if (file_exists(__DIR__.'/phpThumb.config.php')) {
- ob_start();
- if (include_once(__DIR__.'/phpThumb.config.php')) {
- // great
- } else {
- ob_end_flush();
- $phpThumb->config_disable_debug = false; // otherwise error message won't print
- $phpThumb->ErrorImage('failed to include_once('.__DIR__.'/phpThumb.config.php) - realpath="'.realpath(__DIR__.'/phpThumb.config.php').'"');
- }
- ob_end_clean();
-} elseif (file_exists(__DIR__.'/phpThumb.config.php.default')) {
- $phpThumb->config_disable_debug = false; // otherwise error message won't print
- $phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"');
+if (file_exists(dirname(__FILE__).'/phpThumb.config.php')) {
+ ob_start();
+ if (include_once(dirname(__FILE__).'/phpThumb.config.php')) {
+ // great
+ } else {
+ ob_end_flush();
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
+ $phpThumb->ErrorImage('failed to include_once('.dirname(__FILE__).'/phpThumb.config.php) - realpath="'.realpath(dirname(__FILE__).'/phpThumb.config.php').'"');
+ }
+ ob_end_clean();
+} elseif (file_exists(dirname(__FILE__).'/phpThumb.config.php.default')) {
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
+ $phpThumb->ErrorImage('Please rename "phpThumb.config.php.default" to "phpThumb.config.php"');
} else {
- $phpThumb->config_disable_debug = false; // otherwise error message won't print
- $phpThumb->ErrorImage('failed to include_once('.__DIR__.'/phpThumb.config.php) - realpath="'.realpath(__DIR__.'/phpThumb.config.php').'"');
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
+ $phpThumb->ErrorImage('failed to include_once('.dirname(__FILE__).'/phpThumb.config.php) - realpath="'.realpath(dirname(__FILE__).'/phpThumb.config.php').'"');
}
-if (empty($PHPTHUMB_CONFIG['disable_pathinfo_parsing']) && (empty($_GET) || isset($_GET['phpThumbDebug'])) && !empty($_SERVER['PATH_INFO'])) {
- $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', @$_SERVER['PHP_SELF']);
+if (!empty($PHPTHUMB_CONFIG)) {
+ foreach ($PHPTHUMB_CONFIG as $key => $value) {
+ $keyname = 'config_'.$key;
+ $phpThumb->setParameter($keyname, $value);
+ if (!preg_match('#(password|mysql)#i', $key)) {
+ $phpThumb->DebugMessage('setParameter('.$keyname.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
+ }
+ }
+ if (!$phpThumb->config_disable_debug) {
+ // if debug mode is enabled, force phpThumbDebug output, do not allow normal thumbnails to be generated
+ $_GET['phpThumbDebug'] = (!empty($_GET['phpThumbDebug']) ? max(1, intval($_GET['phpThumbDebug'])) : 9);
+ $phpThumb->setParameter('phpThumbDebug', $_GET['phpThumbDebug']);
+ }
+} else {
+ $phpThumb->DebugMessage('$PHPTHUMB_CONFIG is empty', __FILE__, __LINE__);
+}
- $args = explode(';', substr($_SERVER['PATH_INFO'], 1));
- $phpThumb->DebugMessage('PATH_INFO.$args set to ('.implode(')(', $args).')', __FILE__, __LINE__);
- if (!empty($args)) {
- $_GET['src'] = @$args[count($args) - 1];
- $phpThumb->DebugMessage('PATH_INFO."src" = "'.$_GET['src'].'"', __FILE__, __LINE__);
- if (preg_match('#^new\=([a-z0-9]+)#i', $_GET['src'], $matches)) {
- unset($_GET['src']);
- $_GET['new'] = $matches[1];
- }
- }
- if (preg_match('#^([0-9]*)x?([0-9]*)$#i', @$args[count($args) - 2], $matches)) {
- $_GET['w'] = $matches[1];
- $_GET['h'] = $matches[2];
- $phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "'.$_GET['w'].'"x"'.$_GET['h'].'"', __FILE__, __LINE__);
- }
- for ($i = 0; $i < count($args) - 2; $i++) {
- @list($key, $value) = explode('=', @$args[$i]);
- if (substr($key, -2) == '[]') {
- $array_key_name = substr($key, 0, -2);
- $_GET[$array_key_name][] = $value;
- $phpThumb->DebugMessage('PATH_INFO."'.$array_key_name.'[]" = "'.$value.'"', __FILE__, __LINE__);
- } else {
- $_GET[$key] = $value;
- $phpThumb->DebugMessage('PATH_INFO."'.$key.'" = "'.$value.'"', __FILE__, __LINE__);
- }
- }
+if (empty($phpThumb->config_disable_pathinfo_parsing) && (empty($_GET) || isset($_GET['phpThumbDebug'])) && !empty($_SERVER['PATH_INFO'])) {
+ $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', @$_SERVER['PHP_SELF']);
+
+ $args = explode(';', substr($_SERVER['PATH_INFO'], 1));
+ $phpThumb->DebugMessage('PATH_INFO.$args set to ('.implode(')(', $args).')', __FILE__, __LINE__);
+ if (!empty($args)) {
+ $_GET['src'] = @$args[count($args) - 1];
+ $phpThumb->DebugMessage('PATH_INFO."src" = "'.$_GET['src'].'"', __FILE__, __LINE__);
+ if (preg_match('#^new\=([a-z0-9]+)#i', $_GET['src'], $matches)) {
+ unset($_GET['src']);
+ $_GET['new'] = $matches[1];
+ }
+ }
+ if (preg_match('#^([0-9]*)x?([0-9]*)$#i', @$args[count($args) - 2], $matches)) {
+ $_GET['w'] = $matches[1];
+ $_GET['h'] = $matches[2];
+ $phpThumb->DebugMessage('PATH_INFO."w"x"h" set to "'.$_GET['w'].'"x"'.$_GET['h'].'"', __FILE__, __LINE__);
+ }
+ for ($i = 0; $i < count($args) - 2; $i++) {
+ @list($key, $value) = explode('=', @$args[$i]);
+ if (substr($key, -2) == '[]') {
+ $array_key_name = substr($key, 0, -2);
+ $_GET[$array_key_name][] = $value;
+ $phpThumb->DebugMessage('PATH_INFO."'.$array_key_name.'[]" = "'.$value.'"', __FILE__, __LINE__);
+ } else {
+ $_GET[$key] = $value;
+ $phpThumb->DebugMessage('PATH_INFO."'.$key.'" = "'.$value.'"', __FILE__, __LINE__);
+ }
+ }
}
-if (!empty($PHPTHUMB_CONFIG['high_security_enabled'])) {
- if (empty($_GET['hash'])) {
- $phpThumb->config_disable_debug = false; // otherwise error message won't print
- $phpThumb->ErrorImage('ERROR: missing hash');
- } elseif (PasswordStrength($PHPTHUMB_CONFIG['high_security_password']) < 20) {
- $phpThumb->config_disable_debug = false; // otherwise error message won't print
- $phpThumb->ErrorImage('ERROR: $PHPTHUMB_CONFIG[high_security_password] is not complex enough');
- } elseif ($_GET['hash'] != md5(str_replace('&hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']).$PHPTHUMB_CONFIG['high_security_password'])) {
- sleep(10); // deliberate delay to discourage password-guessing
- $phpThumb->config_disable_debug = false; // otherwise error message won't print
- $phpThumb->ErrorImage('ERROR: invalid hash');
- }
+if (!empty($phpThumb->config_high_security_enabled)) {
+ if (empty($_GET['hash'])) {
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
+ $phpThumb->ErrorImage('ERROR: missing hash');
+ } elseif (PasswordStrength($phpThumb->config_high_security_password) < 20) {
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
+ $phpThumb->ErrorImage('ERROR: $PHPTHUMB_CONFIG[high_security_password] is not complex enough');
+ } elseif ($_GET['hash'] != md5(str_replace($phpThumb->config_high_security_url_separator.'hash='.$_GET['hash'], '', $_SERVER['QUERY_STRING']).$phpThumb->config_high_security_password)) {
+ header('HTTP/1.0 403 Forbidden');
+ sleep(10); // deliberate delay to discourage password-guessing
+ $phpThumb->ErrorImage('ERROR: invalid hash');
+ }
}
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[0]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '0')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
// returned the fixed string if the evil "magic_quotes_gpc" setting is on
if (get_magic_quotes_gpc()) {
- // deprecated: 'err', 'file', 'goto',
- $RequestVarsToStripSlashes = array('src', 'wmf', 'down');
- foreach ($RequestVarsToStripSlashes as $key) {
- if (isset($_GET[$key])) {
- if (is_string($_GET[$key])) {
- $_GET[$key] = stripslashes($_GET[$key]);
- } else {
- unset($_GET[$key]);
- }
- }
- }
+ // deprecated: 'err', 'file', 'goto',
+ $RequestVarsToStripSlashes = array('src', 'wmf', 'down');
+ foreach ($RequestVarsToStripSlashes as $key) {
+ if (isset($_GET[$key])) {
+ if (is_string($_GET[$key])) {
+ $_GET[$key] = stripslashes($_GET[$key]);
+ } else {
+ unset($_GET[$key]);
+ }
+ }
+ }
}
if (empty($_SERVER['PATH_INFO']) && empty($_SERVER['QUERY_STRING'])) {
- $phpThumb->config_disable_debug = false; // otherwise error message won't print
- $phpThumb->ErrorImage('ERROR: no parameters specified');
+ $phpThumb->config_disable_debug = false; // otherwise error message won't print
+ $phpThumb->ErrorImage('ERROR: no parameters specified');
}
-if (@$_GET['src'] && isset($_GET['md5s']) && empty($_GET['md5s'])) {
- if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
- if ($rawImageData = phpthumb_functions::SafeURLread($_GET['src'], $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
- $md5s = md5($rawImageData);
- }
- } else {
- $SourceFilename = $phpThumb->ResolveFilenameToAbsolute($_GET['src']);
- if (is_readable($SourceFilename)) {
- $md5s = phpthumb_functions::md5_file_safe($SourceFilename);
- } else {
- $phpThumb->ErrorImage('ERROR: "'.$SourceFilename.'" cannot be read');
- }
- }
- if (@$_SERVER['HTTP_REFERER']) {
- $phpThumb->ErrorImage('&md5s='.$md5s);
- } else {
- die('&md5s='.$md5s);
- }
+if (!empty($_GET['src']) && isset($_GET['md5s']) && empty($_GET['md5s'])) {
+ if (preg_match('#^([a-z0-9]+)://#i', $_GET['src'], $protocol_matches)) {
+ if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
+ if ($rawImageData = phpthumb_functions::SafeURLread($_GET['src'], $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
+ $md5s = md5($rawImageData);
+ }
+ } else {
+ $phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
+ }
+ } else {
+ $SourceFilename = $phpThumb->ResolveFilenameToAbsolute($_GET['src']);
+ if (is_readable($SourceFilename)) {
+ $md5s = phpthumb_functions::md5_file_safe($SourceFilename);
+ } else {
+ $phpThumb->ErrorImage('ERROR: "'.$SourceFilename.'" cannot be read');
+ }
+ }
+ if (!empty($_SERVER['HTTP_REFERER'])) {
+ $phpThumb->ErrorImage('&md5s='.$md5s);
+ } else {
+ die('&md5s='.$md5s);
+ }
}
-if (!empty($PHPTHUMB_CONFIG)) {
- foreach ($PHPTHUMB_CONFIG as $key => $value) {
- $keyname = 'config_'.$key;
- $phpThumb->setParameter($keyname, $value);
- if (!preg_match('#(password|mysql)#i', $key)) {
- $phpThumb->DebugMessage('setParameter('.$keyname.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
- }
- }
-} else {
- $phpThumb->DebugMessage('$PHPTHUMB_CONFIG is empty', __FILE__, __LINE__);
+if (!empty($_GET['src']) && empty($phpThumb->config_allow_local_http_src) && preg_match('#^http://'.@$_SERVER['HTTP_HOST'].'(.+)#i', $_GET['src'], $matches)) {
+ $phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "'.$matches[1].'" instead of "'.$matches[0].'".'."\n\n".'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php');
}
-if (@$_GET['src'] && !@$PHPTHUMB_CONFIG['allow_local_http_src'] && preg_match('#^http://'.@$_SERVER['HTTP_HOST'].'(.+)#i', @$_GET['src'], $matches)) {
- $phpThumb->ErrorImage('It is MUCH better to specify the "src" parameter as "'.$matches[1].'" instead of "'.$matches[0].'".'."\n\n".'If you really must do it this way, enable "allow_local_http_src" in phpThumb.config.php');
-}
-
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[1]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '1')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
$parsed_url_referer = phpthumb_functions::ParseURLbetter(@$_SERVER['HTTP_REFERER']);
if ($phpThumb->config_nooffsitelink_require_refer && !in_array(@$parsed_url_referer['host'], $phpThumb->config_nohotlink_valid_domains)) {
- $phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and '.(@$parsed_url_referer['host'] ? '"'.$parsed_url_referer['host'].'" is not an allowed referer' : 'no HTTP_REFERER exists'));
+ $phpThumb->ErrorImage('config_nooffsitelink_require_refer enabled and '.(@$parsed_url_referer['host'] ? '"'.$parsed_url_referer['host'].'" is not an allowed referer' : 'no HTTP_REFERER exists'));
}
$parsed_url_src = phpthumb_functions::ParseURLbetter(@$_GET['src']);
if ($phpThumb->config_nohotlink_enabled && $phpThumb->config_nohotlink_erase_image && preg_match('#^(f|ht)tps?://#i', @$_GET['src']) && !in_array(@$parsed_url_src['host'], $phpThumb->config_nohotlink_valid_domains)) {
- $phpThumb->ErrorImage($phpThumb->config_nohotlink_text_message);
+ $phpThumb->ErrorImage($phpThumb->config_nohotlink_text_message);
}
if ($phpThumb->config_mysql_query) {
- if ($cid = @mysql_connect($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password)) {
- if (@mysql_select_db($phpThumb->config_mysql_database, $cid)) {
- if ($result = @mysql_query($phpThumb->config_mysql_query, $cid)) {
- if ($row = @mysql_fetch_array($result)) {
+ if ($cid = @mysql_connect($phpThumb->config_mysql_hostname, $phpThumb->config_mysql_username, $phpThumb->config_mysql_password)) {
+ if (@mysql_select_db($phpThumb->config_mysql_database, $cid)) {
+ if ($result = @mysql_query($phpThumb->config_mysql_query, $cid)) {
+ if ($row = @mysql_fetch_array($result)) {
- mysql_free_result($result);
- mysql_close($cid);
- $phpThumb->setSourceData($row[0]);
- unset($row);
+ mysql_free_result($result);
+ mysql_close($cid);
+ $phpThumb->setSourceData($row[0]);
+ unset($row);
- } else {
- mysql_free_result($result);
- mysql_close($cid);
- $phpThumb->ErrorImage('no matching data in database.');
- }
- } else {
- mysql_close($cid);
- $phpThumb->ErrorImage('Error in MySQL query: "'.mysql_error($cid).'"');
- }
- } else {
- mysql_close($cid);
- $phpThumb->ErrorImage('cannot select MySQL database: "'.mysql_error($cid).'"');
- }
- } else {
- $phpThumb->ErrorImage('cannot connect to MySQL server');
- }
- unset($_GET['id']);
+ } else {
+ mysql_free_result($result);
+ mysql_close($cid);
+ $phpThumb->ErrorImage('no matching data in database.');
+ }
+ } else {
+ mysql_close($cid);
+ $phpThumb->ErrorImage('Error in MySQL query: "'.mysql_error($cid).'"');
+ }
+ } else {
+ mysql_close($cid);
+ $phpThumb->ErrorImage('cannot select MySQL database: "'.mysql_error($cid).'"');
+ }
+ } else {
+ $phpThumb->ErrorImage('cannot connect to MySQL server');
+ }
+ unset($_GET['id']);
}
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[2]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '2')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
-$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS = (bool) (@$PHPTHUMB_CONFIG['cache_default_only_suffix'] && (strpos($PHPTHUMB_CONFIG['cache_default_only_suffix'], '*') !== false));
+$PHPTHUMB_DEFAULTS_DISABLEGETPARAMS = (bool) ($phpThumb->config_cache_default_only_suffix && (strpos($phpThumb->config_cache_default_only_suffix, '*') !== false));
-if (!empty($PHPTHUMB_DEFAULTS) && is_array($PHPTHUMB_DEFAULTS)) {
- $phpThumb->DebugMessage('setting $PHPTHUMB_DEFAULTS['.implode(';', array_keys($PHPTHUMB_DEFAULTS)).']', __FILE__, __LINE__);
- foreach ($PHPTHUMB_DEFAULTS as $key => $value) {
- if ($PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE || !isset($_GET[$key])) {
- $_GET[$key] = $value;
- $phpThumb->DebugMessage('PHPTHUMB_DEFAULTS assigning ('.$value.') to $_GET['.$key.']', __FILE__, __LINE__);
- }
- }
-}
-
// deprecated: 'err', 'file', 'goto',
$allowedGETparameters = array('src', 'new', 'w', 'h', 'wp', 'hp', 'wl', 'hl', 'ws', 'hs', 'f', 'q', 'sx', 'sy', 'sw', 'sh', 'zc', 'bc', 'bg', 'bgt', 'fltr', 'xto', 'ra', 'ar', 'aoe', 'far', 'iar', 'maxb', 'down', 'phpThumbDebug', 'hash', 'md5s', 'sfn', 'dpi', 'sia', 'nocache');
foreach ($_GET as $key => $value) {
- if (!empty($PHPTHUMB_DEFAULTS_DISABLEGETPARAMS) && ($key != 'src')) {
- // disabled, do not set parameter
- $phpThumb->DebugMessage('ignoring $_GET['.$key.'] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__);
- } elseif (in_array($key, $allowedGETparameters)) {
- $phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
- $phpThumb->setParameter($key, $value);
- } else {
- $phpThumb->ErrorImage('Forbidden parameter: '.$key);
- }
+ if (!empty($PHPTHUMB_DEFAULTS_DISABLEGETPARAMS) && ($key != 'src')) {
+ // disabled, do not set parameter
+ $phpThumb->DebugMessage('ignoring $_GET['.$key.'] because of $PHPTHUMB_DEFAULTS_DISABLEGETPARAMS', __FILE__, __LINE__);
+ } elseif (in_array($key, $allowedGETparameters)) {
+ $phpThumb->DebugMessage('setParameter('.$key.', '.$phpThumb->phpThumbDebugVarDump($value).')', __FILE__, __LINE__);
+ $phpThumb->setParameter($key, $value);
+ } else {
+ $phpThumb->ErrorImage('Forbidden parameter: '.$key);
+ }
}
+if (!empty($PHPTHUMB_DEFAULTS) && is_array($PHPTHUMB_DEFAULTS)) {
+ $phpThumb->DebugMessage('setting $PHPTHUMB_DEFAULTS['.implode(';', array_keys($PHPTHUMB_DEFAULTS)).']', __FILE__, __LINE__);
+ foreach ($PHPTHUMB_DEFAULTS as $key => $value) {
+ if (!$PHPTHUMB_DEFAULTS_GETSTRINGOVERRIDE || !isset($_GET[$key])) { // set parameter to default value if config is set to allow _GET to override default, OR if no value is passed via _GET for this parameter
+ $_GET[$key] = $value;
+ $phpThumb->DebugMessage('PHPTHUMB_DEFAULTS assigning ('.(is_array($value) ? print_r($value, true) : $value).') to $_GET['.$key.']', __FILE__, __LINE__);
+ }
+ }
+}
+
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[3]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '3')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -359,216 +366,221 @@
// check to see if file can be output from source with no processing or caching
$CanPassThroughDirectly = true;
if ($phpThumb->rawImageData) {
- // data from SQL, should be fine
+ // data from SQL, should be fine
} elseif (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
- // assume is ok to passthru if no other parameters specified
+ // assume is ok to passthru if no other parameters specified
} elseif (preg_match('#^(f|ht)tp\://#i', $phpThumb->src)) {
- $phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tp\://#i", '.$phpThumb->src.')', __FILE__, __LINE__);
- $CanPassThroughDirectly = false;
+ $phpThumb->DebugMessage('$CanPassThroughDirectly=false because preg_match("#^(f|ht)tp\://#i", '.$phpThumb->src.')', __FILE__, __LINE__);
+ $CanPassThroughDirectly = false;
} elseif (!@is_readable($phpThumb->sourceFilename)) {
- $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
- $CanPassThroughDirectly = false;
+ $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_readable('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
+ $CanPassThroughDirectly = false;
} elseif (!@is_file($phpThumb->sourceFilename)) {
- $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
- $CanPassThroughDirectly = false;
+ $phpThumb->DebugMessage('$CanPassThroughDirectly=false because !@is_file('.$phpThumb->sourceFilename.')', __FILE__, __LINE__);
+ $CanPassThroughDirectly = false;
}
foreach ($_GET as $key => $value) {
- switch ($key) {
- case 'src':
- // allowed
- break;
+ switch ($key) {
+ case 'src':
+ // allowed
+ break;
- case 'w':
- case 'h':
- // might be OK if exactly matches original
- if (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
- // assume it is not ok for direct-passthru of remote image
- $CanPassThroughDirectly = false;
- }
- break;
+ case 'w':
+ case 'h':
+ // might be OK if exactly matches original
+ if (preg_match('#^http\://[^\\?&]+\\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
+ // assume it is not ok for direct-passthru of remote image
+ $CanPassThroughDirectly = false;
+ }
+ break;
- case 'phpThumbDebug':
- // handled in direct-passthru code
- break;
+ case 'phpThumbDebug':
+ // handled in direct-passthru code
+ break;
- default:
- // all other parameters will cause some processing,
- // therefore cannot pass through original image unmodified
- $CanPassThroughDirectly = false;
- $UnAllowedGET[] = $key;
- break;
- }
+ default:
+ // all other parameters will cause some processing,
+ // therefore cannot pass through original image unmodified
+ $CanPassThroughDirectly = false;
+ $UnAllowedGET[] = $key;
+ break;
+ }
}
if (!empty($UnAllowedGET)) {
- $phpThumb->DebugMessage('$CanPassThroughDirectly=false because $_GET['.implode(';', array_unique($UnAllowedGET)).'] are set', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('$CanPassThroughDirectly=false because $_GET['.implode(';', array_unique($UnAllowedGET)).'] are set', __FILE__, __LINE__);
}
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[4]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '4')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
$phpThumb->DebugMessage('$CanPassThroughDirectly="'.intval($CanPassThroughDirectly).'" && $phpThumb->src="'.$phpThumb->src.'"', __FILE__, __LINE__);
while ($CanPassThroughDirectly && $phpThumb->src) {
- // no parameters set, passthru
+ // no parameters set, passthru
- if (preg_match('#^http\://[^\\?&]+\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
- $phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect ('.$phpThumb->src.')', __FILE__, __LINE__);
- header('Location: '.$phpThumb->src);
- exit;
- }
+ if (preg_match('#^http\://[^\\?&]+\.(jpe?g|gif|png)$#i', $phpThumb->src)) {
+ $phpThumb->DebugMessage('Passing HTTP source through directly as Location: redirect ('.$phpThumb->src.')', __FILE__, __LINE__);
+ header('Location: '.$phpThumb->src);
+ exit;
+ }
- $SourceFilename = $phpThumb->ResolveFilenameToAbsolute($phpThumb->src);
+ $SourceFilename = $phpThumb->ResolveFilenameToAbsolute($phpThumb->src);
- // security and size checks
- if ($phpThumb->getimagesizeinfo = @GetImageSize($SourceFilename)) {
- $phpThumb->DebugMessage('Direct passthru GetImageSize() returned [w='.$phpThumb->getimagesizeinfo[0].';h='.$phpThumb->getimagesizeinfo[1].';t='.$phpThumb->getimagesizeinfo[2].']', __FILE__, __LINE__);
+ // security and size checks
+ if ($phpThumb->getimagesizeinfo = @GetImageSize($SourceFilename)) {
+ $phpThumb->DebugMessage('Direct passthru GetImageSize() returned [w='.$phpThumb->getimagesizeinfo[0].';h='.$phpThumb->getimagesizeinfo[1].';t='.$phpThumb->getimagesizeinfo[2].']', __FILE__, __LINE__);
- if (!@$_GET['w'] && !@$_GET['wp'] && !@$_GET['wl'] && !@$_GET['ws'] && !@$_GET['h'] && !@$_GET['hp'] && !@$_GET['hl'] && !@$_GET['hs']) {
- // no resizing needed
- $phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'")', __FILE__, __LINE__);
- } elseif (($phpThumb->getimagesizeinfo[0] <= @$_GET['w']) && ($phpThumb->getimagesizeinfo[1] <= @$_GET['h']) && ((@$_GET['w'] == $phpThumb->getimagesizeinfo[0]) || (@$_GET['h'] == $phpThumb->getimagesizeinfo[1]))) {
- // image fits into 'w'x'h' box, and at least one dimension matches exactly, therefore no resizing needed
- $phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" fits inside "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
- } else {
- $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because resizing required (from "'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" to "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
- break;
- }
- switch ($phpThumb->getimagesizeinfo[2]) {
- case 1: // GIF
- case 2: // JPG
- case 3: // PNG
- // great, let it through
- break;
- default:
- // browser probably can't handle format, remangle it to JPEG/PNG/GIF
- $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because $phpThumb->getimagesizeinfo[2] = "'.$phpThumb->getimagesizeinfo[2].'"', __FILE__, __LINE__);
- break 2;
- }
+ if (!@$_GET['w'] && !@$_GET['wp'] && !@$_GET['wl'] && !@$_GET['ws'] && !@$_GET['h'] && !@$_GET['hp'] && !@$_GET['hl'] && !@$_GET['hs']) {
+ // no resizing needed
+ $phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'")', __FILE__, __LINE__);
+ } elseif (($phpThumb->getimagesizeinfo[0] <= @$_GET['w']) && ($phpThumb->getimagesizeinfo[1] <= @$_GET['h']) && ((@$_GET['w'] == $phpThumb->getimagesizeinfo[0]) || (@$_GET['h'] == $phpThumb->getimagesizeinfo[1]))) {
+ // image fits into 'w'x'h' box, and at least one dimension matches exactly, therefore no resizing needed
+ $phpThumb->DebugMessage('Passing "'.$SourceFilename.'" through directly, no resizing required ("'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" fits inside "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
+ } else {
+ $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because resizing required (from "'.$phpThumb->getimagesizeinfo[0].'"x"'.$phpThumb->getimagesizeinfo[1].'" to "'.@$_GET['w'].'"x"'.@$_GET['h'].'")', __FILE__, __LINE__);
+ break;
+ }
+ switch ($phpThumb->getimagesizeinfo[2]) {
+ case 1: // GIF
+ case 2: // JPG
+ case 3: // PNG
+ // great, let it through
+ break;
+ default:
+ // browser probably can't handle format, remangle it to JPEG/PNG/GIF
+ $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because $phpThumb->getimagesizeinfo[2] = "'.$phpThumb->getimagesizeinfo[2].'"', __FILE__, __LINE__);
+ break 2;
+ }
- $ImageCreateFunctions = array(1=>'ImageCreateFromGIF', 2=>'ImageCreateFromJPEG', 3=>'ImageCreateFromPNG');
- $theImageCreateFunction = @$ImageCreateFunctions[$phpThumb->getimagesizeinfo[2]];
- if ($phpThumb->config_disable_onlycreateable_passthru || (function_exists($theImageCreateFunction) && ($dummyImage = @$theImageCreateFunction($SourceFilename)))) {
+ $ImageCreateFunctions = array(1=>'ImageCreateFromGIF', 2=>'ImageCreateFromJPEG', 3=>'ImageCreateFromPNG');
+ $theImageCreateFunction = @$ImageCreateFunctions[$phpThumb->getimagesizeinfo[2]];
+ if ($phpThumb->config_disable_onlycreateable_passthru || (function_exists($theImageCreateFunction) && ($dummyImage = @$theImageCreateFunction($SourceFilename)))) {
- // great
- if (@is_resource($dummyImage)) {
- unset($dummyImage);
- }
+ // great
+ if (@is_resource($dummyImage)) {
+ unset($dummyImage);
+ }
- if (headers_sent()) {
- $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
- exit;
- }
- if (@$_GET['phpThumbDebug']) {
- $phpThumb->DebugTimingMessage('skipped direct $SourceFilename passthru', __FILE__, __LINE__);
- $phpThumb->DebugMessage('Would have passed "'.$SourceFilename.'" through directly, but skipping due to phpThumbDebug', __FILE__, __LINE__);
- break;
- }
+ if (headers_sent()) {
+ $phpThumb->ErrorImage('Headers already sent ('.basename(__FILE__).' line '.__LINE__.')');
+ exit;
+ }
+ if (@$_GET['phpThumbDebug']) {
+ $phpThumb->DebugTimingMessage('skipped direct $SourceFilename passthru', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('Would have passed "'.$SourceFilename.'" through directly, but skipping due to phpThumbDebug', __FILE__, __LINE__);
+ break;
+ }
- SendSaveAsFileHeaderIfNeeded();
- header('Last-Modified: '.gmdate('D, d M Y H:i:s', @filemtime($SourceFilename)).' GMT');
- if ($contentType = phpthumb_functions::ImageTypeToMIMEtype(@$phpThumb->getimagesizeinfo[2])) {
- header('Content-Type: '.$contentType);
- }
- @readfile($SourceFilename);
- exit;
+ SendSaveAsFileHeaderIfNeeded();
+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', @filemtime($SourceFilename)).' GMT');
+ if ($contentType = phpthumb_functions::ImageTypeToMIMEtype(@$phpThumb->getimagesizeinfo[2])) {
+ header('Content-Type: '.$contentType);
+ }
+ @readfile($SourceFilename);
+ exit;
- } else {
- $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because ($phpThumb->config_disable_onlycreateable_passthru = "'.$phpThumb->config_disable_onlycreateable_passthru.'") and '.$theImageCreateFunction.'() failed', __FILE__, __LINE__);
- break;
- }
+ } else {
+ $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because ($phpThumb->config_disable_onlycreateable_passthru = "'.$phpThumb->config_disable_onlycreateable_passthru.'") and '.$theImageCreateFunction.'() failed', __FILE__, __LINE__);
+ break;
+ }
- } else {
- $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because GetImageSize() failed', __FILE__, __LINE__);
- break;
- }
- break;
+ } else {
+ $phpThumb->DebugMessage('Not passing "'.$SourceFilename.'" through directly because GetImageSize() failed', __FILE__, __LINE__);
+ break;
+ }
+ break;
}
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[5]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '5')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
// check to see if file already exists in cache, and output it with no processing if it does
$phpThumb->SetCacheFilename();
if (@is_readable($phpThumb->cache_filename)) {
- RedirectToCachedFile();
+ RedirectToCachedFile();
} else {
- $phpThumb->DebugMessage('Cached file "'.$phpThumb->cache_filename.'" does not exist, processing as normal', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('Cached file "'.$phpThumb->cache_filename.'" does not exist, processing as normal', __FILE__, __LINE__);
}
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[6]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '6')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
if ($phpThumb->rawImageData) {
- // great
+ // great
} elseif (!empty($_GET['new'])) {
- // generate a blank image resource of the specified size/background color/opacity
- if (($phpThumb->w <= 0) || ($phpThumb->h <= 0)) {
- $phpThumb->ErrorImage('"w" and "h" parameters required for "new"');
- }
- @list($bghexcolor, $opacity) = explode('|', $_GET['new']);
- if (!phpthumb_functions::IsHexColor($bghexcolor)) {
- $phpThumb->ErrorImage('BGcolor parameter for "new" is not valid');
- }
- $opacity = (strlen($opacity) ? $opacity : 100);
- if ($phpThumb->gdimg_source = phpthumb_functions::ImageCreateFunction($phpThumb->w, $phpThumb->h)) {
- $alpha = (100 - min(100, max(0, $opacity))) * 1.27;
- if ($alpha) {
- $phpThumb->setParameter('is_alpha', true);
- ImageAlphaBlending($phpThumb->gdimg_source, false);
- ImageSaveAlpha($phpThumb->gdimg_source, true);
- }
- $new_background_color = phpthumb_functions::ImageHexColorAllocate($phpThumb->gdimg_source, $bghexcolor, false, $alpha);
- ImageFilledRectangle($phpThumb->gdimg_source, 0, 0, $phpThumb->w, $phpThumb->h, $new_background_color);
- } else {
- $phpThumb->ErrorImage('failed to create "new" image ('.$phpThumb->w.'x'.$phpThumb->h.')');
- }
+ // generate a blank image resource of the specified size/background color/opacity
+ if (($phpThumb->w <= 0) || ($phpThumb->h <= 0)) {
+ $phpThumb->ErrorImage('"w" and "h" parameters required for "new"');
+ }
+ @list($bghexcolor, $opacity) = explode('|', $_GET['new']);
+ if (!phpthumb_functions::IsHexColor($bghexcolor)) {
+ $phpThumb->ErrorImage('BGcolor parameter for "new" is not valid');
+ }
+ $opacity = (strlen($opacity) ? $opacity : 100);
+ if ($phpThumb->gdimg_source = phpthumb_functions::ImageCreateFunction($phpThumb->w, $phpThumb->h)) {
+ $alpha = (100 - min(100, max(0, $opacity))) * 1.27;
+ if ($alpha) {
+ $phpThumb->setParameter('is_alpha', true);
+ ImageAlphaBlending($phpThumb->gdimg_source, false);
+ ImageSaveAlpha($phpThumb->gdimg_source, true);
+ }
+ $new_background_color = phpthumb_functions::ImageHexColorAllocate($phpThumb->gdimg_source, $bghexcolor, false, $alpha);
+ ImageFilledRectangle($phpThumb->gdimg_source, 0, 0, $phpThumb->w, $phpThumb->h, $new_background_color);
+ } else {
+ $phpThumb->ErrorImage('failed to create "new" image ('.$phpThumb->w.'x'.$phpThumb->h.')');
+ }
} elseif (!$phpThumb->src) {
- $phpThumb->ErrorImage('Usage: '.$_SERVER['PHP_SELF'].'?src=/path/and/filename.jpg'."\n".'read Usage comments for details');
+ $phpThumb->ErrorImage('Usage: '.$_SERVER['PHP_SELF'].'?src=/path/and/filename.jpg'."\n".'read Usage comments for details');
-} elseif (preg_match('#^(f|ht)tp\://#i', $phpThumb->src)) {
+} elseif (preg_match('#^([a-z0-9]+)://#i', $_GET['src'], $protocol_matches)) {
- $phpThumb->DebugMessage('$phpThumb->src ('.$phpThumb->src.') is remote image, attempting to download', __FILE__, __LINE__);
- if ($phpThumb->config_http_user_agent) {
- $phpThumb->DebugMessage('Setting "user_agent" to "'.$phpThumb->config_http_user_agent.'"', __FILE__, __LINE__);
- ini_set('user_agent', $phpThumb->config_http_user_agent);
- }
- $cleanedupurl = phpthumb_functions::CleanUpURLencoding($phpThumb->src);
- $phpThumb->DebugMessage('CleanUpURLencoding('.$phpThumb->src.') returned "'.$cleanedupurl.'"', __FILE__, __LINE__);
- $phpThumb->src = $cleanedupurl;
- unset($cleanedupurl);
- if ($rawImageData = phpthumb_functions::SafeURLread($phpThumb->src, $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
- $phpThumb->DebugMessage('SafeURLread('.$phpThumb->src.') succeeded'.($error ? ' with messsages: "'.$error.'"' : ''), __FILE__, __LINE__);
- $phpThumb->DebugMessage('Setting source data from URL "'.$phpThumb->src.'"', __FILE__, __LINE__);
- $phpThumb->setSourceData($rawImageData, urlencode($phpThumb->src));
- } else {
- $phpThumb->ErrorImage($error);
- }
+ if (preg_match('#^(f|ht)tps?://#i', $_GET['src'])) {
+ $phpThumb->DebugMessage('$phpThumb->src ('.$phpThumb->src.') is remote image, attempting to download', __FILE__, __LINE__);
+ if ($phpThumb->config_http_user_agent) {
+ $phpThumb->DebugMessage('Setting "user_agent" to "'.$phpThumb->config_http_user_agent.'"', __FILE__, __LINE__);
+ ini_set('user_agent', $phpThumb->config_http_user_agent);
+ }
+ $cleanedupurl = phpthumb_functions::CleanUpURLencoding($phpThumb->src);
+ $phpThumb->DebugMessage('CleanUpURLencoding('.$phpThumb->src.') returned "'.$cleanedupurl.'"', __FILE__, __LINE__);
+ $phpThumb->src = $cleanedupurl;
+ unset($cleanedupurl);
+ if ($rawImageData = phpthumb_functions::SafeURLread($phpThumb->src, $error, $phpThumb->config_http_fopen_timeout, $phpThumb->config_http_follow_redirect)) {
+ $phpThumb->DebugMessage('SafeURLread('.$phpThumb->src.') succeeded'.($error ? ' with messsages: "'.$error.'"' : ''), __FILE__, __LINE__);
+ $phpThumb->DebugMessage('Setting source data from URL "'.$phpThumb->src.'"', __FILE__, __LINE__);
+ $phpThumb->setSourceData($rawImageData, urlencode($phpThumb->src));
+ } else {
+ $phpThumb->ErrorImage($error);
+ }
+ } else {
+ $phpThumb->ErrorImage('only FTP and HTTP/HTTPS protocols are allowed, "'.$protocol_matches[1].'" is not');
+ }
+
}
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[7]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '7')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
@@ -578,32 +590,32 @@
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[8]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '8')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
-if (!empty($PHPTHUMB_CONFIG['high_security_enabled']) && !empty($_GET['nocache'])) {
+if (!empty($phpThumb->config_high_security_enabled) && !empty($_GET['nocache'])) {
- // cache disabled, don't write cachefile
+ // cache disabled, don't write cachefile
} else {
- phpthumb_functions::EnsureDirectoryExists(dirname($phpThumb->cache_filename));
- if (is_writable(dirname($phpThumb->cache_filename)) || (file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename))) {
+ phpthumb_functions::EnsureDirectoryExists(dirname($phpThumb->cache_filename));
+ if (is_writable(dirname($phpThumb->cache_filename)) || (file_exists($phpThumb->cache_filename) && is_writable($phpThumb->cache_filename))) {
- $phpThumb->CleanUpCacheDirectory();
- if ($phpThumb->RenderToFile($phpThumb->cache_filename) && is_readable($phpThumb->cache_filename)) {
- chmod($phpThumb->cache_filename, 0644);
- RedirectToCachedFile();
- } else {
- $phpThumb->DebugMessage('Failed: RenderToFile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
- }
+ $phpThumb->CleanUpCacheDirectory();
+ if ($phpThumb->RenderToFile($phpThumb->cache_filename) && is_readable($phpThumb->cache_filename)) {
+ chmod($phpThumb->cache_filename, 0644);
+ RedirectToCachedFile();
+ } else {
+ $phpThumb->DebugMessage('Failed: RenderToFile('.$phpThumb->cache_filename.')', __FILE__, __LINE__);
+ }
- } else {
+ } else {
- $phpThumb->DebugMessage('Cannot write to $phpThumb->cache_filename ('.$phpThumb->cache_filename.') because that directory ('.dirname($phpThumb->cache_filename).') is not writable', __FILE__, __LINE__);
+ $phpThumb->DebugMessage('Cannot write to $phpThumb->cache_filename ('.$phpThumb->cache_filename.') because that directory ('.dirname($phpThumb->cache_filename).') is not writable', __FILE__, __LINE__);
- }
+ }
}
@@ -611,18 +623,20 @@
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[9]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '9')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
if (!$phpThumb->OutputThumbnail()) {
- $phpThumb->ErrorImage('Error in OutputThumbnail():'."\n".$phpThumb->debugmessages[(count($phpThumb->debugmessages) - 1)]);
+ $phpThumb->ErrorImage('Error in OutputThumbnail():'."\n".$phpThumb->debugmessages[(count($phpThumb->debugmessages) - 1)]);
}
////////////////////////////////////////////////////////////////
// Debug output, to try and help me diagnose problems
$phpThumb->DebugTimingMessage('phpThumbDebug[10]', __FILE__, __LINE__);
if (isset($_GET['phpThumbDebug']) && ($_GET['phpThumbDebug'] == '10')) {
- $phpThumb->phpThumbDebug();
+ $phpThumb->phpThumbDebug();
}
////////////////////////////////////////////////////////////////
+
+?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-07-20 20:29:24 UTC (rev 12721)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-07-22 12:18:06 UTC (rev 12722)
@@ -17,889 +17,862 @@
// //
/////////////////////////////////////////////////////////////////
-class phpthumb_bmp
-{
- function phpthumb_bmp()
- {
- return true;
- }
- function phpthumb_bmp2gd(&$BMPdata, $truecolor=true)
- {
- $ThisFileInfo = array();
- if ($this->getid3_bmp($BMPdata, $ThisFileInfo, true, true)) {
- $gd = $this->PlotPixelsGD($ThisFileInfo['bmp'], $truecolor);
+class phpthumb_bmp {
- return $gd;
- }
+ function phpthumb_bmp() {
+ return true;
+ }
- return false;
- }
+ function phpthumb_bmp2gd(&$BMPdata, $truecolor=true) {
+ $ThisFileInfo = array();
+ if ($this->getid3_bmp($BMPdata, $ThisFileInfo, true, true)) {
+ $gd = $this->PlotPixelsGD($ThisFileInfo['bmp'], $truecolor);
+ return $gd;
+ }
+ return false;
+ }
- function phpthumb_bmpfile2gd($filename, $truecolor=true)
- {
- if ($fp = @fopen($filename, 'rb')) {
- $BMPdata = fread($fp, filesize($filename));
- fclose($fp);
+ function phpthumb_bmpfile2gd($filename, $truecolor=true) {
+ if ($fp = @fopen($filename, 'rb')) {
+ $BMPdata = fread($fp, filesize($filename));
+ fclose($fp);
+ return $this->phpthumb_bmp2gd($BMPdata, $truecolor);
+ }
+ return false;
+ }
- return $this->phpthumb_bmp2gd($BMPdata, $truecolor);
- }
+ function GD2BMPstring(&$gd_image) {
+ $imageX = ImageSX($gd_image);
+ $imageY = ImageSY($gd_image);
- return false;
- }
+ $BMP = '';
+ for ($y = ($imageY - 1); $y >= 0; $y--) {
+ $thisline = '';
+ for ($x = 0; $x < $imageX; $x++) {
+ $argb = phpthumb_functions::GetPixelColor($gd_image, $x, $y);
+ $thisline .= chr($argb['blue']).chr($argb['green']).chr($argb['red']);
+ }
+ while (strlen($thisline) % 4) {
+ $thisline .= "\x00";
+ }
+ $BMP .= $thisline;
+ }
- function GD2BMPstring(&$gd_image)
- {
- $imageX = ImageSX($gd_image);
- $imageY = ImageSY($gd_image);
+ $bmpSize = strlen($BMP) + 14 + 40;
+ // BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
+ $BITMAPFILEHEADER = 'BM'; // WORD bfType;
+ $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String($bmpSize, 4); // DWORD bfSize;
+ $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String( 0, 2); // WORD bfReserved1;
+ $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String( 0, 2); // WORD bfReserved2;
+ $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String( 54, 4); // DWORD bfOffBits;
- $BMP = '';
- for ($y = ($imageY - 1); $y >= 0; $y--) {
- $thisline = '';
- for ($x = 0; $x < $imageX; $x++) {
- $argb = phpthumb_functions::GetPixelColor($gd_image, $x, $y);
- $thisline .= chr($argb['blue']).chr($argb['green']).chr($argb['red']);
- }
- while (strlen($thisline) % 4) {
- $thisline .= "\x00";
- }
- $BMP .= $thisline;
- }
+ // BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
+ $BITMAPINFOHEADER = phpthumb_functions::LittleEndian2String( 40, 4); // DWORD biSize;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageX, 4); // LONG biWidth;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageY, 4); // LONG biHeight;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( 1, 2); // WORD biPlanes;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( 24, 2); // WORD biBitCount;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( 0, 4); // DWORD biCompression;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( 0, 4); // DWORD biSizeImage;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( 2835, 4); // LONG biXPelsPerMeter;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( 2835, 4); // LONG biYPelsPerMeter;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( 0, 4); // DWORD biClrUsed;
+ $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( 0, 4); // DWORD biClrImportant;
- $bmpSize = strlen($BMP) + 14 + 40;
- // BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
- $BITMAPFILEHEADER = 'BM'; // WORD bfType;
- $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String($bmpSize, 4); // DWORD bfSize;
- $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String( 0, 2); // WORD bfReserved1;
- $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String( 0, 2); // WORD bfReserved2;
- $BITMAPFILEHEADER .= phpthumb_functions::LittleEndian2String( 54, 4); // DWORD bfOffBits;
+ return $BITMAPFILEHEADER.$BITMAPINFOHEADER.$BMP;
+ }
- // BITMAPINFOHEADER - [40 bytes] http://msdn.microsoft.com/library/en-us/gdi/bitmaps_1rw2.asp
- $BITMAPINFOHEADER = phpthumb_functions::LittleEndian2String( 40, 4); // DWORD biSize;
- $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String( $imageX, 4); // LONG biWidth;
- $BITMAPINFOHEADER .= phpthumb_functions::LittleEndian2String...
[truncated message content] |
|
From: <rgr...@us...> - 2014-07-20 20:29:46
|
Revision: 12721
http://sourceforge.net/p/xoops/svn/12721
Author: rgriffith
Date: 2014-07-20 20:29:24 +0000 (Sun, 20 Jul 2014)
Log Message:
-----------
Sync with latest changes to geekwright/xmf on GitHub. Include vendor directory in prep for release.
Modified Paths:
--------------
XMF/xmf/trunk/xmf/composer.json
XMF/xmf/trunk/xmf/composer.lock
XMF/xmf/trunk/xmf/css/krumo/krumo.js
XMF/xmf/trunk/xmf/css/krumo/skins/blue/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/green/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/modern/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/orange/skin.css
XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/skin.css
XMF/xmf/trunk/xmf/libraries/Xmf/Debug.php
XMF/xmf/trunk/xmf/libraries/Xmf/Highlighter.php
XMF/xmf/trunk/xmf/libraries/Xmf/Language.php
XMF/xmf/trunk/xmf/libraries/Xmf/Metagen.php
XMF/xmf/trunk/xmf/libraries/Xmf/Module/Admin.php
XMF/xmf/trunk/xmf/libraries/Xmf/Utilities.php
Added Paths:
-----------
XMF/xmf/trunk/xmf/css/krumo/skins/stylish/
XMF/xmf/trunk/xmf/css/krumo/skins/stylish/skin.css
XMF/xmf/trunk/xmf/language/danish/
XMF/xmf/trunk/xmf/language/danish/index.html
XMF/xmf/trunk/xmf/language/danish/stopwords.php
XMF/xmf/trunk/xmf/language/dutch/
XMF/xmf/trunk/xmf/language/dutch/index.html
XMF/xmf/trunk/xmf/language/dutch/stopwords.php
XMF/xmf/trunk/xmf/language/english/index.html
XMF/xmf/trunk/xmf/language/finnish/
XMF/xmf/trunk/xmf/language/finnish/index.html
XMF/xmf/trunk/xmf/language/finnish/stopwords.php
XMF/xmf/trunk/xmf/language/hungarian/
XMF/xmf/trunk/xmf/language/hungarian/index.html
XMF/xmf/trunk/xmf/language/hungarian/stopwords.php
XMF/xmf/trunk/xmf/language/italian/index.html
XMF/xmf/trunk/xmf/language/norwegian/
XMF/xmf/trunk/xmf/language/norwegian/index.html
XMF/xmf/trunk/xmf/language/norwegian/stopwords.php
XMF/xmf/trunk/xmf/language/spanish/
XMF/xmf/trunk/xmf/language/spanish/index.html
XMF/xmf/trunk/xmf/language/spanish/stopwords.php
XMF/xmf/trunk/xmf/language/swedish/
XMF/xmf/trunk/xmf/language/swedish/index.html
XMF/xmf/trunk/xmf/language/swedish/stopwordsphp
XMF/xmf/trunk/xmf/vendor/
XMF/xmf/trunk/xmf/vendor/autoload.php
XMF/xmf/trunk/xmf/vendor/composer/
XMF/xmf/trunk/xmf/vendor/composer/ClassLoader.php
XMF/xmf/trunk/xmf/vendor/composer/autoload_classmap.php
XMF/xmf/trunk/xmf/vendor/composer/autoload_files.php
XMF/xmf/trunk/xmf/vendor/composer/autoload_namespaces.php
XMF/xmf/trunk/xmf/vendor/composer/autoload_psr4.php
XMF/xmf/trunk/xmf/vendor/composer/autoload_real.php
XMF/xmf/trunk/xmf/vendor/composer/installed.json
XMF/xmf/trunk/xmf/vendor/oodle/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/.gitignore
XMF/xmf/trunk/xmf/vendor/oodle/krumo/INSTALL
XMF/xmf/trunk/xmf/vendor/oodle/krumo/LICENSE
XMF/xmf/trunk/xmf/vendor/oodle/krumo/README.md
XMF/xmf/trunk/xmf/vendor/oodle/krumo/VERSION
XMF/xmf/trunk/xmf/vendor/oodle/krumo/class.krumo.php
XMF/xmf/trunk/xmf/vendor/oodle/krumo/composer.json
XMF/xmf/trunk/xmf/vendor/oodle/krumo/icons/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/icons/information.png
XMF/xmf/trunk/xmf/vendor/oodle/krumo/js/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/js/krumo.js
XMF/xmf/trunk/xmf/vendor/oodle/krumo/js/krumo.min.js
XMF/xmf/trunk/xmf/vendor/oodle/krumo/krumo.sample.ini
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/blue/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/blue/bg.gif
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/blue/skin.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/blue/skin.unminified.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/default/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/default/bg.gif
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/default/skin.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/green/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/green/bg.gif
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/green/skin.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/green/skin.unminified.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/modern/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/modern/skin.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/modern/skin.unminified.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/orange/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/orange/skin.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/orange/skin.unminified.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/schablon.com/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/schablon.com/collapsed.gif
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/schablon.com/dotted.gif
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/schablon.com/empty.gif
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/schablon.com/expanded.gif
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/schablon.com/skin.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/schablon.com/skin.unminified.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/stylish/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/stylish/skin.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/skins/stylish/skin.unminified.css
XMF/xmf/trunk/xmf/vendor/oodle/krumo/tests/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/tests/php/
XMF/xmf/trunk/xmf/vendor/oodle/krumo/tests/php/class.php
XMF/xmf/trunk/xmf/vendor/oodle/krumo/tests/php/misc.php
XMF/xmf/trunk/xmf/vendor/oodle/krumo/tests/php/object.php
XMF/xmf/trunk/xmf/vendor/symfony/
XMF/xmf/trunk/xmf/vendor/symfony/yaml/
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/DumpException.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ExceptionInterface.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/RuntimeException.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/DumperTest.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsAnchorAlias.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsBasicTests.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsBlockMapping.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsDocumentSeparator.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsErrorTests.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsFlowCollections.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsFoldedScalars.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/embededPhp.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/escapedCharacters.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/index.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfComments.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfCompact.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfObjects.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfQuotes.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/unindentedCollections.yml
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/YamlTest.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
XMF/xmf/trunk/xmf/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist
Modified: XMF/xmf/trunk/xmf/composer.json
===================================================================
--- XMF/xmf/trunk/xmf/composer.json 2014-07-20 11:14:10 UTC (rev 12720)
+++ XMF/xmf/trunk/xmf/composer.json 2014-07-20 20:29:24 UTC (rev 12721)
@@ -10,7 +10,7 @@
},
"require": {
"php": ">=5.3.3",
- "oodle/krumo": "*",
- "symfony/yaml": "~2.0"
+ "oodle/krumo": "0.5.0",
+ "symfony/yaml": "2.4.*"
}
}
Modified: XMF/xmf/trunk/xmf/composer.lock
===================================================================
--- XMF/xmf/trunk/xmf/composer.lock 2014-07-20 11:14:10 UTC (rev 12720)
+++ XMF/xmf/trunk/xmf/composer.lock 2014-07-20 20:29:24 UTC (rev 12721)
@@ -1,22 +1,23 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "This file is @generated automatically"
],
- "hash": "788e419589d80bf726debe8487cea675",
+ "hash": "1ed7107eb927f7f60c45aa5e1adfeee9",
"packages": [
{
"name": "oodle/krumo",
- "version": "v0.3.0",
+ "version": "v0.5.0",
"source": {
"type": "git",
"url": "https://github.com/oodle/krumo.git",
- "reference": "52686ac5dd3571be1ed3d4698bcef0e8fcb08814"
+ "reference": "48239769290e267fd7d6ddd1c37e08f96b87221e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/oodle/krumo/zipball/52686ac5dd3571be1ed3d4698bcef0e8fcb08814",
- "reference": "52686ac5dd3571be1ed3d4698bcef0e8fcb08814",
+ "url": "https://api.github.com/repos/oodle/krumo/zipball/48239769290e267fd7d6ddd1c37e08f96b87221e",
+ "reference": "48239769290e267fd7d6ddd1c37e08f96b87221e",
"shasum": ""
},
"require": {
@@ -56,21 +57,21 @@
"print_r",
"var_dump"
],
- "time": "2013-09-09 22:14:18"
+ "time": "2014-02-26 21:10:16"
},
{
"name": "symfony/yaml",
- "version": "v2.3.4",
+ "version": "v2.4.8",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847"
+ "reference": "e63eb0f9edbf4c48c425604a05fd4b04c8a7629a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
- "reference": "5a279f1b5f5e1045a6c432354d9ea727ff3a9847",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/e63eb0f9edbf4c48c425604a05fd4b04c8a7629a",
+ "reference": "e63eb0f9edbf4c48c425604a05fd4b04c8a7629a",
"shasum": ""
},
"require": {
@@ -79,7 +80,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev"
+ "dev-master": "2.4-dev"
}
},
"autoload": {
@@ -94,7 +95,9 @@
"authors": [
{
"name": "Fabien Potencier",
- "email": "fa...@sy..."
+ "email": "fa...@sy...",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
},
{
"name": "Symfony Community",
@@ -103,7 +106,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2013-08-24 15:26:22"
+ "time": "2014-07-09 09:04:55"
}
],
"packages-dev": [
Modified: XMF/xmf/trunk/xmf/css/krumo/krumo.js
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/krumo.js 2014-07-20 11:14:10 UTC (rev 12720)
+++ XMF/xmf/trunk/xmf/css/krumo/krumo.js 2014-07-20 20:29:24 UTC (rev 12721)
@@ -13,13 +13,13 @@
function krumo() {
}
-// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
/**
* Add a CSS class to an HTML element
*
-* @param HtmlElement el
-* @param string className
+* @param HtmlElement el
+* @param string className
* @return void
*/
krumo.reclass = function(el, className) {
@@ -28,13 +28,13 @@
}
}
-// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
/**
* Remove a CSS class to an HTML element
*
-* @param HtmlElement el
-* @param string className
+* @param HtmlElement el
+* @param string className
* @return void
*/
krumo.unclass = function(el, className) {
@@ -43,12 +43,12 @@
}
}
-// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
/**
* Toggle the nodes connected to an HTML element
*
-* @param HtmlElement el
+* @param HtmlElement el
* @return void
*/
krumo.toggle = function(el) {
@@ -70,29 +70,101 @@
}
}
-// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
/**
* Hover over an HTML element
*
-* @param HtmlElement el
+* @param HtmlElement el
* @return void
*/
krumo.over = function(el) {
krumo.reclass(el, 'krumo-hover');
}
-// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
/**
* Hover out an HTML element
*
-* @param HtmlElement el
+* @param HtmlElement el
* @return void
*/
krumo.out = function(el) {
krumo.unclass(el, 'krumo-hover');
}
-
-/////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
+
+/////////////////////////////////////////////////////////////////////////////
+
+// Get element by ID
+krumo.get_id = function(str) {
+ var ret = document.getElementById(str);
+
+ return ret;
+}
+
+// Get element by Class
+krumo.get_class = function(str) {
+ var elems = document.getElementsByClassName(str);
+ var ret = new Array();
+
+ // Just get the objects (not the extra stuff)
+ for (var i in elems) {
+ var elem = elems[i];
+ if (typeof(elem) === 'object') {
+ ret.push(elem);
+ }
+ }
+
+ return ret;
+}
+
+// This is a poor mans querySelectorAll().
+// querySelectorAll() isn't supported 100% until
+// IE9, so we have to use this work around until
+// we can stop supporting IE8
+krumo.find = function(str) {
+ if (!str) { return false; }
+
+ var first = str.substr(0,1);
+ var remain = str.substr(1);
+
+ if (first === ".") {
+ return krumo.get_class(remain);
+ } else if (first === "#") {
+ return krumo.get_id(remain);
+ } else {
+ return false;
+ }
+}
+
+function toggle_expand_all() {
+ // Find all the expandable items
+ var elems = krumo.find('.krumo-expand');
+ if (elems.length === 0) { return false; }
+
+ // Find the first expandable element and see what state it is in currently
+ var action = 'expand';
+ if (elems[0].nextSibling.style.display === 'block' || elems[0].nextSibling.style.display === '') {
+ action = 'collapse';
+ }
+
+ // Expand each item
+ for (var i in elems) {
+ var item = elems[i];
+
+ // The sibling is the hidden object
+ var sib = item.nextSibling;
+
+ if (action === 'expand') {
+ sib.style.display = 'block';
+ // Give the clicked item the krumo-opened class
+ krumo.reclass(item, 'krumo-opened');
+ } else {
+ sib.style.display = 'none';
+ // Remove the krumo-opened class
+ krumo.unclass(item, 'krumo-opened');
+ }
+ }
+}
Modified: XMF/xmf/trunk/xmf/css/krumo/skins/blue/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/blue/skin.css 2014-07-20 11:14:10 UTC (rev 12720)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/blue/skin.css 2014-07-20 20:29:24 UTC (rev 12721)
@@ -1,158 +1 @@
-/**
-* Krumo "Blue" Skin
-*
-* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
-* @author Kaloyan K. Tsvetkov <mra...@us...>
-*/
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-ul.krumo-node {
- margin: 0px;
- padding: 0px;
- }
-ul.krumo-node ul {
- margin-left: 20px;
- }
-* html ul.krumo-node ul {
- margin-left: 24px;
- }
-div.krumo-root {
- border: solid 1px black;
- margin: 1em 0em;
- }
-ul.krumo-first {
- font: normal 12px arial;
- border: solid 2px white;
- border-top-width:1px;
- background: url(%url%bg.gif);
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-li.krumo-child {
- display:block;
- list-style: none;
- padding: 0px;
- margin: 0px;
- overflow:hidden;
- }
-div.krumo-element {
- cursor:default;
-
- line-height: 24px;
- display:block;
-
- clear:both;
- white-space:nowrap;
-
- border-top: solid 1px white;
- background: #BFDFFF;
- padding-left: 10px;
- }
-* html div.krumo-element {
- padding-bottom: 3px;
- }
-a.krumo-name {
- color:navy;
- font: bold 13px Arial;
- }
-a.krumo-name big {
- font: bold 20pt Georgia;
- line-height: 14px;
- position:relative;
- top:2px;
- left:-2px;
- }
-* html a.krumo-name big {
- font: bold 19pt Georgia;
- top: 5px;
- left: 0px;
- line-height: 9px;
- height: 12px;
- padding: 0px;
- margin: 0px;
- }
-div.krumo-expand {
- background: #AAD5FF;
- cursor:pointer;
- }
-div.krumo-hover {
- background: #FFBE7D;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-div.krumo-preview {
- font: normal 13px courier new;
- padding: 5px 5px 14px 5px;
- background: white;
- border-top: 0px;
- overflow:auto;
- }
-* html div.krumo-preview {
- padding-top: 2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-li.krumo-footnote {
- background:white;
- padding: 2px 5px;
- list-style:none;
- border-top: solid 1px #bebebe;
- margin-top:2px;
- cursor:default;
- }
-* html li.krumo-footnote {
- line-height: 13px;
- }
-div.krumo-version {
- float:right;
- }
-li.krumo-footnote h6 {
- font: bold 11px verdana;
- margin: 0px;
- padding: 0px;
- color:navy;
- display:inline;
- }
-* html li.krumo-footnote h6 {
- margin-right: 3px;
- }
-li.krumo-footnote a {
- font: bold 10px arial;
- color: #434343;
- text-decoration:none;
- }
-li.krumo-footnote a:hover {
- color:black;
- }
-
-li.krumo-footnote span.krumo-call {
- font:normal 11px verdana;
- position: relative;
- top: 1px;
- }
-li.krumo-footnote span.krumo-call code {
- font-weight:bold;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-div.krumo-title {
- font: normal 11px verdana ;
- position:relative;
- top:9px;
- cursor:default;
- line-height:2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-strong.krumo-array-length,
-strong.krumo-string-length {
- font-weight: normal;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+ul.krumo-node{margin:0;padding:0}ul.krumo-node ul{margin-left:20px}* html ul.krumo-node ul{margin-left:24px}div.krumo-root{border:solid 1px #000;margin:1em 0}ul.krumo-first{font:400 12px arial;border:solid 2px #fff;border-top-width:1px;background:url(%url%bg.gif)}li.krumo-child{display:block;list-style:none;padding:0;margin:0;overflow:hidden}div.krumo-element{cursor:default;line-height:24px;display:block;clear:both;white-space:nowrap;border-top:solid 1px #fff;background:#BFDFFF;padding-left:10px}* html div.krumo-element{padding-bottom:3px}a.krumo-name{color:navy;font:700 13px Arial}a.krumo-name big{font:700 20pt Georgia;line-height:14px;position:relative;top:2px;left:-2px}* html a.krumo-name big{font:700 19pt Georgia;top:5px;left:0;line-height:9px;height:12px;padding:0;margin:0}div.krumo-expand{background:#AAD5FF;cursor:pointer}div.krumo-hover{background:#FFBE7D}div.krumo-preview{font:400 13px courier new;padding:5px 5px 14px;background:#fff;border-top:0;overflow:auto}* html div.krumo-preview{padding-top:2px}li.krumo-footnote{background:#fff;padding:2px 5px;list-style:none;border-top:solid 1px #bebebe;margin-top:2px;cursor:default}* html li.krumo-footnote{line-height:13px}div.krumo-version{float:right}li.krumo-footnote h6{font:700 11px verdana;margin:0;padding:0;color:navy;display:inline}* html li.krumo-footnote h6{margin-right:3px}li.krumo-footnote a{font:700 10px arial;color:#434343;text-decoration:none}li.krumo-footnote a:hover{color:#000}li.krumo-footnote span.krumo-call{font:400 11px verdana;position:relative;top:1px}li.krumo-footnote span.krumo-call code{font-weight:700}div.krumo-title{font:400 11px verdana;position:relative;top:9px;cursor:default;line-height:2px}strong.krumo-array-length,strong.krumo-string-length{font-weight:400}
\ No newline at end of file
Modified: XMF/xmf/trunk/xmf/css/krumo/skins/green/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/green/skin.css 2014-07-20 11:14:10 UTC (rev 12720)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/green/skin.css 2014-07-20 20:29:24 UTC (rev 12721)
@@ -1,158 +1 @@
-/**
-* Krumo "Green" Skin
-*
-* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
-* @author Kaloyan K. Tsvetkov <mra...@us...>
-*/
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-ul.krumo-node {
- margin: 0px;
- padding: 0px;
- }
-ul.krumo-node ul {
- margin-left: 20px;
- }
-* html ul.krumo-node ul {
- margin-left: 24px;
- }
-div.krumo-root {
- border: solid 1px black;
- margin: 1em 0em;
- }
-ul.krumo-first {
- font: normal 12px arial;
- border: solid 2px white;
- border-top-width:1px;
- background: url(%url%bg.gif);
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-li.krumo-child {
- display:block;
- list-style: none;
- padding: 0px;
- margin: 0px;
- overflow:hidden;
- }
-div.krumo-element {
- cursor:default;
-
- line-height: 24px;
- display:block;
-
- clear:both;
- white-space:nowrap;
-
- border-top: solid 1px white;
- background: #D7F4CA;
- padding-left: 10px;
- }
-* html div.krumo-element {
- padding-bottom: 3px;
- }
-a.krumo-name {
- color:#004000;
- font: bold 13px Arial;
- }
-a.krumo-name big {
- font: bold 20pt Georgia;
- line-height: 14px;
- position:relative;
- top:2px;
- left:-2px;
- }
-* html a.krumo-name big {
- font: bold 19pt Georgia;
- top: 5px;
- left: 0px;
- line-height: 9px;
- height: 12px;
- padding: 0px;
- margin: 0px;
- }
-div.krumo-expand {
- background: #C0EEAC;
- cursor:pointer;
- }
-div.krumo-hover {
- background: gold;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-div.krumo-preview {
- font: normal 13px courier new;
- padding: 5px 5px 14px 5px;
- background: white;
- border-top: 0px;
- overflow:auto;
- }
-* html div.krumo-preview {
- padding-top: 2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-li.krumo-footnote {
- background:white;
- padding: 2px 5px;
- list-style:none;
- border-top: solid 1px #bebebe;
- margin-top:2px;
- cursor:default;
- }
-* html li.krumo-footnote {
- line-height: 13px;
- }
-div.krumo-version {
- float:right;
- }
-li.krumo-footnote h6 {
- font: bold 11px verdana;
- margin: 0px;
- padding: 0px;
- color:#008040;
- display:inline;
- }
-* html li.krumo-footnote h6 {
- margin-right: 3px;
- }
-li.krumo-footnote a {
- font: bold 10px arial;
- color: #434343;
- text-decoration:none;
- }
-li.krumo-footnote a:hover {
- color:black;
- }
-
-li.krumo-footnote span.krumo-call {
- font:normal 11px verdana;
- position: relative;
- top: 1px;
- }
-li.krumo-footnote span.krumo-call code {
- font-weight:bold;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-div.krumo-title {
- font: normal 11px verdana ;
- position:relative;
- top:9px;
- cursor:default;
- line-height:2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-strong.krumo-array-length,
-strong.krumo-string-length {
- font-weight: normal;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+ul.krumo-node{margin:0;padding:0}ul.krumo-node ul{margin-left:20px}* html ul.krumo-node ul{margin-left:24px}div.krumo-root{border:solid 1px #000;margin:1em 0}ul.krumo-first{font:400 12px arial;border:solid 2px #fff;border-top-width:1px;background:url(%url%bg.gif)}li.krumo-child{display:block;list-style:none;padding:0;margin:0;overflow:hidden}div.krumo-element{cursor:default;line-height:24px;display:block;clear:both;white-space:nowrap;border-top:solid 1px #fff;background:#D7F4CA;padding-left:10px}* html div.krumo-element{padding-bottom:3px}a.krumo-name{color:#004000;font:700 13px Arial}a.krumo-name big{font:700 20pt Georgia;line-height:14px;position:relative;top:2px;left:-2px}* html a.krumo-name big{font:700 19pt Georgia;top:5px;left:0;line-height:9px;height:12px;padding:0;margin:0}div.krumo-expand{background:#C0EEAC;cursor:pointer}div.krumo-hover{background:gold}div.krumo-preview{font:400 13px courier new;padding:5px 5px 14px;background:#fff;border-top:0;overflow:auto}* html div.krumo-preview{padding-top:2px}li.krumo-footnote{background:#fff;padding:2px 5px;list-style:none;border-top:solid 1px #bebebe;margin-top:2px;cursor:default}* html li.krumo-footnote{line-height:13px}div.krumo-version{float:right}li.krumo-footnote h6{font:700 11px verdana;margin:0;padding:0;color:#008040;display:inline}* html li.krumo-footnote h6{margin-right:3px}li.krumo-footnote a{font:700 10px arial;color:#434343;text-decoration:none}li.krumo-footnote a:hover{color:#000}li.krumo-footnote span.krumo-call{font:400 11px verdana;position:relative;top:1px}li.krumo-footnote span.krumo-call code{font-weight:700}div.krumo-title{font:400 11px verdana;position:relative;top:9px;cursor:default;line-height:2px}strong.krumo-array-length,strong.krumo-string-length{font-weight:400}
\ No newline at end of file
Modified: XMF/xmf/trunk/xmf/css/krumo/skins/modern/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/modern/skin.css 2014-07-20 11:14:10 UTC (rev 12720)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/modern/skin.css 2014-07-20 20:29:24 UTC (rev 12721)
@@ -1 +1 @@
-ul.krumo-node,#content ul.krumo-node li{margin:0;padding:0;background:0}ul.krumo-node ul{margin-left:18px}* html ul.krumo-node ul{margin-left:24px}div.krumo-root{border:solid 1px #000;margin:.5em}ul.krumo-first{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:12px;border:solid 2px #fff;border-top-width:1px;background:url(data:image/gif;base64,R0lGODlhWgAJALMAAP///8vLy+Tk5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAABaAAkAAAQ6MAgh6az4astz314Ijl/pkaKJrmqbvivssnJN358973qPn7yfMEi0+YrDoxLJXDZxyehzCnNapVdLBAA7)}li.krumo-child{display:block;list-style:none;padding:0;margin:0;overflow:hidden}div.krumo-element{cursor:default;line-height:22px;display:block;clear:both;white-space:nowrap;border-top:solid 1px #fff;background:#E8E8E8;background-repeat:no-repeat;background-position:6px 8px;padding-left:18px}* html div.krumo-element{padding-bottom:3px}a.krumo-name{color:#2C5858;font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:12px}a.krumo-name big{font:700 20pt Georgia;line-height:14px;position:relative;top:2px;left:-2px}* html a.krumo-name big{font:700 19pt Georgia;top:5px;left:0;line-height:9px;height:12px;padding:0;margin:0}div.krumo-expand{background-color:#CCC;cursor:pointer}div.krumo-hover{background-color:#B7DBDB}div.krumo-expand{background-image:url(data:image/gif;base64,R0lGODlhCQAJALMAAP///wAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAJAAkAAAQTEIAna33USpwt79vncRpZgpcGRAA7);cursor:pointer}div.krumo-opened{background-image:url(data:image/gif;base64,R0lGODlhCQAJALMAAP///wAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAJAAkAAAQQEMhJ63w4Z6C37JUXWmQJRAA7)}div.krumo-preview{font:400 13px courier new;padding:5px 5px 14px;background:#fff;border-top:0;overflow:auto}* html div.krumo-preview{padding-top:2px}li.krumo-footnote{background:#fff;padding:2px 5px;list-style:none;border-top:solid 1px #bebebe;margin-top:2px;cursor:default}* html li.krumo-footnote{line-height:13px}div.krumo-version{float:right}li.krumo-footnote h6{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:11px;margin:0;padding:0;color:#366D6D;display:inline}* html li.krumo-footnote h6{margin-right:3px}li.krumo-footnote a{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:10px;color:#434343;text-decoration:none}li.krumo-footnote a:hover{color:#000}li.krumo-footnote span.krumo-call{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:11px;position:relative;top:1px}li.krumo-footnote span.krumo-call code{font-weight:700}div.krumo-title{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:11px;cursor:default}strong.krumo-array-length,strong.krumo-string-length{font-weight:400}
+#content ul.krumo-node li,ul.krumo-node{margin:0;padding:0;background:0}ul.krumo-node ul{margin-left:18px}* html ul.krumo-node ul{margin-left:24px}div.krumo-root{border:solid 1px #000;margin:.5em}ul.krumo-first{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:12px;border:solid 2px #fff;border-top-width:1px;background:url(data:image/gif;base64,R0lGODlhWgAJALMAAP///8vLy+Tk5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAABaAAkAAAQ6MAgh6az4astz314Ijl/pkaKJrmqbvivssnJN358973qPn7yfMEi0+YrDoxLJXDZxyehzCnNapVdLBAA7)}li.krumo-child{display:block;list-style:none;padding:0;margin:0;overflow:hidden}div.krumo-element{cursor:default;line-height:22px;display:block;clear:both;white-space:nowrap;border-top:solid 1px #fff;background:#E8E8E8;background-repeat:no-repeat;background-position:6px 8px;padding-left:18px}* html div.krumo-element{padding-bottom:3px}a.krumo-name{color:#2C5858;font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:12px}a.krumo-name big{font:700 20pt Georgia;line-height:14px;position:relative;top:2px;left:-2px}* html a.krumo-name big{font:700 19pt Georgia;top:5px;left:0;line-height:9px;height:12px;padding:0;margin:0}div.krumo-expand{background-color:#CCC}div.krumo-hover{background-color:#B7DBDB}div.krumo-expand{background-image:url(data:image/gif;base64,R0lGODlhCQAJALMAAP///wAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAJAAkAAAQTEIAna33USpwt79vncRpZgpcGRAA7);cursor:pointer}div.krumo-opened{background-image:url(data:image/gif;base64,R0lGODlhCQAJALMAAP///wAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAJAAkAAAQQEMhJ63w4Z6C37JUXWmQJRAA7)}div.krumo-preview{font:400 13px courier new;padding:5px;background:#fff;border-top:0;overflow:auto}* html div.krumo-preview{padding-top:2px}li.krumo-footnote{background:#fff;padding:2px 5px;list-style:none;border-top:solid 1px #bebebe;margin-top:2px;cursor:default}* html li.krumo-footnote{line-height:13px}.krumo-version{float:right}.krumo-version-number{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:11px;margin:0;padding:0;color:#366D6D;display:inline;margin-right:3px}li.krumo-footnote a{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:10px;color:#434343;text-decoration:none}li.krumo-footnote a:hover{color:#000}li.krumo-footnote span.krumo-call{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:11px;position:relative;top:1px}li.krumo-footnote span.krumo-call code{font-weight:700}div.krumo-title{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:11px;cursor:default}strong.krumo-array-length,strong.krumo-string-length{font-weight:400}.krumo-boolean,.krumo-datetime,.krumo-null,.krumo-sorted{font-weight:700;color:#700}
\ No newline at end of file
Modified: XMF/xmf/trunk/xmf/css/krumo/skins/orange/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/orange/skin.css 2014-07-20 11:14:10 UTC (rev 12720)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/orange/skin.css 2014-07-20 20:29:24 UTC (rev 12721)
@@ -1,158 +1 @@
-/**
-* Krumo "Orange" Skin
-*
-* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
-* @author Kaloyan K. Tsvetkov <mra...@us...>
-*/
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-ul.krumo-node {
- margin: 0px;
- padding: 0px;
- }
-ul.krumo-node ul {
- margin-left: 20px;
- }
-* html ul.krumo-node ul {
- margin-left: 24px;
- }
-div.krumo-root {
- border: solid 1px black;
- margin: 1em 0em;
- }
-ul.krumo-first {
- font: normal 12px arial;
- border: solid 2px white;
- border-top-width:1px;
- background: url(data:image/gif;base64,R0lGODlhWgAJALMAAP////+/AP/eAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAABaAAkAAAQ6UIQg6az4astz314Ijl/pkaKJrmqbvivssnJN358973qPn7yfMEi0+YrDoxLJXDZxyehzCnNapVdLBAA7);
-}
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-li.krumo-child {
- display:block;
- list-style: none;
- padding: 0px;
- margin: 0px;
- overflow:hidden;
- }
-div.krumo-element {
- cursor:default;
-
- line-height: 24px;
- display:block;
-
- clear:both;
- white-space:nowrap;
-
- border-top: solid 1px white;
- background: #FCEBA9;
- padding-left: 10px;
- }
-* html div.krumo-element {
- padding-bottom: 3px;
- }
-a.krumo-name {
- color:#404000;
- font: bold 13px Arial;
- }
-a.krumo-name big {
- font: bold 20pt Georgia;
- line-height: 14px;
- position:relative;
- top:2px;
- left:-2px;
- }
-* html a.krumo-name big {
- font: bold 19pt Georgia;
- top: 5px;
- left: 0px;
- line-height: 9px;
- height: 12px;
- padding: 0px;
- margin: 0px;
- }
-div.krumo-expand {
- background: #FADB61;
- cursor:pointer;
- }
-div.krumo-hover {
- background: #FF8A4B;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-div.krumo-preview {
- font: normal 13px courier new;
- padding: 5px 5px 14px 5px;
- background: white;
- border-top: 0px;
- overflow:auto;
- }
-* html div.krumo-preview {
- padding-top: 2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-li.krumo-footnote {
- background:white;
- padding: 2px 5px;
- list-style:none;
- border-top: solid 1px #bebebe;
- margin-top:2px;
- cursor:default;
- }
-* html li.krumo-footnote {
- line-height: 13px;
- }
-div.krumo-version {
- float:right;
- }
-li.krumo-footnote h6 {
- font: bold 11px verdana;
- margin: 0px;
- padding: 0px;
- color:#E87400;
- display:inline;
- }
-* html li.krumo-footnote h6 {
- margin-right: 3px;
- }
-li.krumo-footnote a {
- font: bold 10px arial;
- color: #434343;
- text-decoration:none;
- }
-li.krumo-footnote a:hover {
- color:black;
- }
-
-li.krumo-footnote span.krumo-call {
- font:normal 11px verdana;
- position: relative;
- top: 1px;
- }
-li.krumo-footnote span.krumo-call code {
- font-weight:bold;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-div.krumo-title {
- font: normal 11px verdana ;
- position:relative;
- top:9px;
- cursor:default;
- line-height:2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-strong.krumo-array-length,
-strong.krumo-string-length {
- font-weight: normal;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+ul.krumo-node{margin:0;padding:0}ul.krumo-node ul{margin-left:20px}* html ul.krumo-node ul{margin-left:24px}div.krumo-root{border:solid 1px #000;margin:1em 0}ul.krumo-first{font:400 12px arial;border:solid 2px #fff;border-top-width:1px;background:url(data:image/gif;base64,R0lGODlhWgAJALMAAP////+/AP/eAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAABaAAkAAAQ6UIQg6az4astz314Ijl/pkaKJrmqbvivssnJN358973qPn7yfMEi0+YrDoxLJXDZxyehzCnNapVdLBAA7)}li.krumo-child{display:block;list-style:none;padding:0;margin:0;overflow:hidden}div.krumo-element{cursor:default;line-height:24px;display:block;clear:both;white-space:nowrap;border-top:solid 1px #fff;background:#FCEBA9;padding-left:10px}* html div.krumo-element{padding-bottom:3px}a.krumo-name{color:#404000;font:700 13px Arial}a.krumo-name big{font:700 20pt Georgia;line-height:14px;position:relative;top:2px;left:-2px}* html a.krumo-name big{font:700 19pt Georgia;top:5px;left:0;line-height:9px;height:12px;padding:0;margin:0}div.krumo-expand{background:#FADB61;cursor:pointer}div.krumo-hover{background:#FF8A4B}div.krumo-preview{font:400 13px courier new;padding:5px 5px 14px;background:#fff;border-top:0;overflow:auto}* html div.krumo-preview{padding-top:2px}li.krumo-footnote{background:#fff;padding:2px 5px;list-style:none;border-top:solid 1px #bebebe;margin-top:2px;cursor:default}* html li.krumo-footnote{line-height:13px}div.krumo-version{float:right}li.krumo-footnote h6{font:700 11px verdana;margin:0;padding:0;color:#E87400;display:inline}* html li.krumo-footnote h6{margin-right:3px}li.krumo-footnote a{font:700 10px arial;color:#434343;text-decoration:none}li.krumo-footnote a:hover{color:#000}li.krumo-footnote span.krumo-call{font:400 11px verdana;position:relative;top:1px}li.krumo-footnote span.krumo-call code{font-weight:700}div.krumo-title{font:400 11px verdana;position:relative;top:9px;cursor:default;line-height:2px}strong.krumo-array-length,strong.krumo-string-length{font-weight:400}
\ No newline at end of file
Modified: XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/skin.css 2014-07-20 11:14:10 UTC (rev 12720)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/schablon.com/skin.css 2014-07-20 20:29:24 UTC (rev 12721)
@@ -1,165 +1 @@
-/**
-* Krumo `Schablon.com` Skin
-*
-* @version $Id: skin.css 6 2007-06-16 06:37:27Z mrasnika $
-* @author Kaloyan K. Tsvetkov <mra...@us...>
-*/
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-ul.krumo-node {
- margin: 0px;
- padding: 0px;
- background-color: white;
- }
-ul.krumo-node ul {
- margin-left: 20px;
- }
-* html ul.krumo-node ul {
- margin-left: 24px;
- }
-div.krumo-root {
- border: solid 1px black;
- margin: 1em 0em;
- }
-ul.krumo-first {
- font: normal 11px tahoma, verdana;
- border: solid 1px white;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-li.krumo-child {
- display:block;
- list-style: none;
- padding: 0px;
- margin: 0px;
- overflow:hidden;
- }
-div.krumo-element {
- cursor:default;
- display:block;
- clear:both;
- white-space:nowrap;
-
- background-color: white;
- background-image: url(%url%empty.gif);
- background-repeat: no-repeat;
- background-position: 6px 5px;
- padding: 2px 0px 3px 20px;
- }
-* html div.krumo-element {
- padding-bottom: 3px;
- line-height: 13px;
- }
-div.krumo-expand {
- background-image: url(%url%collapsed.gif);
- cursor:pointer;
- }
-div.krumo-hover {
- background-color: #BFDFFF;
- }
-div.krumo-opened {
- background-image: url(%url%expanded.gif);
- }
-a.krumo-name {
- color:navy;
- font: bold 13px courier new;
- line-height:12px;
- }
-a.krumo-name big {
- font: bold 16pt Georgia;
- line-height: 10px;
- position:relative;
- top:2px;
- left:-2px;
- }
-* html a.krumo-name big {
- font: bold 15pt Georgia;
- float:left;
- top: -5px;
- left: 0px;
- padding: 0px;
- margin: 0px;
- }
-em.krumo-type {
- font-style:normal;
- margin: 0px 2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-div.krumo-preview {
- font: normal 13px courier new;
- padding: 5px ;
- background: lightyellow;
- border: solid 1px #808000;
- overflow:auto;
- margin: 5px 1em 1em 0px;
- }
-* html div.krumo-preview {
- padding-top: 2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-li.krumo-footnote {
- background: white url(%url%dotted.gif) repeat-x;
- padding: 4px 5px 3px 5px;
- list-style:none;
- cursor:default;
- }
-* html li.krumo-footnote {
- line-height: 13px;
- }
-div.krumo-version {
- float:right;
- }
-li.krumo-footnote h6 {
- font: bold 11px verdana;
- margin: 0px;
- padding: 0px;
- color:navy;
- display:inline;
- }
-* html li.krumo-footnote h6 {
- margin-right: 3px;
- }
-li.krumo-footnote a {
- font: bold 10px arial;
- color: #434343;
- text-decoration:none;
- }
-li.krumo-footnote a:hover {
- color:black;
- }
-
-
-li.krumo-footnote span.krumo-call {
- font:normal 11px tahoma, verdana;
- position: relative;
- top: 1px;
- }
-li.krumo-footnote span.krumo-call code {
- font-weight:bold;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-div.krumo-title {
- font: normal 11px tahoma, verdana;
- position:relative;
- top:9px;
- cursor:default;
- line-height:2px;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
-
-strong.krumo-array-length,
-strong.krumo-string-length {
- font-weight: normal;
- color: #000099;
- }
-
-/* -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- */
+ul.krumo-node{margin:0;padding:0;background-color:#fff}ul.krumo-node ul{margin-left:20px}* html ul.krumo-node ul{margin-left:24px}div.krumo-root{border:solid 1px #000;margin:1em 0}ul.krumo-first{font:400 11px tahoma,verdana;border:solid 1px #fff}li.krumo-child{display:block;list-style:none;padding:0;margin:0;overflow:hidden}div.krumo-element{cursor:default;display:block;clear:both;white-space:nowrap;background-color:#fff;background-image:url(%url%empty.gif);background-repeat:no-repeat;background-position:6px 5px;padding:2px 0 3px 20px}* html div.krumo-element{padding-bottom:3px;line-height:13px}div.krumo-expand{background-image:url(%url%collapsed.gif);cursor:pointer}div.krumo-hover{background-color:#BFDFFF}div.krumo-opened{background-image:url(%url%expanded.gif)}a.krumo-name{color:navy;font:700 13px courier new;line-height:12px}a.krumo-name big{font:700 16pt Georgia;line-height:10px;position:relative;top:2px;left:-2px}* html a.krumo-name big{font:700 15pt Georgia;float:left;top:-5px;left:0;padding:0;margin:0}em.krumo-type{font-style:normal;margin:0 2px}div.krumo-preview{font:400 13px courier new;padding:5px;background:#ffffe0;border:solid 1px olive;overflow:auto;margin:5px 1em 1em 0}* html div.krumo-preview{padding-top:2px}li.krumo-footnote{background:#fff url(%url%dotted.gif) repeat-x;padding:4px 5px 3px;list-style:none;cursor:default}* html li.krumo-footnote{line-height:13px}div.krumo-version{float:right}li.krumo-footnote h6{font:700 11px verdana;margin:0;padding:0;color:navy;display:inline}* html li.krumo-footnote h6{margin-right:3px}li.krumo-footnote a{font:700 10px arial;color:#434343;text-decoration:none}li.krumo-footnote a:hover{color:#000}li.krumo-footnote span.krumo-call{font:400 11px tahoma,verdana;position:relative;top:1px}li.krumo-footnote span.krumo-call code{font-weight:700}div.krumo-title{font:400 11px tahoma,verdana;position:relative;top:9px;cursor:default;line-height:2px}strong.krumo-array-length,strong.krumo-string-length{font-weight:400;color:#009}
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/css/krumo/skins/stylish/skin.css
===================================================================
--- XMF/xmf/trunk/xmf/css/krumo/skins/stylish/skin.css (rev 0)
+++ XMF/xmf/trunk/xmf/css/krumo/skins/stylish/skin.css 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+#content ul.krumo-node li,ul.krumo-node{margin:0;padding:0}ul.krumo-node ul{padding-left:18px}div.krumo-root{border:solid 1px #E8E8E8;border-radius:3px;padding:4px;margin:.5em 0;background-color:#F8F8F8}div.krumo-root *{font:13px/16px "Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;padding:0;margin:0;color:#666}li.krumo-child{display:block;list-style:none;overflow:hidden}ul.krumo-node ul li.krumo-child{background:rgba(0,0,0,.03)}div.krumo-element{cursor:default;line-height:22px;display:block;clear:both;white-space:nowrap;background-repeat:no-repeat;background-position:6px 8px;padding-left:18px}a.krumo-name{color:#284F76;font-weight:700;text-decoration:none}a.krumo-name big{font:700 20pt Georgia;line-height:14px;position:relative;top:2px;left:-2px}ul.krumo-node div.krumo-expand{background-image:url(data:image/gif;base64,R0lGODlhCQAJALMAAP///wAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAJAAkAAAQTEIAna33USpwt79vncRpZgpcGRAA7);cursor:pointer}ul.krumo-node div.krumo-opened{background-image:url(data:image/gif;base64,R0lGODlhCQAJALMAAP///wAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAJAAkAAAQQEMhJ63w4Z6C37JUXWmQJRAA7)}ul.krumo-node ul div.krumo-expand,ul.krumo-node ul div.krumo-opened,ul.krumo-node ul div.krumo-opened~div{border-left:2px solid #CCC}div.krumo-preview{font:12px/16px Menlo,Consolas,Inconsolata,"Andale Mono","Courier New",monospace;font-weight:400;color:#333;padding:5px;background:#F8F8F8;overflow:auto;word-break:break-all}ul.krumo-node ul div.krumo-expand.krumo-hover,ul.krumo-node ul div.krumo-hover~div{border-left:2px solid #888;background-color:rgba(88,139,255,.05)!important}li.krumo-footnote{background:#fff;padding:2px 5px;list-style:none;border-top:solid 1px #bebebe;margin-top:2px;cursor:default}* html li.krumo-footnote{line-height:13px}.krumo-version{float:right}strong.krumo-version-number{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:11px;margin:0;padding:0;color:#366D6D;display:inline;margin-right:3px}li.krumo-footnote a{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;font-size:10px;color:#434343;text-decoration:none}li.krumo-footnote a:hover{color:#000}li.krumo-footnote span.krumo-call{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:11px;position:relative;top:1px}li.krumo-footnote span.krumo-call code{font-weight:700}div.krumo-title{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:400;font-size:11px;cursor:default}em.krumo-type,strong.krumo-array-length,strong.krumo-string-length{font-style:italic}strong.krumo-integer,strong.krumo-string{color:#000}strong.krumo-boolean,strong.krumo-null{font:13px/16px Menlo,Consolas,Inconsolata,"Andale Mono","Courier New",monospace;font-weight:700;color:#700}strong.krumo-datetime,strong.krumo-sorted{font-family:"Helvetica Neue",Helvetica,Verdana,Arial,sans-serif;font-weight:700;color:#700}strong.krumo-class{color:#000;font-weight:700}
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/danish/index.html
===================================================================
--- XMF/xmf/trunk/xmf/language/danish/index.html (rev 0)
+++ XMF/xmf/trunk/xmf/language/danish/index.html 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/danish/stopwords.php
===================================================================
--- XMF/xmf/trunk/xmf/language/danish/stopwords.php (rev 0)
+++ XMF/xmf/trunk/xmf/language/danish/stopwords.php 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1,16 @@
+<?php
+/**
+ * DA - Danish - dansk
+ * Adapted from the following under GPL 1 or greater license
+ * http://search.cpan.org/~creamyg/Lingua-StopWords-0.09/
+ */
+define(
+ '_XMF_STOPWORDS',
+ "og i jeg det at en den til er som på de med han af for ikke "
+ . "der var mig sig men et har om vi min havde ham hun nu over da "
+ . "fra du ud sin dem os op man hans hvor eller hvad skal selv her "
+ . "alle vil blev kunne ind når være dog noget ville jo deres "
+ . "efter ned skulle denne end dette mit også under have dig anden "
+ . "hende mine alt meget sit sine vor mod disse hvis din nogle hos "
+ . "blive mange ad bliver hendes været thi jer sådan"
+);
Added: XMF/xmf/trunk/xmf/language/dutch/index.html
===================================================================
--- XMF/xmf/trunk/xmf/language/dutch/index.html (rev 0)
+++ XMF/xmf/trunk/xmf/language/dutch/index.html 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/dutch/stopwords.php
===================================================================
--- XMF/xmf/trunk/xmf/language/dutch/stopwords.php (rev 0)
+++ XMF/xmf/trunk/xmf/language/dutch/stopwords.php 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1,17 @@
+<?php
+/**
+ * NL - Dutch - Nederlands
+ * Adapted from the following under GPL 1 or greater license
+ * http://search.cpan.org/~creamyg/Lingua-StopWords-0.09/
+ */
+define(
+ '_XMF_STOPWORDS',
+ "de en van ik te dat die in een hij het niet zijn is was op aan "
+ . "met als voor had er maar om hem dan zou of wat mijn men dit zo "
+ . "door over ze zich bij ook tot je mij uit der daar haar naar heb "
+ . "hoe heeft hebben deze u want nog zal me zij nu ge geen omdat "
+ . "iets worden toch al waren veel meer doen toen moet ben zonder "
+ . "kan hun dus alles onder ja eens hier wie werd altijd doch wordt "
+ . "wezen kunnen ons zelf tegen na reeds wil kon niets uw iemand "
+ . "geweest andere"
+);
Added: XMF/xmf/trunk/xmf/language/english/index.html
===================================================================
--- XMF/xmf/trunk/xmf/language/english/index.html (rev 0)
+++ XMF/xmf/trunk/xmf/language/english/index.html 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/finnish/index.html
===================================================================
--- XMF/xmf/trunk/xmf/language/finnish/index.html (rev 0)
+++ XMF/xmf/trunk/xmf/language/finnish/index.html 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/finnish/stopwords.php
===================================================================
--- XMF/xmf/trunk/xmf/language/finnish/stopwords.php (rev 0)
+++ XMF/xmf/trunk/xmf/language/finnish/stopwords.php 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1,35 @@
+<?php
+/**
+ * FI - Finnish - suomi
+ * Adapted from the following under GPL 1 or greater license
+ * http://search.cpan.org/~creamyg/Lingua-StopWords-0.09/
+ */
+define(
+ '_XMF_STOPWORDS',
+ "olla olen olet on olemme olette ovat ole oli olisi olisit "
+ . "olisin olisimme olisitte olisivat olit olin olimme olitte "
+ . "olivat ollut olleet en et ei emme ette eivät minä minun minut "
+ . "minua minussa minusta minuun minulla minulta minulle sinä "
+ . "sinun sinut sinua sinussa sinusta sinuun sinulla sinulta "
+ . "sinulle hän hänen hänet häntä hänessä hänestä häneen "
+ . "hänellä häneltä hänelle me meidän meidät meitä meissä "
+ . "meistä meihin meillä meiltä meille te teidän teidät teitä "
+ . "teissä teistä teihin teillä teiltä teille he heidän "
+ . "heidät heitä heissä heistä heihin heillä heiltä heille "
+ . "tämä tämän tätä tässä tästä tähän tallä tältä "
+ . "tälle tänä täksi tuo tuon tuotä tuossa tuosta tuohon "
+ . "tuolla tuolta tuolle tuona tuoksi se sen sitä siinä siitä "
+ . "siihen sillä siltä sille sinä siksi nämä näiden näitä "
+ . "näissä näistä näihin näillä näiltä näille näinä "
+ . "näiksi nuo noiden noita noissa noista noihin noilla noilta "
+ . "noille noina noiksi ne niiden niitä niissä niistä niihin "
+ . "niillä niiltä niille niinä niiksi kuka kenen kenet ketä "
+ . "kenessä kenestä keneen kenellä keneltä kenelle kenenä "
+ . "keneksi ketkä keiden ketkä keitä keissä keistä keihin "
+ . "keillä keiltä keille keinä keiksi mikä minkä minkä mitä "
+ . "missä mistä mihin millä miltä mille minä miksi mitkä joka "
+ . "jonka jota jossa josta johon jolla jolta jolle jona joksi jotka "
+ . "joiden joita joissa joista joihin joilla joilta joille joina "
+ . "joiksi että ja jos koska kuin mutta niin sekä sillä tai vaan "
+ . "vai vaikka kanssa mukaan noin poikki yli kun niin nyt itse "
+);
Added: XMF/xmf/trunk/xmf/language/hungarian/index.html
===================================================================
--- XMF/xmf/trunk/xmf/language/hungarian/index.html (rev 0)
+++ XMF/xmf/trunk/xmf/language/hungarian/index.html 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/hungarian/stopwords.php
===================================================================
--- XMF/xmf/trunk/xmf/language/hungarian/stopwords.php (rev 0)
+++ XMF/xmf/trunk/xmf/language/hungarian/stopwords.php 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1,29 @@
+<?php
+/**
+ * HU - Hungarian - magyar
+ * Adapted from the following under GPL 1 or greater license
+ * http://search.cpan.org/~creamyg/Lingua-StopWords-0.09/
+ */
+define(
+ '_XMF_STOPWORDS',
+ "a ahogy ahol aki akik akkor alatt által általában amely "
+ . "amelyek amelyekben amelyeket amelyet amelynek ami amit amolyan "
+ . "amíg amikor át abban ahhoz annak arra arról az azok azon azt "
+ . "azzal azért aztán azután azonban bár be belül benne cikk "
+ . "cikkek cikkeket csak de e eddig egész egy egyes egyetlen "
+ . "egyéb egyik egyre ekkor el elég ellen elõ elõször elõtt "
+ . "elsõ én éppen ebben ehhez emilyen ennek erre ez ezt ezek "
+ . "ezen ezzel ezért és fel felé hanem hiszen hogy hogyan igen "
+ . "így illetve ill. ill ilyen ilyenkor ison ismét itt jó jól "
+ . "jobban kell kellett keresztül keressünk ki kívül között "
+ . "közül legalább lehet lehetett legyen lenne lenni lesz lett "
+ . "maga magát majd majd már más másik meg még mellett mert "
+ . "mely melyek mi mit míg miért milyen mikor minden mindent "
+ . "mindenki mindig mint mintha mivel most nagy nagyobb nagyon ne "
+ . "néha nekem neki nem néhány nélkül nincs olyan ott össze "
+ . "õ õk õket pedig persze rá s saját sem semmi sok sokat "
+ . "sokkal számára szemben szerint szinte talán tehát teljes "
+ . "tovább továbbá több úgy ugyanis új újabb újra után "
+ . "utána utolsó vagy vagyis valaki valami valamint való vagyok "
+ . "van vannak volt voltam voltak voltunk vissza vele viszont volna"
+);
Added: XMF/xmf/trunk/xmf/language/italian/index.html
===================================================================
--- XMF/xmf/trunk/xmf/language/italian/index.html (rev 0)
+++ XMF/xmf/trunk/xmf/language/italian/index.html 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/norwegian/index.html
===================================================================
--- XMF/xmf/trunk/xmf/language/norwegian/index.html (rev 0)
+++ XMF/xmf/trunk/xmf/language/norwegian/index.html 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/norwegian/stopwords.php
===================================================================
--- XMF/xmf/trunk/xmf/language/norwegian/stopwords.php (rev 0)
+++ XMF/xmf/trunk/xmf/language/norwegian/stopwords.php 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1,23 @@
+<?php
+/**
+ * NO - Norwegian - Norsk
+ * Adapted from the following under GPL 1 or greater license
+ * http://search.cpan.org/~creamyg/Lingua-StopWords-0.09/
+ */
+define(
+ '_XMF_STOPWORDS',
+ "og i jeg det at en et den til er som på de med han av ikke "
+ . "ikkje der så var meg seg men ett har om vi min mitt ha hadde "
+ . "hun nå over da ved fra du ut sin dem oss opp man kan hans hvor "
+ . "eller hva skal selv sjøl her alle vil bli ble blei blitt kunne "
+ . "inn når være kom noen noe ville dere som deres kun ja etter "
+ . "ned skulle denne for deg si sine sitt mot å meget hvorfor "
+ . "dette disse uten hvordan ingen din ditt blir samme hvilken "
+ . "hvilke sånn inni mellom vår hver hvem vors hvis både bare "
+ . "enn fordi før mange også slik vært være båe begge siden "
+ . "dykk dykkar dei deira deires deim di då eg ein eit eitt elles "
+ . "honom hjå ho hoe henne hennar hennes hoss hossen ikkje ingi "
+ . "inkje korleis korso kva kvar kvarhelst kven kvi kvifor me medan "
+ . "mi mine mykje no nokon noka nokor noko nokre si sia sidan so "
+ . "somt somme um upp vere vore verte vort varte vart"
+);
Added: XMF/xmf/trunk/xmf/language/spanish/index.html
===================================================================
--- XMF/xmf/trunk/xmf/language/spanish/index.html (rev 0)
+++ XMF/xmf/trunk/xmf/language/spanish/index.html 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XMF/xmf/trunk/xmf/language/spanish/stopwords.php
===================================================================
--- XMF/xmf/trunk/xmf/language/spanish/stopwords.php (rev 0)
+++ XMF/xmf/trunk/xmf/language/spanish/stopwords.php 2014-07-20 20:29:24 UTC (rev 12721)
@@ -0,0 +1,44 @@
+<?php
+/**
+ * ES - Spanish - español
+ * Adapted from the following under GPL 1 or greater license
+ * http://search.cpan.org/~creamyg/Lingua-StopWords-0.09/
+ */
+define(
+ '_XMF_STOPWORDS',
+ "de la que el en y a los del se las por un para con no una su al "
+ . "lo como más pero sus le ya o este sí porque esta entre cuando "
+ . "muy sin sobre también me hasta hay donde quien desde todo nos "
+ . "durante todos uno les ni contra otros ese eso ante ellos e esto "
+ . "mí antes algunos qué unos yo otro otras otra él tanto esa "
+ . "estos mucho quienes nada muchos cual poco ella estar estas "
+ . "algunas algo nosotros mi mis tú te...
[truncated message content] |
|
From: <be...@us...> - 2014-07-20 11:14:13
|
Revision: 12720
http://sourceforge.net/p/xoops/svn/12720
Author: beckmi
Date: 2014-07-20 11:14:10 +0000 (Sun, 20 Jul 2014)
Log Message:
-----------
Couple more corrections
Modified Paths:
--------------
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/global.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/modinfo.php
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/global.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/global.php 2014-07-19 22:19:45 UTC (rev 12719)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/global.php 2014-07-20 11:14:10 UTC (rev 12720)
@@ -174,7 +174,7 @@
define('_DATESTRING', 'j.m.Y, G:i:s');
define('_MEDIUMDATESTRING', 'd.m.Y, G:i');
define('_SHORTDATESTRING', 'd.m.Y');
-define('_SHORTDATESTRING', 'd.m.Y');
+
/**
* The following characters are recognized in the format string:
* a - 'am' or 'pm'
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/modinfo.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/modinfo.php 2014-07-19 22:19:45 UTC (rev 12719)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/modinfo.php 2014-07-20 11:14:10 UTC (rev 12720)
@@ -56,4 +56,4 @@
define("_PROFILE_MI_HOME", "Strona główna");
//1.86
define('_PROFILE_MI_PROFILE_CAPTCHA_STEP1',"Czy użyć Captcha po drugim etapie rejestracji?");
-define('_PROFILE_MI_PROFILE_CAPTCHA_STEP1_DESC',"Wybierz "Tak" , aby dodać dodatkowe środki przeciwko rejestracji spamu przez boty" );
+define('_PROFILE_MI_PROFILE_CAPTCHA_STEP1_DESC','Wybierz "Tak" , aby dodać dodatkowe środki przeciwko rejestracji spamu przez boty' );
|
|
From: <be...@us...> - 2014-07-19 22:20:02
|
Revision: 12719
http://sourceforge.net/p/xoops/svn/12719
Author: beckmi
Date: 2014-07-19 22:19:45 +0000 (Sat, 19 Jul 2014)
Log Message:
-----------
Converting to UTF-8 without BOM
Modified Paths:
--------------
XoopsLanguages/polish/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/polish/main.php
XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/finish.php
XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/install.php
XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/install2.php
XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/support.php
XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/welcome.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/admin.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/auth.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/backend.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/banners.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/calendar.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/captcha.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/comment.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/countries.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/errors.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/findusers.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/formdhtmltextarea.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/global.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/locale.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/logger.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/activated.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/adminactivate.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/comment_notify.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/commentsubmit_notify.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/default_notify.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/lostpass1.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/lostpass2.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/register.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/tellfriend.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/misc.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/notification.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/pmsg.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/search.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/timezone.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/uploader.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/user.php
XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/xoopsmailerlocal.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/admin.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/help/help.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/help/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/main.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/modinfo.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/admin.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/help/help.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/help/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/mail_template/emailchanged.tpl
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/mail_template/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/main.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/modinfo.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/help/help.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/help/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/avatars.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/banners.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/blocksadmin.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/comments.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/groups.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/images.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/mailusers.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/maintenance.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/modulesadmin.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/preferences.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/smilies.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/tplsets.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/userrank.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/users.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/blocks.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/cpanel.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/avatars.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/banners.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/blocksadmin.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/comments.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/groups.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/help_center.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/images.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/mailusers.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/maintenance.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/module_index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/modulesadmin.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/preferences.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/smilies.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/tplsets.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/userrank.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/users.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/images/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/modinfo.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/themes/default/language/polish/admin.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/themes/default/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/themes/default/language/polish/localsupport.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/polish/admin.php
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/polish/localsupport.php
XoopsLanguages/polish/core/2.5.7/htdocs/themes/suico/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/themes/suico/language/polish/main.php
XoopsLanguages/polish/core/2.5.7/htdocs/themes/suico/language/polish/script.js
XoopsLanguages/polish/core/2.5.7/htdocs/themes/xbootstrap/language/polish/main.php
XoopsLanguages/polish/core/2.5.7/htdocs/themes/zetagenesis/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/themes/zetagenesis/language/polish/main.php
XoopsLanguages/polish/core/2.5.7/htdocs/themes/zetagenesis/language/polish/script.js
XoopsLanguages/polish/core/2.5.7/htdocs/themes/zetagenesis/language/polish/style.css
XoopsLanguages/polish/core/2.5.7/htdocs/xoops_lib/modules/protector/language/polish/admin.php
XoopsLanguages/polish/core/2.5.7/htdocs/xoops_lib/modules/protector/language/polish/index.html
XoopsLanguages/polish/core/2.5.7/htdocs/xoops_lib/modules/protector/language/polish/main.php
XoopsLanguages/polish/core/2.5.7/htdocs/xoops_lib/modules/protector/language/polish/modinfo.php
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/polish/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/polish/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/polish/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/polish/main.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/polish/main.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/polish/main.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Frameworks Module Admin
*
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/finish.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/finish.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/finish.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: pl
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/install.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/install.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/install.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Installer main english strings declaration file
*
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/install2.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/install2.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/install2.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/support.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/support.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/support.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/welcome.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/welcome.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/install/language/polish/welcome.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: pl
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/admin.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/admin.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/admin.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/auth.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/auth.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/auth.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/backend.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/backend.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/backend.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/banners.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/banners.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/banners.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/calendar.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/calendar.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/calendar.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/captcha.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/captcha.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/captcha.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/comment.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/comment.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/comment.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/countries.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/countries.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/countries.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// _LANGCODE: en
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/errors.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/errors.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/errors.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// _LANGCODE: en
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/findusers.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/findusers.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/findusers.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/formdhtmltextarea.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/formdhtmltextarea.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/formdhtmltextarea.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* Language definitions for {@link XoopsFormDhtmlTextArea}
*
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/global.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/global.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/global.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/locale.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/locale.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/locale.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?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
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/logger.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/logger.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/logger.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?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
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/activated.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/activated.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/activated.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Twoje nowe konto na {SITENAME} zostało aktywowane przez administratora.
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/adminactivate.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/adminactivate.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/adminactivate.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Nowy użytkownik {USERNAME} ({USEREMAIL}) właśnie się zarejestrował na {SITENAME}.
Klikając na poniższy link aktywujesz jego konto:
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/comment_notify.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/comment_notify.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/comment_notify.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Nowy komentarz został dodany do {X_ITEM_TYPE} "{X_ITEM_NAME}", która jest monitorowana w module {X_NOTIFY_MODULE} ;
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/commentsubmit_notify.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/commentsubmit_notify.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/commentsubmit_notify.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Komentarz został dodany (ale nie zatwierdzony) do {X_ITEM_TYPE} "{X_ITEM_NAME}", która jest monitorowana w module {X_MODULE}.
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/default_notify.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/default_notify.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/default_notify.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Zdarzenie {X_NOTIFY_EVENT} wystąpiło w {X_ITEM_TYPE} "{X_ITEM_TILE}", która jest monitorowana w module {X_MODULE} w naszym serwisie.
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
- <script>history.go(-1);</script>
+ <script>history.go(-1);</script>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/lostpass1.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/lostpass1.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/lostpass1.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Użytkownik z adresu {IP} chciał uzyskać nowe hasło na stronie {SITENAME}.
Możesz otrzymać swoje nowe hasło klikając na link poniżej:
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/lostpass2.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/lostpass2.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/lostpass2.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Użytkownik z adresu {IP} zgłosił prośbę o nowe hasło.
Oto Twoje dane dla strony {SITENAME}.
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/register.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/register.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/register.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Dziękujemy za zarejestrowanie się na stronie {SITENAME}.
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/tellfriend.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/tellfriend.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/mail_template/tellfriend.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {FRIEND_NAME},
+Witaj {FRIEND_NAME},
Twój znajomy {YOUR_NAME} poleca Ci stronę {SITENAME}, możesz ją zobaczyć pod adresem {SITEURL}
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/misc.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/misc.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/misc.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/notification.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/notification.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/notification.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/pmsg.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/pmsg.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/pmsg.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/search.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/search.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/search.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/timezone.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/timezone.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/timezone.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/uploader.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/uploader.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/uploader.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/user.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/user.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/user.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/xoopsmailerlocal.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/xoopsmailerlocal.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/language/polish/xoopsmailerlocal.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?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
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/admin.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/admin.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/admin.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/help/help.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/help/help.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/help/help.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Pomoc: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/pm/admin/admin.php" title="Powrót do administracji PM"> Prywatne Wiadomości <img src="<{xoAdminIcons home.png}>" alt="Powrót do administracji PM"/></a></h1>
<!-- -----Help Content ---------- -->
<h4 class="odd">Opis</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/help/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/help/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/help/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
-<script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/main.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/main.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/main.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/modinfo.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/modinfo.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/pm/language/polish/modinfo.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/admin.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/admin.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/admin.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/help/help.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/help/help.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/help/help.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/profile/admin/index.php" title="Back to the Administration of Profile"> Profile <img src="<{xoAdminIcons home.png}>" alt="Back to the Administration of Profile"/></a></h1>
<!-- -----Help Content ---------- -->
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/help/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/help/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/help/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
-<script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/mail_template/emailchanged.tpl
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/mail_template/emailchanged.tpl 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/mail_template/emailchanged.tpl 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-Witaj {X_UNAME},
+Witaj {X_UNAME},
Twój adres email na {SITENAME} został pomyślnie zmieniony.
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/mail_template/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/mail_template/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/mail_template/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/main.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/main.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/main.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/modinfo.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/modinfo.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/profile/language/polish/modinfo.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/help/help.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/help/help.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/help/help.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/protector/admin/index.php" title="Back to the administration of Protector"> Protector <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of Protector"/></a></h1>
<!-- -----Help Content ---------- -->
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/help/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/help/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/help/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
-<script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/protector/language/polish/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
-<script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/avatars.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/avatars.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/avatars.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/banners.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/banners.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/banners.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/blocksadmin.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/blocksadmin.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/blocksadmin.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/comments.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/comments.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/comments.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/groups.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/groups.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/groups.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/images.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/images.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/images.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/mailusers.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/mailusers.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/mailusers.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/maintenance.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/maintenance.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/maintenance.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/modulesadmin.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/modulesadmin.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/modulesadmin.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/preferences.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/preferences.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/preferences.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/smilies.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/smilies.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/smilies.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/tplsets.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/tplsets.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/tplsets.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/userrank.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/userrank.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/userrank.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/users.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/users.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin/users.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/admin.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/blocks.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/blocks.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/blocks.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/cpanel.php
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/cpanel.php 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/cpanel.php 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<?php
+<?php
// $Id$
// _LANGCODE: en
// _CHARSET : UTF-8
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/avatars.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/avatars.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/avatars.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Avatar</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/banners.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/banners.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/banners.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Banners</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/blocksadmin.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/blocksadmin.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/blocksadmin.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Blocks</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/comments.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/comments.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/comments.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Comments</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/groups.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/groups.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/groups.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Groups</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/help_center.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/help_center.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/help_center.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h2 class="head">Witamy w Centrum Pomocy XOOPS</h2>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/images.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/images.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/images.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Image Manager</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+ <script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/mailusers.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/mailusers.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/mailusers.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Email Users</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/maintenance.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/maintenance.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/maintenance.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Maintenance</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/module_index.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/module_index.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/module_index.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h2 class="head">Welcom to: System module</h2>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/modulesadmin.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/modulesadmin.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/modulesadmin.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Modules</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/preferences.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/preferences.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/preferences.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Preferences</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/smilies.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/smilies.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/smilies.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Smilies</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/tplsets.html
===================================================================
--- XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/tplsets.html 2014-07-17 22:23:35 UTC (rev 12718)
+++ XoopsLanguages/polish/core/2.5.7/htdocs/modules/system/language/polish/help/tplsets.html 2014-07-19 22:19:45 UTC (rev 12719)
@@ -1,4 +1,4 @@
-<div id="help-template" class="outer">
+<div id="help-template" class="outer">
<h1 class="head">Help: Templates</h1>
<h4 class="odd">Description</h4>
Modified: XoopsLanguages/polish/core/2.5.7/htdocs/mo...
[truncated message content] |
|
From: <txm...@us...> - 2014-07-17 22:23:42
|
Revision: 12718
http://sourceforge.net/p/xoops/svn/12718
Author: txmodxoops
Date: 2014-07-17 22:23:35 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Used for system and others modules
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif 2014-07-16 18:31:49 UTC (rev 12717)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif 2014-07-17 22:23:35 UTC (rev 12718)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
|
|
From: <be...@us...> - 2014-07-16 18:31:58
|
Revision: 12717
http://sourceforge.net/p/xoops/svn/12717
Author: beckmi
Date: 2014-07-16 18:31:49 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
improving makepdf with language options (rgriffith)
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/news/makepdf.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php 2014-07-16 17:11:20 UTC (rev 12716)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/newbb/makepdf.php 2014-07-16 18:31:49 UTC (rev 12717)
@@ -32,12 +32,12 @@
// a complete rewrite by irmtfan to enhance: 1- RTL 2- Multilanguage (EMLH and Xlanguage)
error_reporting(0);
-include_once dirname(__FILE__) . "/header.php";
+include_once __DIR__ . "/header.php";
$forum = isset($_GET['forum']) ? intval($_GET['forum']) : 0;
$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
-if (!is_file(XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php')) {
+if (!is_file(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php')) {
redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$topic_id,3,'TCPF for Xoops not installed');
}
@@ -90,7 +90,7 @@
$pdf_data['cat_title']=$viewtopic_cat->getVar('cat_title');
$pdf_data['subject']=NEWBB_PDF_SUBJECT.': '.$pdf_data['topic_title'];
$pdf_data['keywords']=XOOPS_URL . ', '.'SIMPLE-XOOPS, '.$pdf_data['topic_title'];
-$pdf_data['HeadFirstLine']=$xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'];
+$pdf_data['HeadFirstLine']= $xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'];
$pdf_data['HeadSecondLine']=_MD_FORUMHOME.' - '.$pdf_data['cat_title'].' - '.$pdf_data['forum_title'].' - '.$pdf_data['topic_title'];
// START irmtfan to implement EMLH by GIJ
@@ -103,10 +103,16 @@
}
// END irmtfan to implement Xlanguage by phppp(DJ)
-require_once (XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php');
+require_once (XOOPS_PATH.'/vendor/tcpdf/tcpdf.php');
+$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+// load $localLanguageOptions array with language specific definitions and apply
+if (is_file(XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
+} else {
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
+}
+$pdf->setLanguageArray($localLanguageOptions);
-//create the A4-PDF...
-$pdf=new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
// START irmtfan hack to add RTL-LTR local
// until _RTL added to core 2.6.0
if (!defined('_RTL')) {
@@ -122,10 +128,13 @@
$pdf->SetSubject($pdf_data['subject']);
$pdf->SetKeywords($pdf_data['keywords']);
-$pdf->SetHeaderData('', '5', $pdf_data['HeadFirstLine'], $pdf_data['HeadSecondLine']);
+//$pdf->SetHeaderData('', '5', $pdf_data['HeadFirstLine'], $pdf_data['HeadSecondLine']);
+$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, $pdf_data['HeadFirstLine'], $pdf_data['HeadSecondLine'], array(0,64,255), array(0,64,128));
+
//set margins
$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP , PDF_MARGIN_RIGHT);
+$pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
$pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
//set auto page breaks
$pdf->SetAutoPageBreak(true, 25);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/news/makepdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/news/makepdf.php 2014-07-16 17:11:20 UTC (rev 12716)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/news/makepdf.php 2014-07-16 18:31:49 UTC (rev 12717)
@@ -30,9 +30,9 @@
// ------------------------------------------------------------------------- //
error_reporting(0);
-
+
include_once 'header.php';
-if (!is_file(XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php')) {
+if (!is_file(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php')) {
redirect_header(XOOPS_URL.'/modules/news/index.php',3,'tcpdf_for_xoops not installed');
}
$myts =& MyTextSanitizer::getInstance();
@@ -96,13 +96,16 @@
//create the A4-PDF...
$pdf_config['slogan'] = XOOPS_URL.' - '.$xoopsConfig['sitename'].' - '.$xoopsConfig['slogan'];
-require_once (XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php');
-if (is_file(XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
- require_once( XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
+require_once (XOOPS_PATH.'/vendor/tcpdf/tcpdf.php');
+$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+// load $localLanguageOptions array with language specific definitions and apply
+if (is_file(XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
} else {
- require_once( XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/english.php');
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
}
-$pdf=new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+$pdf->setLanguageArray($localLanguageOptions);
+
$pdf->SetCreator(PDF_CREATOR);
$pdf->SetTitle($pdf_data['title']);
@@ -116,15 +119,21 @@
$pdf->setHeaderFont(Array(PDF_FONT_NAME_SUB, '', PDF_FONT_SIZE_SUB));
$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
$pdf->setFooterData($tc=array(0,64,0), $lc=array(0,64,128));
-$pdf->SetHeaderData('','5',$pdf_config['slogan']);
+//$pdf->SetHeaderData('','5',$pdf_config['slogan']);
+$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, $pdf_config['slogan'], array(0,64,255), array(0,64,128));
+//set margins
+$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
+$pdf->SetHeaderMargin(PDF_MARGIN_HEADER);
+$pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
+
$pdf->Open();
//First page
$pdf->AddPage();
-$pdf->SetXY(24,15);
+$pdf->SetXY(24,25);
$pdf->SetTextColor(10,60,160);
$pdf->SetFont(PDF_FONT_NAME_TITLE,PDF_FONT_STYLE_TITLE,PDF_FONT_SIZE_TITLE);
$pdf->WriteHTML($pdf_data['title'].' - '.$pdf_data['subtitle'],K_TITLE_MAGNIFICATION);
-$pdf->Line(25,20,190,20);
+//$pdf->Line(25,20,190,20);
if ($pdf_data['subsubtitle'] != '') {
$pdf->WriteHTML($puff,K_XSMALL_RATIO);
$pdf->SetFont(PDF_FONT_NAME_SUBSUB,PDF_FONT_STYLE_SUBSUB,PDF_FONT_SIZE_SUBSUB);
@@ -143,4 +152,3 @@
$pdf->WriteHTML($pdf_data['content'],$pdf_config['scale']);
$pdf->Output();
-?>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php 2014-07-16 17:11:20 UTC (rev 12716)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/makepdf.php 2014-07-16 18:31:49 UTC (rev 12717)
@@ -21,7 +21,7 @@
*/
error_reporting(0);
-include_once dirname(__FILE__) . '/header.php';
+include_once __DIR__ . '/header.php';
if (!is_file(XOOPS_PATH.'/vendor/tcpdf/tcpdf.php')) {
redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$topic_id,3,'TCPDF for Xoops not installed');
}
@@ -68,12 +68,15 @@
$content .= $itemObj->plain_maintext();
require_once (XOOPS_PATH.'/vendor/tcpdf/tcpdf.php');
+
+$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+// load $localLanguageOptions array with language specific definitions and apply
if (is_file(XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php')) {
- require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/'.$xoopsConfig['language'].'.php');
} else {
- require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
+ require_once( XOOPS_PATH.'/vendor/tcpdf/config/lang/english.php');
}
-$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, _CHARSET, false);
+$pdf->setLanguageArray($localLanguageOptions);
$doc_title = publisher_convertCharset($myts->undoHtmlSpecialChars($itemObj->title()));
$doc_keywords = 'XOOPS';
|
|
From: <be...@us...> - 2014-07-16 17:11:23
|
Revision: 12716
http://sourceforge.net/p/xoops/svn/12716
Author: beckmi
Date: 2014-07-16 17:11:20 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
adding code to .html template entries from the tpl table
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php 2014-07-16 17:10:42 UTC (rev 12715)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php 2014-07-16 17:11:20 UTC (rev 12716)
@@ -25,7 +25,7 @@
{
if ($oldversion <= 100) {
- GLOBAL $xoopsDB;
+ global $xoopsDB;
// Check pm table version
$sql = "SHOW COLUMNS FROM " . $xoopsDB->prefix("priv_msgs");
if (!$result = $xoopsDB->queryF($sql)) {
@@ -51,12 +51,15 @@
@unlink($templateDirectory . $v);
}
}
- // Load class XoopsFile
+
xoops_load('xoopsfile');
//remove /images directory
$imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/images/";
$folderHandler = XoopsFile::getHandler("folder", $imagesDirectory);
$folderHandler->delete($imagesDirectory);
+ //delete .html entries from the tpl table
+ $sql = "DELETE FROM " . $xoopsDB->prefix("tplfile") . " WHERE `tpl_module` = '" .$module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+ $xoopsDB->queryF($sql);
}
return true;
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php 2014-07-16 17:10:42 UTC (rev 12715)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php 2014-07-16 17:11:20 UTC (rev 12716)
@@ -116,7 +116,7 @@
@unlink($templateDirectory . $v);
}
}
- // Load class XoopsFile
+
xoops_load('xoopsfile');
//delete /images directory
$imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/images/";
@@ -126,6 +126,9 @@
$cssFile = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/style.css";
$folderHandler = XoopsFile::getHandler("file", $cssFile);
$folderHandler->delete($cssFile);
+ //delete .html entries from the tpl table
+ $sql = "DELETE FROM " . $GLOBALS['xoopsDB']->prefix("tplfile") . " WHERE `tpl_module` = '" .$module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+ $GLOBALS['xoopsDB']->queryF($sql);
}
$profile_handler =& xoops_getModuleHandler("profile", $module->getVar('dirname', 'n'));
|
|
From: <be...@us...> - 2014-07-16 17:10:46
|
Revision: 12715
http://sourceforge.net/p/xoops/svn/12715
Author: beckmi
Date: 2014-07-16 17:10:42 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
adding code to .html template entries from the tpl table
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php 2014-07-16 14:05:18 UTC (rev 12714)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php 2014-07-16 17:10:42 UTC (rev 12715)
@@ -25,7 +25,7 @@
{
if ($oldversion <= 100) {
- GLOBAL $xoopsDB;
+ global $xoopsDB;
// Check pm table version
$sql = "SHOW COLUMNS FROM " . $xoopsDB->prefix("priv_msgs");
if (!$result = $xoopsDB->queryF($sql)) {
@@ -51,12 +51,15 @@
@unlink($templateDirectory . $v);
}
}
- // Load class XoopsFile
+
xoops_load('xoopsfile');
//remove /images directory
$imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/images/";
$folderHandler = XoopsFile::getHandler("folder", $imagesDirectory);
$folderHandler->delete($imagesDirectory);
+ //delete .html entries from the tpl table
+ $sql = "DELETE FROM " . $xoopsDB->prefix("tplfile") . " WHERE `tpl_module` = '" .$module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+ $xoopsDB->queryF($sql);
}
return true;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php 2014-07-16 14:05:18 UTC (rev 12714)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php 2014-07-16 17:10:42 UTC (rev 12715)
@@ -116,7 +116,7 @@
@unlink($templateDirectory . $v);
}
}
- // Load class XoopsFile
+
xoops_load('xoopsfile');
//delete /images directory
$imagesDirectory = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/images/";
@@ -126,6 +126,9 @@
$cssFile = XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname', 'n') . "/templates/style.css";
$folderHandler = XoopsFile::getHandler("file", $cssFile);
$folderHandler->delete($cssFile);
+ //delete .html entries from the tpl table
+ $sql = "DELETE FROM " . $GLOBALS['xoopsDB']->prefix("tplfile") . " WHERE `tpl_module` = '" .$module->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+ $GLOBALS['xoopsDB']->queryF($sql);
}
$profile_handler =& xoops_getModuleHandler("profile", $module->getVar('dirname', 'n'));
|
|
From: <be...@us...> - 2014-07-16 14:05:26
|
Revision: 12714
http://sourceforge.net/p/xoops/svn/12714
Author: beckmi
Date: 2014-07-16 14:05:18 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
removing unneeded % sign
Modified Paths:
--------------
XoopsModules/xoopspoll/branches/zyspec/templates/blocks/xoopspoll_block_singlepoll.html
Modified: XoopsModules/xoopspoll/branches/zyspec/templates/blocks/xoopspoll_block_singlepoll.html
===================================================================
--- XoopsModules/xoopspoll/branches/zyspec/templates/blocks/xoopspoll_block_singlepoll.html 2014-07-15 21:47:39 UTC (rev 12713)
+++ XoopsModules/xoopspoll/branches/zyspec/templates/blocks/xoopspoll_block_singlepoll.html 2014-07-16 14:05:18 UTC (rev 12714)
@@ -16,7 +16,7 @@
<td class='width30 left'><{$option.text}></td>
<td class='left' style='margin-left: 1em;'>
<{$option.percent}><{if $block.dispVotes}> (<{$option.count}>)<{/if}><br />
- <div class='width90'><img src='<{$xoops_url}>/modules/xoopspoll/images/colorbars/<{$option.color}>' style='height: 14px; width: <{$option.percent}>%;' alt='<{$option.percent}>' /></div>
+ <div class='width90'><img src='<{$xoops_url}>/modules/xoopspoll/images/colorbars/<{$option.color}>' style='height: 14px; width: <{$option.percent}>;' alt='<{$option.percent}>' /></div>
</td>
</tr>
<{ /foreach}>
|
|
From: <txm...@us...> - 2014-07-15 21:47:45
|
Revision: 12713
http://sourceforge.net/p/xoops/svn/12713
Author: txmodxoops
Date: 2014-07-15 21:47:39 +0000 (Tue, 15 Jul 2014)
Log Message:
-----------
- Updated
- added defines class file for languages
- Still work to do
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/defines.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -430,7 +430,7 @@
$ret[] = $userIndex->render();
// Language Main File
$languageMain = LanguageMain::getInstance();
- $languageMain->write($module, $table, $tables, 'main.php');
+ $languageMain->write($module, $tables, 'main.php');
$ret[] = $languageMain->render();
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -19,16 +19,21 @@
* @version $Id: admin.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'defines.php';
class LanguageAdmin extends TDMCreateFile
{
/*
+ * @var mixed
+ */
+ private $defines = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
* @static function &getInstance
@@ -60,19 +65,15 @@
*/
public function getLanguageAdminIndex($language, $tables)
{
- $ret = <<<EOT
-// ---------------- Admin Index ----------------
-define('{$language}STATISTICS', "Statistics");
-// There are\n
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Index ----------------');
+ $ret .= $this->defines->getDefine($language, 'STATISTICS', "Statistics");
+ $ret .= $this->defines->getAboveDefines('There are');
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
$stuTableName = strtoupper($tableName);
$stlTableName = strtolower($tableName);
- $ret .= <<<EOT
-define('{$language}THEREARE_{$stuTableName}', "There are <span class='bold'>%s</span> {$stlTableName} in the database");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "THEREARE_{$stuTableName}", "There are <span class='bold'>%s</span> {$stlTableName} in the database");
}
return $ret;
}
@@ -83,51 +84,39 @@
*/
public function getLanguageAdminPages($language, $tables)
{
- $ret = <<<EOT
-// ---------------- Admin Files ----------------
-// There aren't\n
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Files ----------------');
+ $ret .= $this->defines->getAboveDefines('There aren\'t');
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
$stuTableName = strtoupper($tableName);
$stlTableName = strtolower($tableName);
- $ret .= <<<EOT
-define('{$language}THEREARENT_{$stuTableName}', "There aren't {$stlTableName}");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "THEREARENT_{$stuTableName}", "There aren't {$stlTableName}");
}
- $ret .= <<<EOT
-// Save/Delete
-define('{$language}FORMOK', "Successfully saved");
-define('{$language}FORMDELOK', "Successfully deleted");
-define('{$language}FORMSUREDEL', "Are you sure to delete: <b><span style='color : Red'>%s </span></b>");
-define('{$language}FORMSURERENEW', "Are you sure to update: <b><span style='color : Red'>%s </span></b>");\n
-EOT;
- $ret .= <<<EOT
-// Buttons\n
-EOT;
+ $ret .= $this->defines->getAboveDefines('Save/Delete');
+ $ret .= $this->defines->getDefine($language, "FORMOK", "Successfully saved");
+ $ret .= $this->defines->getDefine($language, "FORMDELOK", "Successfully deleted");
+ $ret .= $this->defines->getDefine($language, "FORMSUREDEL", "Are you sure to delete: <b><span style='color : Red'>%s </span></b>");
+ $ret .= $this->defines->getDefine($language, "FORMSURERENEW", "Are you sure to update: <b><span style='color : Red'>%s </span></b>");
+ $ret .= $this->defines->getAboveDefines('Buttons');
+ //
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
$tableFieldname = $tables[$t]->getVar('table_fieldname');
$stuTableFieldname = strtoupper($tableFieldname);
- $ucfTableFieldname = ucfirst($tableFieldname);
- $ret .= <<<EOT
-define('{$language}ADD_{$stuTableFieldname}', "Add {$ucfTableFieldname}");\n
-EOT;
+ $ucfTableFieldname = ucfirst($tableFieldname);
+ $ret .= $this->defines->getDefine($language, "ADD_{$stuTableFieldname}", "Add {$ucfTableFieldname}");
}
- $ret .= <<<EOT
-// Lists\n
-EOT;
+ $ret .= $this->defines->getAboveDefines('Lists');
+ //
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
$tableFieldname = $tables[$t]->getVar('table_fieldname');
$stuTableName = strtoupper($tableName);
- $ucfTableName = ucfirst($tableName);
- $ret .= <<<EOT
-define('{$language}{$stuTableName}_LIST', "List of {$ucfTableName}");\n
-EOT;
+ $ucfTableName = ucfirst($tableName);
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_LIST", "List of {$ucfTableName}");
}
return $ret;
}
@@ -138,65 +127,57 @@
*/
public function getLanguageAdminClass($language, $tables)
{
- $ret = <<<EOT
-// ---------------- Admin Classes ----------------\n
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Classes ----------------');
+ //
foreach (array_keys($tables) as $t)
{
$tableId = $tables[$t]->getVar('table_id');
$tableName = $tables[$t]->getVar('table_name');
$stuTableName = strtoupper($tableName);
$ucfTableName = ucfirst($tableName);
- $ret .= <<<EOT
-// {$ucfTableName} add/edit
-define('{$language}{$stuTableName}_ADD', "Add {$tableName}");
-define('{$language}{$stuTableName}_EDIT', "Edit {$tableName}");
-// Elements of {$ucfTableName}\n
-EOT;
+ $ret .= $this->defines->getAboveDefines("{$ucfTableName} add/edit");
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_ADD", "Add {$tableName}");
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_EDIT", "Edit {$tableName}");
+ $ret .= $this->defines->getAboveDefines("Elements of {$ucfTableName}");
+ //
$fields = $this->getTableFields($tableId);
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
$stuFieldName = strtoupper($fieldName);
- $fieldNameDesc = ucfirst(str_replace('_', ' ', $fieldName));
- $ret .= <<<EOT
-define('{$language}{$stuFieldName}', "{$fieldNameDesc}");\n
-EOT;
+ //
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_'));
+ //
+ $fieldNameDesc = ucfirst($rpFieldName);
+ //
+ $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc);
+ //
switch($fieldElement)
{
case 10:
- $ret .= <<<EOT
-define('{$language}FORM_UPLOAD_IMAGE_LIST_{$stuTableName}', "{$fieldNameDesc} in frameworks images");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_LIST_{$stuTableName}", "{$fieldNameDesc} in frameworks images");
break;
case 11:
- $ret .= <<<EOT
-define('{$language}FORM_UPLOAD_IMAGE_{$stuTableName}', "{$fieldNameDesc} in uploads images");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_{$stuTableName}", "{$fieldNameDesc} in uploads images");
break;
case 12:
- $ret .= <<<EOT
-define('{$language}FORM_UPLOAD_FILE_{$stuTableName}', "{$fieldNameDesc} in uploads files");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_FILE_{$stuTableName}", "{$fieldNameDesc} in uploads files");
break;
}
}
}
- $ret .= <<<EOT
-// General
-define('{$language}FORMUPLOAD', "Upload file");
-define('{$language}FORMIMAGE_PATH', "Files in %s ");
-define('{$language}FORMACTION', "Action");
-define('{$language}FORMEDIT', "Modification");
-define('{$language}FORMDEL', "Clear");\n
-EOT;
- $ret .= <<<EOT
-// Permissions
-define('{$language}PERMISSIONS_APPROVE', "Permissions to approve");
-define('{$language}PERMISSIONS_SUBMIT', "Permissions to submit");
-define('{$language}PERMISSIONS_VIEW', "Permissions to view");\n
-EOT;
+ $ret .= $this->defines->getAboveDefines('General');
+ $ret .= $this->defines->getDefine($language, 'FORMUPLOAD', "Upload file");
+ $ret .= $this->defines->getDefine($language, 'FORMIMAGE_PATH', "Files in %s ");
+ $ret .= $this->defines->getDefine($language, 'FORMACTION', "Action");
+ $ret .= $this->defines->getDefine($language, 'FORMEDIT', "Modification");
+ $ret .= $this->defines->getDefine($language, 'FORMDEL', "Clear");
+ $ret .= $this->defines->getAboveDefines('Permissions');
+ $ret .= $this->defines->getDefine($language, 'PERMISSIONS_APPROVE', "Permissions to approve");
+ $ret .= $this->defines->getDefine($language, 'PERMISSIONS_SUBMIT', "Permissions to submit");
+ $ret .= $this->defines->getDefine($language, 'PERMISSIONS_VIEW', "Permissions to view");
return $ret;
}
/*
@@ -205,35 +186,31 @@
*/
public function getLanguageAdminPermissions($language)
{
- $ret = <<<EOT
-// ---------------- Admin Permissions ----------------
-// Permissions
-define('{$language}GLOBAL', "Permissions global");
-define('{$language}GLOBAL_DESC', "Permissions global");
-define('{$language}GLOBAL_4', "Permissions global");
-define('{$language}GLOBAL_8', "Permissions global");
-define('{$language}GLOBAL_16', "Permissions global");
-define('{$language}APPROVE', "Permissions to approve");
-define('{$language}APPROVE_DESC', "Permissions to approve");
-define('{$language}SUBMIT', "Permissions to submit");
-define('{$language}SUBMIT_DESC', "Permissions to submit");
-define('{$language}VIEW', "Permissions to view");
-define('{$language}VIEW_DESC', "Permissions to view");
-define('{$language}NOPERMSSET', "No permission set");\n
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Permissions ----------------');
+ $ret .= $this->defines->getAboveDefines('Permissions');
+ $ret .= $this->defines->getDefine($language, 'GLOBAL', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'GLOBAL_DESC', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'GLOBAL_4', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'GLOBAL_8', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'GLOBAL_16', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'APPROVE', "Permissions to approve");
+ $ret .= $this->defines->getDefine($language, 'APPROVE_DESC', "Permissions to approve");
+ $ret .= $this->defines->getDefine($language, 'SUBMIT', "Permissions to submit");
+ $ret .= $this->defines->getDefine($language, 'SUBMIT_DESC', "Permissions to submit");
+ $ret .= $this->defines->getDefine($language, 'VIEW', "Permissions to view");
+ $ret .= $this->defines->getDefine($language, 'VIEW_DESC', "Permissions to view");
+ $ret .= $this->defines->getDefine($language, 'NOPERMSSET', "No permission set");
return $ret;
}
/*
* @public function getLanguageAdminFoot
- * @param null
+ * @param string $language
*/
public function getLanguageAdminFoot($language)
{
- $ret = <<<EOT
-// ---------------- Admin Others ----------------
-define('{$language}MAINTAINEDBY', " is maintained by ");
-// ---------------- ----------------
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Others ----------------');
+ $ret .= $this->defines->getDefine($language, 'MAINTAINEDBY', " is maintained by ");
+ $ret .= $this->defines->getBelowDefines('---------------- End ----------------');
return $ret;
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -19,16 +19,21 @@
* @version $Id: blocks.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'defines.php';
class LanguageBlocks extends TDMCreateFile
{
/*
+ * @var mixed
+ */
+ private $defines = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
* @static function &getInstance
@@ -54,41 +59,67 @@
$this->setTables($tables);
}
/*
- * @public function render
- * @param null
+ * @private function getLanguageBlock
+ * @param string $language
+ * @param string $module
*/
- public function render() {
- $module = $this->getModule();
- $tables = $this->getTables();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $language = $this->getLanguage($moduleDirname, 'MB');
- $content = $this->getHeaderFilesComments($module, $filename);
- $content .= <<<EOT
-// Main
-define('{$language}DISPLAY', "How Many Tables to Display");
-define('{$language}TITLELENGTH', "Title Length");
-define('{$language}CATTODISPLAY', "Categories to Display");
-define('{$language}ALLCAT', "All Categories");\n
+ private function getLanguageBlock($module, $language)
+ {
+ $tables = $this->getTables();
+ $ret = <<<EOT
+// Admin Edit\n
EOT;
+ $ret .= $this->defines->getDefine($language, 'DISPLAY', "How Many Tables to Display");
+ $ret .= $this->defines->getDefine($language, 'TITLELENGTH', "Title Length");
+ $ret .= $this->defines->getDefine($language, 'CATTODISPLAY', "Categories to Display");
+ $ret .= $this->defines->getDefine($language, 'ALLCAT', "All Categories");
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
- $ucf_table_name = ucfirst($tableName);
- $content .= <<<EOT
-// {$ucf_table_name}\n
+ $ucfTableName = ucfirst($tableName);
+ $ret .= <<<EOT
+// {$ucfTableName}\n
EOT;
$fields = $this->getTableFields($tables[$t]->getVar('table_id'));
foreach (array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
- $lng_fields = $language.strtoupper($fieldName);
- $ucf_table_field = ucfirst($tableName.' '.str_replace('_', ' ', $fieldName));
- $content .= <<<EOT
-define('{$lng_fields}', "{$ucf_table_field}");\n
+ $stuFieldName = strtoupper($fieldName);
+ //
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_'));
+ //
+ $fieldNameDesc = ucfirst($rpFieldName);
+ //
+ $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc);
+ }
+ }
+ return $ret;
+ }
+ /*
+ * @private function getFooter
+ * @param null
+ */
+ private function getLanguageFooter()
+ {
+ $ret = <<<EOT
+// ---------------- End ----------------
EOT;
- }
- }
+ return $ret;
+ }
+ /*
+ * @public function render
+ * @param null
+ */
+ public function render() {
+ $module = $this->getModule();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($moduleDirname, 'MB');
+ $content = $this->getHeaderFilesComments($module, $filename);
+ $content .= $this->getLanguageBlock($module, $language);
+ $content .= $this->getLanguageFooter();
+ //
$this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
Added: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/defines.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/defines.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/defines.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -0,0 +1,88 @@
+<?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.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: defines.php 12258 2014-01-02 09:33:29Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class LanguageDefines
+{
+ /*
+ * @public function constructor
+ * @param null
+ */
+ public function __construct() { }
+ /*
+ * @static function &getInstance
+ * @param null
+ */
+ public static function &getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+ return $instance;
+ }
+ /*
+ * @public function getAboveHeadDefines
+ * @param string $string
+ */
+ public function getAboveHeadDefines($string)
+ {
+ $ret = <<<EOT
+// ---------------- {$string} ----------------\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getAboveDefines
+ * @param string $string
+ */
+ public function getAboveDefines($string)
+ {
+ $ret = <<<EOT
+// {$string}\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getDefine
+ * @param string $language
+ * @param string $defined
+ * @param string $description
+ */
+ public function getDefine($language, $defined, $description)
+ {
+ $ret = <<<EOT
+define('{$language}{$defined}', "{$description}");\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getBelowDefines
+ * @param string $string
+ */
+ public function getBelowDefines($string)
+ {
+ $ret = <<<EOT
+// ---------------- {$string} ----------------
+EOT;
+ return $ret;
+ }
+}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -19,16 +19,21 @@
* @version $Id: include_search.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'defines.php';
class LanguageMain extends TDMCreateFile
{
/*
+ * @var mixed
+ */
+ private $defines = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
* @static function &getInstance
@@ -45,65 +50,76 @@
/*
* @public function write
* @param string $module
- * @param mixed $table
* @param mixed $tables
* @param string $filename
*/
- public function write($module, $table, $tables, $filename) {
+ public function write($module, $tables, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->setTable($table);
$this->setTables($tables);
}
/*
- * @public function render
- * @param null
+ * @private function geLanguagetMain
+ * @param string $module
+ * @param string $language
*/
- public function render() {
- $module = $this->getModule();
+ private function geLanguagetMain($module, $language)
+ {
$tables = $this->getTables();
- $filename = $this->getFileName();
- $moduleName = $module->getVar('mod_name');
- $moduleDirname = $module->getVar('mod_dirname');
- $moduleDescription = $module->getVar('mod_description');
- $ucf_mod_name = ucfirst($moduleName);
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getHeaderFilesComments($module, $filename);
- $content .= <<<EOT
-// ---------------- Main ----------------
-define('{$language}INDEX', "Home");
-define('{$language}TITLE', "{$ucf_mod_name}");
-define('{$language}DESC', "{$moduleDescription}");
-define('{$language}INDEX_DESC', "Welcome to the homepage of your new module!<br />
-As you can see, you've created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.");\n
-EOT;
+ $ret = $this->defines->getAboveHeadDefines('Main');
+ $ret .= $this->defines->getDefine($language, 'INDEX', "Home");
+ $ret .= $this->defines->getDefine($language, 'TITLE', "{$module->getVar('mod_name')}");
+ $ret .= $this->defines->getDefine($language, 'DESC', "{$module->getVar('mod_description')}");
+ $ret .= $this->defines->getDefine($language, 'INDEX_DESC', "Welcome to the homepage of your new module!<br />
+As you can see, you've created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.");
+ $ret .= $this->defines->getAboveHeadDefines('Contents');
foreach (array_keys($tables) as $i)
{
$tableName = $tables[$i]->getVar('table_name');
- $lng_stu_table_name = $language.strtoupper($tableName);
- $ucf_table_name = UcFirstAndToLower($tableName);
- $content .= <<<EOT
-// {$ucf_table_name}
-define('{$lng_stu_table_name}', "{$ucf_table_name}");
-define('{$lng_stu_table_name}_DESC', "{$ucf_table_name} description");
-// Caption of {$ucf_table_name}\n
-EOT;
+ $stuTableName = strtoupper($tableName);
+ $ucfTableName = UcFirstAndToLower($tableName);
+ $ret .= $this->defines->getAboveDefines($ucfTableName);
+ $ret .= $this->defines->getDefine($language, $stuTableName, $ucfTableName);
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_DESC", "{$ucfTableName} description");
+ $ret .= $this->defines->getAboveDefines("Caption of {$ucfTableName}");
$fields = $this->getTableFields($tables[$i]->getVar('table_id'));
foreach (array_keys($fields) as $f)
{
- $field_name = $fields[$f]->getVar('field_name');
- $lng_stu_fields = $language.strtoupper($field_name);
- $ucf_field_name = ucfirst(str_replace('_', ' ', $field_name));
- $content .= <<<EOT
-define('{$lng_stu_fields}', "{$ucf_field_name}");\n
-EOT;
- }
+ $fieldName = $fields[$f]->getVar('field_name');
+ $stuFieldName = strtoupper($fieldName);
+ //
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_'));
+ //
+ $fieldNameDesc = ucfirst($rpFieldName);
+ //
+ $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc);
+ }
}
- $content .= <<<EOT
-// Admin link
-define('{$language}ADMIN', "Admin");
-// ---------------- ----------------
-EOT;
+ return $ret;
+ }
+ /*
+ * @private function geLanguagetMainFooter
+ * @param null
+ */
+ private function geLanguagetMainFooter()
+ {
+ $ret = $this->defines->getBelowDefines('End');
+ return $ret;
+ }
+ /*
+ * @public function render
+ * @param null
+ */
+ public function render() {
+ $module = $this->getModule();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($moduleDirname, 'MA');
+ $content = $this->getHeaderFilesComments($module, $filename);
+ $content .= $this->geLanguagetMain($module, $language);
+ $content .= $this->geLanguagetMainFooter();
+ //
$this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -19,16 +19,21 @@
* @version $Id: include_search.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'defines.php';
class LanguageModinfo extends TDMCreateFile
{
/*
+ * @var mixed
+ */
+ private $defines = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
* @static function &getInstance
@@ -56,80 +61,68 @@
$this->setFileName($filename);
}
/*
- * @private function getMain
+ * @private function getLanguageMain
* @param string $language
* @param string $module
*/
- private function getMain($language, $module) {
- $ret = <<<EOT
-// Main
-define('{$language}NAME', "{$module->getVar('mod_name')}");
-define('{$language}DESC', "{$module->getVar('mod_description')}");\n
-EOT;
+ private function getLanguageMain($language, $module)
+ {
+ $ret = $this->defines->getAboveHeadDefines('Admin Main');
+ $ret .= $this->defines->getDefine($language, "NAME", "{$module->getVar('mod_name')}");
+ $ret .= $this->defines->getDefine($language, "DESC", "{$module->getVar('mod_description')}");
return $ret;
}
/*
- * @private function getMenu
+ * @private function getLanguageMenu
* @param string $language
+ * @param array $table
* @param array $tables
*/
- private function getMenu($language, $table, $tables) {
+ private function getLanguageMenu($language, $table, $tables)
+ {
$menu = 1;
- $ret = <<<EOT
-// Admin Menu
-define('{$language}ADMENU{$menu}', "Dashboard");\n
-EOT;
-
+ $ret = $this->defines->getAboveHeadDefines('Admin Menu');
+ $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "Dashboard");
foreach (array_keys($tables) as $i)
{
$menu++;
- $ucfTableName = ucfirst(str_replace('_', ' ', $tables[$i]->getVar('table_name')));
- $ret .= <<<EOT
-define('{$language}ADMENU{$menu}', "{$ucfTableName}");\n
-EOT;
+ $ucfTableName = ucfirst($tables[$i]->getVar('table_name'));
+ $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "{$ucfTableName}");
}
if (is_object($table) && $table->getVar('table_permissions') == 1) {
$menu++;
- $ret .= <<<EOT
-define('{$language}ADMENU{$menu}', "Permissions");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "Permissions");
}
$menu++;
- $ret .= <<<EOT
-define('{$language}ADMENU{$menu}', "About");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "About");
unset( $menu );
return $ret;
}
/*
- * @private function getAdmin
+ * @private function getLanguageAdmin
* @param string $language
*/
- private function getAdmin($language) {
- $ret = <<<EOT
-// Admin
-define('{$language}ADMINPAGER', "Admin pager");
-define('{$language}ADMINPAGER_DESC', "Admin per page list");\n
-EOT;
+ private function getLanguageAdmin($language)
+ {
+ $ret = $this->defines->getAboveHeadDefines('Admin Nav');
+ $ret .= $this->defines->getDefine($language, "ADMINPAGER", "Admin pager");
+ $ret .= $this->defines->getDefine($language, "ADMINPAGER_DESC", "Admin per page list");
return $ret;
}
/*
- * @private function getSubmenu
+ * @private function getLanguageSubmenu
* @param string $language
* @param array $tables
*/
- private function getSubmenu($language, $tables) {
- $ret = <<<EOT
-// Blocks\n
-EOT;
+ private function getLanguageSubmenu($language, $tables)
+ {
+ $ret = $this->defines->getAboveDefines('Submenu');
$i = 1;
- foreach (array_keys($tables) as $t)
+ foreach(array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
- if ( $tables[$t]->getVar('table_submenu') == 1 ) {
- $ret .= <<<EOT
-define('{$language}SMNAME{$i}', "{$tableName}");\n
-EOT;
+ if( $tables[$t]->getVar('table_submenu') == 1 ) {
+ $ret .= $this->defines->getDefine($language, "SMNAME{$i}", "{$tableName}");
}
$i++;
}
@@ -137,137 +130,135 @@
return $ret;
}
/*
- * @private function getBlocks
+ * @private function getLanguageBlocks
* @param string $language
* @param array $tables
*/
- private function getBlocks($language, $tables) {
- $ret = <<<EOT
-// Blocks\n
-EOT;
+ private function getLanguageBlocks($language, $tables)
+ {
+ $ret = $this->defines->getAboveDefines('Blocks');
foreach (array_keys($tables) as $i)
{
$tableName = $tables[$i]->getVar('table_name');
- $language1 = $language.strtoupper($tableName);
- $ucfTableName = str_replace("_", " ", ucfirst($tableName));
- if ( $tables[$i]->getVar('table_blocks') == 1 ) {
- $ret .= <<<EOT
-define('{$language1}_BLOCK', "{$ucfTableName} block");\n
-EOT;
+ $stuTableName = strtoupper($tableName);
+ $ucfTableName = ucfirst($tableName);
+ if( $tables[$i]->getVar('table_blocks') == 1 ) {
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_BLOCK", "{$ucfTableName} block");
}
}
return $ret;
}
/*
- * @private function getUser
+ * @private function getLanguageUser
* @param string $language
*/
- private function getUser($language) {
- $ret = <<<EOT
-// User
-define('{$language}USERPAGER', "User pager");
-define('{$language}USERPAGER_DESC', "User per page list");\n
-EOT;
+ private function getLanguageUser($language)
+ {
+ $ret = $this->defines->getAboveDefines('User');
+ $ret .= $this->defines->getDefine($language, "USERPAGER", "User pager");
+ $ret .= $this->defines->getDefine($language, "USERPAGER_DESC", "User per page list");
return $ret;
}
/*
- * @private function getConfig
+ * @private function getLanguageConfig
* @param string $language
- * @param string $table_image
+ * @param string $table
*/
- private function getConfig($language, $table) {
- $ret = <<<EOT
-// Config
-define('{$language}EDITOR', "Editor");
-define('{$language}EDITOR_DESC', "Select the Editor to use");
-define('{$language}KEYWORDS', "Keywords");
-define('{$language}KEYWORDS_DESC', "Insert here the keywords (separate by comma)");\n
-EOT;
+ private function getLanguageConfig($language, $table)
+ {
+ $ret = $this->defines->getAboveDefines('Config');
+ $ret .= $this->defines->getDefine($language, "EDITOR", "Editor");
+ $ret .= $this->defines->getDefine($language, "EDITOR_DESC", "Select the Editor to use");
+ $ret .= $this->defines->getDefine($language, "KEYWORDS", "Keywords");
+ $ret .= $this->defines->getDefine($language, "KEYWORDS_DESC", "Insert here the keywords (separate by comma)");
if ( $table->getVar('table_image') != '' )
{
- $ret .= <<<EOT
-define('{$language}MAXSIZE', "Max size");
-define('{$language}MAXSIZE_DESC', "Set a number of max size uploads file in byte");
-define('{$language}MIMETYPES', "Mime Types");
-define('{$language}MIMETYPES_DESC', "Set the mime types selected");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "MAXSIZE", "Max size");
+ $ret .= $this->defines->getDefine($language, "MAXSIZE_DESC", "Set a number of max size uploads file in byte");
+ $ret .= $this->defines->getDefine($language, "MIMETYPES", "Mime Types");
+ $ret .= $this->defines->getDefine($language, "MIMETYPES_DESC", "Set the mime types selected");
}
- $ret .= <<<EOT
-define('{$language}IDPAYPAL', "Paypal ID");
-define('{$language}IDPAYPAL_DESC', "Insert here your PayPal ID for donactions.");
-define('{$language}ADVERTISE', "Advertisement Code");
-define('{$language}ADVERTISE_DESC', "Insert here the advertisement code");
-define('{$language}BOOKMARKS', "Social Bookmarks");
-define('{$language}BOOKMARKS_DESC', "Show Social Bookmarks in the form");
-define('{$language}FBCOMMENTS', "Facebook comments");
-define('{$language}FBCOMMENTS_DESC', "Allow Facebook comments in the form");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "IDPAYPAL", "Paypal ID");
+ $ret .= $this->defines->getDefine($language, "IDPAYPAL_DESC", "Insert here your PayPal ID for donactions.");
+ $ret .= $this->defines->getDefine($language, "ADVERTISE", "Advertisement Code");
+ $ret .= $this->defines->getDefine($language, "ADVERTISE_DESC", "Insert here the advertisement code");
+ $ret .= $this->defines->getDefine($language, "BOOKMARKS", "Social Bookmarks");
+ $ret .= $this->defines->getDefine($language, "BOOKMARKS_DESC", "Show Social Bookmarks in the form");
+ $ret .= $this->defines->getDefine($language, "FBCOMMENTS", "Facebook comments");
+ $ret .= $this->defines->getDefine($language, "FBCOMMENTS_DESC", "Allow Facebook comments in the form");
return $ret;
}
/*
- * @private function getNotifications
+ * @private function getLanguageNotifications
* @param string $language
* @param mixed $table
*/
- private function getNotifications($language) {
- $ret = <<<EOT
-// Notifications
-define('{$language}GLOBAL_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}FILE_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}FILE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWCATEGORY_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWCATEGORY_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWCATEGORY_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWCATEGORY_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEMODIFY_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEMODIFY_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEMODIFY_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEMODIFY_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEBROKEN_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEBROKEN_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEBROKEN_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEBROKEN_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILESUBMIT_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILESUBMIT_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILESUBMIT_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILESUBMIT_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWFILE_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWFILE_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWFILE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWFILE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_FILESUBMIT_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_FILESUBMIT_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_FILESUBMIT_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_FILESUBMIT_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NEWFILE_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NEWFILE_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NEWFILE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NEWFILE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");\n
-EOT;
+ private function getLanguageNotifications($language)
+ {
+ $ret = $this->defines->getAboveDefines('Notifications');
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NOTIFY", "Global notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NOTIFY_DESC", "Global notify desc");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NOTIFY", "Category notify");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NOTIFY_DESC", "Category notify desc");
+ $ret .= $this->defines->getDefine($language, "FILE_NOTIFY", "File notify");
+ $ret .= $this->defines->getDefine($language, "FILE_NOTIFY_DESC", "File notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWCATEGORY_NOTIFY", "Global newcategory notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWCATEGORY_NOTIFY_CAPTION", "Global newcategory notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWCATEGORY_NOTIFY_DESC", "Global newcategory notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWCATEGORY_NOTIFY_SUBJECT", "Global newcategory notify subject");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEMODIFY_NOTIFY", "Global filemodify notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEMODIFY_NOTIFY_CAPTION", "Global filemodify notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEMODIFY_NOTIFY_DESC", "Global filemodify notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEMODIFY_NOTIFY_SUBJECT", "Global filemodify notify subject");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEBROKEN_NOTIFY", "Global filebroken notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEBROKEN_NOTIFY_CAPTION", "Global filebroken notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEBROKEN_NOTIFY_DESC", "Global filebroken notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEBROKEN_NOTIFY_SUBJECT", "Global filebroken notify subject");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILESUBMIT_NOTIFY", "Global filesubmit notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILESUBMIT_NOTIFY_CAPTION", "Global filesubmit notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILESUBMIT_NOTIFY_DESC", "Global filesubmit notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILESUBMIT_NOTIFY_SUBJECT", "Global filesubmit notify subject");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWFILE_NOTIFY", "Global newfile notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWFILE_NOTIFY_CAPTION", "Global newfile notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWFILE_NOTIFY_DESC", "Global newfile notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWFILE_NOTIFY_SUBJECT", "Global newfile notify subject");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_FILESUBMIT_NOTIFY", "Category filesubmit notify");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_FILESUBMIT_NOTIFY_CAPTION", "Category filesubmit notify caption");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_FILESUBMIT_NOTIFY_DESC", "Category filesubmit notify desc");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_FILESUBMIT_NOTIFY_SUBJECT", "Category filesubmit notify subject");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NEWFILE_NOTIFY", "Category newfile notify");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NEWFILE_NOTIFY_CAPTION", "Category newfile notify caption");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NEWFILE_NOTIFY_DESC", "Category newfile notify desc");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NEWFILE_NOTIFY_SUBJECT", "Category newfile notify subject");
+ $ret .= $this->defines->getDefine($language, "FILE_APPROVE_NOTIFY", "File approve notify");
+ $ret .= $this->defines->getDefine($language, "FILE_APPROVE_NOTIFY_CAPTION", "File approve notify caption");
+ $ret .= $this->defines->getDefine($language, "FILE_APPROVE_NOTIFY_DESC", "File approve notify desc");
+ $ret .= $this->defines->getDefine($language, "FILE_APPROVE_NOTIFY_SUBJECT", "File approve notify subject");
return $ret;
}
/*
- * @private function getPermissions
+ * @private function getLanguagePermissions
* @param string $language
*/
- private function getPermissions($language) {
- $ret = <<<EOT
-// Permissions Groups
-define('{$language}GROUPS', "Groups access");
-define('{$language}GROUPS_DESC', "Select general access permission for groups.");
-define('{$language}ADMINGROUPS', "Admin Group Permissions");
-define('{$language}ADMINGROUPS_DESC', "Which groups have access to tools and permissions page");
-EOT;
+ private function getLanguagePermissions($language)
+ {
+ $ret = $this->defines->getAboveDefines('Permissions Groups');
+ $ret .= $this->defines->getDefine($language, "GROUPS", "Groups access");
+ $ret .= $this->defines->getDefine($language, "GROUPS_DESC", "Select general access permission for groups.");
+ $ret .= $this->defines->getDefine($language, "ADMINGROUPS", "Admin Group Permissions");
+ $ret .= $this->defines->getDefine($language, "ADMINGROUPS_DESC", "Which groups have access to tools and permissions page");
return $ret;
}
/*
+ * @private function getFooter
+ * @param null
+ */
+ private function getLanguageFooter()
+ {
+ $ret = $this->defines->getBelowDefines('End');
+ return $ret;
+ }
+ /*
* @public function render
* @param null
*/
@@ -279,28 +270,29 @@
$moduleDirname = $module->getVar('mod_dirname');
$language = $this->getLanguage($moduleDirname, 'MI');
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getMain($language, $module);
- $content .= $this->getMenu($language, $table, $tables);
+ $content .= $this->getLanguageMain($language, $module);
+ $content .= $this->getLanguageMenu($language, $table, $tables);
if (is_object($table)) {
if ( $table->getVar('table_admin') == 1 ) {
- $content .= $this->getAdmin($language);
+ $content .= $this->getLanguageAdmin($language);
}
if ( $table->getVar('table_user') == 1 ) {
- $content .= $this->getUser($language);
+ $content .= $this->getLanguageUser($language);
}
if ( $table->getVar('table_submenu') == 1 ) {
- $content .= $this->getSubmenu($language, $tables);
+ $content .= $this->getLanguageSubmenu($language, $tables);
}
- $content .= $this->getBlocks($language, $tables);
- $content .= $this->getConfig($language, $table);
+ $content .= $this->getLanguageBlocks($language, $tables);
+ $content .= $this->getLanguageConfig($language, $table);
if ( $table->getVar('table_notifications') == 1 )
{
- $content .= $this->getNotifications($language);
+ $content .= $this->getLanguageNotifications($language);
}
if ( $table->getVar('table_permissions') == 1 ) {
- $content .= $this->getPermissions($language);
+ $content .= $this->getLanguagePermissions($language);
}
}
+ $content .= $this->getLanguageFooter();
//
$this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -105,13 +105,10 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
if($f == 0) {
- $field_id = $fieldName;
- $rpFieldName = $this->tdmcfile->getRightString($field_id);
- } else {
- $rpFieldName = $this->tdmcfile->getRightString($fieldName);
- }
- $lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
+ $field_id = $fieldName;
+ }
if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
|
|
From: <be...@us...> - 2014-07-14 07:53:07
|
Revision: 12712
http://sourceforge.net/p/xoops/svn/12712
Author: beckmi
Date: 2014-07-14 07:53:04 +0000 (Mon, 14 Jul 2014)
Log Message:
-----------
Fixing typo (Timgno)
fix for Update setting Template import date to 0 (timgno/mamba)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-07-14 07:50:15 UTC (rev 12711)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-07-14 07:53:04 UTC (rev 12712)
@@ -1,9 +1,17 @@
XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
+
===============================
-2014-06-14: Version 2.5.7 Final (Patch)
+NOT RELEASED Version 2.5.7 Final (Patch 2)
===============================
+- Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith)
+- fix for Update setting Template import date to 0 (timgno/mamba)
+
+===============================
+2014-06-14: Version 2.5.7 Final (Patch 1)
+===============================
+
- Updating docu for the correct version of tablesorter (mamba)
- Fix path specified for include (rgriffith, mamba)
- added mainfile.php to /extras for use on servers where write to root is not possible (rgriffith)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2014-07-14 07:50:15 UTC (rev 12711)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2014-07-14 07:53:04 UTC (rev 12712)
@@ -582,7 +582,7 @@
$tplfile = empty($tplfiles) ? $tplfile_handler->create() : $tplfiles[0];
// END irmtfan solve templates duplicate issue
$tplfile->setVar('tpl_refid', $newmid);
- $tplfile->setVar('tpl_lastimported', 0);
+// $tplfile->setVar('tpl_lastimported', 0);
$tplfile->setVar('tpl_lastmodified', time());
$tplfile->setVar('tpl_type', $type);
$tplfile->setVar('tpl_source', $tpldata, true);
@@ -686,7 +686,7 @@
$tplfile_new->setVar('tpl_source', $content, true);
$tplfile_new->setVar('tpl_desc', $block['description'], true);
$tplfile_new->setVar('tpl_lastmodified', time());
- $tplfile_new->setVar('tpl_lastimported', 0);
+// $tplfile_new->setVar('tpl_lastimported', 0);
$tplfile_new->setVar(
'tpl_file',
$block['template'],
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-07-14 07:50:15 UTC (rev 12711)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-07-14 07:53:04 UTC (rev 12712)
@@ -515,7 +515,7 @@
} else {
$msgs = array();
$msgs[] = '<div id="xo-module-log"><div class="header">';
- $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UNINSTAL . $module->getInfo('name', 's') . '</h4>';
+ $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UNINSTALL . $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/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-07-14 07:50:15 UTC (rev 12711)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-07-14 07:53:04 UTC (rev 12712)
@@ -18,7 +18,6 @@
define('_AM_SYSTEM_MODULES_RUSUREUPD',"Press the button below to update this module");
define('_AM_SYSTEM_MODULES_BTOMADMIN',"XOOPS Module Administration");
define('_AM_SYSTEM_MODULES_INSTALLING',"Installing ");
-define('_AM_SYSTEM_MODULES_UNINSTAL',"Uninstall ");
define('_AM_SYSTEM_MODULES_DEACTIVATE',"Deactivate ");
define('_AM_SYSTEM_MODULES_ACTIVATE',"Activate ");
define('_AM_SYSTEM_MODULES_UPDATING',"Updating ");
|
|
From: <be...@us...> - 2014-07-14 07:50:20
|
Revision: 12711
http://sourceforge.net/p/xoops/svn/12711
Author: beckmi
Date: 2014-07-14 07:50:15 +0000 (Mon, 14 Jul 2014)
Log Message:
-----------
Fixing typo (Timgno)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-07-14 07:42:44 UTC (rev 12710)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-07-14 07:50:15 UTC (rev 12711)
@@ -18,7 +18,6 @@
define('_AM_SYSTEM_MODULES_RUSUREUPD',"Press the button below to update this module");
define('_AM_SYSTEM_MODULES_BTOMADMIN',"XOOPS Module Administration");
define('_AM_SYSTEM_MODULES_INSTALLING',"Installing ");
-define('_AM_SYSTEM_MODULES_UNINSTALL',"Uninstall ");
define('_AM_SYSTEM_MODULES_DEACTIVATE',"Deactivate ");
define('_AM_SYSTEM_MODULES_ACTIVATE',"Activate ");
define('_AM_SYSTEM_MODULES_UPDATING',"Updating ");
|
|
From: <be...@us...> - 2014-07-14 07:42:48
|
Revision: 12710
http://sourceforge.net/p/xoops/svn/12710
Author: beckmi
Date: 2014-07-14 07:42:44 +0000 (Mon, 14 Jul 2014)
Log Message:
-----------
Fixing typo (Timgno)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-07-13 10:24:13 UTC (rev 12709)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-07-14 07:42:44 UTC (rev 12710)
@@ -515,7 +515,7 @@
} else {
$msgs = array();
$msgs[] = '<div id="xo-module-log"><div class="header">';
- $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UNINSTAL . $module->getInfo('name', 's') . '</h4>';
+ $msgs[] = $errs[] = '<h4>' . _AM_SYSTEM_MODULES_UNINSTALL . $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/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-07-13 10:24:13 UTC (rev 12709)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-07-14 07:42:44 UTC (rev 12710)
@@ -18,7 +18,7 @@
define('_AM_SYSTEM_MODULES_RUSUREUPD',"Press the button below to update this module");
define('_AM_SYSTEM_MODULES_BTOMADMIN',"XOOPS Module Administration");
define('_AM_SYSTEM_MODULES_INSTALLING',"Installing ");
-define('_AM_SYSTEM_MODULES_UNINSTAL',"Uninstall ");
+define('_AM_SYSTEM_MODULES_UNINSTALL',"Uninstall ");
define('_AM_SYSTEM_MODULES_DEACTIVATE',"Deactivate ");
define('_AM_SYSTEM_MODULES_ACTIVATE',"Activate ");
define('_AM_SYSTEM_MODULES_UPDATING',"Updating ");
|
|
From: <txm...@us...> - 2014-07-13 10:24:24
|
Revision: 12709
http://sourceforge.net/p/xoops/svn/12709
Author: txmodxoops
Date: 2014-07-13 10:24:13 +0000 (Sun, 13 Jul 2014)
Log Message:
-----------
- Fixed bugs
- Updated
- Still work to do
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/install.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -202,7 +202,7 @@
if( $tablesObj->isNew() ) {
$tableIid = $GLOBALS['xoopsDB']->getInsertId();
$table_action='&field_mid='.$tableMid.'&field_tid='.$tableIid.'&field_numb='.$tableNumbFields.'&field_name='.$tableFieldname;
- redirect_header('fields.php?op=new'.$table_action, 5, sprintf(_AM_TDMCREATE_TABLE_FORM_SAVED_OK, $_POST['table_name']));
+ redirect_header('fields.php?op=new'.$table_action, 5, sprintf(_AM_TDMCREATE_TABLE_FORM_CREATED_OK, $_POST['table_name']));
} else {
// Get fields where table id
$fields =& $tdmcreate->getHandler('fields');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -169,6 +169,22 @@
return $ret;
}
/*
+ * @public function getUploadImageGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
+ $ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$fieldName} = \${$tableName}_arr[\$i]->getVar('{$fieldName}');
+\t\t\t\t\$upload_image = \${$fieldName} ? \${$fieldName} : 'blank.gif';
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \$upload_image;\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getTextAreaGetVar
* @param string $lpFieldName
* @param string $rpFieldName
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -61,7 +61,7 @@
* @param string $moduleDirname
* @param string $tableName
*/
- public function getAdminPagesHeader($moduleDirname, $tableName, $fpif) {
+ public function getAdminPagesHeader($moduleDirname, $table, $fpif) {
$ret = <<<EOT
include_once 'header.php';
@@ -127,9 +127,12 @@
case 4:
$ret .= $this->adminobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
- case 5:
+ case 8:
$ret .= $this->adminobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
+ break;
+ case 11:
+ $ret .= $this->adminobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
case 13:
$ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -320,6 +320,10 @@
}
// Creation of blocks language file
if (is_object($table)) {
+ // Include Install File
+ $includeInstall = IncludeInstall::getInstance();
+ $includeInstall->write($module, $table, $tables, 'install.php');
+ $ret[] = $includeInstall->render();
if ( $table->getVar('table_blocks') == 1) {
// Language Blocks File
$languageBlocks = LanguageBlocks::getInstance();
@@ -354,11 +358,7 @@
$languageMailTpl = LanguageMailTpl::getInstance();
$languageMailTpl->write($module);
$ret[] = $languageMailTpl->renderFile('category_new_notify.tpl');
- }
- // Include Install File
- $includeInstall = IncludeInstall::getInstance();
- $includeInstall->write($module, $table, $tables, 'install.php');
- $ret[] = $includeInstall->render();
+ }
// Creation of sql file
if ( $table->getVar('table_name') != null) {
// Sql File
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -60,7 +60,7 @@
$ucfModuleDirname = ucfirst($moduleDirname);
$ret = <<<EOT
include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/include/common.php';
-include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/include/functions.php';
+// Function show block
function b_{$moduleDirname}_{$tableName}_show(\$options)
{
include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/class/{$tableName}.php';
@@ -128,6 +128,7 @@
$stuModuleDirname = strtoupper($moduleDirname);
$ucfModuleDirname = ucfirst($moduleDirname);
$ret = <<<EOT
+// Function edit block
function b_{$moduleDirname}_{$tableName}_edit(\$options)
{
include_once XOOPS_ROOT_PATH.'/modules/{$moduleDirname}/class/{$tableName}.php';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/install.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/install.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/install.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -181,7 +181,7 @@
$fieldElement = $fields[$f]->getVar('field_element');
// All fields elements selected
switch( $fieldElement ) {
- case 10:
+ case 11:
$content .= $this->getInstallImagesFolder($moduleDirname);
foreach(array_keys($tables) as $t)
{
@@ -189,7 +189,7 @@
$content .= $this->getInstallTableImagesFolder($tableName);
}
break;
- case 11:
+ case 12:
$content .= $this->getInstallFilesFolder($moduleDirname);
foreach(array_keys($tables) as $t)
{
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -165,17 +165,17 @@
EOT;
switch($fieldElement)
{
- case 9:
+ case 10:
$ret .= <<<EOT
define('{$language}FORM_UPLOAD_IMAGE_LIST_{$stuTableName}', "{$fieldNameDesc} in frameworks images");\n
EOT;
break;
- case 10:
+ case 11:
$ret .= <<<EOT
define('{$language}FORM_UPLOAD_IMAGE_{$stuTableName}', "{$fieldNameDesc} in uploads images");\n
EOT;
break;
- case 11:
+ case 12:
$ret .= <<<EOT
define('{$language}FORM_UPLOAD_FILE_{$stuTableName}', "{$fieldNameDesc} in uploads files");\n
EOT;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -43,6 +43,10 @@
*/
private $path = null;
/*
+ * @var mixed
+ */
+ //private $uploadPath = null;
+ /*
* @var string
*/
private $fromFile = null;
@@ -70,12 +74,40 @@
return $instance;
}
/*
+ * @public function setPath
+ * @param string $path
+ */
+ /*public function setPath($path) {
+ $this->path = TDMC_PATH . DIRECTORY_SEPARATOR . $path;
+ }*/
+ /*
+ * @public function setUploadPath
+ * @param string $path
+ */
+ /*public function setUploadPath($path) {
+ $this->uploadPath = TDMC_UPLOAD_PATH . DIRECTORY_SEPARATOR . $path;
+ }*/
+ /*
* @public function getPath
* @param string $path
*/
+ /*public function getPath() {
+ return $this->path;
+ }*/
+ /*
+ * @public function getUploadPath
+ * @param string $path
+ */
+ /*public function getUploadPath() {
+ return $this->uploadPath;
+ }*/
+ /*
+ * @public function getPath
+ * @param string $path
+ */
public function getPath($path) {
$this->path = $path;
- }
+ }
/*
* @public function isDir
* @param string $dname
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -58,7 +58,9 @@
* @param string $fields
* @param string $language
*/
- private function getTemplatesAdminPagesHeader($moduleDirname, $tableName, $fields, $language) {
+ private function getTemplatesAdminPagesHeader($moduleDirname, $table, $fields, $language)
+ {
+ $tableName = $table->getVar('table_name');
$ret = <<<EOT
<{include file="db:{$moduleDirname}_admin_header.tpl"}>
<{if {$tableName}_list}>
@@ -70,7 +72,8 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$lang_fn = $language.strtoupper($fieldName);
- if( $fields[$f]->getVar('field_inlist') == 1 ) {
+ if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1)
+ ) {
$ret .= <<<EOT
<th class="center"><{\$smarty.const.{$lang_fn}}></th>\n
EOT;
@@ -90,8 +93,9 @@
* @param string $fields
* @param string $language
*/
- private function getTemplatesAdminPagesBody($moduleDirname, $tableName, $fields, $language)
+ private function getTemplatesAdminPagesBody($moduleDirname, $table, $fields, $language)
{
+ $tableName = $table->getVar('table_name');
$ret = <<<EOT
<tbody>
<{foreach item=list from=\${$tableName}_list}>
@@ -108,7 +112,7 @@
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
}
$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
- if( $fields[$f]->getVar('field_inlist') == 1 ) {
+ if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
$ret .= <<<EOT
@@ -156,8 +160,9 @@
* @param string $fields
* @param string $language
*/
- private function getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $tableName, $fields, $language)
+ private function getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $table, $fields, $language)
{
+ $tableName = $table->getVar('table_name');
$ret = <<<EOT
<tbody>
<{foreach item=list from=\${$tableName}_list}>
@@ -169,8 +174,8 @@
$fieldElement = $fields[$f]->getVar('field_element');
if($f == 0) {
$field_id = $fieldName;
- }
- if( $fields[$f]->getVar('field_inlist') == 1 ) {
+ }
+ if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
$ret .= <<<EOT
@@ -222,11 +227,11 @@
<!-- Display navigation -->
<div class="xo-pagenav floatright"><{\$pagenav}></div><div class="clear spacer"></div>
<{/if}>
- <{if \$error}>
- <div class="errorMsg">
- <strong><{\$error}></strong>
- </div>
- <{/if}>
+<{/if}>
+<{if \$error}>
+ <div class="errorMsg">
+ <strong><{\$error}></strong>
+ </div>
<{/if}>
<{if \$form}>
<!-- Display form (add,edit) -->
@@ -246,16 +251,15 @@
$module = $this->getModule();
$table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
- $tableName = $table->getVar('table_name');
$tableFieldname = $table->getVar('table_fieldname');
$language = $this->getLanguage($moduleDirname, 'AM');
$fields = $this->getTableFields($table->getVar('table_id'));
- $content = $this->getTemplatesAdminPagesHeader($moduleDirname, $tableName, $fields, $language);
+ $content = $this->getTemplatesAdminPagesHeader($moduleDirname, $table, $fields, $language);
// Verify if table_fieldname is not empty
if(!empty($tableFieldname)) {
- $content .= $this->getTemplatesAdminPagesBody($moduleDirname, $tableName, $fields, $language);
+ $content .= $this->getTemplatesAdminPagesBody($moduleDirname, $table, $fields, $language);
} else {
- $content .= $this->getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $tableName, $fields, $language);
+ $content .= $this->getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $table, $fields, $language);
}
$content .= $this->getTemplatesAdminPagesFooter($moduleDirname);
//
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -71,7 +71,7 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$langStuFieldName = $language.strtoupper($fieldName);
- if( $fields[$f]->getVar('field_user') == 1 ) {
+ if( ($fields[$f]->getVar('field_user') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
$ret .= <<<EOT
<th class="center"><{\$smarty.const.{$langStuFieldName}}></th>\n
EOT;
@@ -103,7 +103,7 @@
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
- if( $fields[$f]->getVar('field_user') == 1 ) {
+ if( ($fields[$f]->getVar('field_user') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
$ret .= <<<EOT
@@ -155,7 +155,7 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
- if( $fields[$f]->getVar('field_user') == 1 ) {
+ if( ($fields[$f]->getVar('field_user') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
$ret .= <<<EOT
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -16,7 +16,7 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: user_objects.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: objects.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
@@ -78,12 +78,28 @@
*/
public function getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
$ret = <<<EOT
-\t\t\t// Get Var {$fieldName}
-\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
+\t\t// Get Var {$fieldName}
+\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
EOT;
return $ret;
}
/*
+ * @public function getUploadImageGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
+ $ret = <<<EOT
+\t\t// Get Var {$fieldName}
+\t\t\${$fieldName} = \${$tableName}_arr[\$i]->getVar('{$fieldName}');
+\t\t\$upload_image = \${$fieldName} ? \${$fieldName} : 'blank.gif';
+\t\t\${$lpFieldName}['{$rpFieldName}'] = \$upload_image;\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getTextAreaGetVar
* @param string $lpFieldName
* @param string $rpFieldName
@@ -92,8 +108,8 @@
*/
public function getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
$ret = <<<EOT
-\t\t\t// Get Var {$fieldName}
-\t\t\t\${$lpFieldName}['{$rpFieldName}'] = strip_tags(\${$tableName}_arr[\$i]->getVar('{$fieldName}'));\n
+\t\t// Get Var {$fieldName}
+\t\t\${$lpFieldName}['{$rpFieldName}'] = strip_tags(\${$tableName}_arr[\$i]->getVar('{$fieldName}'));\n
EOT;
return $ret;
}
@@ -106,8 +122,8 @@
*/
public function getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
$ret = <<<EOT
-\t\t\t// Get Var {$fieldName}
-\t\t\t\${$lpFieldName}['{$rpFieldName}'] = XoopsUser::getUnameFromId(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
+\t\t// Get Var {$fieldName}
+\t\t\${$lpFieldName}['{$rpFieldName}'] = XoopsUser::getUnameFromId(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
EOT;
return $ret;
}
@@ -120,8 +136,8 @@
*/
public function getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
$ret = <<<EOT
-\t\t\t// Get Var {$fieldName}
-\t\t\t\${$lpFieldName}['{$rpFieldName}'] = formatTimeStamp(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
+\t\t// Get Var {$fieldName}
+\t\t\${$lpFieldName}['{$rpFieldName}'] = formatTimeStamp(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
EOT;
return $ret;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-13 10:24:13 UTC (rev 12709)
@@ -67,10 +67,10 @@
$table = $this->getTable();
$tableName = $table->getVar('table_name');
$tableFieldname = $table->getVar('table_fieldname');
- $tableAutoincrement = $table->getVar('table_autoincrement');
$stuModuleDirname = strtoupper($moduleDirname);
$stuTableName = strtoupper($tableName);
$stlTableName = strtolower($tableName);
+ $ucfTableName = ucfirst($tableName);
$ret = <<<EOT
\ninclude_once 'header.php';
\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl';
@@ -84,9 +84,10 @@
//
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
//
-\$criteria = new CriteriaCompo();
-\${$stlTableName}_count = \${$stlTableName}Handler->getCount(\$criteria);
-\${$stlTableName}_arr = \${$stlTableName}Handler->getAll(\$criteria);
+\$criteria{$ucfTableName} = new CriteriaCompo();
+\${$stlTableName}_count = \${$stlTableName}Handler->getCount(\$criteria{$ucfTableName});
+\${$stlTableName}_arr = \${$stlTableName}Handler->getAll(\$criteria{$ucfTableName});
+unset(\$criteria{$ucfTableName});
\$keywords = array();
if (\${$stlTableName}_count > 0) {
foreach (array_keys(\${$stlTableName}_arr) as \$i)
@@ -104,16 +105,19 @@
$fpmf = $fieldName; // fpmf = fields parameters main field
}
$fieldElement = $fields[$f]->getVar('field_element');
- if( ($fields[$f]->getVar('field_user') == 1) || ($tableAutoincrement == 1) ) {
+ if( ($fields[$f]->getVar('field_user') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch($fieldElement) {
- case 2:
case 3:
+ case 4:
$ret .= $this->userobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
- case 7:
+ case 8:
$ret .= $this->userobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 12:
+ break;
+ case 11:
+ $ret .= $this->userobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ case 13:
$ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
default:
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql 2014-07-13 00:34:40 UTC (rev 12708)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql 2014-07-13 10:24:13 UTC (rev 12709)
@@ -110,7 +110,8 @@
`field_required` TINYINT(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`field_id`),
KEY `field_mid` (`field_mid`),
- KEY `field_tid` (`field_tid`)
+ KEY `field_tid` (`field_tid`),
+ KEY `field_name` (`field_name`)
)ENGINE =MyISAM;
#
|